Permalink
Browse files

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

  • Loading branch information...
2 parents 0c784d0 + 109f248 commit 92e8b9b3d672b0bb6752351524d3d55c3deff795 Ken Moore committed Mar 7, 2014
Showing with 1,978 additions and 1,956 deletions.
  1. +1 −0 src-qt4/EasyPBI/EasyPBI.qrc
  2. BIN src-qt4/EasyPBI/configure.png
  3. +30 −30 src-qt4/EasyPBI/mainGUI.ui
  4. +3 −3 src-qt4/about-gui/mainwindow.ui
  5. BIN src-qt4/pc-pkgmanager/configure.png
  6. +1 −1 src-qt4/pc-pkgmanager/mainWin.ui
  7. +1 −0 src-qt4/pc-pkgmanager/pc-pkgmanager.qrc
  8. +1 −0 src-qt4/pc-softwaremanager/SoftwareManager.qrc
  9. BIN src-qt4/pc-softwaremanager/configure.png
  10. +5 −5 src-qt4/pc-softwaremanager/mainUI.ui
  11. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_af.ts
  12. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_ar.ts
  13. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_az.ts
  14. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_bg.ts
  15. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_bn.ts
  16. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_bs.ts
  17. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_ca.ts
  18. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_cs.ts
  19. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_cy.ts
  20. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_da.ts
  21. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_de.ts
  22. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_el.ts
  23. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_en_GB.ts
  24. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_en_ZA.ts
  25. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_es.ts
  26. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_et.ts
  27. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_eu.ts
  28. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_fa.ts
  29. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_fi.ts
  30. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_fr.ts
  31. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_fr_CA.ts
  32. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_gl.ts
  33. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_he.ts
  34. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_hi.ts
  35. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_hr.ts
  36. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_hu.ts
  37. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_id.ts
  38. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_is.ts
  39. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_it.ts
  40. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_ja.ts
  41. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_ka.ts
  42. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_ko.ts
  43. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_lt.ts
  44. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_lv.ts
  45. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_mk.ts
  46. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_mn.ts
  47. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_ms.ts
  48. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_mt.ts
  49. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_nb.ts
  50. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_nl.ts
  51. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_pa.ts
  52. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_pl.ts
  53. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_pt.ts
  54. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_pt_BR.ts
  55. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_ro.ts
  56. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_ru.ts
  57. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_sa.ts
  58. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_sk.ts
  59. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_sl.ts
  60. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_sr.ts
  61. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_sv.ts
  62. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_sw.ts
  63. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_ta.ts
  64. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_tg.ts
  65. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_th.ts
  66. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_tr.ts
  67. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_uk.ts
  68. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_uz.ts
  69. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_vi.ts
  70. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_zh_CN.ts
  71. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_zh_HK.ts
  72. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_zh_TW.ts
  73. +29 −29 src-qt4/pc-soundconfig/i18n/SoundConfig_zu.ts
  74. BIN src-qt4/pc-updatecenter/configure.png
  75. +21 −23 src-qt4/pc-updatecenter/mainwindow.ui
  76. +39 −37 src-qt4/pc-updatecenter/res.qrc
  77. BIN src-qt4/pc-updatecenter/window-close.png
  78. +49 −30 src-qt4/pc-zmanager/i18n/ZManager_uk.ts
