translation: Japanese and minor layout fixes

data/keyboards/de.yaml

@@ -1,5 +1,4 @@
-# German layout by Mark Müller
+# Maintained by: Mark Müller <markmueller86@gmail.com>
-# Version 2019111700
 ---
 bounds: { x: 0, y: 1, width: 360, height: 208 }
 
@@ -25,22 +24,22 @@ views:
         - "Q W E R T Z U I O P"
         - "A S D F G H J K L"
         - "Shift_L   Y X C V B N M  BackSpace"
-        - "show_numbers show_dechars preferences         space        ! ? Return"
+        - "show_numbers show_eschars preferences         space        ! ? Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
         - "show_symbols   , \" ' : = < >  BackSpace"
-        - "show_letters show_dechars preferences         space        , . Return"
+        - "show_letters show_eschars preferences         space        , . Return"
     symbols:
         - "~ ` ´ | · √ µ ÷ × ¶"
         - "© ® £ $ ¥ ^ ° * { }"
         - "show_numbers   \\ / § π τ [ ]  BackSpace"
-        - "show_letters show_dechars preferences         space        , . Return"
+        - "show_letters show_eschars preferences         space        , . Return"
-    dechars:
+    eschars:
         - "ä è é ö ü Ä È É Ö Ü"
         - "à â ê î ô À Â È Î Ô"
         - "show_numbers  « » ç Ç æ œ ß  BackSpace"
-        - "show_letters show_dechars preferences         space        „ “ Return"
+        - "show_letters show_eschars preferences         space        „ “ Return"
 
 buttons:
     Shift_L:
@@ -73,15 +72,16 @@ buttons:
             set_view: "symbols"
         outline: "altline"
         label: "*/="
-    show_dechars:
+    show_eschars:
         action:
             locking:
-                lock_view: "dechars"
+                lock_view: "eschars"
                 unlock_view: "base"
         outline: "altline"
         label: "äÄ"
     space:
         outline: "spaceline"
+        label: " "
         text: " "
     Return:
         outline: "altline"

data/keyboards/jp+kana.yaml

@@ -1,5 +1,4 @@
-# Japanese Kana layout by Mark Müller
+# Maintained by: Mark Müller <markmueller86@gmail.com>
-# Version 2019111800
 ---
 bounds: { x: 0, y: 1, width: 360, height: 208 }
 
@@ -221,7 +220,7 @@ buttons:
         action: "show_prefs"
         outline: "special"
         icon: "keyboard-mode-symbolic"
-    # space button with unicode keysym for ideographic space
+    # space button using text tag for ideographic space
     space:
         outline: "default-wide"
         label: "␣"

data/langs/ja-JP.txt

@@ -0,0 +1,8 @@
+us 英語 (US)
+de ドイツ語
+el ギリシャ語
+es スペイン語
+it イタリア語
+jp+kana 日本語 (かな)
+nb ノルウェー語
+

src/resources.rs

@@ -42,6 +42,7 @@ const LAYOUT_NAMES: &[(*const str, *const str)] = &[
     ("de-DE", include_str!("../data/langs/de-DE.txt")),
     ("en-US", include_str!("../data/langs/en-US.txt")),
     ("es-ES", include_str!("../data/langs/es-ES.txt")),
+    ("ja-JP", include_str!("../data/langs/ja-JP.txt")),
     ("pl-PL", include_str!("../data/langs/pl-PL.txt")),
 ];