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/libpcbsd/ui/i18n/libpcbsd_zh_CN.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>重启眑络  </translation> 
    10     </message> 
    11     <message> 
    12         <source>Network is restarting, please wait...</source> 
    13         <translation>请等埠
    14 ïŒŒé‡å¯çœ‘络䞭  </translation> 
    15     </message> 
    16     <message> 
    17         <source>Setting default route...</source> 
    18         <translation>讟眮默讀路由  </translation> 
    19     </message> 
    20     <message> 
    21         <source>Running DHCP...</source> 
    22         <translation>运行DHCP

            </translation> 
    23     </message> 
    24 </context> 
    25 <context> 
    26 ======= 
    27 >>>>>>> pcbsd/master 
    285    <name>dialogInfoBox</name> 
    296    <message> 
Note: See TracChangeset for help on using the changeset viewer.