summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarja van Waes <marja@mageia.org>2017-11-19 09:25:25 +0100
committerMarja van Waes <marja@mageia.org>2017-11-19 09:25:25 +0100
commitca3898e5c32b6009efd327f12b1a844dad8bbb99 (patch)
tree20e4c18aa0db0df36212b84ac3f4efa31cbd7e69
parentca89dc77ea2b2a2afe9eb9b44cef8eaef0ca9e3e (diff)
downloaddrakx-kbd-mouse-x11-ca3898e5c32b6009efd327f12b1a844dad8bbb99.tar
drakx-kbd-mouse-x11-ca3898e5c32b6009efd327f12b1a844dad8bbb99.tar.gz
drakx-kbd-mouse-x11-ca3898e5c32b6009efd327f12b1a844dad8bbb99.tar.bz2
drakx-kbd-mouse-x11-ca3898e5c32b6009efd327f12b1a844dad8bbb99.tar.xz
drakx-kbd-mouse-x11-ca3898e5c32b6009efd327f12b1a844dad8bbb99.zip
Add the French Azerty Latin9 keyboard (mga#20364)
o and improve the names of some French keyboards
-rw-r--r--NEWS3
-rw-r--r--lib/keyboard.pm7
2 files changed, 7 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index c1aea0d..a258f2b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- add the French Azerty latin9 keyboard (mga#20364)
+- improve the names of some French keyboards
+
Version 1.23 - 5 June 2017
- translation updates
diff --git a/lib/keyboard.pm b/lib/keyboard.pm
index 56cb6e9..3d7b2f5 100644
--- a/lib/keyboard.pm
+++ b/lib/keyboard.pm
@@ -62,7 +62,7 @@ our %lang2keyboard =
'fa' => 'ir:90',
'fi' => 'fi:90',
'fo' => 'fo:80 is:70 dk:60',
- 'fr' => 'fr:89 qc:85 be:85 ch_fr:70 dvorak_fr:20 fr_bepo:10 fr_bepo_latin9:10',
+ 'fr' => 'fr:89 qc:85 be:85 ch_fr:70 dvorak_fr:20 fr_bepo:10 fr_bepo_latin9:10 fr_latin9:10',
'fr_CA' => 'qc:89',
'fr_CH' => 'ch_fr:89',
'fr_BE' => 'be:89',
@@ -219,9 +219,10 @@ my %keyboards = (
"es" => [ N_("_: keyboard\nSpanish"), "es-latin1", "es", "", 0 ],
"fi" => [ N_("_: keyboard\nFinnish"), "fi-latin1", "fi", "", 0 ],
"fo" => [ N_("_: keyboard\nFaroese"), "is-latin1", "fo", "", 0 ],
- "fr" => [ N_("_: keyboard\nFrench"), "fr-latin1", "fr", "", 0 ],
+ "fr" => [ N_("_: keyboard\nFrench (Azerty standard"), "fr-latin1", "fr", "", 0 ],
"fr_bepo" => [ N_("_: keyboard\nFrench (Bepo)"), "fr-bepo", "fr", "bepo", 0 ],
- "fr_bepo_latin9" => [ N_("_: keyboard\nFrench (Bepo, only latin-9)"), "fr-bepo-latin9", "fr", "bepo_latin9", 0 ],
+ "fr_bepo_latin9" => [ N_("_: keyboard\nFrench (Bepo latin9)"), "fr-bepo-latin9", "fr", "bepo_latin9", 0 ],
+ "fr_latin9" => [ N_("_: keyboard\nFrench (Azerty latin9)"), "fr-latin9", "fr" "latin9", 0 ],
"gb" => [ N_("UK keyboard"), "uk-latin1", "gb", "", 0 ],
"ge_ru" => [ N_("_: keyboard\nGeorgian (\"Russian\" layout)"), "ge_ru-georgian_academy", "ge", "ru", 1 ],
"ge_la" => [ N_("_: keyboard\nGeorgian (\"Latin\" layout)"), "ge_la-georgian_academy", "ge", "qwerty", 1 ],