Changeset 2ec77c7


Ignore:
Timestamp:
11/15/13 07:28:46 (10 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
89cdf9c7, 82f1819
Parents:
a847f63 (diff), 4d01922 (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

Location:
src-qt4
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-installgui/i18n/SysInstaller_en.ts

    r87ba9df r4d01922  
    162162    </message> 
    163163    <message> 
     164        <location filename="../installer.cpp" line="406"/> 
     165        <location filename="../installer.cpp" line="448"/> 
     166        <location filename="../installer.cpp" line="478"/> 
     167        <source>Partition:</source> 
     168        <translation type="unfinished"></translation> 
     169    </message> 
     170    <message> 
    164171        <location filename="../installer.cpp" line="407"/> 
    165172        <location filename="../installer.cpp" line="449"/> 
    166         <location filename="../installer.cpp" line="479"/> 
    167         <source>Partition:</source> 
     173        <location filename="../installer.cpp" line="480"/> 
     174        <source>FileSystem:</source> 
    168175        <translation type="unfinished"></translation> 
    169176    </message> 
     
    171178        <location filename="../installer.cpp" line="408"/> 
    172179        <location filename="../installer.cpp" line="450"/> 
    173         <location filename="../installer.cpp" line="481"/> 
    174         <source>FileSystem:</source> 
    175         <translation type="unfinished"></translation> 
    176     </message> 
    177     <message> 
    178         <location filename="../installer.cpp" line="409"/> 
    179         <location filename="../installer.cpp" line="451"/> 
    180         <location filename="../installer.cpp" line="483"/> 
     180        <location filename="../installer.cpp" line="482"/> 
    181181        <source>Size:</source> 
    182182        <translation type="unfinished"></translation> 
    183183    </message> 
    184184    <message> 
    185         <location filename="../installer.cpp" line="425"/> 
     185        <location filename="../installer.cpp" line="424"/> 
    186186        <source>ZFS Datasets:&lt;br&gt;</source> 
    187187        <translation type="unfinished"></translation> 
    188188    </message> 
    189189    <message> 
    190         <location filename="../installer.cpp" line="427"/> 
    191         <location filename="../installer.cpp" line="485"/> 
     190        <location filename="../installer.cpp" line="426"/> 
     191        <location filename="../installer.cpp" line="484"/> 
    192192        <source>Mount:</source> 
    193193        <translation type="unfinished"></translation> 
    194194    </message> 
    195195    <message> 
    196         <location filename="../installer.cpp" line="430"/> 
    197         <location filename="../installer.cpp" line="487"/> 
     196        <location filename="../installer.cpp" line="429"/> 
     197        <location filename="../installer.cpp" line="486"/> 
    198198        <source>Options:</source> 
    199199        <translation type="unfinished"></translation> 
    200200    </message> 
    201201    <message> 
    202         <location filename="../installer.cpp" line="537"/> 
     202        <location filename="../installer.cpp" line="536"/> 
    203203        <source>TrueOS Package Selection</source> 
    204204        <translation type="unfinished"></translation> 
    205205    </message> 
    206206    <message> 
    207         <location filename="../installer.cpp" line="535"/> 
     207        <location filename="../installer.cpp" line="534"/> 
    208208        <source>PC-BSD Package Selection</source> 
    209209        <translation type="unfinished"></translation> 
    210210    </message> 
    211211    <message> 
    212         <location filename="../installer.cpp" line="539"/> 
     212        <location filename="../installer.cpp" line="538"/> 
    213213        <source>The following meta-pkgs will be installed:</source> 
    214214        <translation type="unfinished"></translation> 
     
    218218        <location filename="../installer.cpp" line="193"/> 
    219219        <location filename="../installer.cpp" line="283"/> 
    220         <location filename="../installer.cpp" line="735"/> 
    221         <location filename="../installer.cpp" line="1295"/> 
    222         <location filename="../installer.cpp" line="1323"/> 
    223         <location filename="../installer.cpp" line="1634"/> 
    224         <location filename="../installer.cpp" line="1691"/> 
    225         <location filename="../installer.cpp" line="1703"/> 
    226         <location filename="../installer.cpp" line="1716"/> 
    227         <location filename="../installer.cpp" line="1723"/> 
    228         <location filename="../installer.cpp" line="1740"/> 
    229         <location filename="../installer.cpp" line="1746"/> 
    230         <location filename="../installer.cpp" line="1756"/> 
    231         <location filename="../installer.cpp" line="1769"/> 
    232         <location filename="../installer.cpp" line="1784"/> 
    233         <location filename="../installer.cpp" line="1791"/> 
    234         <location filename="../installer.cpp" line="1804"/> 
    235         <location filename="../installer.cpp" line="1809"/> 
     220        <location filename="../installer.cpp" line="734"/> 
     221        <location filename="../installer.cpp" line="1294"/> 
     222        <location filename="../installer.cpp" line="1322"/> 
     223        <location filename="../installer.cpp" line="1633"/> 
     224        <location filename="../installer.cpp" line="1690"/> 
     225        <location filename="../installer.cpp" line="1702"/> 
     226        <location filename="../installer.cpp" line="1715"/> 
     227        <location filename="../installer.cpp" line="1722"/> 
     228        <location filename="../installer.cpp" line="1739"/> 
     229        <location filename="../installer.cpp" line="1745"/> 
     230        <location filename="../installer.cpp" line="1755"/> 
     231        <location filename="../installer.cpp" line="1768"/> 
     232        <location filename="../installer.cpp" line="1783"/> 
     233        <location filename="../installer.cpp" line="1790"/> 
     234        <location filename="../installer.cpp" line="1803"/> 
     235        <location filename="../installer.cpp" line="1808"/> 
    236236        <source>PC-BSD Installer</source> 
    237237        <translation type="unfinished"></translation> 
     
    253253    </message> 
    254254    <message> 
    255         <location filename="../installer.cpp" line="423"/> 
     255        <location filename="../installer.cpp" line="422"/> 
    256256        <source>ZFS Datasets:</source> 
    257257        <translation type="unfinished"></translation> 
    258258    </message> 
    259259    <message> 
    260         <location filename="../installer.cpp" line="423"/> 
     260        <location filename="../installer.cpp" line="422"/> 
    261261        <source>The original ZFS layout will be restored</source> 
    262262        <translation type="unfinished"></translation> 
    263263    </message> 
    264264    <message> 
    265         <location filename="../installer.cpp" line="570"/> 
     265        <location filename="../installer.cpp" line="569"/> 
    266266        <source>Performing a restore from a Life-Preserver backup. Click next to start the restore wizard.</source> 
    267267        <translation type="unfinished"></translation> 
    268268    </message> 
    269269    <message> 
    270         <location filename="../installer.cpp" line="731"/> 
     270        <location filename="../installer.cpp" line="730"/> 
    271271        <source>Start the restore now?</source> 
    272272        <translation type="unfinished"></translation> 
    273273    </message> 
    274274    <message> 
    275         <location filename="../installer.cpp" line="733"/> 
     275        <location filename="../installer.cpp" line="732"/> 
    276276        <source>Start the installation now?</source> 
    277277        <translation type="unfinished"></translation> 
    278278    </message> 
    279279    <message> 
    280         <location filename="../installer.cpp" line="1239"/> 
     280        <location filename="../installer.cpp" line="1238"/> 
    281281        <source>Your system is now restored! 
    282282Click Finish to reboot. After rebooting you may eject the install media.</source> 
     
    284284    </message> 
    285285    <message> 
     286        <location filename="../installer.cpp" line="1239"/> 
     287        <source>System Restore</source> 
     288        <translation type="unfinished"></translation> 
     289    </message> 
     290    <message> 
    286291        <location filename="../installer.cpp" line="1240"/> 
    287         <source>System Restore</source> 
    288         <translation type="unfinished"></translation> 
    289     </message> 
    290     <message> 
    291         <location filename="../installer.cpp" line="1241"/> 
    292292        <source>Your system is now being restored, this may take a while depending upon the size of your backup and network conditions.</source> 
    293293        <translation type="unfinished"></translation> 
    294294    </message> 
    295295    <message> 
    296         <location filename="../installer.cpp" line="1292"/> 
     296        <location filename="../installer.cpp" line="1291"/> 
    297297        <source>Failed!</source> 
    298298        <translation type="unfinished"></translation> 
    299299    </message> 
    300300    <message> 
     301        <location filename="../installer.cpp" line="1296"/> 
     302        <source>The installer has encountered an error and has been halted.</source> 
     303        <translation type="unfinished"></translation> 
     304    </message> 
     305    <message> 
    301306        <location filename="../installer.cpp" line="1297"/> 
    302         <source>The installer has encountered an error and has been halted.</source> 
    303         <translation type="unfinished"></translation> 
    304     </message> 
    305     <message> 
    306         <location filename="../installer.cpp" line="1298"/> 
    307307        <source>Do you want to generate an error report?</source> 
    308308        <translation type="unfinished"></translation> 
    309309    </message> 
    310310    <message> 
    311         <location filename="../installer.cpp" line="1325"/> 
     311        <location filename="../installer.cpp" line="1324"/> 
    312312        <source>Restart the system now?</source> 
    313313        <translation type="unfinished"></translation> 
    314314    </message> 
    315315    <message> 
    316         <location filename="../installer.cpp" line="1353"/> 
     316        <location filename="../installer.cpp" line="1352"/> 
    317317        <source>&amp;Finish</source> 
    318318        <translation type="unfinished"></translation> 
    319319    </message> 
    320320    <message> 
    321         <location filename="../installer.cpp" line="1450"/> 
    322         <location filename="../installer.cpp" line="1492"/> 
     321        <location filename="../installer.cpp" line="1449"/> 
     322        <location filename="../installer.cpp" line="1491"/> 
    323323        <source>Extracting system...</source> 
    324324        <translation type="unfinished"></translation> 
    325325    </message> 
    326326    <message> 
    327         <location filename="../installer.cpp" line="1452"/> 
    328         <location filename="../installer.cpp" line="1494"/> 
     327        <location filename="../installer.cpp" line="1451"/> 
     328        <location filename="../installer.cpp" line="1493"/> 
    329329        <source>Installing system... This may take a while...</source> 
    330330        <translation type="unfinished"></translation> 
    331331    </message> 
    332332    <message> 
    333         <location filename="../installer.cpp" line="1471"/> 
     333        <location filename="../installer.cpp" line="1470"/> 
    334334        <source>Installing packages... This may take a while...</source> 
    335335        <translation type="unfinished"></translation> 
    336336    </message> 
    337337    <message> 
    338         <location filename="../installer.cpp" line="1517"/> 
     338        <location filename="../installer.cpp" line="1516"/> 
    339339        <source>Installing meta-package: %1</source> 
    340340        <translation type="unfinished"></translation> 
    341341    </message> 
    342342    <message> 
    343         <location filename="../installer.cpp" line="1635"/> 
     343        <location filename="../installer.cpp" line="1634"/> 
    344344        <source>Are you sure you want to abort this installation?</source> 
    345345        <translation type="unfinished"></translation> 
    346346    </message> 
    347347    <message> 
    348         <location filename="../installer.cpp" line="1692"/> 
     348        <location filename="../installer.cpp" line="1691"/> 
    349349        <source>The selected disk / partition is less than recommended %1GB. The installation may fail...</source> 
    350350        <translation type="unfinished"></translation> 
    351351    </message> 
    352352    <message> 
    353         <location filename="../installer.cpp" line="1704"/> 
     353        <location filename="../installer.cpp" line="1703"/> 
    354354        <source>This will save your installation configuration to a MSDOSFS/FAT32 formatted USB stick. Continue?</source> 
    355355        <translation type="unfinished"></translation> 
    356356    </message> 
    357357    <message> 
    358         <location filename="../installer.cpp" line="1717"/> 
     358        <location filename="../installer.cpp" line="1716"/> 
    359359        <source>Please insert a USB stick now, and click OK to continue.</source> 
    360360        <translation type="unfinished"></translation> 
    361361    </message> 
    362362    <message> 
    363         <location filename="../installer.cpp" line="1724"/> 
     363        <location filename="../installer.cpp" line="1723"/> 
    364364        <source>Please enter the nickname you want to save this configuration as.</source> 
    365365        <translation type="unfinished"></translation> 
    366366    </message> 
    367367    <message> 
    368         <location filename="../installer.cpp" line="1741"/> 
     368        <location filename="../installer.cpp" line="1740"/> 
    369369        <source>Failed saving config to USB media. Is the device working and formatted MSDOSFS/FAT32?</source> 
    370370        <translation type="unfinished"></translation> 
    371371    </message> 
    372372    <message> 
    373         <location filename="../installer.cpp" line="1747"/> 
     373        <location filename="../installer.cpp" line="1746"/> 
    374374        <source>Configuration saved! You may now safely remove the USB media.</source> 
    375375        <translation type="unfinished"></translation> 
    376376    </message> 
    377377    <message> 
    378         <location filename="../installer.cpp" line="1757"/> 
     378        <location filename="../installer.cpp" line="1756"/> 
    379379        <source>This will load a installation configuration file your MSDOSFS/FAT32 formatted USB stick. Continue?</source> 
    380380        <translation type="unfinished"></translation> 
    381381    </message> 
    382382    <message> 
    383         <location filename="../installer.cpp" line="1785"/> 
     383        <location filename="../installer.cpp" line="1784"/> 
    384384        <source>Failed loading saved config file from the USB media. Is the device working and formatted MSDOSFS/FAT32?</source> 
    385385        <translation type="unfinished"></translation> 
    386386    </message> 
    387387    <message> 
    388         <location filename="../installer.cpp" line="1792"/> 
     388        <location filename="../installer.cpp" line="1791"/> 
    389389        <source>Configuration loaded! You may now safely remove the USB media.</source> 
    390390        <translation type="unfinished"></translation> 
    391391    </message> 
    392392    <message> 
    393         <location filename="../installer.cpp" line="1868"/> 
     393        <location filename="../installer.cpp" line="1867"/> 
    394394        <source>Restoring system: %1</source> 
    395395        <translation type="unfinished"></translation> 
    396396    </message> 
    397397    <message> 
    398         <location filename="../installer.cpp" line="1770"/> 
     398        <location filename="../installer.cpp" line="1769"/> 
    399399        <source>Please insert the USB stick now, and click OK to continue.</source> 
    400400        <translation type="unfinished"></translation> 
    401401    </message> 
    402402    <message> 
    403         <location filename="../installer.cpp" line="1805"/> 
     403        <location filename="../installer.cpp" line="1804"/> 
    404404        <source>Config File:</source> 
    405405        <translation type="unfinished"></translation> 
    406406    </message> 
    407407    <message> 
    408         <location filename="../installer.cpp" line="1810"/> 
     408        <location filename="../installer.cpp" line="1809"/> 
    409409        <source>Start the install using this config file?</source> 
    410410        <translation type="unfinished"></translation> 
  • src-qt4/pc-installgui/i18n/SysInstaller_en_US.ts

    r87ba9df r4d01922  
    162162    </message> 
    163163    <message> 
     164        <location filename="../installer.cpp" line="406"/> 
     165        <location filename="../installer.cpp" line="448"/> 
     166        <location filename="../installer.cpp" line="478"/> 
     167        <source>Partition:</source> 
     168        <translation type="unfinished"></translation> 
     169    </message> 
     170    <message> 
    164171        <location filename="../installer.cpp" line="407"/> 
    165172        <location filename="../installer.cpp" line="449"/> 
    166         <location filename="../installer.cpp" line="479"/> 
    167         <source>Partition:</source> 
     173        <location filename="../installer.cpp" line="480"/> 
     174        <source>FileSystem:</source> 
    168175        <translation type="unfinished"></translation> 
    169176    </message> 
     
    171178        <location filename="../installer.cpp" line="408"/> 
    172179        <location filename="../installer.cpp" line="450"/> 
    173         <location filename="../installer.cpp" line="481"/> 
    174         <source>FileSystem:</source> 
    175         <translation type="unfinished"></translation> 
    176     </message> 
    177     <message> 
    178         <location filename="../installer.cpp" line="409"/> 
    179         <location filename="../installer.cpp" line="451"/> 
    180         <location filename="../installer.cpp" line="483"/> 
     180        <location filename="../installer.cpp" line="482"/> 
    181181        <source>Size:</source> 
    182182        <translation type="unfinished"></translation> 
    183183    </message> 
    184184    <message> 
    185         <location filename="../installer.cpp" line="425"/> 
     185        <location filename="../installer.cpp" line="424"/> 
    186186        <source>ZFS Datasets:&lt;br&gt;</source> 
    187187        <translation type="unfinished"></translation> 
    188188    </message> 
    189189    <message> 
    190         <location filename="../installer.cpp" line="427"/> 
    191         <location filename="../installer.cpp" line="485"/> 
     190        <location filename="../installer.cpp" line="426"/> 
     191        <location filename="../installer.cpp" line="484"/> 
    192192        <source>Mount:</source> 
    193193        <translation type="unfinished"></translation> 
    194194    </message> 
    195195    <message> 
    196         <location filename="../installer.cpp" line="430"/> 
    197         <location filename="../installer.cpp" line="487"/> 
     196        <location filename="../installer.cpp" line="429"/> 
     197        <location filename="../installer.cpp" line="486"/> 
    198198        <source>Options:</source> 
    199199        <translation type="unfinished"></translation> 
    200200    </message> 
    201201    <message> 
    202         <location filename="../installer.cpp" line="537"/> 
     202        <location filename="../installer.cpp" line="536"/> 
    203203        <source>TrueOS Package Selection</source> 
    204204        <translation type="unfinished"></translation> 
    205205    </message> 
    206206    <message> 
    207         <location filename="../installer.cpp" line="535"/> 
     207        <location filename="../installer.cpp" line="534"/> 
    208208        <source>PC-BSD Package Selection</source> 
    209209        <translation type="unfinished"></translation> 
    210210    </message> 
    211211    <message> 
    212         <location filename="../installer.cpp" line="539"/> 
     212        <location filename="../installer.cpp" line="538"/> 
    213213        <source>The following meta-pkgs will be installed:</source> 
    214214        <translation type="unfinished"></translation> 
     
    218218        <location filename="../installer.cpp" line="193"/> 
    219219        <location filename="../installer.cpp" line="283"/> 
    220         <location filename="../installer.cpp" line="735"/> 
    221         <location filename="../installer.cpp" line="1295"/> 
    222         <location filename="../installer.cpp" line="1323"/> 
    223         <location filename="../installer.cpp" line="1634"/> 
    224         <location filename="../installer.cpp" line="1691"/> 
    225         <location filename="../installer.cpp" line="1703"/> 
    226         <location filename="../installer.cpp" line="1716"/> 
    227         <location filename="../installer.cpp" line="1723"/> 
    228         <location filename="../installer.cpp" line="1740"/> 
    229         <location filename="../installer.cpp" line="1746"/> 
    230         <location filename="../installer.cpp" line="1756"/> 
    231         <location filename="../installer.cpp" line="1769"/> 
    232         <location filename="../installer.cpp" line="1784"/> 
    233         <location filename="../installer.cpp" line="1791"/> 
    234         <location filename="../installer.cpp" line="1804"/> 
    235         <location filename="../installer.cpp" line="1809"/> 
     220        <location filename="../installer.cpp" line="734"/> 
     221        <location filename="../installer.cpp" line="1294"/> 
     222        <location filename="../installer.cpp" line="1322"/> 
     223        <location filename="../installer.cpp" line="1633"/> 
     224        <location filename="../installer.cpp" line="1690"/> 
     225        <location filename="../installer.cpp" line="1702"/> 
     226        <location filename="../installer.cpp" line="1715"/> 
     227        <location filename="../installer.cpp" line="1722"/> 
     228        <location filename="../installer.cpp" line="1739"/> 
     229        <location filename="../installer.cpp" line="1745"/> 
     230        <location filename="../installer.cpp" line="1755"/> 
     231        <location filename="../installer.cpp" line="1768"/> 
     232        <location filename="../installer.cpp" line="1783"/> 
     233        <location filename="../installer.cpp" line="1790"/> 
     234        <location filename="../installer.cpp" line="1803"/> 
     235        <location filename="../installer.cpp" line="1808"/> 
    236236        <source>PC-BSD Installer</source> 
    237237        <translation type="unfinished"></translation> 
     
    253253    </message> 
    254254    <message> 
    255         <location filename="../installer.cpp" line="423"/> 
     255        <location filename="../installer.cpp" line="422"/> 
    256256        <source>ZFS Datasets:</source> 
    257257        <translation type="unfinished"></translation> 
    258258    </message> 
    259259    <message> 
    260         <location filename="../installer.cpp" line="423"/> 
     260        <location filename="../installer.cpp" line="422"/> 
    261261        <source>The original ZFS layout will be restored</source> 
    262262        <translation type="unfinished"></translation> 
    263263    </message> 
    264264    <message> 
    265         <location filename="../installer.cpp" line="570"/> 
     265        <location filename="../installer.cpp" line="569"/> 
    266266        <source>Performing a restore from a Life-Preserver backup. Click next to start the restore wizard.</source> 
    267267        <translation type="unfinished"></translation> 
    268268    </message> 
    269269    <message> 
    270         <location filename="../installer.cpp" line="731"/> 
     270        <location filename="../installer.cpp" line="730"/> 
    271271        <source>Start the restore now?</source> 
    272272        <translation type="unfinished"></translation> 
    273273    </message> 
    274274    <message> 
    275         <location filename="../installer.cpp" line="733"/> 
     275        <location filename="../installer.cpp" line="732"/> 
    276276        <source>Start the installation now?</source> 
    277277        <translation type="unfinished"></translation> 
    278278    </message> 
    279279    <message> 
    280         <location filename="../installer.cpp" line="1239"/> 
     280        <location filename="../installer.cpp" line="1238"/> 
    281281        <source>Your system is now restored! 
    282282Click Finish to reboot. After rebooting you may eject the install media.</source> 
     
    284284    </message> 
    285285    <message> 
     286        <location filename="../installer.cpp" line="1239"/> 
     287        <source>System Restore</source> 
     288        <translation type="unfinished"></translation> 
     289    </message> 
     290    <message> 
    286291        <location filename="../installer.cpp" line="1240"/> 
    287         <source>System Restore</source> 
    288         <translation type="unfinished"></translation> 
    289     </message> 
    290     <message> 
    291         <location filename="../installer.cpp" line="1241"/> 
    292292        <source>Your system is now being restored, this may take a while depending upon the size of your backup and network conditions.</source> 
    293293        <translation type="unfinished"></translation> 
    294294    </message> 
    295295    <message> 
    296         <location filename="../installer.cpp" line="1292"/> 
     296        <location filename="../installer.cpp" line="1291"/> 
    297297        <source>Failed!</source> 
    298298        <translation type="unfinished"></translation> 
    299299    </message> 
    300300    <message> 
     301        <location filename="../installer.cpp" line="1296"/> 
     302        <source>The installer has encountered an error and has been halted.</source> 
     303        <translation type="unfinished"></translation> 
     304    </message> 
     305    <message> 
    301306        <location filename="../installer.cpp" line="1297"/> 
    302         <source>The installer has encountered an error and has been halted.</source> 
    303         <translation type="unfinished"></translation> 
    304     </message> 
    305     <message> 
    306         <location filename="../installer.cpp" line="1298"/> 
    307307        <source>Do you want to generate an error report?</source> 
    308308        <translation type="unfinished"></translation> 
    309309    </message> 
    310310    <message> 
    311         <location filename="../installer.cpp" line="1325"/> 
     311        <location filename="../installer.cpp" line="1324"/> 
    312312        <source>Restart the system now?</source> 
    313313        <translation type="unfinished"></translation> 
    314314    </message> 
    315315    <message> 
    316         <location filename="../installer.cpp" line="1353"/> 
     316        <location filename="../installer.cpp" line="1352"/> 
    317317        <source>&amp;Finish</source> 
    318318        <translation type="unfinished"></translation> 
    319319    </message> 
    320320    <message> 
    321         <location filename="../installer.cpp" line="1450"/> 
    322         <location filename="../installer.cpp" line="1492"/> 
     321        <location filename="../installer.cpp" line="1449"/> 
     322        <location filename="../installer.cpp" line="1491"/> 
    323323        <source>Extracting system...</source> 
    324324        <translation type="unfinished"></translation> 
    325325    </message> 
    326326    <message> 
    327         <location filename="../installer.cpp" line="1452"/> 
    328         <location filename="../installer.cpp" line="1494"/> 
     327        <location filename="../installer.cpp" line="1451"/> 
     328        <location filename="../installer.cpp" line="1493"/> 
    329329        <source>Installing system... This may take a while...</source> 
    330330        <translation type="unfinished"></translation> 
    331331    </message> 
    332332    <message> 
    333         <location filename="../installer.cpp" line="1471"/> 
     333        <location filename="../installer.cpp" line="1470"/> 
    334334        <source>Installing packages... This may take a while...</source> 
    335335        <translation type="unfinished"></translation> 
    336336    </message> 
    337337    <message> 
    338         <location filename="../installer.cpp" line="1517"/> 
     338        <location filename="../installer.cpp" line="1516"/> 
    339339        <source>Installing meta-package: %1</source> 
    340340        <translation type="unfinished"></translation> 
    341341    </message> 
    342342    <message> 
    343         <location filename="../installer.cpp" line="1635"/> 
     343        <location filename="../installer.cpp" line="1634"/> 
    344344        <source>Are you sure you want to abort this installation?</source> 
    345345        <translation type="unfinished"></translation> 
    346346    </message> 
    347347    <message> 
    348         <location filename="../installer.cpp" line="1692"/> 
     348        <location filename="../installer.cpp" line="1691"/> 
    349349        <source>The selected disk / partition is less than recommended %1GB. The installation may fail...</source> 
    350350        <translation type="unfinished"></translation> 
    351351    </message> 
    352352    <message> 
    353         <location filename="../installer.cpp" line="1704"/> 
     353        <location filename="../installer.cpp" line="1703"/> 
    354354        <source>This will save your installation configuration to a MSDOSFS/FAT32 formatted USB stick. Continue?</source> 
    355355        <translation type="unfinished"></translation> 
    356356    </message> 
    357357    <message> 
    358         <location filename="../installer.cpp" line="1717"/> 
     358        <location filename="../installer.cpp" line="1716"/> 
    359359        <source>Please insert a USB stick now, and click OK to continue.</source> 
    360360        <translation type="unfinished"></translation> 
    361361    </message> 
    362362    <message> 
    363         <location filename="../installer.cpp" line="1724"/> 
     363        <location filename="../installer.cpp" line="1723"/> 
    364364        <source>Please enter the nickname you want to save this configuration as.</source> 
    365365        <translation type="unfinished"></translation> 
    366366    </message> 
    367367    <message> 
    368         <location filename="../installer.cpp" line="1741"/> 
     368        <location filename="../installer.cpp" line="1740"/> 
    369369        <source>Failed saving config to USB media. Is the device working and formatted MSDOSFS/FAT32?</source> 
    370370        <translation type="unfinished"></translation> 
    371371    </message> 
    372372    <message> 
    373         <location filename="../installer.cpp" line="1747"/> 
     373        <location filename="../installer.cpp" line="1746"/> 
    374374        <source>Configuration saved! You may now safely remove the USB media.</source> 
    375375        <translation type="unfinished"></translation> 
    376376    </message> 
    377377    <message> 
    378         <location filename="../installer.cpp" line="1757"/> 
     378        <location filename="../installer.cpp" line="1756"/> 
    379379        <source>This will load a installation configuration file your MSDOSFS/FAT32 formatted USB stick. Continue?</source> 
    380380        <translation type="unfinished"></translation> 
    381381    </message> 
    382382    <message> 
    383         <location filename="../installer.cpp" line="1785"/> 
     383        <location filename="../installer.cpp" line="1784"/> 
    384384        <source>Failed loading saved config file from the USB media. Is the device working and formatted MSDOSFS/FAT32?</source> 
    385385        <translation type="unfinished"></translation> 
    386386    </message> 
    387387    <message> 
    388         <location filename="../installer.cpp" line="1792"/> 
     388        <location filename="../installer.cpp" line="1791"/> 
    389389        <source>Configuration loaded! You may now safely remove the USB media.</source> 
    390390        <translation type="unfinished"></translation> 
    391391    </message> 
    392392    <message> 
    393         <location filename="../installer.cpp" line="1868"/> 
     393        <location filename="../installer.cpp" line="1867"/> 
    394394        <source>Restoring system: %1</source> 
    395395        <translation type="unfinished"></translation> 
    396396    </message> 
    397397    <message> 
    398         <location filename="../installer.cpp" line="1770"/> 
     398        <location filename="../installer.cpp" line="1769"/> 
    399399        <source>Please insert the USB stick now, and click OK to continue.</source> 
    400400        <translation type="unfinished"></translation> 
    401401    </message> 
    402402    <message> 
    403         <location filename="../installer.cpp" line="1805"/> 
     403        <location filename="../installer.cpp" line="1804"/> 
    404404        <source>Config File:</source> 
    405405        <translation type="unfinished"></translation> 
    406406    </message> 
    407407    <message> 
    408         <location filename="../installer.cpp" line="1810"/> 
     408        <location filename="../installer.cpp" line="1809"/> 
    409409        <source>Start the install using this config file?</source> 
    410410        <translation type="unfinished"></translation> 
  • src-qt4/pc-usermanager/main.cpp

    r38bddb5 rec5b219  
    2626       QString chkarg = argv[1]; 
    2727       // Running in a warden jail? 
    28        if ( chkarg == "-warden" ) 
     28       if ( chkarg == "-warden" ) { 
    2929         if ( argc == 4 ){ 
    3030           w.setWardenMode(QString(argv[2]), QString(argv[3])); 
    31          }else{ 
     31         } else { 
    3232           qDebug() << "Usage: -warden <directory> <ip>"; 
    3333           exit(1); 
    3434         } 
     35       } 
    3536    } 
    3637         
  • src-qt4/pc-usermanager/usermanagerback.cpp

    r7374c7b rec5b219  
    3939    homeLocRegExp.setPattern("^(/usr)?/home/?"); 
    4040    usernameRegExp.setPattern("([a-z]*[A-Z]*[0-9]*[_]*)+"); 
    41     passwordRegExp.setPattern("([a-z]*[A-Z]*[0-9]*[!\"£$%^&*()_+=¬#'`@~:?<>|{}\\-.]*)+"); 
     41    passwordRegExp.setPattern("([a-z]*[A-Z]*[0-9]*[!\"$%^&*()_+=#'`@~:?<>|{}\\-.]*)+"); 
    4242    groupnameRegExp.setPattern("([a-z]*[A-Z]*[0-9]*[_]*)+"); 
    4343} 
     
    5252 
    5353    for ( it = userList.begin(); it != userList.end(); ++it ) { 
    54         if ((! it->getDeleted()) && (((it->getUid() >= minId) || (minId == -1)) && (it->getUid() <= maxId) || (maxId == -1) || (it->getUid() < 0))) { 
     54        if ( (! it->getDeleted()) && (((it->getUid() >= minId) || (minId == -1)) && (it->getUid() <= maxId) || (maxId == -1) || (it->getUid() < 0)) ) { 
    5555            result.append(it->getUsername()); 
    5656        } 
  • src-qt4/pc-systemupdatertray/UpdaterTray.cpp

    r88de14c ra847f63  
    358358     QCoreApplication::processEvents(); 
    359359  } 
    360  
     360   
     361    //Make sure that we have a valid connection, otherwise stop the update process here 
     362    if(p.exitCode() != 0){ 
     363       programstatus = CHECK_FAILED; 
     364       contextMenuRefresh(); 
     365       displayTooltip(); 
     366       doingCheck=false; 
     367       return; 
     368    } 
     369     
    361370  while (p.canReadLine()) { 
    362371    line = p.readLine().simplified(); 
Note: See TracChangeset for help on using the changeset viewer.