Place PPM scripts under the same TEXTDOMAIN. Issue #591

puppylinux-woof-CE · Oct 7, 2015 · d1c59c0 · d1c59c0
1 parent 052a878
commit d1c59c0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/woof-code/rootfs-skeleton/usr/local/petget/installmodes.sh b/woof-code/rootfs-skeleton/usr/local/petget/installmodes.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export TEXTDOMAIN=petget__installmodes.sh
+export TEXTDOMAIN=petget___pkg_chooser.sh
 export OUTPUT_CHARSET=UTF-8
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
@@ -404,10 +404,6 @@ wait_func () {
 }
 export -f wait_func
 
-# ATTENTION TRANSLATORS: The translation in the variables below must be *IDENTICAL*
-# to the point of spacing, capitalization and punctuation, with the ones used in
-# pkg_chooser.sh, or PPM will break.
-# It is highly recommended to copy/paste the corresponding strings from there.
 case "$1" in
 	check_total_size)
 		touch /tmp/install_quietly #avoid splashes

diff --git a/woof-code/rootfs-skeleton/usr/local/petget/removemodes.sh b/woof-code/rootfs-skeleton/usr/local/petget/removemodes.sh
@@ -2,7 +2,7 @@
 
 #set -x ; mkdir -p /root/LOGs; NAME=$(basename "$0"); exec 1>> /root/LOGs/"$NAME".log 2>&1
 
-export TEXTDOMAIN=petget__removemodes.sh
+export TEXTDOMAIN=petget___pkg_chooser.sh
 export OUTPUT_CHARSET=UTF-8
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
@@ -186,10 +186,6 @@ delete_out_entry () {
 }
 export -f delete_out_entry
 
-# ATTENTION TRANSLATORS: The translation in the variables below must be *IDENTICAL*
-# to the point of spacing, capitalization and punctuation, with the ones used in
-# pkg_chooser.sh, or PPM will break.
-# It is highly recommended to copy/paste the corresponding strings from there.
 case "$1" in
 	"$(gettext 'Auto remove')") auto_remove;;
 	"$(gettext 'Step by step remove (classic mode)')") classic_remove;;

diff --git a/woof-code/rootfs-skeleton/usr/local/petget/ui_Classic b/woof-code/rootfs-skeleton/usr/local/petget/ui_Classic
@@ -11,7 +11,7 @@
 #130330 GUI filter. see also filterpkgs.sh, pkg_chooser.sh, ui_Ziggy.
 #130331 more GUI filter options.
 
-export TEXTDOMAIN=petget___ui_Classic
+export TEXTDOMAIN=petget___pkg_chooser.sh
 export OUTPUT_CHARSET=UTF-8
 
 # Remove any 'auto' flags