Merge the l10n from 0.9-bugfix

[vlc] / src / libvlc-module.c

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index e719b6098037c35ef3170c1e53760623c2286228..4f2f9405ecfffa4f17b4a3128f18fcd89792470f 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -48,6 +48,7 @@ static const char *const ppsz_language[] =
     "auto",
     "en",
     "ar",
+    "bn"
     "pt_BR",
     "en_GB",
     "bg",
@@ -63,6 +64,7 @@ static const char *const ppsz_language[] =
     "de",
     "he",
     "hu",
+    "id",
     "it",
     "ja",
     "ko",
@@ -81,6 +83,7 @@ static const char *const ppsz_language[] =
     "es",
     "sv",
     "tr",
+    "uk",
 };
 
 static const char *const ppsz_language_text[] =
@@ -88,6 +91,7 @@ static const char *const ppsz_language_text[] =
     N_("Auto"),
     "American English",
     "ﻉﺮﺒﻳ",
+    "বাংলা",
     "Português Brasileiro",
     "British English",
     "български език",
@@ -103,6 +107,7 @@ static const char *const ppsz_language_text[] =
     "Deutsch",
     "עברית",
     "Magyar",
+    "Bahasa Indonesia",
     "Italiano",
     "日本語",
     "한국어",
@@ -121,6 +126,7 @@ static const char *const ppsz_language_text[] =
     "Español",
     "Svenska",
     "Türkçe",
+    "украї́нська мо́ва",
 };
 #endif
 
@@ -1215,6 +1221,12 @@ static const char *const ppsz_albumart_descriptions[] =
 #define FASTER_KEY_LONGTEXT N_("Select the hotkey to use for fast forward playback.")
 #define SLOWER_KEY_TEXT N_("Slower")
 #define SLOWER_KEY_LONGTEXT N_("Select the hotkey to use for slow motion playback.")
+#define RATE_NORMAL_KEY_TEXT N_("Normal rate")
+#define RATE_NORMAL_KEY_LONGTEXT N_("Select the hotkey to set the playback rate back to normal.")
+#define RATE_FASTER_FINE_KEY_TEXT N_("Faster (fine)")
+#define RATE_FASTER_FINE_KEY_LONGTEXT N_("Select the hotkey to use for fast forward playback.")
+#define RATE_SLOWER_FINE_KEY_TEXT N_("Slower (fine)")
+#define RATE_SLOWER_FINE_KEY_LONGTEXT N_("Select the hotkey to use for slow motion playback.")
 #define NEXT_KEY_TEXT N_("Next")
 #define NEXT_KEY_LONGTEXT N_("Select the hotkey to use to skip to the next item in the playlist.")
 #define PREV_KEY_TEXT N_("Previous")
@@ -2114,6 +2126,9 @@ vlc_module_begin ()
 #   define KEY_PLAY               KEY_UNSET
 #   define KEY_FASTER             KEY_MODIFIER_COMMAND|'='
 #   define KEY_SLOWER             KEY_MODIFIER_COMMAND|'-'
+#   define KEY_RATE_NORMAL        KEY_UNSET
+#   define KEY_RATE_FASTER_FINE   KEY_UNSET
+#   define KEY_RATE_SLOWER_FINE   KEY_UNSET
 #   define KEY_NEXT               KEY_MODIFIER_COMMAND|KEY_RIGHT
 #   define KEY_PREV               KEY_MODIFIER_COMMAND|KEY_LEFT
 #   define KEY_STOP               KEY_MODIFIER_COMMAND|'.'
@@ -2225,6 +2240,9 @@ vlc_module_begin ()
 #   define KEY_PLAY               KEY_UNSET
 #   define KEY_FASTER             '+'
 #   define KEY_SLOWER             '-'
+#   define KEY_RATE_NORMAL        '='
+#   define KEY_RATE_FASTER_FINE   ']'
+#   define KEY_RATE_SLOWER_FINE   '['
 #   define KEY_NEXT               'n'
 #   define KEY_PREV               'p'
 #   define KEY_STOP               's'
@@ -2345,6 +2363,12 @@ vlc_module_begin ()
              FASTER_KEY_LONGTEXT, false )
     add_key( "key-slower", KEY_SLOWER, NULL, SLOWER_KEY_TEXT,
              SLOWER_KEY_LONGTEXT, false )
+    add_key( "key-rate-normal", KEY_RATE_NORMAL, NULL, RATE_NORMAL_KEY_TEXT,
+             RATE_NORMAL_KEY_LONGTEXT, false )
+    add_key( "key-rate-faster-fine", KEY_RATE_FASTER_FINE, NULL, RATE_FASTER_FINE_KEY_TEXT,
+             RATE_FASTER_FINE_KEY_LONGTEXT, false )
+    add_key( "key-rate-slower-fine", KEY_RATE_SLOWER_FINE, NULL, RATE_SLOWER_FINE_KEY_TEXT,
+             RATE_SLOWER_FINE_KEY_LONGTEXT, false )
     add_key( "key-next", KEY_NEXT, NULL, NEXT_KEY_TEXT,
              NEXT_KEY_LONGTEXT, false )
     add_key( "key-prev", KEY_PREV, NULL, PREV_KEY_TEXT,
@@ -2687,6 +2711,9 @@ const struct hotkey libvlc_hotkeys[] =
     { "key-next", ACTIONID_NEXT, 0, },
     { "key-faster", ACTIONID_FASTER, 0, },
     { "key-slower", ACTIONID_SLOWER, 0, },
+    { "key-rate-normal", ACTIONID_RATE_NORMAL, 0, },
+    { "key-rate-faster-fine", ACTIONID_RATE_FASTER_FINE, 0, },
+    { "key-rate-slower-fine", ACTIONID_RATE_SLOWER_FINE, 0, },
     { "key-toggle-fullscreen", ACTIONID_TOGGLE_FULLSCREEN, 0, },
     { "key-leave-fullscreen", ACTIONID_LEAVE_FULLSCREEN, 0, },
     { "key-vol-up", ACTIONID_VOL_UP, 0, },