From db6b06b9a8e50bf0c2e548c1f151160ac9c42007 Mon Sep 17 00:00:00 2001
From: Daniel Napora <napcok@gmail.com>
Date: Thu, 13 Dec 2018 12:39:01 +0100
Subject: [PATCH] update

---
 README.md                    |  5 +----
 usr/bin/mabox-compositor     |  9 ++++++---
 usr/bin/mabox-kb-pipemenu    | 32 ++++++++++++++++++++++++++------
 usr/bin/mabox-tint2-pipemenu |  7 +++++--
 4 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 813e398..28f1f13 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,5 @@
-# manjaro-pipemenus
+# mabox-pipemenus
 An Openbox pipemenus for use with Manjaro Linux (port of CrunchBang pipemenus)
 
 Work in progress
 
-TO DO
-
-x-www-browser-pipemenus
\ No newline at end of file
diff --git a/usr/bin/mabox-compositor b/usr/bin/mabox-compositor
index 761f798..b1fd93e 100755
--- a/usr/bin/mabox-compositor
+++ b/usr/bin/mabox-compositor
@@ -20,13 +20,15 @@ case $LANG in
     ENABLE="Włącz Kompozytora"
     RESTART="Restartuj Kompozytora"
     DISABLE="Wyłącz Kompozytora"
-    EDIT="Edytuj Ustawienia Kompozytora"
+    EDIT="Edytuj plik ustawień Kompozytora"
+    EDIT_GUI="Ustawienia Kompozytora (GUI)"
     ;;
     *)
     ENABLE="Enable Compositor"
     RESTART="Restart Compositor"
     DISABLE="Disable Compositor"
-    EDIT="Edit Compositor settings"
+    EDIT="Edit Compositor settings file"
+    EDIT_GUI="Settings (GUI)"
     ;;
 esac
 
@@ -79,9 +81,10 @@ else
     else
         menuItem "$RESTART" 'mabox-compositor --restart'
         menuItem "$DISABLE" 'mabox-compositor --toggle'
-        menuSeparator
     fi
+    menuSeparator
     menuItem "$EDIT" 'mabox-compositor --edit'
+    menuItem "$EDIT_GUI" 'compton-conf'
     menuEnd
 fi
 exit 0
diff --git a/usr/bin/mabox-kb-pipemenu b/usr/bin/mabox-kb-pipemenu
index 1c37c46..b1d0a30 100755
--- a/usr/bin/mabox-kb-pipemenu
+++ b/usr/bin/mabox-kb-pipemenu
@@ -26,6 +26,25 @@ KBSCRIPT="mb-kb"
 RCPATH="$USR_CFG_DIR/rc.xml"
 KBTEXT="$USR_CFG_DIR/kbinds.txt"
 
+case $LANG in
+    pl*)
+    BKP_EDIT="Backup oraz edycja rc.xml"
+    GUI_EDIT="Edytuj w obkey (GUI)"
+    DISPLAY_IN_WINDOW="Pokaż w nowym oknie"
+    DISPLAY_IN_MENU="Pokaż w menu"
+    WINDOW_COMMANDS="Zarządzanie oknami"
+    RUN_COMMANDS="Klawisze uruchamiania"
+    ;;
+    *)
+    BKP_EDIT="Backup and Edit rc.xml"
+    GUI_EDIT="Edit in obkey (GUI)"
+    DISPLAY_IN_WINDOW="Display Keybinds in new window"
+    DISPLAY_IN_MENU="Display Keybinds in menu"
+    WINDOW_COMMANDS="Openbox window commands"
+    RUN_COMMANDS="'Run' commands"
+    ;;
+esac
+
 if ! . "$MB_COMMON_LIBDIR/mabox-include.cfg" 2> /dev/null; then
     echo $"Error: Failed to locate mabox-include.cfg in $MB_COMMON_LIBDIR" >&2
     exit 1
@@ -37,7 +56,7 @@ if type "$KBSCRIPT" &> /dev/null;then
     "$KBSCRIPT" > /dev/null
 else
     menuStart
-    menuSeparator "$KBSCRIPT is not available. Try installing bunsen-utilities."
+    menuSeparator "$KBSCRIPT is not available. Try installing mabox-utilities."
     menuEnd
     exit 1
 fi
@@ -53,11 +72,12 @@ fi
 
 # pipemenu
 menuStart
-    menuItem "Backup and Edit rc.xml" "mabox-kb-pipemenu --rcedit"
+    menuItem "$BKP_EDIT" "mabox-kb-pipemenu --rcedit"
+    menuItem "$GUI_EDIT" "obkey"
     menuSeparator
-    menuItem "Display Keybinds in new window" "mb-kb --gui"
-    menuSubmenu "Display keybinds" "Display Keybinds in menu"
-        menuSeparator "Openbox window commands"
+    menuItem "$DISPLAY_IN_WINDOW" "mb-kb --gui"
+    menuSubmenu "Display keybinds" "$DISPLAY_IN_MENU"
+        menuSeparator "$WINDOW_COMMANDS"
         while read -r a b c;do      # write out Openbox commands (not clickable)
             if [[ "$a" = "o" ]];then
                 curItem=$(printf "%-20s %s" "$b" "$c")
@@ -66,7 +86,7 @@ menuStart
         done < "$KBTEXT"
 
         menuSeparator
-        menuSeparator "'Run' commands"
+        menuSeparator "$RUN_COMMANDS"
         while read -r a b c;do      # write out 'Run' commands (clickable)
             if [[ "$a" = "x" ]];then
                 curItem=$(printf "%-20s %s" "$b" "$c")
diff --git a/usr/bin/mabox-tint2-pipemenu b/usr/bin/mabox-tint2-pipemenu
index 801132d..38cbffe 100755
--- a/usr/bin/mabox-tint2-pipemenu
+++ b/usr/bin/mabox-tint2-pipemenu
@@ -32,7 +32,8 @@ case $LANG in
     RUNNING_TINT2="Działające Tint2"
     DEFAULT_TINT2RC="Domyślny tint2rc"
     EDIT_TINT2="Edytuj Tint2"
-    TINT2_EDITOR="Edytor Tint2"
+    TINT2_EDITOR="Wybierz pliki Tint2 do edycji"
+    TINT2_EDITOR_GUI="tint2conf (GUI)"
     CHOOSE_TINT2="Wybierz Tint2"
     RESTART_TINT2="Restartuj Tint2"
     ;;
@@ -40,7 +41,8 @@ case $LANG in
     RUNNING_TINT2="Running Tint2"
     DEFAULT_TINT2RC="Default tint2rc"
     EDIT_TINT2="Edit Tint2"
-    TINT2_EDITOR="Tint2 editor"
+    TINT2_EDITOR="Choose Tint2 to edit"
+    TINT2_EDITOR_GUI="tint2conf (GUI)"
     CHOOSE_TINT2="Choose Tint2"
     RESTART_TINT2="Restart Tint2"  
     
@@ -70,6 +72,7 @@ loadTEditmenu(){
 
 getTint2s(){
     menuSubmenu "EditTint2" "$EDIT_TINT2"
+        menuItem "TINT2_EDITOR_GUI" "tint2conf"
         if type mb-tint2edit &>/dev/null;then  # mb-tint2edit script found
             menuItem "$TINT2_EDITOR" "mb-tint2edit"
             loadTEditmenu