1 files changed, 82 insertions, 156 deletions

diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang
index f2d5992b32..478722c801 100644
--- a/apps/lang/lietuviu.lang
+++ b/apps/lang/lietuviu.lang
@@ -14,80 +14,6 @@
 # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 # KIND, either express or implied.
 #
-# This is the master of the language files. This is the original, the one with
-# all the existing strings Rockbox features.
-#
-# The target names used for target-specific strings are set in the ARCHOS
-# variable in the root Makefile
-#
-# *WARNING*
-#
-# If you want to add a new string, add it to the end of this file!
-# If you want to remove a string, just blank it, don't actually remove it!
-#
-# If you re-order things or remove entries, you must bump the binary language
-# file version number in both the 'genlang' tool and the language loader code.
-#
-# The "voice' entry contains how we want the speech UI to pronounce the phrase.
-#
-# Since this file is both the master for the language system, as well as the
-# source for generating english strings, make sure that all <source> strings
-# are *identical* to the <dest> strings within the english.lang file. The
-# <source> strings are the ones that'll be exposed and used by other languages
-# when doing updates etc, while the <dest> ones are used when this file is
-# used to simply get the full set of english strings for a particular target.
-#
-# All phrases have a default string like: *: "default" that will be used if no
-# other string matches for the particular model you build the language for. If
-# you want a particular string for the iriver h300 series you'd write it like:
-# h300: "h300-specific string" (below the default line). If your string isn't
-# used for all targets set the default to none like: *: none (no quotes!) this
-# will not include the string for target that will not need it, see
-# apps/features.txt for available categories that can be used instead of the
-# target name, for example: swcodec: "swcodec-specific string".
-#
-#
-# The target names used are picked from the configure script and are set in the
-# MODELNAME variable in the root makefile. Currently, they are:
-# Target        Target string
-# Archos
-# Player/Studio     player
-# Recorder          recorder
-# FM Recorder       fmrecorder
-# Recorder V2       recorderv2
-# Ondio SP          ondiosp
-# Ondio FM          ondiofm
-# iriver
-# H100/H110/H115    h100
-# H120/H140         h120
-# H320/H340         h300
-# H10               h10
-# IFP 7XX           ifp7xx
-# iaudio
-# X5                x5
-# M5                m5
-# ipod
-# All iPods         ipod*
-# 4G Color/Photo    ipodcolor
-# Nano              ipodnano
-# Video (5G)        ipodvideo
-# 3G                ipod3g
-# 4G gray           ipod4g
-# mini              ipodmini
-# mini 2G           ipodmini2g
-# Toshiba
-# Gigabeat Fxx      gigabeatf
-# Gigabeat Sxx      gigabeats
-#
-# Sandisk
-# Sansa E200        e200
-# Sansa C200        c200*
-#
-# Olympus
-# m:robe 100        mrobe100
-#
-# Philips
-# GoGear SA9200     sa9200
 
 <phrase>
   id: LANG_SET_BOOL_YES
@@ -333,15 +259,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Taip"
-    h100,h120,h300: "NAVI = Taip"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Taip"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Taip"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Taip"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -353,15 +279,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Bet koks kitas = Ne"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -2454,17 +2380,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Kuriama duomenų bazė... %d rasta (OFF grįžimui)"
-    h100,h120,h300: "Kuriama duomenų bazė... %d rasta (STOP grįžimui)"
+    iriverh100,iriverh120,iriverh300: "Kuriama duomenų bazė... %d rasta (STOP grįžimui)"
     ipod*: "Kuriama duomenų bazė... %d rasta (PREV grįžimui)"
-    x5,m5,gigabeat*,mrobe100: "Kuriama duomenų bazė... %d rasta (LEFT grįžimui)"
-    h10,h10_5gb,e200*,c200*,sa9200: "Kuriama duomenų bazė... %d rasta (PREV to grįžimui)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Kuriama duomenų bazė... %d rasta (LEFT grįžimui)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Kuriama duomenų bazė... %d rasta (PREV to grįžimui)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -3264,7 +3190,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3278,7 +3204,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3292,7 +3218,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3924,17 +3850,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Klavišų apšvietimo laikas"
-    fuze*,e200*: "Rato apšvietimo laikas"
+    sansafuze*,sansae200*: "Rato apšvietimo laikas"
   </dest>
   <voice>
     *: none
     button_light: "Klavišų apšvietimo laikas"
-    fuze*,e200*: "Rato apšvietimo laikas"
+    sansafuze*,sansae200*: "Rato apšvietimo laikas"
   </voice>
 </phrase>
 <phrase>
@@ -4215,18 +4141,18 @@
   <source>
     *: none
     rtc: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Nustatyti"
