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

Fix bad merge, correct my files, oops!

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/EasyPBI/i18n/EasyPBI_et.ts

    r4d0d420 r76557842  
    762762    <message> 
    763763        <source>FreeBSD Ports Missing</source> 
    764 <<<<<<< HEAD 
    765         <translation type="unfinished"> 
    766             </translation> 
    767     </message> 
    768     <message> 
    769         <source>The FreeBSD ports tree is missing from your system.</source> 
    770         <translation type="unfinished"> 
    771             </translation> 
    772     </message> 
    773     <message> 
    774         <source>Please open up the appropriate EasyPBI menu option to correct this deficiency.</source> 
    775         <translation type="unfinished"> 
    776             </translation> 
    777 ======= 
    778764        <translation>FreeBSD pordid on puudu</translation> 
    779765    </message> 
     
    785771        <source>Please open up the appropriate EasyPBI menu option to correct this deficiency.</source> 
    786772        <translation>Tõmba FreeBSD portide puu EasyPBI menÌÌ kaudu.</translation> 
    787 >>>>>>> pcbsd/master 
    788773    </message> 
    789774</context> 
Note: See TracChangeset for help on using the changeset viewer.