Changeset fbc8e89


Ignore:
Timestamp:
11/26/13 08:19:55 (19 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, enter/10, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
2b62dde
Parents:
f17bcf9 (diff), 80c38d5 (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:
8 edited

Legend:

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

    r0f6669f ref32bd5  
    257257    <message> 
    258258        <source>Boot Environment names may only be comprised of letters and numbers</source> 
    259         <translation type="unfinished"> 
    260             </translation> 
     259        <translation>Nazwy środowisk uruchomieniowych mogÄ 
     260 składać się tylko z liter i cyfr</translation> 
    261261    </message> 
    262262</context> 
  • src-qt4/pc-installgui/i18n/SysInstaller_de.ts

    ra789e81 ref32bd5  
    268268    <message> 
    269269        <source>ZFS Datasets:</source> 
    270         <translation type="unfinished"> 
    271             </translation> 
     270        <translation>ZFS Datenmenge:</translation> 
    272271    </message> 
    273272    <message> 
    274273        <source>The original ZFS layout will be restored</source> 
    275         <translation type="unfinished"> 
    276             </translation> 
     274        <translation>Das originale Layout fÃŒr ZFS wird wieder hergestellt</translation> 
    277275    </message> 
    278276    <message> 
    279277        <source>Performing a restore from a Life-Preserver backup. Click next to start the restore wizard.</source> 
    280         <translation type="unfinished"> 
    281             </translation> 
     278        <translation>FÃŒhren eine Wiederherstellung von einem Life-Preserver Backup aus. Klicke next, um den Wiederherstellungassistent zu starten.</translation> 
    282279    </message> 
    283280    <message> 
    284281        <source>Start the restore now?</source> 
    285         <translation type="unfinished"> 
    286             </translation> 
     282        <translation>Soll die Wiederherstellung jetzt gestartet werden?</translation> 
    287283    </message> 
    288284    <message> 
    289285        <source>Your system is now restored! 
    290286Click Finish to reboot. After rebooting you may eject the install media.</source> 
    291         <translation type="unfinished"> 
    292             </translation> 
     287        <translation>Ihr System ist nun wiederhergestellt! 
     288Klicken Sie Finish zum Neustart. Nach dem Neustart sollten Sie das Installationsmedium entnehmen.</translation> 
    293289    </message> 
    294290    <message> 
    295291        <source>System Restore</source> 
    296         <translation type="unfinished"> 
    297             </translation> 
     292        <translation>Systemwiederherstellung</translation> 
    298293    </message> 
    299294    <message> 
    300295        <source>Your system is now being restored, this may take a while depending upon the size of your backup and network conditions.</source> 
    301         <translation type="unfinished"> 
    302             </translation> 
     296        <translation>Ihr System wird nun wiederhergestellt. Dies kann eine Weile, in AbhÀngigkeit von der Größe Ihres Backups und den Bedingungen des Netzwerkes, dauern.</translation> 
    303297    </message> 
    304298    <message> 
    305299        <source>Installing meta-package: %1</source> 
    306         <translation type="unfinished"> 
    307             </translation> 
     300        <translation>Installiere Meta-Pakete: %1</translation> 
    308301    </message> 
    309302    <message> 
    310303        <source>Restoring system: %1</source> 
    311         <translation type="unfinished"> 
    312             </translation> 
     304        <translation>Wiederherstellen des Systems: %1</translation> 
    313305    </message> 
    314306</context> 
  • src-qt4/pc-pkgmanager/i18n/PackageManager_pl.ts

    rf91dfa6 ref32bd5  
    276276    <message> 
    277277        <source>Package Check</source> 
    278         <translation type="unfinished"> 
    279             </translation> 
     278        <translation>Sprawdzanie pakietu</translation> 
    280279    </message> 
    281280    <message> 
    282281        <source>Unable to check for package updates!</source> 
    283         <translation type="unfinished"> 
    284             </translation> 
     282        <translation>Wyszukiewanie aktualizacji pakietów nie powiodło się!</translation> 
    285283    </message> 
    286284</context> 
  • src-qt4/xtrafiles/local/share/wallpapers/pcbsd10-default/metadata.desktop

    r24c6934 r80c38d5  
    1515Name[lv]=Noklusējums: PC-BSD 10 
    1616Name[nl]=Standaard: PC-BSD 10 
     17Name[pl]=Domyślnie: PC-BSD 10 
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/02Mate.desktop

    r24c6934 r80c38d5  
    148148ଧିବେଶଚ ଆପଣଙ୍କୁ ଚୋମ ରେ ଲଗ କରଟଇଥଟଏ 
    149149Comment[pa]=àš‡àš¹ àšžàšŒà©ˆàšžàšŒàšš àš€à©àš¹àšŸàššà©‚à©° àš—àššà©‹àš® àšµàš¿à©±àšš àš²àšŸàš— àš•àš°àšŠàšŸ àš¹à©ˆ 
    150 Comment[pl]=Ta sesja loguje uÅŒytkownika do środowiska MATE 
     150Comment[pl]=Ta sesja zaloguje Cię do MATE 
    151151Comment[ps]=دا ناسته تاسو ګنو٠
    152152 ØªÙ‡ ننؚاسي 
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/32Cinnamon.desktop

    r8165098 r80c38d5  
    1111Name[ko]=시나몬 
    1212Name[nl]=Cinnamon 
     13Name[pl]=Cinnamon 
    1314Comment=This session logs you into Cinnamon 
    1415Comment[de]=Diese Sitzung meldet Sie bei Cinnamon an 
     
    1617Comment[en_ZA]=This session logs you into Cinnamon 
    1718Comment[nl]=Deze sessie meldt u aan in Cinnamon 
     19Comment[pl]=Ta sesja zaloguje Cię do Cinnamon 
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/33Cinnamon2d.desktop

    r8165098 r80c38d5  
    1212Name[ko]=시나몬 (소프튞웚얎 렌더링) 
    1313Name[nl]=Cinnamon (weergave via programmatuur) 
     14Name[pl]=Cinnamon (Oprogramowanie renderujÄ 
     15ce) 
    1416Comment=This session logs you into Cinnamon (using software rendering) 
    1517Comment[de]=Diese Sitzung meldet Sie bei Cinnamon (bei Nutzung von Software-Rendering) an 
     
    1719Comment[en_ZA]=This session logs you into Cinnamon (using software rendering) 
    1820Comment[nl]=Deze sessie meldt u aan in Cinnamon (met weergave via programmatuur) 
     21Comment[pl]=Ta sesja zaloguje Cię do Cinnamon (uÅŒywajÄ 
     22c oprogramowania renderujÄ 
     23cego) 
  • src-sh/pbi-manager10/pbi-manager

    r55549dde rf17bcf9  
    60456045        fi       
    60466046 
    6047         if [ ! -d "${PORTSDIR}/${PBI_MAKEPORT}" ] ; then  
    6048                 #echo "Skipping invalid port ${PORTSDIR}/${PBI_MAKEPORT}" 
    6049                 continue 
    6050         fi 
    6051  
    60526047        # Remove any trailing '/' 
    60536048        echo $PBI_MAKEPORT | grep -q "/$" 
     
    60566051        fi 
    60576052         
    6058         # Check if this port can be built on this architecture 
    6059         check_port_compat_arch "${PORTSDIR}/${PBI_MAKEPORT}" 
    6060         if [ "$?" = "1" ] ; then 
    6061            if [ "$PBI_ABFB32" != "YES" ] ; then 
    6062                 echo "${PBI_MAKEPORT} - Skipping for invalid system arch" 
    6063                 continue 
    6064            fi 
    6065            if [ "$have32" != "true" ] ; then 
    6066                 echo "${PBI_MAKEPORT} - Skipping for invalid system arch" 
    6067                 continue 
    6068            fi 
    6069         fi 
    6070          
    60716053        # Check for missing port target 
    60726054        if [ -z "$PBI_MAKEPORT" ] ; then 
    60736055                #echo "Warning: Missing PBI_MAKEPORT for ${pbi}" 
    60746056                continue 
     6057        fi 
     6058 
     6059        if [ "$PBI_AB_PKGBUILD" = "YES" -a -z "$PBI_AB_NOPKGBUILD"  ] ; then 
     6060                # Doing a package build for this PBI 
     6061                pkg rquery "%v" ${PBI_MAKEPORT} >/dev/null 2>/dev/null 
     6062                if [ $? -ne 0 ] ; then 
     6063                        echo "No package found for: ${PBI_MAKEPORT}" 
     6064                        continue 
     6065                fi 
     6066 
     6067        else 
     6068 
     6069                # Doing a port build for this PBI 
     6070                if [ ! -d "${PORTSDIR}/${PBI_MAKEPORT}" ] ; then  
     6071                        #echo "Skipping invalid port ${PORTSDIR}/${PBI_MAKEPORT}" 
     6072                        continue 
     6073                fi 
     6074 
     6075                # Check if this port can be built on this architecture 
     6076                check_port_compat_arch "${PORTSDIR}/${PBI_MAKEPORT}" 
     6077                if [ "$?" = "1" ] ; then 
     6078                        if [ "$PBI_ABFB32" != "YES" ] ; then 
     6079                                echo "${PBI_MAKEPORT} - Skipping for invalid system arch" 
     6080                                continue 
     6081                        fi 
     6082                        if [ "$have32" != "true" ] ; then 
     6083                                echo "${PBI_MAKEPORT} - Skipping for invalid system arch" 
     6084                                continue 
     6085                        fi 
     6086                fi 
     6087 
    60756088        fi 
    60766089 
     
    69656978 
    69666979        if [ -z "$PBI_LICENSE" ] ; then 
    6967                 PBI_LICENSE="`pkg query '%L' ${PBI_MAKEPORT}`" 
     6980                PBI_LICENSE="`pkg query '%L' ${PBI_MAKEPORT} | head -n 1`" 
    69686981        fi 
    69696982        if [ -z "$PBI_SHORTDESC" ] ; then 
Note: See TracChangeset for help on using the changeset viewer.