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

Fix bad merge, correct my files, oops!

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_et.ts

    r4d0d420 r76557842  
    273273    <message> 
    274274        <source>Proxy enabled</source> 
    275 <<<<<<< HEAD 
    276         <translation type="unfinished"> 
    277             </translation> 
    278     </message> 
    279     <message> 
    280         <source>You may need to re-login for proxy settings to take effect.</source> 
    281         <translation type="unfinished"> 
    282             </translation> 
    283 ======= 
    284275        <translation>Proksi sisse lÃŒlitatud</translation> 
    285276    </message> 
     
    287278        <source>You may need to re-login for proxy settings to take effect.</source> 
    288279        <translation>Proksi seadete aktiveerimiseks peab võib-olla uuesti sisse logima.</translation> 
    289 >>>>>>> pcbsd/master 
    290280    </message> 
    291281</context> 
Note: See TracChangeset for help on using the changeset viewer.