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/about-gui/i18n/AboutGui_et.ts

    r4d0d420 r76557842  
    8282    <message> 
    8383        <source>System components...</source> 
    84 <<<<<<< HEAD 
    85         <translation type="unfinished"> 
    86             </translation> 
    87     </message> 
    88     <message> 
    89         <source>Desktop environments...</source> 
    90         <translation type="unfinished"> 
    91             </translation> 
    92     </message> 
    93     <message> 
    94         <source>PC-BSD CLI utilities:</source> 
    95         <translation type="unfinished"> 
    96             </translation> 
    97     </message> 
    98     <message> 
    99         <source>PC-BSD UI utilities:</source> 
    100         <translation type="unfinished"> 
    101             </translation> 
    102 ======= 
    10384        <translation>SÃŒsteemi komponendid...</translation> 
    10485    </message> 
     
    11495        <source>PC-BSD UI utilities:</source> 
    11596        <translation>PC-BSD kasutajaliidese tööriistad:</translation> 
    116 >>>>>>> pcbsd/master 
    11797    </message> 
    11898</context> 
Note: See TracChangeset for help on using the changeset viewer.