@@ -1,5 +1,6 @@
<RCC>
<qresource prefix="png">
+ <file>configure.png</file>
<file>icons/search.png</file>
<file>icons/accept.png</file>
<file>icons/cancel.png</file>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -37,7 +37,7 @@
<enum>QTabWidget::Rounded</enum>
</property>
<property name="currentIndex">
- <number>1</number>
+ <number>3</number>
</property>
<property name="elideMode">
<enum>Qt::ElideMiddle</enum>
@@ -118,7 +118,7 @@
<string>Start building a PBI from the current module (requires administrator privileges)</string>
</property>
<property name="text">
- <string>Build PBI</string>
+ <string>&amp;Build PBI</string>
</property>
<property name="icon">
<iconset resource="EasyPBI.qrc">
@@ -159,7 +159,7 @@
<string>Cancel the currently running build process</string>
</property>
<property name="text">
- <string>Cancel Build</string>
+ <string>&amp;Cancel Build</string>
</property>
</widget>
</item>
@@ -176,7 +176,7 @@
<string>Save the current build log to disk (very useful when requesting help with a failed build)</string>
</property>
<property name="text">
- <string>Save Build Log</string>
+ <string>&amp;Save Build Log</string>
</property>
<property name="icon">
<iconset>
@@ -234,7 +234,7 @@
<string>Save the current settings to the PBI configuration file</string>
</property>
<property name="text">
- <string>Save Configuration</string>
+ <string>&amp;Save Configuration</string>
</property>
<property name="icon">
<iconset>
@@ -258,7 +258,7 @@
<x>0</x>
<y>0</y>
<width>528</width>
- <height>822</height>
+ <height>834</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
@@ -302,7 +302,7 @@
<string>Select a different FreeBSD package</string>
</property>
<property name="text">
- <string>Change</string>
+ <string>&amp;Change</string>
</property>
</widget>
</item>
@@ -857,7 +857,7 @@
<string>Copy an additional file into the PBI module</string>
</property>
<property name="text">
- <string>Add File</string>
+ <string>&amp;Add File</string>
</property>
<property name="icon">
<iconset resource="EasyPBI.qrc">
@@ -871,7 +871,7 @@
<string>Delete the selected file from the PBI module</string>
</property>
<property name="text">
- <string>Delete File</string>
+ <string>&amp;Delete File</string>
</property>
<property name="icon">
<iconset resource="EasyPBI.qrc">
@@ -898,7 +898,7 @@
<string>Create a custom wrapper script for a program binary</string>
</property>
<property name="text">
- <string>Wrapper Script</string>
+ <string>&amp;Wrapper Script</string>
</property>
<property name="icon">
<iconset resource="EasyPBI.qrc">
@@ -950,7 +950,7 @@
<string>Save the wrapper script</string>
</property>
<property name="text">
- <string>Save Script</string>
+ <string>&amp;Save Script</string>
</property>
<property name="icon">
<iconset>
@@ -1319,7 +1319,7 @@
<string>Save the item as currently shown</string>
</property>
<property name="text">
- <string>Save</string>
+ <string>&amp;Save</string>
</property>
</widget>
</item>
@@ -1342,7 +1342,7 @@
<string>Create a new item with the current settings</string>
</property>
<property name="text">
- <string>Add</string>
+ <string>&amp;Add</string>
</property>
<property name="icon">
<iconset resource="EasyPBI.qrc">
@@ -1428,7 +1428,7 @@
<string>Create the selected script</string>
</property>
<property name="text">
- <string>Create</string>
+ <string>&amp;Create</string>
</property>
</widget>
</item>
@@ -1438,7 +1438,7 @@
<string>Delete the selected script from the PBI module</string>
</property>
<property name="text">
- <string>Remove</string>
+ <string>&amp;Remove</string>
</property>
<property name="icon">
<iconset resource="EasyPBI.qrc">
@@ -1452,7 +1452,7 @@
<string>Save the current text as the selected script</string>
</property>
<property name="text">
- <string>Save</string>
+ <string>&amp;Save</string>
</property>
</widget>
</item>
@@ -1550,7 +1550,7 @@
<string>Remove currently selected link</string>
</property>
<property name="text">
- <string>Remove Entry</string>
+ <string>&amp;Remove Entry</string>
</property>
<property name="icon">
<iconset resource="EasyPBI.qrc">
@@ -1704,7 +1704,7 @@
<string>Save this link to the PBI module</string>
</property>
<property name="text">
- <string>Add Entry</string>
+ <string>&amp;Add Entry</string>
</property>
<property name="icon">
<iconset resource="EasyPBI.qrc">
@@ -1745,18 +1745,18 @@
<x>0</x>
<y>0</y>
<width>575</width>
- <height>20</height>
+ <height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
<property name="title">
- <string>File</string>
+ <string>&amp;File</string>
</property>
<addaction name="actionExit"/>
</widget>
<widget class="QMenu" name="menuEdit">
<property name="title">
- <string>Configure</string>
+ <string>&amp;Configure</string>
</property>
<addaction name="actionPreferences"/>
<addaction name="separator"/>
@@ -1768,7 +1768,7 @@
<bool>false</bool>
</property>
<property name="title">
- <string>Help</string>
+ <string>&amp;Help</string>
</property>
<addaction name="actionAbout_EasyPBI"/>
<addaction name="separator"/>
@@ -1820,10 +1820,10 @@
<action name="actionPreferences">
<property name="icon">
<iconset resource="EasyPBI.qrc">
- <normaloff>:/png/icons/config.png</normaloff>:/png/icons/config.png</iconset>
+ <normaloff>:/png/configure.png</normaloff>:/png/configure.png</iconset>
</property>
<property name="text">
- <string>EasyPBI Settings</string>
+ <string>&amp;Settings</string>
</property>
<property name="statusTip">
<string>Open up the EasyPBI settings editor</string>
@@ -1895,7 +1895,7 @@
<normaloff>:/png/icons/freebsd.png</normaloff>:/png/icons/freebsd.png</iconset>
</property>
<property name="text">
- <string>FreeBSD Ports</string>
+ <string>Free&amp;BSD Ports</string>
</property>
<property name="statusTip">
<string>Open up freshports.org for additional port information</string>
@@ -1907,7 +1907,7 @@
<normaloff>:/png/icons/pcbsd.png</normaloff>:/png/icons/pcbsd.png</iconset>
</property>
<property name="text">
- <string>PBI Modules</string>
+ <string>&amp;PBI Modules</string>
</property>
<property name="statusTip">
<string>Open up the PC-BSD Wiki page for PBI developers</string>
@@ -1919,7 +1919,7 @@
<normaloff>:/png/icons/window-close.png</normaloff>:/png/icons/window-close.png</iconset>
</property>
<property name="text">
- <string>Quit</string>
+ <string>&amp;Quit</string>
</property>
<property name="statusTip">
<string>Close EasyPBI</string>
@@ -1934,7 +1934,7 @@
<normaloff>:/png/icons/config.png</normaloff>:/png/icons/config.png</iconset>
</property>
<property name="text">
- <string>Package Module</string>
+ <string>&amp;Package Module</string>
</property>
<property name="statusTip">
<string>Compress the current module for distribution</string>
@@ -1946,7 +1946,7 @@
<normaloff>:/png/icons/EasyPBIicon.png</normaloff>:/png/icons/EasyPBIicon.png</iconset>
</property>
<property name="text">
- <string>About</string>
+ <string>&amp;About</string>
</property>
<property name="statusTip">
<string>View additional information about EasyPBI</string>
@@ -1957,7 +1957,7 @@
</action>
<action name="actionRefresh_Module">
<property name="text">
- <string>Refresh Module</string>
+ <string>&amp;Refresh Module</string>
</property>
</action>
</widget>
@@ -319,14 +319,14 @@
<item>
<widget class="QPushButton" name="pushButton_2">
<property name="text">
- <string>System components...</string>
+ <string>&amp;System components...</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton">
<property name="text">
- <string>Desktop environments...</string>
+ <string>&amp;Desktop environments...</string>
</property>
</widget>
</item>
@@ -634,7 +634,7 @@
<item>
<widget class="QPushButton" name="pushButton_3">
<property name="text">
- <string>Close</string>
+ <string>&amp;Close</string>
</property>
</widget>
</item>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -500,7 +500,7 @@ p, li { white-space: pre-wrap; }
<action name="action_Configuration">
<property name="icon">
<iconset resource="pc-pkgmanager.qrc">
- <normaloff>:/config.png</normaloff>:/config.png</iconset>
+ <normaloff>:/configure.png</normaloff>:/configure.png</iconset>
</property>
<property name="text">
<string>Settings</string>
@@ -1,5 +1,6 @@
<RCC>
<qresource prefix="/">
+ <file>configure.png</file>
<file>config.png</file>
<file>window-close3.png</file>
<file>window-close.png</file>
@@ -1,5 +1,6 @@
<RCC>
<qresource>
+ <file>configure.png</file>
<file>icons/graphicalapp.png</file>
<file>icons/serverapp.png</file>
<file>icons/textapp.png</file>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -972,7 +972,7 @@ spacing: 1px;
<x>0</x>
<y>0</y>
<width>435</width>
- <height>346</height>
+ <height>344</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_23"/>
@@ -993,8 +993,8 @@ spacing: 1px;
<rect>
<x>0</x>
<y>0</y>
- <width>435</width>
- <height>386</height>
+ <width>98</width>
+ <height>28</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_24"/>
@@ -1518,7 +1518,7 @@ spacing: 1px;
<x>0</x>
<y>0</y>
<width>473</width>
- <height>20</height>
+ <height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@@ -1580,7 +1580,7 @@ spacing: 1px;
<action name="actionAppCafe_Settings">
<property name="icon">
<iconset resource="SoftwareManager.qrc">
- <normaloff>:/icons/preferences-system.png</normaloff>:/icons/preferences-system.png</iconset>
+ <normaloff>:/configure.png</normaloff>:/configure.png</iconset>
</property>
<property name="text">
<string>&amp;Settings</string>
Oops, something went wrong.

0 comments on commit 92e8b9b

Please sign in to comment.