Changeset 986f78b


Ignore:
Timestamp:
01/13/14 02:32:47 (8 months ago)
Author:
yurkis <yurkis@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
cc07588, a13f94a
Parents:
d7a088d (diff), 021abd6 (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 https://github.com/pcbsd/pcbsd

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/EasyPBI/i18n/EasyPBI_uk.ts

    re9dc989 r021abd6  
    663663    <message> 
    664664        <source>Port/Package</source> 
    665         <translation type="unfinished"> 
    666             </translation> 
     665        <translation>ППрт/ПакуМПк</translation> 
    667666    </message> 
    668667    <message> 
    669668        <source>Select a different FreeBSD package</source> 
    670         <translation type="unfinished"> 
    671             </translation> 
     669        <translation>ОбратО іМшОй пакуМПк FreeBSD</translation> 
    672670    </message> 
    673671    <message> 
    674672        <source>Change</source> 
    675         <translation type="unfinished"> 
    676             </translation> 
     673        <translation>ЗЌіМОтО</translation> 
    677674    </message> 
    678675    <message> 
    679676        <source>View Package Overrides (optional)</source> 
    680         <translation type="unfinished"> 
    681             </translation> 
     677        <translation>ПерегляМутО переМазМачеММя пакуМку (Ппція)</translation> 
    682678    </message> 
    683679    <message> 
    684680        <source>Add Pkgs</source> 
    685         <translation type="unfinished"> 
    686             </translation> 
     681        <translation>ДПЎатО пакуМкО</translation> 
    687682    </message> 
    688683    <message> 
  • src-qt4/pc-controlpanel/i18n/pc-controlpanel_ru.ts

    rcd98459 r021abd6  
    103103    <message> 
    104104        <source>Mate</source> 
    105         <translation type="unfinished"> 
    106             </translation> 
     105        <translation>Mate</translation> 
    107106    </message> 
    108107    <message> 
    109108        <source>Cinnamon</source> 
    110         <translation type="unfinished"> 
    111             </translation> 
     109        <translation>Cinnamon</translation> 
    112110    </message> 
    113111    <message> 
    114112        <source>(Mate)</source> 
    115         <translation type="unfinished"> 
    116             </translation> 
     113        <translation>(Mate)</translation> 
    117114    </message> 
    118115    <message> 
    119116        <source>(Cinnamon)</source> 
    120         <translation type="unfinished"> 
    121             </translation> 
     117        <translation>(Cinnamon)</translation> 
    122118    </message> 
    123119</context> 
  • src-qt4/pc-installgui/i18n/SysInstaller_en_GB.ts

    rb283ca6 r021abd6  
    294294    <message> 
    295295        <source>&amp;Load config from USB</source> 
    296         <translation type="unfinished"> 
    297             </translation> 
     296        <translation>&amp;Load config from USB</translation> 
    298297    </message> 
    299298    <message> 
    300299        <source>&amp;Save Config to USB</source> 
    301         <translation type="unfinished"> 
    302             </translation> 
     300        <translation>&amp;Save Config to USB</translation> 
    303301    </message> 
    304302</context> 
     
    888886    <message> 
    889887        <source>If you saved your Life-Preserver key onto a USB drive, insert it now and select USB key, otherwise you may wish to use password authentication.</source> 
    890         <translation type="unfinished"> 
    891             </translation> 
     888        <translation>If you saved your Life-Preserver key onto a USB drive, insert it now and select USB key, otherwise you may wish to use password authentication.</translation> 
    892889    </message> 
    893890</context> 
  • src-qt4/pc-installgui/i18n/SysInstaller_en_ZA.ts

    rb283ca6 r021abd6  
    294294    <message> 
    295295        <source>&amp;Load config from USB</source> 
    296         <translation type="unfinished"> 
    297             </translation> 
     296        <translation>&amp;Load config from USB</translation> 
    298297    </message> 
    299298    <message> 
    300299        <source>&amp;Save Config to USB</source> 
    301         <translation type="unfinished"> 
    302             </translation> 
     300        <translation>&amp;Save Config to USB</translation> 
    303301    </message> 
    304302</context> 
     
    888886    <message> 
    889887        <source>If you saved your Life-Preserver key onto a USB drive, insert it now and select USB key, otherwise you may wish to use password authentication.</source> 
    890         <translation type="unfinished"> 
    891             </translation> 
     888        <translation>If you saved your Life-Preserver key onto a USB drive, insert it now and select USB key, otherwise you may wish to use password authentication.</translation> 
    892889    </message> 
    893890</context> 
  • src-qt4/pc-sysmanager/i18n/PBSystem_en_GB.ts

    r9bcb76a r021abd6  
    66    <message> 
    77        <source>CMD Output</source> 
    8         <translation type="unfinished"> 
    9             </translation> 
     8        <translation>CMD Output</translation> 
    109    </message> 
    1110    <message> 
    1211        <source>Stop</source> 
    13         <translation type="unfinished"> 
    14             </translation> 
     12        <translation>Stop</translation> 
    1513    </message> 
    1614    <message> 
    1715        <source>Close</source> 
    18         <translation type="unfinished"> 
    19             </translation> 
     16        <translation>Close</translation> 
    2017    </message> 
    2118    <message> 
    2219        <source>Getting PC-BSD Ports Tree</source> 
    23         <translation type="unfinished"> 
    24             </translation> 
     20        <translation>Getting PC-BSD Ports Tree</translation> 
    2521    </message> 
    2622    <message> 
    2723        <source>Getting PC-BSD Sources</source> 
    28         <translation type="unfinished"> 
    29             </translation> 
     24        <translation>Getting PC-BSD Sources</translation> 
    3025    </message> 
    3126    <message> 
    3227        <source>Process Running</source> 
    33         <translation type="unfinished"> 
    34             </translation> 
     28        <translation>Process Running</translation> 
    3529    </message> 
    3630    <message> 
    3731        <source>Please stop the current process before closing this window.</source> 
    38         <translation type="unfinished"> 
    39             </translation> 
     32        <translation>Please stop the current process before closing this window.</translation> 
    4033    </message> 
    4134</context> 
     
    108101    <message> 
    109102        <source>PC-BSD Versions</source> 
    110         <translation type="unfinished"> 
    111             </translation> 
     103        <translation>PC-BSD Versions</translation> 
    112104    </message> 
    113105    <message> 
    114106        <source>Base:</source> 
    115         <translation type="unfinished"> 
    116             </translation> 
     107        <translation>Base:</translation> 
    117108    </message> 
    118109    <message> 
    119110        <source>Backend Utilities:</source> 
    120         <translation type="unfinished"> 
    121             </translation> 
     111        <translation>Backend Utilities:</translation> 
    122112    </message> 
    123113    <message> 
    124114        <source>Graphical Utilities:</source> 
    125         <translation type="unfinished"> 
    126             </translation> 
     115        <translation>Graphical Utilities:</translation> 
    127116    </message> 
    128117    <message> 
    129118        <source>System Information</source> 
    130         <translation type="unfinished"> 
    131             </translation> 
     119        <translation>System Information</translation> 
    132120    </message> 
    133121    <message> 
    134122        <source>FreeBSD Version:</source> 
    135         <translation type="unfinished"> 
    136             </translation> 
     123        <translation>FreeBSD Version:</translation> 
    137124    </message> 
    138125    <message> 
    139126        <source>Fetch PC-BSD &amp;System Source</source> 
    140         <translation type="unfinished"> 
    141             </translation> 
     127        <translation>Fetch PC-BSD &amp;System Source</translation> 
    142128    </message> 
    143129    <message> 
    144130        <source>Fetch PC-BSD P&amp;orts Tree</source> 
    145         <translation type="unfinished"> 
    146             </translation> 
     131        <translation>Fetch PC-BSD P&amp;orts Tree</translation> 
    147132    </message> 
    148133    <message> 
    149134        <source>Error</source> 
    150         <translation type="unfinished"> 
    151             </translation> 
     135        <translation>Error</translation> 
    152136    </message> 
    153137    <message> 
    154138        <source>Error Generating Diagnostic File</source> 
    155         <translation type="unfinished"> 
    156             </translation> 
     139        <translation>Error Generating Diagnostic File</translation> 
    157140    </message> 
    158141    <message> 
    159142        <source>Success</source> 
    160         <translation type="unfinished"> 
    161             </translation> 
     143        <translation>Success</translation> 
    162144    </message> 
    163145    <message> 
    164146        <source>Diagnostic File Created: %1</source> 
    165         <translation type="unfinished"> 
    166             </translation> 
     147        <translation>Diagnostic File Created: %1</translation> 
    167148    </message> 
    168149    <message> 
    169150        <source>Process Already Running</source> 
    170         <translation type="unfinished"> 
    171             </translation> 
     151        <translation>Process Already Running</translation> 
    172152    </message> 
    173153    <message> 
    174154        <source>You already have a process running. Please wait for that one to finish first.</source> 
    175         <translation type="unfinished"> 
    176             </translation> 
     155        <translation>You already have a process running. Please wait for that one to finish first.</translation> 
    177156    </message> 
    178157</context> 
  • src-qt4/pc-sysmanager/i18n/PBSystem_en_ZA.ts

    r9bcb76a r021abd6  
    66    <message> 
    77        <source>CMD Output</source> 
    8         <translation type="unfinished"> 
    9             </translation> 
     8        <translation>CMD Output</translation> 
    109    </message> 
    1110    <message> 
    1211        <source>Stop</source> 
    13         <translation type="unfinished"> 
    14             </translation> 
     12        <translation>Stop</translation> 
    1513    </message> 
    1614    <message> 
    1715        <source>Close</source> 
    18         <translation type="unfinished"> 
    19             </translation> 
     16        <translation>Close</translation> 
    2017    </message> 
    2118    <message> 
    2219        <source>Getting PC-BSD Ports Tree</source> 
    23         <translation type="unfinished"> 
    24             </translation> 
     20        <translation>Getting PC-BSD Ports Tree</translation> 
    2521    </message> 
    2622    <message> 
    2723        <source>Getting PC-BSD Sources</source> 
    28         <translation type="unfinished"> 
    29             </translation> 
     24        <translation>Getting PC-BSD Sources</translation> 
    3025    </message> 
    3126    <message> 
    3227        <source>Process Running</source> 
    33         <translation type="unfinished"> 
    34             </translation> 
     28        <translation>Process Running</translation> 
    3529    </message> 
    3630    <message> 
    3731        <source>Please stop the current process before closing this window.</source> 
    38         <translation type="unfinished"> 
    39             </translation> 
     32        <translation>Please stop the current process before closing this window.</translation> 
    4033    </message> 
    4134</context> 
     
    108101    <message> 
    109102        <source>PC-BSD Versions</source> 
    110         <translation type="unfinished"> 
    111             </translation> 
     103        <translation>PC-BSD Versions</translation> 
    112104    </message> 
    113105    <message> 
    114106        <source>Base:</source> 
    115         <translation type="unfinished"> 
    116             </translation> 
     107        <translation>Base:</translation> 
    117108    </message> 
    118109    <message> 
    119110        <source>Backend Utilities:</source> 
    120         <translation type="unfinished"> 
    121             </translation> 
     111        <translation>Backend Utilities:</translation> 
    122112    </message> 
    123113    <message> 
    124114        <source>Graphical Utilities:</source> 
    125         <translation type="unfinished"> 
    126             </translation> 
     115        <translation>Graphical Utilities:</translation> 
    127116    </message> 
    128117    <message> 
    129118        <source>System Information</source> 
    130         <translation type="unfinished"> 
    131             </translation> 
     119        <translation>System Information</translation> 
    132120    </message> 
    133121    <message> 
    134122        <source>FreeBSD Version:</source> 
    135         <translation type="unfinished"> 
    136             </translation> 
     123        <translation>FreeBSD Version:</translation> 
    137124    </message> 
    138125    <message> 
    139126        <source>Fetch PC-BSD &amp;System Source</source> 
    140         <translation type="unfinished"> 
    141             </translation> 
     127        <translation>Fetch PC-BSD &amp;System Source</translation> 
    142128    </message> 
    143129    <message> 
    144130        <source>Fetch PC-BSD P&amp;orts Tree</source> 
    145         <translation type="unfinished"> 
    146             </translation> 
     131        <translation>Fetch PC-BSD P&amp;orts Tree</translation> 
    147132    </message> 
    148133    <message> 
    149134        <source>Error</source> 
    150         <translation type="unfinished"> 
    151             </translation> 
     135        <translation>Error</translation> 
    152136    </message> 
    153137    <message> 
    154138        <source>Error Generating Diagnostic File</source> 
    155         <translation type="unfinished"> 
    156             </translation> 
     139        <translation>Error Generating Diagnostic File</translation> 
    157140    </message> 
    158141    <message> 
    159142        <source>Success</source> 
    160         <translation type="unfinished"> 
    161             </translation> 
     143        <translation>Success</translation> 
    162144    </message> 
    163145    <message> 
    164146        <source>Diagnostic File Created: %1</source> 
    165         <translation type="unfinished"> 
    166             </translation> 
     147        <translation>Diagnostic File Created: %1</translation> 
    167148    </message> 
    168149    <message> 
    169150        <source>Process Already Running</source> 
    170         <translation type="unfinished"> 
    171             </translation> 
     151        <translation>Process Already Running</translation> 
    172152    </message> 
    173153    <message> 
    174154        <source>You already have a process running. Please wait for that one to finish first.</source> 
    175         <translation type="unfinished"> 
    176             </translation> 
     155        <translation>You already have a process running. Please wait for that one to finish first.</translation> 
    177156    </message> 
    178157</context> 
  • src-sh/de-info/de-profiles/mate.profile

    rd2b761b rd7a088d  
    1818which pc-metapkgmanager >/dev/null 2>/dev/null 
    1919if [ $? -eq 0 ] ; then 
    20   pc-metapkgmanager status mate | grep "is installed" >/dev/null 
     20  pc-metapkgmanager status Mate | grep "is installed" >/dev/null 
    2121  if [ $? -eq 0 ] ; then 
    2222    DE_INSTALLED=1 
Note: See TracChangeset for help on using the changeset viewer.