replace "_" with "N" and "__" with "N_"

rationale:

- currently, we use _("xxx") as a shorthand for gettext("xxx"). It
also used to call xgettext with --keyword=_

- alas, function &_ is global and not by package (notice esp. that _
is not exported in common.pm)

- this lead to big ugly pb with packages defining their own &_,
overriding common.pm's &_

- a fix is to set @::textdomains to add a new domain (the default
being "libDrakX")

but relying on the global "_" is still dangerous!

1 files changed, 108 insertions, 108 deletions

diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 2694b5ddc..7f6b64b3c 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -149,131 +149,131 @@ my @usb2keyboard =
 #- a multigroup layout (eg: one with latin/non-latin letters)
 my %keyboards = (
 arch() =~ /^sparc/ ? (
- "cz" => [ __("Czech (QWERTZ)"), "sunt5-cz-us",	    "cz",    0 ],
- "de" => [ __("German"),         "sunt5-de-latin1", "de",    0 ],
- "dvorak" => [ __("Dvorak"),     "sundvorak",       "dvorak",0 ],
- "es" => [ __("Spanish"),        "sunt5-es",        "es",    0 ],
- "fi" => [ __("Finnish"),        "sunt5-fi-latin1", "fi",    0 ],
- "fr" => [ __("French"),         "sunt5-fr-latin1", "fr",    0 ],
- "no" => [ __("Norwegian"),      "sunt4-no-latin1", "no",    0 ],
- "pl" => [ __("Polish"),         "sun-pl-altgraph", "pl",    0 ],
- "ru" => [ __("Russian"),        "sunt5-ru",        "ru",    1 ],
+ "cz" => [ N_("Czech (QWERTZ)"), "sunt5-cz-us",	    "cz",    0 ],
+ "de" => [ N_("German"),         "sunt5-de-latin1", "de",    0 ],
+ "dvorak" => [ N_("Dvorak"),     "sundvorak",       "dvorak",0 ],
+ "es" => [ N_("Spanish"),        "sunt5-es",        "es",    0 ],
+ "fi" => [ N_("Finnish"),        "sunt5-fi-latin1", "fi",    0 ],
+ "fr" => [ N_("French"),         "sunt5-fr-latin1", "fr",    0 ],
+ "no" => [ N_("Norwegian"),      "sunt4-no-latin1", "no",    0 ],
+ "pl" => [ N_("Polish"),         "sun-pl-altgraph", "pl",    0 ],
+ "ru" => [ N_("Russian"),        "sunt5-ru",        "ru",    1 ],
 # TODO: check the console map
- "se" => [ __("Swedish"),        "sunt5-fi-latin1", "se",    0 ],
- "uk" => [ __("UK keyboard"),    "sunt5-uk",        "gb",    0 ],
- "us" => [ __("US keyboard"),    "sunkeymap",       "us",    0 ],
+ "se" => [ N_("Swedish"),        "sunt5-fi-latin1", "se",    0 ],
+ "uk" => [ N_("UK keyboard"),    "sunt5-uk",        "gb",    0 ],
+ "us" => [ N_("US keyboard"),    "sunkeymap",       "us",    0 ],
 ) : (
- "al" => [ __("Albanian"),       "al",              "al",    0 ],
- "am_old" => [ __("Armenian (old)"),"am_old",	    "am(old)", 1 ],
- "am" => [ __("Armenian (typewriter)"),"am-armscii8","am",   1 ],
- "am_phonetic" => [ __("Armenian (phonetic)"),"am_phonetic","am(phonetic)",1 ],
-#-"ar_azerty" => [ __("Arabic (AZERTY)"),"ar-8859_6","ar(azerty)",1 ],
-#-"ar_azerty_d" => [ __("Arabic (AZERTY, arabic digits)"),"ar-8859_6","ar(azerty_digits)",1 ],
-#-"ar" => [ __("Arabic (QWERTY)"),"ar-8859_6",      "ar",    1 ],
-#-"ar_d" => [ __("Arabic (QWERTY, arabic digits)"),"ar-8859_6","ar(digits)",1 ],
- "az" => [ __("Azerbaidjani (latin)"),"az",         "az",    0 ],
-#"a3" => [ __("Azerbaidjani (cyrillic)"), "az-koi8k","az(cyrillic)",1 ],
- "be" => [ __("Belgian"),        "be2-latin1",      "be",    0 ],
- "ben"=> [ __("Bengali"),        "us",              "ben",   1 ],
-"bg_phonetic" => [ __("Bulgarian (phonetic)"),"bg", "bg(phonetic)", 1 ],
- "bg" => [ __("Bulgarian (BDS)"), "bg",             "bg",    1 ],
- "br" => [ __("Brazilian (ABNT-2)"),"br-abnt2",     "br",    0 ],
+ "al" => [ N_("Albanian"),       "al",              "al",    0 ],
+ "am_old" => [ N_("Armenian (old)"),"am_old",	    "am(old)", 1 ],
+ "am" => [ N_("Armenian (typewriter)"),"am-armscii8","am",   1 ],
+ "am_phonetic" => [ N_("Armenian (phonetic)"),"am_phonetic","am(phonetic)",1 ],
+#-"ar_azerty" => [ N_("Arabic (AZERTY)"),"ar-8859_6","ar(azerty)",1 ],
+#-"ar_azerty_d" => [ N_("Arabic (AZERTY, arabic digits)"),"ar-8859_6","ar(azerty_digits)",1 ],
+#-"ar" => [ N_("Arabic (QWERTY)"),"ar-8859_6",      "ar",    1 ],
+#-"ar_d" => [ N_("Arabic (QWERTY, arabic digits)"),"ar-8859_6","ar(digits)",1 ],
+ "az" => [ N_("Azerbaidjani (latin)"),"az",         "az",    0 ],
+#"a3" => [ N_("Azerbaidjani (cyrillic)"), "az-koi8k","az(cyrillic)",1 ],
+ "be" => [ N_("Belgian"),        "be2-latin1",      "be",    0 ],
+ "ben"=> [ N_("Bengali"),        "us",              "ben",   1 ],
+"bg_phonetic" => [ N_("Bulgarian (phonetic)"),"bg", "bg(phonetic)", 1 ],
+ "bg" => [ N_("Bulgarian (BDS)"), "bg",             "bg",    1 ],
+ "br" => [ N_("Brazilian (ABNT-2)"),"br-abnt2",     "br",    0 ],
 #- Bosnia and Croatia use the same layout, but people are confused if there
 #- isn't an antry for their country
- "bs" => [ __("Bosnian"),	 "croat",           "hr",    0 ],
- "by" => [ __("Belarusian"),      "by-cp1251",      "by",    1 ],
- "ch_de" => [ __("Swiss (German layout)"), "sg-latin1", "de_CH", 0 ],
- "ch_fr" => [ __("Swiss (French layout)"), "fr_CH-latin1", "fr_CH", 0 ],
- "cz" => [ __("Czech (QWERTZ)"), "cz-latin2",       "cz",    0 ],
- "cz_qwerty" => [ __("Czech (QWERTY)"), "cz-lat2", "cz_qwerty", 0 ],
- "de" => [ __("German"),         "de-latin1",       "de",    0 ],
- "de_nodeadkeys" => [ __("German (no dead keys)"), "de-latin1-nodeadkeys", "de(nodeadkeys)", 0 ],
- "dev" => [ __("Devanagari"),     "us",              "dev",   0 ],
- "dk" => [ __("Danish"),         "dk-latin1",       "dk",    0 ],
- "dvorak" => [ __("Dvorak (US)"), "pc-dvorak-latin1", "dvorak", 0 ],
- "dvorak_no" => [ __("Dvorak (Norwegian)"), "no-dvorak", "dvorak(no)", 0 ],
- "dvorak_se" => [ __("Dvorak (Swedish)"), "se-dvorak", "dvorak(se)", 0 ],
- "ee" => [ __("Estonian"),       "ee-latin9",       "ee",    0 ],
- "es" => [ __("Spanish"),        "es-latin1",       "es",    0 ],
- "fi" => [ __("Finnish"),        "fi-latin1",       "fi",    0 ],
- "fr" => [ __("French"),         "fr-latin1",       "fr",    0 ],
- "ge_ru"=>[__("Georgian (\"Russian\" layout)"),"ge_ru-georgian_academy","ge_ru",1],
- "ge_la"=>[__("Georgian (\"Latin\" layout)"),"ge_la-georgian_academy","ge_la",1],
- "gr" => [ __("Greek"),          "gr-8859_7",       "el",    1 ],
- "guj"=> [ __("Gujarati"),       "us",              "guj",   1 ],
- "gur"=> [ __("Gurmukhi"),       "us",              "gur",   1 ],
- "hu" => [ __("Hungarian"),      "hu-latin2",       "hu",    0 ],
- "hr" => [ __("Croatian"),	 "croat",           "hr",    0 ],
- "il" => [ __("Israeli"),        "il-8859_8",       "il",    1 ],
- "il_phonetic" => [ __("Israeli (Phonetic)"), "hebrew", "il_phonetic", 1 ],
- "ir" => [ __("Iranian"),        "ir-isiri_3342",   "ir",    1 ],
- "is" => [ __("Icelandic"),      "is-latin1",       "is",    0 ],
- "it" => [ __("Italian"),        "it-latin1",       "it",    0 ],
- "iu" => [ __("Inuktitut"),      "us",              "iu",    1 ],
- "jp" => [ __("Japanese 106 keys"), "jp106",        "jp",    1 ],
+ "bs" => [ N_("Bosnian"),	 "croat",           "hr",    0 ],
+ "by" => [ N_("Belarusian"),      "by-cp1251",      "by",    1 ],
+ "ch_de" => [ N_("Swiss (German layout)"), "sg-latin1", "de_CH", 0 ],
+ "ch_fr" => [ N_("Swiss (French layout)"), "fr_CH-latin1", "fr_CH", 0 ],
+ "cz" => [ N_("Czech (QWERTZ)"), "cz-latin2",       "cz",    0 ],
+ "cz_qwerty" => [ N_("Czech (QWERTY)"), "cz-lat2", "cz_qwerty", 0 ],
+ "de" => [ N_("German"),         "de-latin1",       "de",    0 ],
+ "de_nodeadkeys" => [ N_("German (no dead keys)"), "de-latin1-nodeadkeys", "de(nodeadkeys)", 0 ],
+ "dev" => [ N_("Devanagari"),     "us",              "dev",   0 ],
+ "dk" => [ N_("Danish"),         "dk-latin1",       "dk",    0 ],
+ "dvorak" => [ N_("Dvorak (US)"), "pc-dvorak-latin1", "dvorak", 0 ],
+ "dvorak_no" => [ N_("Dvorak (Norwegian)"), "no-dvorak", "dvorak(no)", 0 ],
+ "dvorak_se" => [ N_("Dvorak (Swedish)"), "se-dvorak", "dvorak(se)", 0 ],
+ "ee" => [ N_("Estonian"),       "ee-latin9",       "ee",    0 ],
+ "es" => [ N_("Spanish"),        "es-latin1",       "es",    0 ],
+ "fi" => [ N_("Finnish"),        "fi-latin1",       "fi",    0 ],
+ "fr" => [ N_("French"),         "fr-latin1",       "fr",    0 ],
+ "ge_ru"=>[N_("Georgian (\"Russian\" layout)"),"ge_ru-georgian_academy","ge_ru",1],
+ "ge_la"=>[N_("Georgian (\"Latin\" layout)"),"ge_la-georgian_academy","ge_la",1],
+ "gr" => [ N_("Greek"),          "gr-8859_7",       "el",    1 ],
+ "guj"=> [ N_("Gujarati"),       "us",              "guj",   1 ],
+ "gur"=> [ N_("Gurmukhi"),       "us",              "gur",   1 ],
+ "hu" => [ N_("Hungarian"),      "hu-latin2",       "hu",    0 ],
+ "hr" => [ N_("Croatian"),	 "croat",           "hr",    0 ],
+ "il" => [ N_("Israeli"),        "il-8859_8",       "il",    1 ],
+ "il_phonetic" => [ N_("Israeli (Phonetic)"), "hebrew", "il_phonetic", 1 ],
+ "ir" => [ N_("Iranian"),        "ir-isiri_3342",   "ir",    1 ],
+ "is" => [ N_("Icelandic"),      "is-latin1",       "is",    0 ],
+ "it" => [ N_("Italian"),        "it-latin1",       "it",    0 ],
+ "iu" => [ N_("Inuktitut"),      "us",              "iu",    1 ],
+ "jp" => [ N_("Japanese 106 keys"), "jp106",        "jp",    1 ],
 #There is no XKB korean file yet; but using xmodmap one disables
 # some functioanlity; "us" used for XKB until this is fixed
- "kr" => [ __("Korean keyboard"), "us",             "us",    1 ],
- "la" => [ __("Latin American"), "la-latin1",       "la",    0 ],
- "lao"=> [ __("Laotian"),	 "us",	            "lao",   1 ], 
- "lt" => [ __("Lithuanian AZERTY (old)"), "lt-latin7", "lt_a", 0 ],
+ "kr" => [ N_("Korean keyboard"), "us",             "us",    1 ],
+ "la" => [ N_("Latin American"), "la-latin1",       "la",    0 ],
+ "lao"=> [ N_("Laotian"),	 "us",	            "lao",   1 ], 
+ "lt" => [ N_("Lithuanian AZERTY (old)"), "lt-latin7", "lt_a", 0 ],
 #- TODO: write a console kbd map for lt_new
- "lt_new" => [ __("Lithuanian AZERTY (new)"), "lt-latin7", "lt_std", 0 ],
- "lt_b" => [ __("Lithuanian \"number row\" QWERTY"), "ltb-latin7", "lt", 1 ],
- "lt_p" => [ __("Lithuanian \"phonetic\" QWERTY"), "ltp-latin7", "lt_p", 0 ],
- "lv" => [ __("Latvian"),	 "lv-latin7",       "lv",    0 ],
- "mk" => [ __("Macedonian"),	 "mk",              "mk",    1 ],
- "mm" => [ __("Myanmar (Burmese)"),"us",            "mm",    1 ],
- "mng"=> [ __("Mongolian (cyrillic)"),"us",         "mng",   1 ],
- "mt" => [ __("Maltese (UK)"),   "uk",              "mt",    0 ],
- "mt_us" => [ __("Maltese (US)"),"us",              "mt_us", 0 ],
- "nl" => [ __("Dutch"),          "nl-latin1",       "nl",    0 ],
- "no" => [ __("Norwegian"),      "no-latin1",       "no",    0 ],
- "pl" => [ __("Polish (qwerty layout)"), "pl",      "pl",    0 ],
- "pl2" => [ __("Polish (qwertz layout)"), "pl-latin2", "pl2", 0 ],
- "pt" => [ __("Portuguese"),     "pt-latin1",       "pt",    0 ],
- "qc" => [ __("Canadian (Quebec)"), "qc-latin1", "ca_enhanced", 0 ],
+ "lt_new" => [ N_("Lithuanian AZERTY (new)"), "lt-latin7", "lt_std", 0 ],
+ "lt_b" => [ N_("Lithuanian \"number row\" QWERTY"), "ltb-latin7", "lt", 1 ],
+ "lt_p" => [ N_("Lithuanian \"phonetic\" QWERTY"), "ltp-latin7", "lt_p", 0 ],
+ "lv" => [ N_("Latvian"),	 "lv-latin7",       "lv",    0 ],
+ "mk" => [ N_("Macedonian"),	 "mk",              "mk",    1 ],
+ "mm" => [ N_("Myanmar (Burmese)"),"us",            "mm",    1 ],
+ "mng"=> [ N_("Mongolian (cyrillic)"),"us",         "mng",   1 ],
+ "mt" => [ N_("Maltese (UK)"),   "uk",              "mt",    0 ],
+ "mt_us" => [ N_("Maltese (US)"),"us",              "mt_us", 0 ],
+ "nl" => [ N_("Dutch"),          "nl-latin1",       "nl",    0 ],
+ "no" => [ N_("Norwegian"),      "no-latin1",       "no",    0 ],
+ "pl" => [ N_("Polish (qwerty layout)"), "pl",      "pl",    0 ],
+ "pl2" => [ N_("Polish (qwertz layout)"), "pl-latin2", "pl2", 0 ],
+ "pt" => [ N_("Portuguese"),     "pt-latin1",       "pt",    0 ],
+ "qc" => [ N_("Canadian (Quebec)"), "qc-latin1", "ca_enhanced", 0 ],
 #- TODO: write a console kbd map for ro2
- "ro2" => [ __("Romanian (qwertz)"), "ro2",         "ro2",   0 ],
- "ro" => [ __("Romanian (qwerty)"), "ro",           "ro",    0 ],
- "ru" => [ __("Russian"),        "ru4",             "ru(winkeys)", 1 ],
- "ru_yawerty" => [ __("Russian (Yawerty)"), "ru-yawerty", "ru_yawerty", 1 ],
- "se" => [ __("Swedish"),        "se-latin1",       "se",    0 ],
- "si" => [ __("Slovenian"),      "slovene",         "si",    0 ],
- "sk" => [ __("Slovakian (QWERTZ)"), "sk-qwertz",   "sk",    0 ],
- "sk_qwerty" => [ __("Slovakian (QWERTY)"), "sk-qwerty", "sk_qwerty", 0 ],
+ "ro2" => [ N_("Romanian (qwertz)"), "ro2",         "ro2",   0 ],
+ "ro" => [ N_("Romanian (qwerty)"), "ro",           "ro",    0 ],
+ "ru" => [ N_("Russian"),        "ru4",             "ru(winkeys)", 1 ],
+ "ru_yawerty" => [ N_("Russian (Yawerty)"), "ru-yawerty", "ru_yawerty", 1 ],
+ "se" => [ N_("Swedish"),        "se-latin1",       "se",    0 ],
+ "si" => [ N_("Slovenian"),      "slovene",         "si",    0 ],
+ "sk" => [ N_("Slovakian (QWERTZ)"), "sk-qwertz",   "sk",    0 ],
+ "sk_qwerty" => [ N_("Slovakian (QWERTY)"), "sk-qwerty", "sk_qwerty", 0 ],
 # TODO: console map
- "sr" => [ __("Serbian (cyrillic)"), "sr",          "sr",    0 ],
+ "sr" => [ N_("Serbian (cyrillic)"), "sr",          "sr",    0 ],
 # no console kbd that I'm aware of
- "tml" => [ __("Tamil (Unicode)"), "us",            "tml",   1 ],
- "tscii" => [ __("Tamil (TSCII)"), "us",            "tscii", 1 ],
- "th" => [ __("Thai keyboard"),  "th",              "th",    1 ],
+ "tml" => [ N_("Tamil (Unicode)"), "us",            "tml",   1 ],
+ "tscii" => [ N_("Tamil (TSCII)"), "us",            "tscii", 1 ],
+ "th" => [ N_("Thai keyboard"),  "th",              "th",    1 ],
 # TODO: console map
- "tj" => [ __("Tajik keyboard"), "ru4",             "tj",    1 ],
- "tr_f" => [ __("Turkish (traditional \"F\" model)"), "trf", "tr_f", 0 ],
- "tr_q" => [ __("Turkish (modern \"Q\" model)"), "tr_q-latin5", "tr", 0 ],
-#-"tw => [ __("Chineses bopomofo"), "tw",           "tw",    1 ],
- "ua" => [ __("Ukrainian"),      "ua",              "ua",    1 ],
- "uk" => [ __("UK keyboard"),    "uk",              "gb",    0 ],
- "us" => [ __("US keyboard"),    "us",              "us",    0 ],
- "us_intl" => [ __("US keyboard (international)"), "us-latin1", "us_intl", 0 ],
- "vn" => [ __("Vietnamese \"numeric row\" QWERTY"),"vn-tcvn", "vn(toggle)", 0 ], 
- "yu" => [ __("Yugoslavian (latin)"), "sr",         "yu",    0 ],
+ "tj" => [ N_("Tajik keyboard"), "ru4",             "tj",    1 ],
+ "tr_f" => [ N_("Turkish (traditional \"F\" model)"), "trf", "tr_f", 0 ],
+ "tr_q" => [ N_("Turkish (modern \"Q\" model)"), "tr_q-latin5", "tr", 0 ],
+#-"tw => [ N_("Chineses bopomofo"), "tw",           "tw",    1 ],
+ "ua" => [ N_("Ukrainian"),      "ua",              "ua",    1 ],
+ "uk" => [ N_("UK keyboard"),    "uk",              "gb",    0 ],
+ "us" => [ N_("US keyboard"),    "us",              "us",    0 ],
+ "us_intl" => [ N_("US keyboard (international)"), "us-latin1", "us_intl", 0 ],
+ "vn" => [ N_("Vietnamese \"numeric row\" QWERTY"),"vn-tcvn", "vn(toggle)", 0 ], 
+ "yu" => [ N_("Yugoslavian (latin)"), "sr",         "yu",    0 ],
 ),
 );
 
 #- list of  possible choices for the key combinations to toggle XKB groups
 #- (eg in X86Config file: XkbOptions "grp:toggle")
 my %grp_toggles = (
-    toggle => _("Right Alt key"),
-    shift_toggle => _("Both Shift keys simultaneously"),
-    ctrl_shift_toggle => _("Control and Shift keys simultaneously"),
-    caps_toggle => _("CapsLock key"),
-    ctrl_alt_toggle => _("Ctrl and Alt keys simultaneously"),
-    alt_shift_toggle => _("Alt and Shift keys simultaneously"),
-    menu_toggle => _("\"Menu\" key"),
-    lwin_toggle => _("Left \"Windows\" key"),
-    rwin_toggle => _("Right \"Windows\" key"),
+    toggle => N("Right Alt key"),
+    shift_toggle => N("Both Shift keys simultaneously"),
+    ctrl_shift_toggle => N("Control and Shift keys simultaneously"),
+    caps_toggle => N("CapsLock key"),
+    ctrl_alt_toggle => N("Ctrl and Alt keys simultaneously"),
+    alt_shift_toggle => N("Alt and Shift keys simultaneously"),
+    menu_toggle => N("\"Menu\" key"),
+    lwin_toggle => N("Left \"Windows\" key"),
+    rwin_toggle => N("Right \"Windows\" key"),
 );