Changeset 66127c2


Ignore:
Timestamp:
Oct 31, 2013 9:19:02 AM (6 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
4e655ec
Parents:
71d919d (diff), 7e583de (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:
19 deleted
10 edited

Legend:

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

    raebf244 r193c44c  
    246246    <message> 
    247247        <source>You cannot make a copy of the currently running boot environment!</source> 
    248         <translation type="unfinished"> 
    249             </translation> 
     248        <translation>U kunt geen kopie maken van de thans draaiende opstartomgeving.</translation> 
    250249    </message> 
    251250</context> 
  • src-qt4/pc-controlpanel/items/hardware/pc-zmanager.desktop

    rc59238a r3e47866  
    1414Name[fr]=Gestionnaire de disque 
    1515Name[fr_CA]=Gestionnaire de disque 
     16Name[nl]=Schijfbeheerder 
    1617Name[pl]=MenadÅŒer dysku 
    1718Name[uk]=ЀайлПві сОстеЌО 
     
    2324Comment[fr]=ZFS / Gestion des disques 
    2425Comment[fr_CA]=ZFS / Gestion des disques 
     26Comment[nl]=ZFS / Schijfbeheer 
    2527Comment[pl]=ZFS / zarzÄ 
    2628dzanie dyskiem 
  • src-qt4/pc-mounttray/i18n/MountTray_nl.ts

    raebf244 r193c44c  
    9696    <message> 
    9797        <source>Device Busy</source> 
    98         <translation type="unfinished"> 
    99             </translation> 
     98        <translation>Apparaat bezig</translation> 
    10099    </message> 
    101100    <message> 
    102101        <source>The device appears to be busy. Would you like to unmount it anyway?</source> 
    103         <translation type="unfinished"> 
    104             </translation> 
     102        <translation>Het apparaat lijkt bezig te zijn. Wilt u het toch ontkoppelen?</translation> 
    105103    </message> 
    106104    <message> 
    107105        <source>NOTE: This is generally not recommended unless you are sure that you don&apos;t have any applications using the device.</source> 
    108         <translation type="unfinished"> 
    109             </translation> 
     106        <translation>Let op: dit wordt gewoonlijk niet aangeraden tenzij u er zeker van bent dat er geen toepassingen zijn die het apparaat aan het gebruiken zijn.</translation> 
    110107    </message> 
    111108</context> 
  • src-qt4/pc-pkgmanager/i18n/PackageManager_nl.ts

    raebf244 r193c44c  
    229229    <message> 
    230230        <source>Dependencies</source> 
    231         <translation type="unfinished"> 
    232             </translation> 
     231        <translation>Afhankelijkheden</translation> 
    233232    </message> 
    234233    <message> 
    235234        <source>Find Packages</source> 
    236         <translation type="unfinished"> 
    237             </translation> 
     235        <translation>Pakketten zoeken</translation> 
    238236    </message> 
    239237    <message> 
    240238        <source>Search</source> 
    241         <translation type="unfinished"> 
    242             </translation> 
     239        <translation>Zoeken</translation> 
    243240    </message> 
    244241    <message> 
    245242        <source>No Search Results</source> 
    246         <translation type="unfinished"> 
    247             </translation> 
     243        <translation>Geen zoekresultaten</translation> 
    248244    </message> 
    249245    <message> 
    250246        <source>Do you want to continue the search from the top?</source> 
    251         <translation type="unfinished"> 
    252             </translation> 
     247        <translation>Wilt u doorgaan met de zoektocht vanaf de bovenkant?</translation> 
    253248    </message> 
    254249    <message> 
    255250        <source>No packages could be found with that search term. Please adjust it and try again.</source> 
    256         <translation type="unfinished"> 
    257             </translation> 
     251        <translation>Geen pakketten gevonden met deze zoekterm. Wijzig hem a.u.b. en probeer het opnieuw.</translation> 
    258252    </message> 
    259253    <message> 
    260254        <source>Processes Running</source> 
    261         <translation type="unfinished"> 
    262             </translation> 
     255        <translation>Draaiende processen</translation> 
    263256    </message> 
    264257    <message> 
    265258        <source>Packages are currently being changed. Are you sure you want to quit?</source> 
    266         <translation type="unfinished"> 
    267             </translation> 
     259        <translation>Er worden thans pakketten veranderd. Weet u wel zeker dat u wil afsluiten?</translation> 
    268260    </message> 
    269261</context> 
  • src-qt4/pc-softwaremanager/i18n/SoftwareManager_nl.ts

    re1fdbaf r193c44c  
    485485    <message> 
    486486        <source>Product Page</source> 
    487         <translation type="unfinished"> 
    488             </translation> 
     487        <translation>Productpagina</translation> 
    489488    </message> 
    490489    <message> 
    491490        <source>Verify Installation</source> 
    492         <translation type="unfinished"> 
    493             </translation> 
     491        <translation>Installatie verifiëren</translation> 
    494492    </message> 
    495493    <message> 
    496494        <source>Are you sure you want to install this application?</source> 
    497         <translation type="unfinished"> 
    498             </translation> 
     495        <translation>Weet u zeker dat u deze toepassing wil installeren?</translation> 
    499496    </message> 
    500497</context> 
  • src-qt4/pc-updategui/i18n/UpdateGui_nl.ts

    raebf244 r193c44c  
    158158    <message> 
    159159        <source>Reboot required for update to finish!</source> 
    160         <translation type="unfinished"> 
    161             </translation> 
     160        <translation>Herstart is vereist om het bijwerken af te ronden.</translation> 
    162161    </message> 
    163162</context> 
  • src-qt4/warden-gui/i18n/Warden_nl.ts

    r9617171 r193c44c  
    228228    <message> 
    229229        <source>The following permissions can be enabled or disabled for this jail. For more details hover over each item or refer to the jail manpage.</source> 
    230         <translation type="unfinished"> 
    231             </translation> 
     230        <translation>De volgende rechten kunnen worden ingeschakeld of uitgeschakeld voor deze gevangenis. Voor meer bijzonderheden plaatst u de muispijl op elk element. Ook kunt u de handleidingpagina voor gevangenis inzien.</translation> 
    232231    </message> 
    233232</context> 
  • src-sh/pbi-manager10/pbime/pbimount

    r7234a50 r7e583de  
    44 
    55is_mounted() { 
     6   if [ ! -d "${1}" ] ; then return 0; fi 
    67   mount | grep -q "on ${1} ("  
    78   return $? 
  • src-qt4/PCDM/PCDMd

    r1691c6a r71d919d  
    4444    (sleep 10 ; $vnccmd >/var/log/vncserver 2>/var/log/vncserver) & 
    4545  fi 
    46  
     46  setenv XAUTHORITY ${PCDMAUTHFILE} 
    4747  xinit /usr/local/bin/PCDM-session --once -- :0 -auth ${PCDMAUTHFILE} $XOPTS 
    4848done 
  • src-qt4/PCDM/src/main.cpp

    r1234f7c r71d919d  
    173173  if(runonce){ neverquit = FALSE; } 
    174174  qDebug() << " -- PCDM Session Starting..."; 
     175  system("xauth generate :0 ."); //Using MIT-MAGIC-COOKIE-1 protocol 
     176  //MIT-MAGIC-COOKIE-1 is good enough for our purposes since it is a single-user graphical system with no XDMCP 
    175177  int sid = -1; 
    176178  int pid = fork(); 
     
    198200  if(QFile::exists("/var/run/nologin")){ neverquit = FALSE; }  
    199201 } 
     202 system("xauth remove :0"); 
    200203 return 0; 
    201204} 
Note: See TracChangeset for help on using the changeset viewer.