Permalink
Browse files

Merge branch 'master' of github.com:pcbsd/pcbsd

  • Loading branch information...
2 parents 0ea51d5 + de1ea77 commit 58518e6dcbd36cd189273f5fff99dd6c8ce00e01 @kmoore134 kmoore134 committed Aug 7, 2013
Showing with 378 additions and 379 deletions.
  1. +7 −2 src-qt4/pc-bootconfig/mainUI.cpp
  2. +2 −0 src-qt4/pc-controlpanel/items/system/pc-bootconfig.desktop
  3. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_af.ts
  4. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_ar.ts
  5. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_az.ts
  6. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_bg.ts
  7. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_bn.ts
  8. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_bs.ts
  9. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_ca.ts
  10. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_cs.ts
  11. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_cy.ts
  12. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_da.ts
  13. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_de.ts
  14. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_el.ts
  15. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_en_GB.ts
  16. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_en_ZA.ts
  17. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_es.ts
  18. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_et.ts
  19. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_eu.ts
  20. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_fa.ts
  21. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_fi.ts
  22. +1 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_fr.ts
  23. +1 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_fr_CA.ts
  24. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_fur.ts
  25. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_gl.ts
  26. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_he.ts
  27. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_hi.ts
  28. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_hr.ts
  29. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_hu.ts
  30. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_id.ts
  31. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_is.ts
  32. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_it.ts
  33. +33 −49 src-qt4/pc-softwaremanager/i18n/SoftwareManager_ja.ts
  34. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_ka.ts
  35. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_ko.ts
  36. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_lt.ts
  37. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_lv.ts
  38. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_mk.ts
  39. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_mn.ts
  40. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_ms.ts
  41. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_mt.ts
  42. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_nb.ts
  43. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_ne.ts
  44. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_nl.ts
  45. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_pa.ts
  46. +5 −7 src-qt4/pc-softwaremanager/i18n/SoftwareManager_pl.ts
  47. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_pt.ts
  48. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_pt_BR.ts
  49. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_ro.ts
  50. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_ru.ts
  51. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_sa.ts
  52. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_sk.ts
  53. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_sl.ts
  54. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_sr.ts
  55. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_sv.ts
  56. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_sw.ts
  57. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_ta.ts
  58. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_tg.ts
  59. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_th.ts
  60. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_tr.ts
  61. +77 −134 src-qt4/pc-softwaremanager/i18n/SoftwareManager_uk.ts
  62. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_uz.ts
  63. +1 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_vi.ts
  64. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_CN.ts
  65. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_HK.ts
  66. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_TW.ts
  67. +2 −1 src-qt4/pc-softwaremanager/i18n/SoftwareManager_zu.ts
  68. +132 −125 src-qt4/pc-softwaremanager/mainUI.cpp
  69. +1 −0 src-qt4/pc-softwaremanager/mainUI.h
@@ -393,6 +393,9 @@ void mainUI::on_tool_GRUBsavedefaults_clicked(){
bool ok = saveGRUBdefaults(themefile,fontfile,countdown,showcountdown);
if(!ok){
qDebug() << "Unable to save the GRUB defaults to file:" << file_GRUBdefaults+".new";
+ }else{
+ ui->tool_GRUBsavedefaults->setEnabled(false);
+ ui->tool_GRUBresetdefaults->setEnabled(false);
}
}
@@ -418,8 +421,10 @@ void mainUI::on_tool_GRUBsaveentries_clicked(){
//Get the current text
QStringList contents = ui->text_GRUBentries->toPlainText().split("\n");
bool ok = saveGRUBcustomentries(contents);
- if(ok){ }//ui->tool_GRUBsaveentries->setEnabled(false); }
- else{
+ if(ok){
+ ui->tool_GRUBsaveentries->setEnabled(false);
+ ui->tool_GRUBresetentries->setEnabled(false);
+ }else{
qDebug() << "Error saving custom grub entries to file:" << file_GRUBentries+".new";
}
}
@@ -13,12 +13,14 @@ Name[fr]=Gestionnaire de démarrage
Name[fr_CA]=Gestionnaire de démarrage
Name[ja]=起動マネージャー
Name[pl]=Menadżer botowania
+Name[uk]=Налаштування завантаження
Name[vi]=khởi động Trình quản lý
Name[zh_CN]=启动管理器
Comment=Configure bootup options
Comment[fr]=Configurer les options de démarrage
Comment[fr_CA]=Configurer les options de démarrage
Comment[ja]=起動オプションを設定します
Comment[pl]=Konfiguruj opcje botowania.
+Comment[uk]=Налаштування завантаження комп'ютера
Comment[vi]=Cấu hình tùy chọn khởi động hệ thống
Comment[zh_CN]=配置启动选项
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -589,7 +589,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -588,7 +588,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -588,7 +588,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -588,7 +588,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -588,7 +588,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -588,7 +588,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -486,7 +486,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -486,7 +486,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -518,7 +518,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -484,7 +484,7 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation>Démarrer l&apos;application</translation>
</message>
</context>
<context>
@@ -484,7 +484,7 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation>Démarrer l&apos;application</translation>
</message>
</context>
<context>
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -594,7 +594,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -588,7 +588,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -588,7 +588,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
Oops, something went wrong.

0 comments on commit 58518e6

Please sign in to comment.