Ignore:
Timestamp:
04/16/13 12:14:28 (20 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, releng/10.1
Children:
750d224
Parents:
4d0d420
Message:

Fix bad merge, correct my files, oops!

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-installgui/i18n/SysInstaller_et.ts

    r4d0d420 r76557842  
    228228    <message> 
    229229        <source>Click arrows to change system selection</source> 
    230 <<<<<<< HEAD 
    231         <translation type="unfinished"> 
    232             </translation> 
    233     </message> 
    234     <message> 
    235         <source>Unable to suggest a partition for the detected disk.</source> 
    236         <translation type="unfinished"> 
    237             </translation> 
    238     </message> 
    239     <message> 
    240         <source>Detected that you are running the 32bit version. If your system is 64bit capable (most systems made after 2005), you really should be running the 64bit version</source> 
    241         <translation type="unfinished"> 
    242             </translation> 
    243     </message> 
    244     <message> 
    245         <source>The selected disk / partition is less than recommended %1MB. The installation may fail...</source> 
    246         <translation type="unfinished"> 
    247             </translation> 
    248 ======= 
    249230        <translation>Vali nooltele vajutades sÃŒsteem</translation> 
    250231    </message> 
     
    260241        <source>The selected disk / partition is less than recommended %1MB. The installation may fail...</source> 
    261242        <translation>Valitud ketas/partitsioon on vÀiksem kui soovitatud %1 MB. Paigaldamine võib ebaõnnestuda...</translation> 
    262 >>>>>>> pcbsd/master 
    263243    </message> 
    264244</context> 
     
    708688    <message> 
    709689        <source>Enter SWAP size</source> 
    710 <<<<<<< HEAD 
    711         <translation type="unfinished"> 
    712             </translation> 
    713     </message> 
    714     <message> 
    715         <source>Size (MB)</source> 
    716         <translation type="unfinished"> 
    717             </translation> 
    718 ======= 
    719690        <translation>Sisesta saaleala suurus</translation> 
    720691    </message> 
     
    722693        <source>Size (MB)</source> 
    723694        <translation>Suurus (MB)</translation> 
    724 >>>>>>> pcbsd/master 
    725695    </message> 
    726696</context> 
Note: See TracChangeset for help on using the changeset viewer.