-    h100,h120,h300: "NAVI = Nustatyti"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Nustatyti"
+    iriverh100,iriverh120,iriverh300: "NAVI = Nustatyti"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Nustatyti"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4236,22 +4162,22 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*,sa9200: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Atstatyti"
-    h100,h120,h300: "STOP = Atstatyti"
-    ipod*,c200*,sa9200: "MENU = Atstatyti"
-    x5,m5: "RECORD = Atstatyti"
-    h10,h10_5gb,e200*,fuze*: "PREV = Atstatyti"
-    gigabeatf: "POWER = Atstatyti"
+    iriverh100,iriverh120,iriverh300: "STOP = Atstatyti"
+    ipod*,sansac200*,gogearsa9200: "MENU = Atstatyti"
+    iaudiox5,iaudiom5: "RECORD = Atstatyti"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Atstatyti"
+    gigabeatfx: "POWER = Atstatyti"
     mrobe100: "DISPLAY = Atstatyti"
     gigabeats: "BACK = Atstatyti"
   </dest>
@@ -4779,14 +4705,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Nustatyti OFF=Atšaukti"
     ipod*: "SELECT=Nustatyti MENU=Atšaukti"
-    h10,h10_5gb: "SELECT=Nustatyti PREV=Atšaukti"
+    iriverh10,iriverh10_5gb: "SELECT=Nustatyti PREV=Atšaukti"
     gigabeats: "SELECT=Nustatyti POWER=Atšaukti"
   </dest>
   <voice>
@@ -5961,17 +5887,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofonas"
-    h100,h120,h300: "Vidinis mikrofonas"
+    iriverh100,iriverh120,iriverh300: "Vidinis mikrofonas"
   </dest>
   <voice>
     *: none
     recording: "Mikrofonas"
-    h100,h120,h300: "Vidinis mikrofonas"
+    iriverh100,iriverh120,iriverh300: "Vidinis mikrofonas"
   </voice>
 </phrase>
 <phrase>
@@ -5997,15 +5923,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </dest>
   <voice>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -6935,11 +6861,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Buferis:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </dest>
   <voice>
     *: "Buferio dydis"
@@ -6951,13 +6877,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterija: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Bat: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Baterijos lygis"
@@ -7015,19 +6941,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "MSD:"
+    sansae200*,sansac200*,sansafuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    e200*,c200*,fuze*: "micro S D"
+    sansae200*,sansac200*,sansafuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8139,11 +8065,11 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Dainų sąrašo pabaiga"
-    player: "Sąrašo pabaiga"
+    archosplayer: "Sąrašo pabaiga"
   </dest>
   <voice>
     *: "Dainų sąrašo pabaiga"
@@ -8386,20 +8312,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    h100,h120,h300: "The disk is full. Press STOP to continue."
-    m5,x5: "The disk is full. Press POWER to continue."
-    e200*,c200*: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
+    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Diskas pilnas. Spauskite OFF."
-    h100,h120,h300: "Diskas pilnas. Spauskite STOP."
-    m5,x5: "Diskas pilnas. Spauskite POWER."
-    e200*,c200*: "Diskas pilnas. Spauskite PREV."
+    iriverh100,iriverh120,iriverh300: "Diskas pilnas. Spauskite STOP."
+    iaudiom5,iaudiox5: "Diskas pilnas. Spauskite POWER."
+    sansae200*,sansac200*: "Diskas pilnas. Spauskite PREV."
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8483,25 +8409,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF atšaukimui"
-    player,h100,h120,h300: "STOP atšaukimui"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP atšaukimui"
     ipod*: "PLAY/PAUSE atšaukimui"
-    x5,m5: "Ilgas PLAY atšaukimui"
-    h10,h10_5gb,e200*,c200*: "PREV atšaukimui"
+    iaudiox5,iaudiom5: "Ilgas PLAY atšaukimui"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV atšaukimui"
     gigabeats: "BACK atšaukimui"
-    gigabeatf: "POWER atšaukimui"
+    gigabeatfx: "POWER atšaukimui"
   </dest>
   <voice>
     *: ""
@@ -8725,19 +8651,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Baterija: Pilna"
+    archosrecorder: "Baterija: Pilna"
   </dest>
   <voice>
     *: none
-    recorder: "Pilanas pakrovimas"
+    archosrecorder: "Pilanas pakrovimas"
   </voice>
 </phrase>
 <phrase>
@@ -10554,7 +10480,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11765,15 +11691,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Jautrumas lietimui"
+    gigabeatfx: "Jautrumas lietimui"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Jautrumas lietimui"
+    gigabeatfx: "Jautrumas lietimui"
   </voice>
 </phrase>
 <phrase>
@@ -11782,15 +11708,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Aukštas"
+    gigabeatfx: "Aukštas"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Aukštas"
+    gigabeatfx: "Aukštas"
   </voice>
 </phrase>
 <phrase>