Ignore:
Timestamp:
04/16/13 12:14:28 (19 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/libpcbsd/ui/i18n/libpcbsd_is.ts

    r4d0d420 r76557842  
    33<TS version="2.0"> 
    44<context> 
    5 <<<<<<< HEAD 
    6     <name>QObject</name> 
    7     <message> 
    8         <source>Restarting network...</source> 
    9         <translation type="unfinished"> 
    10             </translation> 
    11     </message> 
    12     <message> 
    13         <source>Network is restarting, please wait...</source> 
    14         <translation type="unfinished"> 
    15             </translation> 
    16     </message> 
    17     <message> 
    18         <source>Setting default route...</source> 
    19         <translation type="unfinished"> 
    20             </translation> 
    21     </message> 
    22     <message> 
    23         <source>Running DHCP...</source> 
    24         <translation type="unfinished"> 
    25             </translation> 
    26     </message> 
    27 </context> 
    28 <context> 
    29 ======= 
    30 >>>>>>> pcbsd/master 
    315    <name>dialogInfoBox</name> 
    326    <message> 
Note: See TracChangeset for help on using the changeset viewer.