Further lanuage tweaks:

 - Corrected X3 mSD slot voices
 - Synchronized English-US
 - Synchronized Russian

Change-Id: If0dffc7b06b5434a318342856e101d997a91b861

3 files changed, 491 insertions, 17 deletions

diff --git a/apps/lang/english-us.lang b/apps/lang/english-us.lang
index 148af4f5e4..5e117d470f 100644
--- a/apps/lang/english-us.lang
+++ b/apps/lang/english-us.lang
@@ -6599,7 +6599,7 @@
   </dest>
   <voice>
     *: "Internal"
-    xduoox3: "micro S D 1:"
+    xduoox3: "micro S D 1"
   </voice>
 </phrase>
 <phrase>
@@ -15244,22 +15244,22 @@
 </phrase>
 <phrase>
   id: LANG_DISPLAY_FPS
-  desc: in the mpegplayer settings menu
+  desc: in the mpegplayer and pictureflow settings menus
   user: core
   <source>
     *: none
     swcodec: "Display FPS"
-    lowmem: none
+    lcd_bitmap: "Display FPS"
   </source>
   <dest>
     *: none
     swcodec: "Display FPS"
-    lowmem: none
+    lcd_bitmap: "Display FPS"
   </dest>
   <voice>
     *: none
     swcodec: "Display FPS"
-    lowmem: none
+    lcd_bitmap: "Display FPS"
   </voice>
 </phrase>
 <phrase>
@@ -15833,3 +15833,474 @@
     *: "Move Item Down"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SHOW_AT_THE_BOTTOM
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Show at the bottom"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Show at the bottom"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Show at the bottom"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ADDED_TO_PLAYLIST
+  desc: in the pictureflow splash messages
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Added to playlist"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Added to playlist"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Added to playlist"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CLEAR_PLAYLIST
+  desc: in the pictureflow main menu
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Clear playlist"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Clear playlist"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Clear playlist"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CPU_BOOST
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: none
+    swcodec: "CPU Boost"
+    lowmem: none
+  </source>
+  <dest>
+    *: none
+    swcodec: "CPU Boost"
+    lowmem: none
+  </dest>
+  <voice>
+    *: none
+    swcodec: "CPU Boost"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESIZE_COVERS
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Resize Covers"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Resize Covers"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Resize Covers"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NO_ALBUMART_FOUND
+  desc: in the pictureflow splash messages
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "No album art found"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "No album art found"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "No album art found"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PANNING_SEPARATION
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: none
+    swcodec: "Panning Separation"
+    lowmem: none
+  </source>
+  <dest>
+    *: none
+    swcodec: "Panning Separation"
+    lowmem: none
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Panning Separation"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REVERBERATION
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: none
+    swcodec: "Reverberation"
+    lowmem: none
+  </source>
+  <dest>
+    *: none
+    swcodec: "Reverberation"
+    lowmem: none
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Reverberation"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MIKMOD_SURROUND
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: none
+    swcodec: "Surround"
+    lowmem: none
+  </source>
+  <dest>
+    *: none
+    swcodec: "Surround"
+    lowmem: none
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Surround"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HIDE_ALBUM_TITLE
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Hide album title"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Hide album title"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Hide album title"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_AT_THE_TOP
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Show at the top"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Show at the top"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Show at the top"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NUMBER_OF_SLIDES
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Number of slides"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Number of slides"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Number of slides"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALWAYS_ON
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Always On"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Always On"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Always On"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ZOOM
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Zoom"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Zoom"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Zoom"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VIA_TRACK_LIST
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Via Track list"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Via Track list"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Via Track list"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_ALBUM_TITLE
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Show album title"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Show album title"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Show album title"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GOTO_WPS
+  desc: in the pictureflow main menu
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Go to WPS"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Go to WPS"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Go to WPS"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CACHE_REBUILT_NEXT_RESTART
+  desc: in the pictureflow splash messages
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Cache will be rebuilt on next restart"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Cache will be rebuilt on next restart"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Cache will be rebuilt on next restart"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REBUILD_CACHE
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Rebuild cache"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Rebuild cache"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Rebuild cache"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ERROR_WRITING_CONFIG
+  desc: in the pictureflow splash messages
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Error writing config"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Error writing config"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Error writing config"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYLIST_CLEARED
+  desc: in the pictureflow splash messages
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Playlist Cleared"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Playlist Cleared"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Playlist Cleared"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CENTRE_MARGIN
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Centre margin"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Centre margin"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Centre margin"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SPACING
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Spacing"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Spacing"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Spacing"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DIRECT
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Direct"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Direct"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Direct"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_INTERPOLATION
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: none
+    swcodec: "Interpolation"
+    lowmem: none
+  </source>
+  <dest>
+    *: none
+    swcodec: "Interpolation"
+    lowmem: none
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Interpolation"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SWAP_CHANNELS
+  desc: in sound_settings
+  user: core
+  <source>
+    *: "Swap Channels"
+  </source>
+  <dest>
+    *: "Swap Channels"
+  </dest>
+  <voice>
+    *: "Swap Channels"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WPS_INTEGRATION
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "WPS Integration"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "WPS Integration"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "WPS Integration"
+  </voice>
+</phrase>
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 5bb2069aac..23b5fa62a1 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -6683,7 +6683,7 @@
   </dest>
   <voice>
     *: "Internal"
-    xduoox3: "micro S D 1:"
+    xduoox3: "micro S D 1"
   </voice>
 </phrase>
 <phrase>
@@ -6708,7 +6708,7 @@
     *: none
     multivolume: "H D 1"
     sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
-    xduoox3: "micro S D 2:"
+    xduoox3: "micro S D 2"
     archosondio*: "M M C"
   </voice>
 </phrase>
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index 540ba7e8e3..73d69835d4 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -3999,16 +3999,16 @@
   desc: in info menu; name for internal disk with multivolume (keep short!)
   user: core
   <source>
-    *: none
-    multivolume: "Int:"
+    *: "Int:"
+    xduoox3: "mSD1:"
   </source>
   <dest>
-    *: none
-    multivolume: "Внутр:"
+    *: "Внутр:"
+    xduoox3: "mSD1:"
   </dest>
   <voice>
-    *: none
-    multivolume: "Внутр:"
+    *: "Внутр"
+    xduoox3: "микро Эс Ди 1"
   </voice>
 </phrase>
 <phrase>
@@ -4019,18 +4019,21 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    xduoox3: "mSD2:"
     archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    xduoox3: "mSD2:"
     archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "Эйч Ди 1"
     sansae200*,sansac200*,sansafuze*,sansaclipplus: "микро Эс Ди"
+    xduoox3: "микро Эс Ди 2"
     archosondio*: "Эм Эм Си"
   </voice>
 </phrase>
@@ -15441,22 +15444,22 @@
 </phrase>
 <phrase>
   id: LANG_DISPLAY_FPS
-  desc: in the mpegplayer settings menu
+  desc: in the mpegplayer and pictureflow settings menus
   user: core
   <source>
     *: none
     swcodec: "Display FPS"
-    lowmem: none
+    lcd_bitmap: "Display FPS"
   </source>
   <dest>
     *: none
     swcodec: "Кадров в секунду"
-    lowmem: none
+    lcd_bitmap: "Кадров в секунду"
   </dest>
   <voice>
     *: none
     swcodec: "Кадров в секунду"
-    lowmem: none
+    lcd_bitmap: "Кадров в секунду"
   </voice>
 </phrase>
 <phrase>