Changeset 8102fda


Ignore:
Timestamp:
08/22/14 05:37:25 (11 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
9ded2f8, 201757f
Parents:
2b24d3c (diff), 68b4203 (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:
4 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-installgui/installer.cpp

    r1f57f0a r68b4203  
    10921092    tmpList << "disk" + tmp.setNum(disk) + "=" + workingDisk; 
    10931093 
    1094     //  
    1095     if ( tmpSlice.indexOf("s") == 0 ) { 
     1094    if ( tmpSlice.indexOf("s") == 0 && tmpSlice != "all" && tmpSlice != "free" ) { 
    10961095      tmpList << "partition=" + tmpSlice; 
    10971096    } else { 
     1097      // If we are installing to a GPT partition, mark it as such 
    10981098      loadGPT=true; 
    10991099      tmpList << "partition=p" + tmpSlice; 
  • src-qt4/warden-gui/i18n/Warden_et.ts

    r81dac54 rf0d2439  
    260260    <message> 
    261261        <source>IPv4 Address</source> 
    262         <translation type="unfinished">IPv4-aadress</translation> 
     262        <translation>IPv4-aadress</translation> 
    263263    </message> 
    264264    <message> 
    265265        <source>Hostname</source> 
    266         <translation type="unfinished">Hostinimi</translation> 
     266        <translation>Hostinimi</translation> 
    267267    </message> 
    268268    <message> 
    269269        <source>Jail Name</source> 
    270         <translation type="unfinished"> 
    271             </translation> 
     270        <translation>Vangla nimi</translation> 
    272271    </message> 
    273272</context> 
     
    643642    <message> 
    644643        <source>Run the AppCafe for this jail. (Jail must be running)</source> 
    645         <translation type="unfinished"> 
    646             </translation> 
     644        <translation>KÀivita selle vangla AppCafe. (Vangla peab töötama)</translation> 
    647645    </message> 
    648646    <message> 
    649647        <source>AppCafe</source> 
    650         <translation type="unfinished"> 
    651             </translation> 
     648        <translation>AppCafe</translation> 
    652649    </message> 
    653650    <message> 
    654651        <source>&amp;Start Jail</source> 
    655         <translation type="unfinished"> 
    656             </translation> 
     652        <translation>&amp;KÀivita vangla</translation> 
    657653    </message> 
    658654    <message> 
    659655        <source>J&amp;ail Configuration</source> 
    660         <translation type="unfinished"> 
    661             </translation> 
     656        <translation>Vangla &amp;seadistus</translation> 
    662657    </message> 
    663658    <message> 
    664659        <source>&amp;Remove Jail</source> 
    665         <translation type="unfinished"> 
    666             </translation> 
     660        <translation>&amp;Eemalda vangla</translation> 
    667661    </message> 
    668662    <message> 
    669663        <source>&amp;Stop Jail</source> 
    670         <translation type="unfinished"> 
    671             </translation> 
     664        <translation>&amp;Peata vangla</translation> 
    672665    </message> 
    673666    <message> 
    674667        <source>Clone this Jail</source> 
    675         <translation type="unfinished"> 
    676             </translation> 
     668        <translation>Klooni see vangla</translation> 
    677669    </message> 
    678670    <message> 
    679671        <source>Enter hostname for cloned jail</source> 
    680         <translation type="unfinished"> 
    681             </translation> 
     672        <translation>Sisesta kloonitud vangla hostinimi</translation> 
    682673    </message> 
    683674    <message> 
    684675        <source>Cloned jail hostname:</source> 
    685         <translation type="unfinished"> 
    686             </translation> 
     676        <translation>Kloonitud vangla hostinimi:</translation> 
    687677    </message> 
    688678    <message> 
    689679        <source>Any newer snapshots will be lost, and the jail will be restarted!</source> 
    690         <translation type="unfinished"> 
    691             </translation> 
     680        <translation>Kõik uuemad hetktõmmised lÀhevad kaotsi ja vangla taaskÀivitatakse!</translation> 
    692681    </message> 
    693682</context> 
  • src-qt4/warden-gui/i18n/Warden_uk.ts

    r81dac54 rf0d2439  
    259259    <message> 
    260260        <source>Enter the nickname for this new jail. You have the option to change the IP / Hostname of the imported jail. Any internal references to the old IP / hostname may still need to be changed after importing. </source> 
    261         <translation type="unfinished"> 
    262             </translation> 
     261        <translation>ВвеЎіть псевЎПМіЌ Ўля МПвПгП ізПльПваМПгП ПтПчеММя (тюрЌО). ВО ЌПжете зЌіМОтО IP аЎресу / Ñ–ÐŒ&apos;я Ñ 
     262Пста в іЌпПртПваМій тюрЌі. БуЎь які вМутрішМі пПсОлаММя Ма стару  IP аЎресу / Ñ–ÐŒ&apos;я Ñ 
     263Пста МеПбѠ
     264іЎМП зЌіМОтО після іЌпПрту. </translation> 
    263265    </message> 
    264266    <message> 
    265267        <source>IPv4 Address</source> 
    266         <translation type="unfinished">IPv6 аЎреса {4 ?}</translation> 
     268        <translation>АЎреса IPv4</translation> 
    267269    </message> 
    268270    <message> 
    269271        <source>Hostname</source> 
    270         <translation type="unfinished">Назва сОстеЌО</translation> 
     272        <translation>ІЌ&apos;я сОстеЌО (Ñ 
     273Пста)</translation> 
    271274    </message> 
    272275    <message> 
    273276        <source>Jail Name</source> 
    274         <translation type="unfinished"> 
    275             </translation> 
     277        <translation>ІЌ&apos;я тюрЌО</translation> 
    276278    </message> 
    277279</context> 
     
    661663    <message> 
    662664        <source>&amp;Start Jail</source> 
    663         <translation type="unfinished"> 
    664             </translation> 
     665        <translation>ЗапустОтО</translation> 
    665666    </message> 
    666667    <message> 
    667668        <source>J&amp;ail Configuration</source> 
    668         <translation type="unfinished"> 
    669             </translation> 
     669        <translation>НалаштуватО</translation> 
    670670    </message> 
    671671    <message> 
    672672        <source>&amp;Remove Jail</source> 
    673         <translation type="unfinished"> 
    674             </translation> 
     673        <translation>ВОЎалОтО</translation> 
    675674    </message> 
    676675    <message> 
    677676        <source>&amp;Stop Jail</source> 
    678         <translation type="unfinished"> 
    679             </translation> 
     677        <translation>ЗапОМОтО</translation> 
    680678    </message> 
    681679    <message> 
    682680        <source>Clone this Jail</source> 
    683         <translation type="unfinished"> 
    684             </translation> 
     681        <translation>КлПМуватО</translation> 
    685682    </message> 
    686683    <message> 
    687684        <source>Enter hostname for cloned jail</source> 
    688         <translation type="unfinished"> 
    689             </translation> 
     685        <translation>ВвеЎіть Ñ–ÐŒ&apos;я Ñ 
     686Пста Ўля клПМПваМПї тюрЌО</translation> 
    690687    </message> 
    691688    <message> 
  • lumina/lumina-config/mainUI.cpp

    r125a7df r2b24d3c  
    279279//Convert to/from fluxbox key codes 
    280280QString MainUI::dispToFluxKeys(QString in){ 
    281   in.replace("Ctrl", "control"); 
    282   in.replace("Shift", "shift"); 
     281  in.replace("Ctrl", "Control"); 
     282  in.replace("Shift", "Shift"); 
    283283  in.replace("Alt", "Mod1"); 
    284284  in.replace("Meta", "Mod4"); 
     
    287287 
    288288QString MainUI::fluxToDispKeys(QString in){ 
    289   in.replace("control", "Ctrl"); 
    290   in.replace("shift", "Shift"); 
     289  in.replace("Control", "Ctrl"); 
     290  in.replace("Shift", "Shift"); 
    291291  in.replace("Mod1", "Alt"); 
    292292  in.replace("Mod4", "Meta"); 
     
    999999      it->setWhatsThis(0, special[i].section("::::",0,0)); 
    10001000    if(!spec.isEmpty()){ 
     1001      info.removeAll(spec); //this line has been dealt with - remove it 
    10011002      it->setText(1, fluxToDispKeys(spec.section(":",0,0)) ); //need to make this easier to read later 
    10021003      it->setWhatsThis(1, spec.section(":",0,0) ); 
     
    10041005    ui->tree_shortcut->addTopLevelItem(it); 
    10051006  } 
    1006   //Now add support for all the other fluxbox shortcuts (Not Implemented Yet) 
    1007  
     1007  //Now add support for all the other fluxbox shortcuts 
     1008  for(int i=0; i<info.length(); i++){ 
     1009    //skip empty/invalid lines, as well as non-global shortcuts (OnMenu, OnWindow, etc..) 
     1010    if(info[i].isEmpty() || info[i].startsWith("#") || info[i].startsWith("!") || info[i].startsWith("On")){ continue; } 
     1011    QTreeWidgetItem *it = new QTreeWidgetItem(); 
     1012      it->setText(0, info[i].section(":",1,10).replace("Exec ","Run ").section("{",0,0).simplified()); 
     1013      it->setWhatsThis(0, info[i].section(":",1,10)); 
     1014      it->setText(1, fluxToDispKeys(info[i].section(":",0,0)) ); //need to make this easier to read later 
     1015      it->setWhatsThis(1, info[i].section(":",0,0) ); 
     1016    ui->tree_shortcut->addTopLevelItem(it); 
     1017  } 
    10081018} 
    10091019 
Note: See TracChangeset for help on using the changeset viewer.