# HG changeset patch # User Christophe Lincoln # Date 1308083733 -7200 # Node ID 7f9dc19119a77242a6be6c63d34cada7d5aa8434 # Parent e2f4675226517e21510c0d10b513df2f0c6cd60b gettextize tazkeymap and make pot diff -r e2f467522651 -r 7f9dc19119a7 Makefile --- a/Makefile Tue Jun 14 22:19:47 2011 +0200 +++ b/Makefile Tue Jun 14 22:35:33 2011 +0200 @@ -21,7 +21,7 @@ @echo -n "Generating SliTaz Tools pot file... " @xgettext -o po/slitaz-tools/slitaz-tools.pot -L Shell \ --package-name="SliTaz Tools" \ - ./tinyutils/tazlocale + ./tinyutils/tazlocale ./tinyutils/tazkeymap @echo "done" boxes-pot: diff -r e2f467522651 -r 7f9dc19119a7 po/slitaz-boxes/slitaz-boxes.pot --- a/po/slitaz-boxes/slitaz-boxes.pot Tue Jun 14 22:19:47 2011 +0200 +++ b/po/slitaz-boxes/slitaz-boxes.pot Tue Jun 14 22:35:33 2011 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SliTaz Boxes\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-14 22:15+0200\n" +"POT-Creation-Date: 2011-06-14 22:33+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -r e2f467522651 -r 7f9dc19119a7 po/slitaz-tools/slitaz-tools.pot --- a/po/slitaz-tools/slitaz-tools.pot Tue Jun 14 22:19:47 2011 +0200 +++ b/po/slitaz-tools/slitaz-tools.pot Tue Jun 14 22:35:33 2011 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: SliTaz Tools\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-14 22:15+0200\n" +"POT-Creation-Date: 2011-06-14 22:33+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,15 +17,28 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: tinyutils/tazlocale:16 -msgid "You must be root to run" +#: tinyutils/tazlocale:16 tinyutils/tazkeymap:17 +msgid "You must be root to run:" msgstr "" -#: tinyutils/tazlocale:17 +#: tinyutils/tazlocale:17 tinyutils/tazkeymap:18 msgid "Type su and root password to become super-user" msgstr "" +#: tinyutils/tazlocale:78 +msgid "SliTaz language configuration" +msgstr "" + #: tinyutils/tazlocale:103 msgid "" "Please logout of your current session and login again to use new locale." msgstr "" + +#: tinyutils/tazkeymap:53 +msgid "SliTaz keymap configuration" +msgstr "" + +#: tinyutils/tazkeymap:94 +msgid "" +"Please logout of your current session and login again to use new keyboard." +msgstr "" diff -r e2f467522651 -r 7f9dc19119a7 po/tazbox/tazbox.pot --- a/po/tazbox/tazbox.pot Tue Jun 14 22:19:47 2011 +0200 +++ b/po/tazbox/tazbox.pot Tue Jun 14 22:35:33 2011 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: TazBox\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-14 22:15+0200\n" +"POT-Creation-Date: 2011-06-14 22:33+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -r e2f467522651 -r 7f9dc19119a7 po/tazdrop/tazdrop.pot --- a/po/tazdrop/tazdrop.pot Tue Jun 14 22:19:47 2011 +0200 +++ b/po/tazdrop/tazdrop.pot Tue Jun 14 22:35:33 2011 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: TazDrop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-14 22:15+0200\n" +"POT-Creation-Date: 2011-06-14 22:33+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -r e2f467522651 -r 7f9dc19119a7 tinyutils/tazkeymap --- a/tinyutils/tazkeymap Tue Jun 14 22:19:47 2011 +0200 +++ b/tinyutils/tazkeymap Tue Jun 14 22:35:33 2011 +0200 @@ -7,11 +7,15 @@ # : ${DIALOG=dialog} +# Internationalization +. /usr/bin/gettext.sh +TEXTDOMAIN='slitaz-tools' +export TEXTDOMAIN + # Check if user is root. -# if test $(id -u) != 0; then - echo -e "\nYou must be root to run `basename $0`!" - echo -e "Type 'su' and root password to become super-user.\n" + gettext "You must be root to run:"; echo " $(basename $0)" + gettext "Type su and root password to become super-user"; echo exit 1 fi @@ -46,8 +50,8 @@ # Default to text mode dialog. exec 3>&1 value=`$DIALOG --clear \ - --title " SliTaz keymap configuration " \ - --menu "\nPlease select your keymap, current config: $CUR" 15 70 5 \ + --title " $(gettext "SliTaz keymap configuration") " \ + --menu "" 15 70 5 \ "us" "USA" \ "fr_CH-latin1" "Suisse Romande" \ "fr-latin1" "France" \ @@ -82,26 +86,16 @@ retval=$? exec 3>&- case $retval in - 0) - continue ;; - 1) - echo "Cancel pressed." - exit 0 ;; - 255) - if test -n "$value" ; then - echo "$value" - else - echo "ESC pressed." - exit 0 - fi ;; + 0) continue ;; + 1|255) exit 0 ;; esac # If it's a reconfiguration give an info message. if [ -s /etc/keymap.conf ]; then + msg=$(gettext "\ +Please logout of your current session and login again to use new keyboard.") $DIALOG --clear \ - --title " Keyboard mapping information\n" \ - --msgbox " - Please logout of your current session and login again to use $value - keyboard.\n" 16 70 + --title " Information " \ + --msgbox "$msg" 16 70 fi kmap=$value echo "$kmap" > /etc/keymap.conf diff -r e2f467522651 -r 7f9dc19119a7 tinyutils/tazlocale --- a/tinyutils/tazlocale Tue Jun 14 22:19:47 2011 +0200 +++ b/tinyutils/tazlocale Tue Jun 14 22:35:33 2011 +0200 @@ -13,7 +13,7 @@ # Check if user is root. if test $(id -u) != 0; then - gettext "You must be root to run"; echo $(basename $0) + gettext "You must be root to run:"; echo " $(basename $0)" gettext "Type su and root password to become super-user"; echo exit 1 fi @@ -75,7 +75,7 @@ { exec 3>&1 locale=`$DIALOG --clear \ - --title " SliTaz language configuration " \ + --title " $(gettext "SliTaz language configuration") " \ --menu "" 15 70 5 \ "en" "English" \ $(get_locale_name) \