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/pc-updategui/i18n/UpdateGui_et.ts

    r4d0d420 r76557842  
    210210    <message> 
    211211        <source>Downloading: %1</source> 
    212 <<<<<<< HEAD 
    213         <translation type="unfinished"> 
    214             </translation> 
    215     </message> 
    216     <message> 
    217         <source>Failed package update</source> 
    218         <translation type="unfinished"> 
    219             </translation> 
    220     </message> 
    221     <message> 
    222         <source>The package update failed! If this persists, you may need to manually run: pc-updatemanager pkgupdate</source> 
    223         <translation type="unfinished"> 
    224             </translation> 
    225 ======= 
    226212        <translation>Allalaadimine: %1</translation> 
    227213    </message> 
     
    233219        <source>The package update failed! If this persists, you may need to manually run: pc-updatemanager pkgupdate</source> 
    234220        <translation>Paki uuendamine ebaõnnestus! Kui see juhtub korduvalt, siis peab võib-olla uuendama kÀsitsi kÀsuga: pc-updatemanager pkgupdate</translation> 
    235 >>>>>>> pcbsd/master 
    236221    </message> 
    237222</context> 
Note: See TracChangeset for help on using the changeset viewer.