summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormaz-12015-12-04 12:02:36 +0800
committermaz-12015-12-04 12:02:36 +0800
commitd9d5d5aaacdd7046e23152aa486bf1980c5e3219 (patch)
treeba800ca7ad50196671cda782943e1869b08d07e1
parent3d939d120f6f1f8b77950fe01bd19bc24533b2cf (diff)
downloadaur-d9d5d5aaacdd7046e23152aa486bf1980c5e3219.tar.gz
bump
Diffstat
-rw-r--r--PKGBUILD2
-rw-r--r--port_to_kf5.patch388
2 files changed, 308 insertions, 82 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 4f6f6ee9ffa3..b6241785951c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,7 +29,7 @@ prepare() {
cd kcm-grub2-$pkgver
patch -p1 -i "$srcdir/port_to_kf5.patch"
patch -p1 -i "$srcdir/l10n_zh-cn.patch"
- sed -i 's:^Exec=.*$:Exec=pkexec env DISPLAY=\$DISPLAY XAUTHORITY=\$XAUTHORITY kcmshell5 kcm_grub2:g' other/kcm_grub2.desktop
+ #sed -i 's:^Exec=.*$:Exec=pkexec env DISPLAY=\$DISPLAY XAUTHORITY=\$XAUTHORITY kcmshell5 kcm_grub2:g' other/kcm_grub2.desktop
}
build() {
diff --git a/port_to_kf5.patch b/port_to_kf5.patch
index 7e6e3400d689..31e57d74f9ba 100644
--- a/port_to_kf5.patch
+++ b/port_to_kf5.patch
@@ -1,6 +1,6 @@
diff -Naur a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2013-10-12 18:34:15.000000000 +0800
-+++ b/CMakeLists.txt 2015-12-02 11:50:05.532223210 +0800
++++ b/CMakeLists.txt 2015-12-04 11:57:10.170563874 +0800
@@ -1,31 +1,46 @@
+cmake_minimum_required( VERSION 2.8.12 )
+cmake_policy(SET CMP0002 OLD)
@@ -58,7 +58,7 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt
diff -Naur a/cmake/modules/FindMsgfmt.cmake b/cmake/modules/FindMsgfmt.cmake
--- a/cmake/modules/FindMsgfmt.cmake 1970-01-01 08:00:00.000000000 +0800
-+++ b/cmake/modules/FindMsgfmt.cmake 2015-12-02 11:36:17.353838901 +0800
++++ b/cmake/modules/FindMsgfmt.cmake 2015-12-04 11:57:10.171563911 +0800
@@ -0,0 +1,28 @@
+# - Try to find msgfmt
+# Once done this will define
@@ -90,7 +90,7 @@ diff -Naur a/cmake/modules/FindMsgfmt.cmake b/cmake/modules/FindMsgfmt.cmake
+
diff -Naur a/cmake/modules/MacroBoolTo01.cmake b/cmake/modules/MacroBoolTo01.cmake
--- a/cmake/modules/MacroBoolTo01.cmake 1970-01-01 08:00:00.000000000 +0800
-+++ b/cmake/modules/MacroBoolTo01.cmake 2015-12-02 11:36:17.353838901 +0800
++++ b/cmake/modules/MacroBoolTo01.cmake 2015-12-04 11:57:10.171563911 +0800
@@ -0,0 +1,20 @@
+# MACRO_BOOL_TO_01( VAR RESULT0 ... RESULTN )
+# This macro evaluates its first argument
@@ -114,7 +114,7 @@ diff -Naur a/cmake/modules/MacroBoolTo01.cmake b/cmake/modules/MacroBoolTo01.cma
+ENDMACRO(MACRO_BOOL_TO_01)
diff -Naur a/cmake/modules/MacroLogFeature.cmake b/cmake/modules/MacroLogFeature.cmake
--- a/cmake/modules/MacroLogFeature.cmake 1970-01-01 08:00:00.000000000 +0800
-+++ b/cmake/modules/MacroLogFeature.cmake 2015-12-02 11:36:17.353838901 +0800
++++ b/cmake/modules/MacroLogFeature.cmake 2015-12-04 11:57:10.172563947 +0800
@@ -0,0 +1,157 @@
+# This file defines the Feature Logging macros.
+#
@@ -273,9 +273,25 @@ diff -Naur a/cmake/modules/MacroLogFeature.cmake b/cmake/modules/MacroLogFeature
+ ENDIF(_printSummary)
+
+ENDMACRO(MACRO_DISPLAY_FEATURE_LOG)
+diff -Naur a/config.h.cmake b/config.h.cmake
+--- a/config.h.cmake 2013-10-12 18:34:15.000000000 +0800
++++ b/config.h.cmake 2015-12-04 11:59:00.128528653 +0800
+@@ -18,6 +18,12 @@
+ #define GRUB_ENV "@GRUB_ENV@"
+ #define GRUB_MEMTEST "@GRUB_MEMTEST@"
+
++enum actionType {
++ actionLoad,
++ actionProbe,
++ actionProbevbe
++};
++
+ enum GrubFile {
+ GrubMenuFile,
+ GrubConfigurationFile,
diff -Naur a/other/kcm_grub2.desktop b/other/kcm_grub2.desktop
--- a/other/kcm_grub2.desktop 2013-10-12 18:34:15.000000000 +0800
-+++ b/other/kcm_grub2.desktop 2015-12-02 11:36:17.353838901 +0800
++++ b/other/kcm_grub2.desktop 2015-12-04 11:57:10.173563983 +0800
@@ -2,12 +2,12 @@
Icon=system-reboot
Type=Service
@@ -293,210 +309,210 @@ diff -Naur a/other/kcm_grub2.desktop b/other/kcm_grub2.desktop
Name[bs]=GRUB2 pokretač sistemar
diff -Naur a/po/ca/CMakeLists.txt b/po/ca/CMakeLists.txt
--- a/po/ca/CMakeLists.txt 2013-10-12 18:34:24.000000000 +0800
-+++ b/po/ca/CMakeLists.txt 2015-12-02 11:54:12.221819963 +0800
++++ b/po/ca/CMakeLists.txt 2015-12-04 11:57:10.173563983 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( ca ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( ca ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/ca@valencia/CMakeLists.txt b/po/ca@valencia/CMakeLists.txt
--- a/po/ca@valencia/CMakeLists.txt 2013-10-12 18:34:25.000000000 +0800
-+++ b/po/ca@valencia/CMakeLists.txt 2015-12-02 11:54:12.261820650 +0800
++++ b/po/ca@valencia/CMakeLists.txt 2015-12-04 11:57:10.174564019 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( ca@valencia ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( ca@valencia ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/cs/CMakeLists.txt b/po/cs/CMakeLists.txt
--- a/po/cs/CMakeLists.txt 2013-10-12 18:34:26.000000000 +0800
-+++ b/po/cs/CMakeLists.txt 2015-12-02 11:54:12.241820306 +0800
++++ b/po/cs/CMakeLists.txt 2015-12-04 11:57:10.174564019 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( cs ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( cs ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/da/CMakeLists.txt b/po/da/CMakeLists.txt
--- a/po/da/CMakeLists.txt 2013-10-12 18:34:29.000000000 +0800
-+++ b/po/da/CMakeLists.txt 2015-12-02 11:54:12.138485196 +0800
++++ b/po/da/CMakeLists.txt 2015-12-04 11:57:10.175564056 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( da ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( da ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/de/CMakeLists.txt b/po/de/CMakeLists.txt
--- a/po/de/CMakeLists.txt 2013-10-12 18:34:30.000000000 +0800
-+++ b/po/de/CMakeLists.txt 2015-12-02 11:54:12.211819790 +0800
++++ b/po/de/CMakeLists.txt 2015-12-04 11:57:10.175564056 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( de ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( de ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/el/CMakeLists.txt b/po/el/CMakeLists.txt
--- a/po/el/CMakeLists.txt 2013-10-12 18:34:31.000000000 +0800
-+++ b/po/el/CMakeLists.txt 2015-12-02 11:54:12.178485884 +0800
++++ b/po/el/CMakeLists.txt 2015-12-04 11:57:10.176564092 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( el ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( el ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/es/CMakeLists.txt b/po/es/CMakeLists.txt
--- a/po/es/CMakeLists.txt 2013-10-12 18:34:34.000000000 +0800
-+++ b/po/es/CMakeLists.txt 2015-12-02 11:54:12.188486056 +0800
++++ b/po/es/CMakeLists.txt 2015-12-04 11:57:10.176564092 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( es ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( es ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/et/CMakeLists.txt b/po/et/CMakeLists.txt
--- a/po/et/CMakeLists.txt 2013-10-12 18:34:35.000000000 +0800
-+++ b/po/et/CMakeLists.txt 2015-12-02 11:54:12.368489151 +0800
++++ b/po/et/CMakeLists.txt 2015-12-04 11:57:10.177564128 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( et ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( et ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/fi/CMakeLists.txt b/po/fi/CMakeLists.txt
--- a/po/fi/CMakeLists.txt 2013-10-12 18:34:37.000000000 +0800
-+++ b/po/fi/CMakeLists.txt 2015-12-02 11:54:12.121818243 +0800
++++ b/po/fi/CMakeLists.txt 2015-12-04 11:57:10.177564128 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( fi ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( fi ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/fr/CMakeLists.txt b/po/fr/CMakeLists.txt
--- a/po/fr/CMakeLists.txt 2013-10-12 18:34:38.000000000 +0800
-+++ b/po/fr/CMakeLists.txt 2015-12-02 11:54:12.271820822 +0800
++++ b/po/fr/CMakeLists.txt 2015-12-04 11:57:10.178564164 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( fr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/ga/CMakeLists.txt b/po/ga/CMakeLists.txt
--- a/po/ga/CMakeLists.txt 2013-10-12 18:34:40.000000000 +0800
-+++ b/po/ga/CMakeLists.txt 2015-12-02 11:54:12.338488635 +0800
++++ b/po/ga/CMakeLists.txt 2015-12-04 11:57:10.178564164 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( ga ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( ga ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/gl/CMakeLists.txt b/po/gl/CMakeLists.txt
--- a/po/gl/CMakeLists.txt 2013-10-12 18:34:41.000000000 +0800
-+++ b/po/gl/CMakeLists.txt 2015-12-02 11:54:12.331821854 +0800
++++ b/po/gl/CMakeLists.txt 2015-12-04 11:57:10.179564201 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( gl ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( gl ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/hu/CMakeLists.txt b/po/hu/CMakeLists.txt
--- a/po/hu/CMakeLists.txt 2013-10-12 18:34:46.000000000 +0800
-+++ b/po/hu/CMakeLists.txt 2015-12-02 11:54:12.348488807 +0800
++++ b/po/hu/CMakeLists.txt 2015-12-04 11:57:10.180564237 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( hu ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( hu ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/it/CMakeLists.txt b/po/it/CMakeLists.txt
--- a/po/it/CMakeLists.txt 2013-10-12 18:34:50.000000000 +0800
-+++ b/po/it/CMakeLists.txt 2015-12-02 11:54:12.068483992 +0800
++++ b/po/it/CMakeLists.txt 2015-12-04 11:57:10.180564237 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( it ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( it ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/lt/CMakeLists.txt b/po/lt/CMakeLists.txt
--- a/po/lt/CMakeLists.txt 2013-10-12 18:34:55.000000000 +0800
-+++ b/po/lt/CMakeLists.txt 2015-12-02 11:54:12.321821682 +0800
++++ b/po/lt/CMakeLists.txt 2015-12-04 11:57:10.180564237 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( lt ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( lt ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/nb/CMakeLists.txt b/po/nb/CMakeLists.txt
--- a/po/nb/CMakeLists.txt 2013-10-12 18:35:02.000000000 +0800
-+++ b/po/nb/CMakeLists.txt 2015-12-02 11:54:12.088484337 +0800
++++ b/po/nb/CMakeLists.txt 2015-12-04 11:57:10.181564273 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( nb ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( nb ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/nl/CMakeLists.txt b/po/nl/CMakeLists.txt
--- a/po/nl/CMakeLists.txt 2013-10-12 18:35:05.000000000 +0800
-+++ b/po/nl/CMakeLists.txt 2015-12-02 11:54:12.151818759 +0800
++++ b/po/nl/CMakeLists.txt 2015-12-04 11:57:10.181564273 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( nl ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( nl ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/pa/CMakeLists.txt b/po/pa/CMakeLists.txt
--- a/po/pa/CMakeLists.txt 2013-10-12 18:35:08.000000000 +0800
-+++ b/po/pa/CMakeLists.txt 2015-12-02 11:54:12.278487603 +0800
++++ b/po/pa/CMakeLists.txt 2015-12-04 11:57:10.181564273 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( pa ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( pa ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/pl/CMakeLists.txt b/po/pl/CMakeLists.txt
--- a/po/pl/CMakeLists.txt 2013-10-12 18:35:10.000000000 +0800
-+++ b/po/pl/CMakeLists.txt 2015-12-02 11:54:12.165152321 +0800
++++ b/po/pl/CMakeLists.txt 2015-12-04 11:57:10.181564273 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( pl ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( pl ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/pt/CMakeLists.txt b/po/pt/CMakeLists.txt
--- a/po/pt/CMakeLists.txt 2013-10-12 18:35:11.000000000 +0800
-+++ b/po/pt/CMakeLists.txt 2015-12-02 11:54:12.201819619 +0800
++++ b/po/pt/CMakeLists.txt 2015-12-04 11:57:10.182564310 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( pt ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( pt ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/pt_BR/CMakeLists.txt b/po/pt_BR/CMakeLists.txt
--- a/po/pt_BR/CMakeLists.txt 2013-10-12 18:35:12.000000000 +0800
-+++ b/po/pt_BR/CMakeLists.txt 2015-12-02 11:54:12.231820134 +0800
++++ b/po/pt_BR/CMakeLists.txt 2015-12-04 11:57:10.182564310 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( pt_BR ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( pt_BR ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/ro/CMakeLists.txt b/po/ro/CMakeLists.txt
--- a/po/ro/CMakeLists.txt 2013-10-12 18:35:14.000000000 +0800
-+++ b/po/ro/CMakeLists.txt 2015-12-02 11:54:12.315154900 +0800
++++ b/po/ro/CMakeLists.txt 2015-12-04 11:57:10.182564310 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( ro ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( ro ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/ru/CMakeLists.txt b/po/ru/CMakeLists.txt
--- a/po/ru/CMakeLists.txt 2013-10-12 18:35:15.000000000 +0800
-+++ b/po/ru/CMakeLists.txt 2015-12-02 11:54:12.251820478 +0800
++++ b/po/ru/CMakeLists.txt 2015-12-04 11:57:10.183564346 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( ru ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( ru ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/sk/CMakeLists.txt b/po/sk/CMakeLists.txt
--- a/po/sk/CMakeLists.txt 2013-10-12 18:35:18.000000000 +0800
-+++ b/po/sk/CMakeLists.txt 2015-12-02 11:54:12.298487947 +0800
++++ b/po/sk/CMakeLists.txt 2015-12-04 11:57:10.183564346 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( sk ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( sk ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/sl/CMakeLists.txt b/po/sl/CMakeLists.txt
--- a/po/sl/CMakeLists.txt 2013-10-12 18:35:19.000000000 +0800
-+++ b/po/sl/CMakeLists.txt 2015-12-02 11:54:12.305154728 +0800
++++ b/po/sl/CMakeLists.txt 2015-12-04 11:57:10.183564346 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( sl ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( sl ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/sv/CMakeLists.txt b/po/sv/CMakeLists.txt
--- a/po/sv/CMakeLists.txt 2013-10-12 18:35:23.000000000 +0800
-+++ b/po/sv/CMakeLists.txt 2015-12-02 11:54:12.378489323 +0800
++++ b/po/sv/CMakeLists.txt 2015-12-04 11:57:10.184564382 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( sv ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( sv ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/tr/CMakeLists.txt b/po/tr/CMakeLists.txt
--- a/po/tr/CMakeLists.txt 2013-10-12 18:35:28.000000000 +0800
-+++ b/po/tr/CMakeLists.txt 2015-12-02 11:54:12.108484681 +0800
++++ b/po/tr/CMakeLists.txt 2015-12-04 11:57:10.184564382 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( tr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( tr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/uk/CMakeLists.txt b/po/uk/CMakeLists.txt
--- a/po/uk/CMakeLists.txt 2013-10-12 18:35:31.000000000 +0800
-+++ b/po/uk/CMakeLists.txt 2015-12-02 11:54:12.358488979 +0800
++++ b/po/uk/CMakeLists.txt 2015-12-04 11:57:10.184564382 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( uk ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( uk ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/po/zh_TW/CMakeLists.txt b/po/zh_TW/CMakeLists.txt
--- a/po/zh_TW/CMakeLists.txt 2013-10-12 18:35:37.000000000 +0800
-+++ b/po/zh_TW/CMakeLists.txt 2015-12-02 11:54:12.288487775 +0800
++++ b/po/zh_TW/CMakeLists.txt 2015-12-04 11:57:10.185564418 +0800
@@ -1,2 +1,2 @@
file( GLOB _po_files *.po )
-GETTEXT_PROCESS_PO_FILES( zh_TW ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} )
+GETTEXT_PROCESS_PO_FILES( zh_TW ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt 2013-10-12 18:34:15.000000000 +0800
-+++ b/src/CMakeLists.txt 2015-12-02 11:36:17.357172349 +0800
++++ b/src/CMakeLists.txt 2015-12-04 11:57:10.186564455 +0800
@@ -1,7 +1,7 @@
add_subdirectory(helper)
@@ -559,7 +575,7 @@ diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
# Install
diff -Naur a/src/common.cpp b/src/common.cpp
--- a/src/common.cpp 2013-10-12 18:34:15.000000000 +0800
-+++ b/src/common.cpp 2015-12-02 11:36:17.357172349 +0800
++++ b/src/common.cpp 2015-12-04 11:57:10.186564455 +0800
@@ -66,7 +66,7 @@
return QString();
}
@@ -580,7 +596,7 @@ diff -Naur a/src/common.cpp b/src/common.cpp
default:
diff -Naur a/src/convertDlg.cpp b/src/convertDlg.cpp
--- a/src/convertDlg.cpp 2013-10-12 18:34:15.000000000 +0800
-+++ b/src/convertDlg.cpp 2015-12-02 11:36:17.357172349 +0800
++++ b/src/convertDlg.cpp 2015-12-04 11:57:10.187564491 +0800
@@ -19,23 +19,34 @@
#include "convertDlg.h"
@@ -673,7 +689,7 @@ diff -Naur a/src/convertDlg.cpp b/src/convertDlg.cpp
}
diff -Naur a/src/convertDlg.h b/src/convertDlg.h
--- a/src/convertDlg.h 2013-10-12 18:34:15.000000000 +0800
-+++ b/src/convertDlg.h 2015-12-02 11:36:17.360505797 +0800
++++ b/src/convertDlg.h 2015-12-04 11:57:10.187564491 +0800
@@ -18,8 +18,8 @@
#ifndef CONVERTDLG_H
#define CONVERTDLG_H
@@ -707,7 +723,7 @@ diff -Naur a/src/convertDlg.h b/src/convertDlg.h
private:
diff -Naur a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
--- a/src/helper/CMakeLists.txt 2013-10-12 18:34:15.000000000 +0800
-+++ b/src/helper/CMakeLists.txt 2015-12-02 11:36:17.360505797 +0800
++++ b/src/helper/CMakeLists.txt 2015-12-04 11:57:10.188564527 +0800
@@ -8,17 +8,17 @@
set(kcmgrub2helper_SRCS helper.cpp)
@@ -733,8 +749,8 @@ diff -Naur a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
+kauth_install_actions(org.kde.kcontrol.kcmgrub2 kcmgrub2.actions)
diff -Naur a/src/helper/helper.cpp b/src/helper/helper.cpp
--- a/src/helper/helper.cpp 2013-10-12 18:34:15.000000000 +0800
-+++ b/src/helper/helper.cpp 2015-12-02 11:36:17.360505797 +0800
-@@ -25,11 +25,12 @@
++++ b/src/helper/helper.cpp 2015-12-04 11:59:00.129528689 +0800
+@@ -25,11 +25,9 @@
#include <QDir>
//KDE
@@ -742,16 +758,13 @@ diff -Naur a/src/helper/helper.cpp b/src/helper/helper.cpp
-#include <KGlobal>
-#include <KLocale>
+//#include <KDebug>
-+//#include <KGlobal>
-+//#include <KLocale>
#include <KProcess>
-#include <KAuth/HelperSupport>
+#include <klocalizedstring.h>
-+//#include <KAuth/HelperSupport>
//Project
#include "../config.h"
-@@ -44,7 +45,6 @@
+@@ -44,7 +42,6 @@
Helper::Helper()
{
@@ -759,7 +772,7 @@ diff -Naur a/src/helper/helper.cpp b/src/helper/helper.cpp
qputenv("PATH", path.toLatin1());
}
-@@ -54,13 +54,14 @@
+@@ -54,19 +51,36 @@
process.setProgram(command);
process.setOutputChannelMode(KProcess::MergedChannels);
@@ -777,7 +790,29 @@ diff -Naur a/src/helper/helper.cpp b/src/helper/helper.cpp
}
reply.addData("command", command);
reply.addData("output", process.readAll());
-@@ -75,17 +76,17 @@
+ return reply;
+ }
+
++ActionReply Helper::initialize(QVariantMap args)
++{
++ ActionReply reply;
++ switch (args.value("actionType").toInt()) {
++ case actionLoad:
++ reply = load(args);
++ break;
++ case actionProbe:
++ reply = probe(args);
++ break;
++ case actionProbevbe:
++ reply = probevbe(args);
++ }
++ return reply;
++}
++
+ ActionReply Helper::defaults(QVariantMap args)
+ {
+ Q_UNUSED(args)
+@@ -75,17 +89,17 @@
QString originalConfigFileName = configFileName + ".original";
if (!QFile::exists(originalConfigFileName)) {
@@ -798,7 +833,7 @@ diff -Naur a/src/helper/helper.cpp b/src/helper/helper.cpp
reply.addData("errorDescription", i18nc("@info", "Cannot copy original configuration file <filename>%1</filename> to <filename>%2</filename>.", originalConfigFileName, configFileName));
return reply;
}
-@@ -101,7 +102,7 @@
+@@ -101,7 +115,7 @@
if (mountPoint.isEmpty()) {
for (int i = 0; QDir(mountPoint = QString("%1/kcm-grub2-%2").arg(QDir::tempPath(), QString::number(i))).exists(); i++);
if (!QDir().mkpath(mountPoint)) {
@@ -807,7 +842,7 @@ diff -Naur a/src/helper/helper.cpp b/src/helper/helper.cpp
reply.addData("errorDescription", i18nc("@info", "Failed to create temporary mount point."));
return reply;
}
-@@ -145,7 +146,7 @@
+@@ -145,7 +159,7 @@
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -816,7 +851,7 @@ diff -Naur a/src/helper/helper.cpp b/src/helper/helper.cpp
reply.addData("errorDescription", file.errorString());
return reply;
}
-@@ -190,7 +191,7 @@
+@@ -190,7 +204,7 @@
hd_free_hd_data(&hd_data);
reply.addData("gfxmodes", gfxmodes);
#else
@@ -825,7 +860,7 @@ diff -Naur a/src/helper/helper.cpp b/src/helper/helper.cpp
#endif
return reply;
-@@ -207,7 +208,7 @@
+@@ -207,7 +221,7 @@
QFile file(configFileName);
if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
@@ -834,7 +869,7 @@ diff -Naur a/src/helper/helper.cpp b/src/helper/helper.cpp
reply.addData("errorDescription", file.errorString());
return reply;
}
-@@ -237,4 +238,4 @@
+@@ -237,4 +251,4 @@
return grub_mkconfigReply;
}
@@ -842,7 +877,7 @@ diff -Naur a/src/helper/helper.cpp b/src/helper/helper.cpp
+KAUTH_HELPER_MAIN("org.kde.kcontrol.kcmgrub2", Helper)
diff -Naur a/src/helper/helper.h b/src/helper/helper.h
--- a/src/helper/helper.h 2013-10-12 18:34:15.000000000 +0800
-+++ b/src/helper/helper.h 2015-12-02 11:36:17.360505797 +0800
++++ b/src/helper/helper.h 2015-12-04 11:59:00.129528689 +0800
@@ -17,9 +17,10 @@
#ifndef HELPER_H
@@ -856,9 +891,190 @@ diff -Naur a/src/helper/helper.h b/src/helper/helper.h
using namespace KAuth;
class Helper : public QObject
+@@ -29,12 +30,14 @@
+ Helper();
+ private:
+ ActionReply executeCommand(const QStringList &command);
+-public Q_SLOTS:
+- ActionReply defaults(QVariantMap args);
+- ActionReply install(QVariantMap args);
++ //merge
+ ActionReply load(QVariantMap args);
+ ActionReply probe(QVariantMap args);
+ ActionReply probevbe(QVariantMap args);
++public Q_SLOTS:
++ ActionReply initialize(QVariantMap args);
++ ActionReply defaults(QVariantMap args);
++ ActionReply install(QVariantMap args);
+ ActionReply save(QVariantMap args);
+ };
+
+diff -Naur a/src/helper/kcmgrub2.actions b/src/helper/kcmgrub2.actions
+--- a/src/helper/kcmgrub2.actions 2013-10-12 18:34:15.000000000 +0800
++++ b/src/helper/kcmgrub2.actions 2015-12-04 11:59:00.131528761 +0800
+@@ -184,7 +184,7 @@
+ Policy=auth_admin
+ Persistence=session
+
+-[org.kde.kcontrol.kcmgrub2.load]
++[org.kde.kcontrol.kcmgrub2.initialize]
+ Name=Load the GRUB2 Bootloader settings
+ Name[bs]=Učitaj postavke GRUB2 pokretača sistema
+ Name[ca]=Carrega l'arranjament del gestor d'arrencada Grub2
+@@ -259,150 +259,6 @@
+ Policy=auth_admin
+ Persistence=session
+
+-[org.kde.kcontrol.kcmgrub2.probe]
+-Name=Probe devices for their GRUB2 names
+-Name[bs]=Testiranje uređaja za njihova GRUB2 imena
+-Name[ca]=Prova els dispositius pels seus noms a Grub2
+-Name[ca@valencia]=Prova els dispositius pels seus noms a Grub2
+-Name[cs]=Prozkoumat zařízení pro jejich GRUB2 názvy
+-Name[da]=Søg efter enheders GRUB2-navne
+-Name[de]=Geräte auf ihre GRUB2-Namen abfragen.
+-Name[el]=Έλεγχος συσκευών αν έχουν ονόματα GRUB2
+-Name[es]=Examinar los nombres de los dispositivos en GRUB2
+-Name[et]=Seadmete kontrollimine GRUB2 nimede osas
+-Name[fi]=Tunnustele laitteet niiden GRUB2-nimien selvittämiseksi
+-Name[fr]=Interroger les périphériques pour trouver leurs noms GRUB2
+-Name[gl]=Probar os dispositivos polo seu nome en GRUB2
+-Name[hu]=Eszközök vizsgálata a GRUB2 név meghatározásához
+-Name[it]=Sonda i dispositivi per trovarne i loro nomi in GRUB2
+-Name[lt]=Tikrini įrenginius dėl GRUB2 vardų
+-Name[mr]=साधनांच्या GRUB2 नावाकरिता साधने शोधा
+-Name[nb]=Undersøk enheter for å finne deres GRUB2-navn
+-Name[nds]=De Reedschappen ehr Grub2-Naams opdecken
+-Name[nl]=Apparaten aftasten voor hun GRUB2 namen
+-Name[pa]=ਜੰਤਰ ਨੂੰ ਉਹਨਾਂ ਦੇ ਗਰਬ2 ਨਾਂ ਲਈ ਪੜਤਾਲ ਕਰੋ
+-Name[pl]=Wykryj nazwy urządzeń dla GRUB2
+-Name[pt]=Detectar os nomes dos dispositivos no GRUB2
+-Name[pt_BR]=Detectar os nomes dos dispositivos no GRUB2
+-Name[ro]=Sondează dispozitivele pentru denumirile lor GRUB2
+-Name[ru]=Определение имён устройств, используемых загрузчиком GRUB2
+-Name[sk]=Vyskúšať zariadenia pre ich názvy v GRUB2
+-Name[sl]=Preizkusi naprave za njihova imena GRUB2
+-Name[sv]=Sök igenom enheter efter deras GRUB2-namn
+-Name[tr]=Aygıtları GRUB2 isimleri için araştır
+-Name[uk]=Визначення назв пристроїв GRUB2
+-Name[x-test]=xxProbe devices for their GRUB2 namesxx
+-Name[zh_CN]=探测设备的 GRUB2 名字
+-Name[zh_TW]=偵測裝置在 GRUB2 上的名稱
+-Description=Administrator authorization is required to probe devices for their GRUB2 names
+-Description[bs]=Administratorska potvrda je potrebna za upit uređaja za njihova GRUB2 imena
+-Description[ca]=Es requereix autorització de l'administrador per a provar els dispositius pels seus noms a Grub2
+-Description[ca@valencia]=Es requereix autorització de l'administrador per a provar els dispositius pels seus noms a Grub2
+-Description[cs]=Pro prozkoumání GRUB2 názvů zařízení je potřeba oprávnění administrátora
+-Description[da]=Administrator-godkendelse kræves for at søge efter enheders GRUB2-navne
+-Description[de]=Zur Abfrage der Geräte nach ihren GRUB2-Namen sind Systemverwalterrechte erforderlich.
+-Description[el]=Απαιτείται εξουσιοδότηση διαχειριστή για τον έλεγχο συσκευών για ονόματα GRUB2
+-Description[es]=Se requiere la autorización del administrador para examinar los nombres de los dispositivos en GRUB2
+-Description[et]=Seadmete kontrollimiseks GRUB2 nimede osas on vajalik autentimine administraatorina
+-Description[fi]=Laitteiden tunnusteleminen niiden GRUB2-nimien selvittämiseksi vaatii pääkäyttäjän oikeudet
+-Description[fr]=L'autorisation de l'administrateur est requise pour interroger les périphériques pour trouver leurs noms GRUB2
+-Description[gl]=Precísase a autorización do administrador para probar os dispositivos polo seu nome en GRUB2
+-Description[hu]=Rendszergazdai jogosultságok szükségesek az eszközök GRUB2 nevének meghatározásához
+-Description[it]=Sono i richiesti i privilegi amministrativi per sondare i dispositivi e trovarne i nomi in GRUB2
+-Description[lt]=Administratoriaus įgaliojimas reikalingas, kad patikrinti įrenginių GRUB2 vardus
+-Description[mr]=साधनांच्या GRUB2 नावाकरिता साधने शोधण्याकरिता व्यवस्थापकाची परवानगी आवश्यक आहे
+-Description[nb]=Det kreves autorisasjon som administrator for å søke etter enheters GRUB2-navn
+-Description[nds]=De Reedschappen ehr Grub2-Naams laat sik bloots mit Systeempleger-Verlööf opdecken.
+-Description[nl]=Autorisatie van systeembeheerder is vereist om apparaten af te tasten voor hun GRUB2 namen
+-Description[pl]=Do wykrycia nazw urządzeń dla GRUB2 potrzebne są uprawnienia administratora
+-Description[pt]=É necessária a autorização do administrador para detectar os nomes dos dispositivos no GRUB2
+-Description[pt_BR]=É necessária a autorização do administrador para detectar os nomes dos dispositivos no GRUB2
+-Description[ro]=Este necesară autorizarea ca administrator pentru a sonda dispozitivele pentru denumirile lor GRUB2
+-Description[ru]=Необходимы права администратора для определения имён устройств, используемых загрузчиком GRUB2
+-Description[sk]=Vyžaduje sa overenie administrátora na vyskúšanie zariadení pre ich názvy v GRUB2
+-Description[sl]=Za preizkus naprav za njihovimi imeni GRUB2 je zahtevana pooblastitev skrbnika
+-Description[sv]=Administratörsbehörighet krävs för att söka igenom enheter efter deras GRUB2 namn
+-Description[tr]=Aygıtların GRUB2 isimlerini araştırmak için yönetici yetkilendirmesi gerekli
+-Description[uk]=Для визначення назв пристроїв GRUB2 слід набути прав доступу адміністратора
+-Description[x-test]=xxAdministrator authorization is required to probe devices for their GRUB2 namesxx
+-Description[zh_CN]=探测设备的 GRUB2 名字需要管理员权限
+-Description[zh_TW]=偵測裝置在 GRUB2 上的名稱需要管理者權限
+-Policy=auth_admin
+-Persistence=session
+-
+-[org.kde.kcontrol.kcmgrub2.probevbe]
+-Name=Probe VESA BIOS Extensions
+-Name[bs]=Ispitaj VESA BIOS proširenja
+-Name[ca]=Prova les extensions VESA del BIOS
+-Name[ca@valencia]=Prova les extensions VESA del BIOS
+-Name[cs]=Prozkoumat rozšířeni VESA BIOS (VBE)
+-Name[da]=Søg efter VESA BIOS-udvidelser
+-Name[de]=VESA-BIOS-Erweiterungen ermitteln
+-Name[el]=Έλεγχος για VESA BIOS επεκτάσεις
+-Name[es]=Examinar las extensiones BIOS de VESA
+-Name[et]=VESA BIOS-e laiendite kontrollimine
+-Name[fi]=Tunnustele VESA BIOS -laajennukset
+-Name[fr]=Détecter les extensions « BIOS VESA »
+-Name[ga]=Fiosraigh Eisínteachtaí BIOS VESA
+-Name[gl]=Probar os engadidos VESA BIOS
+-Name[hu]=VESA BIOS kiterjesztések vizsgálata
+-Name[it]=Sonda le estensioni per il BIOS della VESA
+-Name[lt]=Tikrinti VESA BIOS plėtinius
+-Name[mr]=VESA BIOS विस्तारणे शोधा
+-Name[nb]=Se etter VESA BIOS-utvidelser
+-Name[nds]=VESA-BIOS-Verwiedern opdecken
+-Name[nl]=VESA BIOS extensies aftasten
+-Name[pa]=VESA BIOS ਇਕਸਟੈਨਸ਼ਨ ਲਈ ਪੜਤਾਲ
+-Name[pl]=Wykryj rozszerzenia VESA BIOS
+-Name[pt]=Testar as extensões da BIOS para o VESA
+-Name[pt_BR]=Testar as extensões da BIOS para o VESA
+-Name[ro]=Sondează extensiile BIOS VESA
+-Name[ru]=Проверка расширений BIOS в стандарте VESA (VBE)
+-Name[sk]=Vyskúšať rozšírenia VESA BIOSu
+-Name[sl]=Preizkusi razširitve VESA BIOS
+-Name[sv]=Sök efter VESA BIOS-utökningar
+-Name[tr]=VESA BIOS Uzantılarını Araştır
+-Name[uk]=Виявлення розширень BIOS VESA
+-Name[x-test]=xxProbe VESA BIOS Extensionsxx
+-Name[zh_CN]=探测 VESA BIOS 扩展
+-Name[zh_TW]=偵測 VESA BIOS 延伸
+-Description=Administrator authorization is required to probe VESA BIOS Extensions
+-Description[bs]=Administratorska potvrda je potrebna za testiranje VESA BIOS proširenja
+-Description[ca]=Es requereix autorització de l'administrador per a provar les extensions VESA del BIOS
+-Description[ca@valencia]=Es requereix autorització de l'administrador per a provar les extensions VESA del BIOS
+-Description[cs]=Pro prozkoumání rozšíření VESA BIOS (VBE) je potřeba oprávnění administrátora
+-Description[da]=Administrator-godkendelse kræves for at søge efter VESA BIOS-udvidelser
+-Description[de]=Zur Ermittlung der VESA-BIOS-Erweiterungen sind Systemverwalterrechte erforderlich.
+-Description[el]=Απαιτείται εξουσιοδότηση διαχειριστή για τον έλεγχο VESA BIOS επεκτάσεων
+-Description[es]=Se requiere la autorización del administrador para examinar las extensiones BIOS de VESA
+-Description[et]=VESA BIOS-e laiendite kontrollimiseks on vajalik autentimine administraatorina
+-Description[fi]=VESA BIOS -laajennusten tunnusteleminen vaatii pääkäyttäjän oikeudet
+-Description[fr]=L'autorisation de l'administrateur est requise pour détecter les extensions BIOS VESA
+-Description[ga]=Is é riarthóir an chórais amháin atá in ann Eisínteachtaí BIOS VESA a fhiosrú
+-Description[gl]=Precísase a autorización do administrador para probar os engadidos VESA BIOS
+-Description[hu]=Rendszergazdai jogosultságok szükségesek a VESA BIOS kiterjesztések vizsgálatához
+-Description[it]=Sono i richiesti i privilegi amministrativi per sondare le estensioni per il BIOS della VESA
+-Description[lt]=Administratoriaus įgaliojimas reikalingas, kad patikrinti VESA BIOS plėtinius
+-Description[mr]=VESA BIOS विस्तारणे शोधण्याकरिता व्यवस्थापकाची परवानगी आवश्यक आहे
+-Description[nb]=Det kreves autorisasjon som administrator for å søke etter VESA BIOS-utvidcelser
+-Description[nds]=De VESA-BIOS-Verwiedern laat sik bloots mit Systeempleger-Verlööf opdecken.
+-Description[nl]=Autorisatie van systeembeheerder is vereist om VESA BIOS extensies af te tasten
+-Description[pl]=Do wykrycia rozszerzeń VESA BIOS potrzebne są uprawnienia administratora
+-Description[pt]=É necessária a autorização do administrador para testar a extensões da BIOS para o VESA
+-Description[pt_BR]=É necessária a autorização do administrador para testar a extensões da BIOS para o VESA
+-Description[ro]=Este necesară autorizarea ca administrator pentru a sonda extensiile BIOS VESA
+-Description[ru]=Для проверки расширений BIOS в стандарте VESA (VBE) необходимы права администратора
+-Description[sk]=Vyžaduje sa overenie administrátora na vyskúšanie rozšírení VESA BIOSu
+-Description[sl]=Za preizkus razširitev VESA BIOS GRUB2 je zahtevana pooblastitev skrbnika
+-Description[sv]=Administratörsbehörighet krävs för att söka efter VESA BIOS-utökningar
+-Description[tr]=VESA BIOS Uzantılarını araştırmak için yönetici yetkilendirmesi gerekli
+-Description[uk]=Для виявлення розширень BIOS VESA слід набути прав доступу адміністратора
+-Description[x-test]=xxAdministrator authorization is required to probe VESA BIOS Extensionsxx
+-Description[zh_CN]=探测 VESA BIOS 扩展需要管理员权限
+-Description[zh_TW]=偵測 VESA BIOS 延伸需要管理者權限
+-Policy=auth_admin
+-Persistence=session
+-
+ [org.kde.kcontrol.kcmgrub2.save]
+ Name=Save the GRUB2 Bootloader settings
+ Name[bs]=Snimie postavke GRUB2 pokretača sistema
diff -Naur a/src/installDlg.cpp b/src/installDlg.cpp
--- a/src/installDlg.cpp 2013-10-12 18:34:15.000000000 +0800
-+++ b/src/installDlg.cpp 2015-12-02 11:36:17.360505797 +0800
++++ b/src/installDlg.cpp 2015-12-04 11:59:00.132528797 +0800
@@ -21,36 +21,47 @@
//Qt
#include <QFile>
@@ -949,7 +1165,7 @@ diff -Naur a/src/installDlg.cpp b/src/installDlg.cpp
for (int i = 0; i < ui->treeWidget_recover->topLevelItemCount(); i++) {
QRadioButton *radio = qobject_cast<QRadioButton *>(ui->treeWidget_recover->itemWidget(ui->treeWidget_recover->topLevelItem(i), 0));
if (radio && radio->isChecked()) {
-@@ -98,34 +108,35 @@
+@@ -98,34 +108,37 @@
KMessageBox::sorry(this, i18nc("@info", "Sorry, you have to select a partition with a proper name!"));
return;
}
@@ -986,15 +1202,16 @@ diff -Naur a/src/installDlg.cpp b/src/installDlg.cpp
+ ExecuteJob* reply = installAction.execute();
+ reply->exec();
+
-+ if (installAction.status() != Action::AuthorizedStatus ) {
-+ progressDlg.hide();
-+ return;
-+ }
++ //if (installAction.status() != Action::AuthorizedStatus ) {
++ // progressDlg.hide();
++ // return;
++ //}
+
+ //connect(reply, SIGNAL(result()), &progressDlg, SLOT(hide()));
+ progressDlg.hide();
+ if (reply->error()) {
+ KMessageBox::detailedError(this, i18nc("@info", "Failed to install GRUB."), reply->data().value("errorDescription").toString());
++ this->reject();
} else {
- KMessageBox::detailedError(this, i18nc("@info", "Failed to install GRUB."), KDE_IS_VERSION(4,7,0) ? reply.errorDescription() : reply.data().value("errorDescription").toString());
+ progressDlg.hide();
@@ -1003,14 +1220,15 @@ diff -Naur a/src/installDlg.cpp b/src/installDlg.cpp
+ dialog->setModal(true);
+ QDialogButtonBox *btnbox = new QDialogButtonBox(QDialogButtonBox::Ok);
+ KMessageBox::createKMessageBox(dialog, btnbox, QMessageBox::Information, i18nc("@info", "Successfully installed GRUB."), QStringList(), QString(), 0, KMessageBox::Notify, reply->data().value("output").toString()); // krazy:exclude=qclasses
++ this->accept();
}
- }
- KDialog::slotButtonClicked(button);
-+ this->accept();
++ //this->accept();
}
diff -Naur a/src/installDlg.h b/src/installDlg.h
--- a/src/installDlg.h 2013-10-12 18:34:15.000000000 +0800
-+++ b/src/installDlg.h 2015-12-02 11:36:17.360505797 +0800
++++ b/src/installDlg.h 2015-12-04 11:57:10.190564600 +0800
@@ -19,22 +19,22 @@
#define INSTALLDLG_H
@@ -1041,7 +1259,7 @@ diff -Naur a/src/installDlg.h b/src/installDlg.h
};
diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
--- a/src/kcm_grub2.cpp 2013-10-12 18:34:15.000000000 +0800
-+++ b/src/kcm_grub2.cpp 2015-12-02 11:36:17.363839245 +0800
++++ b/src/kcm_grub2.cpp 2015-12-04 11:59:00.133528832 +0800
@@ -20,22 +20,26 @@
//Own
@@ -1349,16 +1567,18 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
ui->kpushbutton_terminalOutputSuggestions->menu()->addAction(i18nc("@action:inmenu", "PC BIOS && EFI Console"))->setData("console");
ui->kpushbutton_terminalOutputSuggestions->menu()->addAction(i18nc("@action:inmenu", "Serial Terminal"))->setData("serial");
ui->kpushbutton_terminalOutputSuggestions->menu()->addAction(i18nc("@action:inmenu 'Open' is an adjective here, not a verb. 'Open Firmware' is a former IEEE standard.", "Open Firmware Console"))->setData("ofconsole");
-@@ -956,18 +967,13 @@
+@@ -956,18 +967,14 @@
return fileName;
}
-ActionReply KCMGRUB2::loadFile(GrubFile grubFile)
+ExecuteJob * KCMGRUB2::loadFile(GrubFile grubFile)
{
- Action loadAction("org.kde.kcontrol.kcmgrub2.load");
+- Action loadAction("org.kde.kcontrol.kcmgrub2.load");
- loadAction.setHelperID("org.kde.kcontrol.kcmgrub2");
++ Action loadAction("org.kde.kcontrol.kcmgrub2.initialize");
+ loadAction.setHelperId("org.kde.kcontrol.kcmgrub2");
++ loadAction.addArgument("actionType", actionLoad);
loadAction.addArgument("grubFile", grubFile);
-#if KDE_IS_VERSION(4,6,0)
- loadAction.setParentWidget(this);
@@ -1371,7 +1591,7 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
}
QString KCMGRUB2::readFile(GrubFile grubFile)
{
-@@ -992,13 +998,13 @@
+@@ -992,13 +999,13 @@
return stream.readAll();
}
@@ -1390,7 +1610,7 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
}
void KCMGRUB2::readEntries()
{
-@@ -1030,15 +1036,15 @@
+@@ -1030,15 +1037,15 @@
return;
}
@@ -1412,12 +1632,15 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
}
}
void KCMGRUB2::readDevices()
-@@ -1051,28 +1057,36 @@
+@@ -1050,29 +1057,38 @@
+ }
}
- Action probeAction("org.kde.kcontrol.kcmgrub2.probe");
+- Action probeAction("org.kde.kcontrol.kcmgrub2.probe");
- probeAction.setHelperID("org.kde.kcontrol.kcmgrub2");
++ Action probeAction("org.kde.kcontrol.kcmgrub2.initialize");
+ probeAction.setHelperId("org.kde.kcontrol.kcmgrub2");
++ probeAction.addArgument("actionType", actionProbe);
probeAction.addArgument("mountPoints", mountPoints);
-#if KDE_IS_VERSION(4,6,0)
- probeAction.setParentWidget(this);
@@ -1467,15 +1690,18 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
if (mountPoints.size() != grubPartitions.size()) {
KMessageBox::error(this, i18nc("@info", "Helper returned malformed device list."));
return;
-@@ -1086,19 +1100,15 @@
+@@ -1085,20 +1101,17 @@
+ }
void KCMGRUB2::readResolutions()
{
- Action probeVbeAction("org.kde.kcontrol.kcmgrub2.probevbe");
+- Action probeVbeAction("org.kde.kcontrol.kcmgrub2.probevbe");
- probeVbeAction.setHelperID("org.kde.kcontrol.kcmgrub2");
-#if KDE_IS_VERSION(4,6,0)
- probeVbeAction.setParentWidget(this);
-#endif
++ Action probeVbeAction("org.kde.kcontrol.kcmgrub2.initialize");
+ probeVbeAction.setHelperId("org.kde.kcontrol.kcmgrub2");
++ probeVbeAction.addArgument("actionType", actionProbevbe);
- ActionReply reply = probeVbeAction.execute();
- processReply(reply);
@@ -1491,7 +1717,7 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
}
void KCMGRUB2::sortResolutions()
-@@ -1140,8 +1150,8 @@
+@@ -1140,8 +1153,8 @@
ui->kcombobox_gfxpayload->addItem(resolution, resolution);
}
}
@@ -1502,7 +1728,7 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
{
if (reply.type() == ActionReply::Success || reply.type() == ActionReply::KAuthError) {
return;
-@@ -1171,6 +1181,7 @@
+@@ -1171,6 +1184,7 @@
reply.addData(QLatin1String("errorMessage"), errorMessage);
reply.setErrorDescription(i18nc("@info", "Command: <command>%1</command><nl/>Error code: <numid>%2</numid><nl/>Error message:<nl/><message>%3</message>", reply.data().value(QLatin1String("command")).toStringList().join(QLatin1String(" ")), reply.errorCode(), errorMessage));
}
@@ -1510,7 +1736,7 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
QString KCMGRUB2::parseTitle(const QString &line)
{
QChar ch;
-@@ -1230,8 +1241,8 @@
+@@ -1230,8 +1244,8 @@
//If the first word is known, process the rest of the line
if (word == QLatin1String("menuentry")) {
if (inEntry) {
@@ -1521,7 +1747,7 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
m_entries.clear();
return;
}
-@@ -1245,8 +1256,8 @@
+@@ -1245,8 +1259,8 @@
continue;
} else if (word == QLatin1String("submenu")) {
if (inEntry) {
@@ -1532,7 +1758,7 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
m_entries.clear();
return;
}
-@@ -1262,8 +1273,8 @@
+@@ -1262,8 +1276,8 @@
continue;
} else if (word == QLatin1String("linux")) {
if (!inEntry) {
@@ -1545,7 +1771,7 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
}
diff -Naur a/src/kcm_grub2.h b/src/kcm_grub2.h
--- a/src/kcm_grub2.h 2013-10-12 18:34:15.000000000 +0800
-+++ b/src/kcm_grub2.h 2015-12-02 11:36:17.363839245 +0800
++++ b/src/kcm_grub2.h 2015-12-04 11:57:10.192564672 +0800
@@ -20,9 +20,11 @@
//Qt
@@ -1570,7 +1796,7 @@ diff -Naur a/src/kcm_grub2.h b/src/kcm_grub2.h
void readSettings();
diff -Naur a/src/removeDlg.cpp b/src/removeDlg.cpp
--- a/src/removeDlg.cpp 2013-10-12 18:34:15.000000000 +0800
-+++ b/src/removeDlg.cpp 2015-12-02 12:26:16.962737422 +0800
++++ b/src/removeDlg.cpp 2015-12-04 11:57:10.192564672 +0800
@@ -28,7 +28,8 @@
//KDE
@@ -1671,7 +1897,7 @@ diff -Naur a/src/removeDlg.cpp b/src/removeDlg.cpp
}
diff -Naur a/src/removeDlg.h b/src/removeDlg.h
--- a/src/removeDlg.h 2013-10-12 18:34:15.000000000 +0800
-+++ b/src/removeDlg.h 2015-12-02 11:36:17.363839245 +0800
++++ b/src/removeDlg.h 2015-12-04 11:57:10.193564709 +0800
@@ -22,8 +22,9 @@
#define REMOVEDLG_H
@@ -1703,7 +1929,7 @@ diff -Naur a/src/removeDlg.h b/src/removeDlg.h
void slotProgress(const QString &status, int percentage);
diff -Naur a/src/widgets/regexpinputdialog.cpp b/src/widgets/regexpinputdialog.cpp
--- a/src/widgets/regexpinputdialog.cpp 1970-01-01 08:00:00.000000000 +0800
-+++ b/src/widgets/regexpinputdialog.cpp 2015-12-02 11:36:17.367172694 +0800
++++ b/src/widgets/regexpinputdialog.cpp 2015-12-04 11:57:10.193564709 +0800
@@ -0,0 +1,57 @@
+#include <QtGui>
+#include "regexpinputdialog.h"
@@ -1765,7 +1991,7 @@ diff -Naur a/src/widgets/regexpinputdialog.cpp b/src/widgets/regexpinputdialog.c
\ No newline at end of file
diff -Naur a/src/widgets/regexpinputdialog.h b/src/widgets/regexpinputdialog.h
--- a/src/widgets/regexpinputdialog.h 1970-01-01 08:00:00.000000000 +0800
-+++ b/src/widgets/regexpinputdialog.h 2015-12-02 11:36:17.367172694 +0800
++++ b/src/widgets/regexpinputdialog.h 2015-12-04 11:57:10.193564709 +0800
@@ -0,0 +1,45 @@
+#ifndef REGEXPINPUTDIALOG_H
+#define REGEXPINPUTDIALOG_H
@@ -1815,7 +2041,7 @@ diff -Naur a/src/widgets/regexpinputdialog.h b/src/widgets/regexpinputdialog.h
\ No newline at end of file
diff -Naur a/ui/kcm_grub2.ui b/ui/kcm_grub2.ui
--- a/ui/kcm_grub2.ui 2013-10-12 18:34:15.000000000 +0800
-+++ b/ui/kcm_grub2.ui 2015-12-02 11:36:17.367172694 +0800
++++ b/ui/kcm_grub2.ui 2015-12-04 11:57:10.194564745 +0800
@@ -12,7 +12,7 @@
</property>
<layout class="QGridLayout" name="gridLayout_6">