Ignore:
Timestamp:
Apr 16, 2013 12:14:28 PM (12 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.1-release, 9.2-release, releng/10.0, releng/10.0.1
Children:
750d224
Parents:
4d0d420
Message:

Fix bad merge, correct my files, oops!

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-mounttray/i18n/MountTray_et.ts

    r4d0d420 r7655784  
    5454    <message> 
    5555        <source>Mounted at %1</source> 
    56 <<<<<<< HEAD 
    57         <translation type="unfinished"> 
    58             </translation> 
    59 ======= 
    6056        <translation>Haagitud asukohta %1</translation> 
    61 >>>>>>> pcbsd/master 
    6257    </message> 
    6358</context> 
Note: See TracChangeset for help on using the changeset viewer.