Changeset c2eb399


Ignore:
Timestamp:
12/03/13 09:27:29 (12 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
618401b, 6c5c258
Parents:
14a2c02 (diff), 1dbc20f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
66 added
7 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-bootconfig/i18n/pc-bootconfig_zh_CN.ts

    r0f6669f r83203d6  
    260260    <message> 
    261261        <source>Boot Environment names may only be comprised of letters and numbers</source> 
    262         <translation type="unfinished"> 
    263             </translation> 
     262        <translation>匕富环境名称只胜由数字和字母组成 
     263</translation> 
    264264    </message> 
    265265</context> 
  • src-qt4/pc-installgui/i18n/SysInstaller_zh_CN.ts

    r9617171 r83203d6  
    309309    <message> 
    310310        <source>Restore from Life-Preserver backup</source> 
    311         <translation type="unfinished"> 
    312             </translation> 
     311        <translation>从Life-Preserver倇仜恢倍</translation> 
    313312    </message> 
    314313    <message> 
    315314        <source>Manage network connectivity</source> 
    316         <translation type="unfinished"> 
    317             </translation> 
     315        <translation>管理眑络连接</translation> 
    318316    </message> 
    319317    <message> 
    320318        <source>ZFS Datasets:</source> 
    321         <translation type="unfinished"> 
    322             </translation> 
     319        <translation>ZFS数据集</translation> 
    323320    </message> 
    324321    <message> 
    325322        <source>The original ZFS layout will be restored</source> 
    326         <translation type="unfinished"> 
    327             </translation> 
     323        <translation>原始ZFS垃局将被恢倍</translation> 
    328324    </message> 
    329325    <message> 
    330326        <source>Performing a restore from a Life-Preserver backup. Click next to start the restore wizard.</source> 
    331         <translation type="unfinished"> 
    332             </translation> 
     327        <translation>从Life-Preserver倇仜恢倍。点击&quot;䞋䞀步&quot;匀始恢倍向富。</translation> 
    333328    </message> 
    334329    <message> 
  • src-qt4/pc-zmanager/i18n/ZManager_zh_CN.ts

    rc5b6872 r83203d6  
    13211321    <message> 
    13221322        <source>Unmount</source> 
    1323         <translation type="unfinished"> 
    1324             </translation> 
     1323        <translation>取消挂蜜</translation> 
    13251324    </message> 
    13261325    <message> 
    13271326        <source>Mount</source> 
    1328         <translation type="unfinished"> 
    1329             </translation> 
     1327        <translation>挂蜜</translation> 
    13301328    </message> 
    13311329    <message> 
    13321330        <source>Create MBR partition table</source> 
    1333         <translation type="unfinished"> 
    1334             </translation> 
     1331        <translation>创建MBR分区衚</translation> 
    13351332    </message> 
    13361333    <message> 
    13371334        <source>Create GPT partition table</source> 
    1338         <translation type="unfinished"> 
    1339             </translation> 
     1335        <translation>创建GPT分区衚</translation> 
    13401336    </message> 
    13411337    <message> 
    13421338        <source>Create BSD partition table</source> 
    1343         <translation type="unfinished"> 
    1344             </translation> 
     1339        <translation>创建BSD分区衚</translation> 
    13451340    </message> 
    13461341    <message> 
    13471342        <source>Delete Partition Table</source> 
    1348         <translation type="unfinished"> 
    1349             </translation> 
     1343        <translation>删陀分区衚</translation> 
    13501344    </message> 
    13511345    <message> 
    13521346        <source>Add new slice</source> 
    1353         <translation type="unfinished"> 
    1354             </translation> 
     1347        <translation>添加新slice</translation> 
    13551348    </message> 
    13561349    <message> 
    13571350        <source>Add new partition</source> 
    1358         <translation type="unfinished"> 
    1359             </translation> 
     1351        <translation>添加新分区</translation> 
    13601352    </message> 
    13611353    <message> 
    13621354        <source>Destroy this slice</source> 
    1363         <translation type="unfinished"> 
    1364             </translation> 
     1355        <translation>销毁这䞪slice</translation> 
    13651356    </message> 
    13661357    <message> 
    13671358        <source>Destroy this partition</source> 
    1368         <translation type="unfinished"> 
    1369             </translation> 
     1359        <translation>销毁这䞪分区</translation> 
    13701360    </message> 
    13711361    <message> 
    13721362        <source>Warning</source> 
    1373         <translation type="unfinished"> 
    1374             </translation> 
     1363        <translation>è­Šå‘Š</translation> 
    13751364    </message> 
    13761365    <message> 
    13771366        <source>This operation cannot be undone. 
    13781367OK to destroy the slice/partition?</source> 
    1379         <translation type="unfinished"> 
    1380             </translation> 
     1368        <translation>歀操䜜无法被撀销。 
     1369确定芁销毁slice或分区吗</translation> 
    13811370    </message> 
    13821371    <message> 
    13831372        <source>Error report</source> 
    1384         <translation type="unfinished"> 
    1385             </translation> 
     1373        <translation>错误报告</translation> 
    13861374    </message> 
    13871375    <message> 
    13881376        <source>Create new zpool</source> 
    1389         <translation type="unfinished"> 
    1390             </translation> 
     1377        <translation>创建新的zpool</translation> 
    13911378    </message> 
    13921379    <message> 
    13931380        <source>Important information</source> 
    1394         <translation type="unfinished"> 
    1395             </translation> 
     1381        <translation>重芁信息</translation> 
    13961382    </message> 
    13971383    <message> 
  • src-qt4/xtrafiles/local/share/wallpapers/pcbsd10-default/metadata.desktop

    r8e99ed9 r0bba88c  
    1818Name[sv]=Standard: PC-BSD 10 
    1919Name[uk]=Default: PC-BSD 10 
     20Name[zh_CN]=默讀PC-BSD 10 
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/02Mate.desktop

    r8e99ed9 r0bba88c  
    8181Name[uz]=MATE 
    8282Name[vi]=MATE 
    83 Name[zh_CN]=MATE 
     83Name[zh_CN]=MATE桌面环境 
    8484Name[zh_HK]=MATE 
    8585Name[zh_TW]=MATE 
     
    171171Comment[uz]=Ushbu seans MATE'ga kirishingizni taÊŒminlaydi 
    172172Comment[vi]=Phiên chạy này sẜ đăng nhập bạn vào MATE 
    173 Comment[zh_CN]=歀䌚话将悚登圕到 MATE 
     173Comment[zh_CN]=歀䌚话将䜿䜠登å 
     174¥MATE桌面环境 
    174175Comment[zh_HK]=這個䜜業階段讓䜠登å 
    175176¥ MATE 
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/32Cinnamon.desktop

    r6c83cf1 r0bba88c  
    44Icon=/usr/local/share/pixmaps/cinnamon.png 
    55Type=Application 
    6 Comment=This session logs you into Cinnamon 
    7 Comment[de]=Diese Sitzung meldet Sie bei Cinnamon an 
    8 Comment[en_GB]=This session logs you into Cinnamon 
    9 Comment[en_ZA]=This session logs you into Cinnamon 
    10 Comment[nl]=Deze sessie meldt u aan in Cinnamon 
    11 Comment[pl]=Ta sesja zaloguje Cię do Cinnamon 
    12 Comment[sv]=Denna session loggar in dig i Cinnamon 
    13 Comment[uk]=В цій сесії вО увійЎете ЎП Cinnamon 
    146Name=Cinnamon 
    157Name[de]=Cinnamon 
     
    2315Name[sv]=Cinnamon 
    2416Name[uk]=Cinnamon 
     17Name[zh_CN]=Cinnamon桌面环境 
     18Comment=This session logs you into Cinnamon 
     19Comment[de]=Diese Sitzung meldet Sie bei Cinnamon an 
     20Comment[en_GB]=This session logs you into Cinnamon 
     21Comment[en_ZA]=This session logs you into Cinnamon 
     22Comment[nl]=Deze sessie meldt u aan in Cinnamon 
     23Comment[pl]=Ta sesja zaloguje Cię do Cinnamon 
     24Comment[sv]=Denna session loggar in dig i Cinnamon 
     25Comment[uk]=В цій сесії вО увійЎете ЎП Cinnamon 
     26Comment[zh_CN]=歀䌚话将䜿䜠登å 
     27¥Cinnamon桌面环境 
  • src-qt4/PCDM/src/pcdm-backend.cpp

    rf2fe669 r14a2c02  
    230230  //Check for sample files 
    231231  if(!mainDir.exists("pcdm.conf.sample")){ QFile::copy(":samples/pcdm.conf",base+"/pcdm.conf.sample"); }  
     232  //Check for the PCDM runtime directory 
     233  mainDir.cd("/var/db/pcdm"); 
     234  if(!mainDir.exists()){ mainDir.mkdir("/var/db/pcdm"); } 
    232235} 
    233236 
     
    263266    keyvariant = ""; 
    264267  //Read the current inputs file and overwrite default values 
    265   QFile file("/usr/local/share/PCDM/.defaultInputs"); 
     268  QFile file("/var/db/pcdm/defaultInputs"); 
    266269  bool goodFile=false; 
    267270  if(file.exists()){ 
     
    287290 
    288291void Backend::saveDefaultSysEnvironment(QString lang, QString keymodel, QString keylayout, QString keyvariant){ 
    289   QFile file("/usr/local/share/PCDM/.defaultInputs"); 
     292  QFile file("/var/db/pcdm/defaultInputs"); 
    290293    if(file.open(QIODevice::WriteOnly | QIODevice::Text) ){ 
    291294      QTextStream out(&file); 
Note: See TracChangeset for help on using the changeset viewer.