New function for formatting large-range values for output, both printed and voiced. This replaces num2max5(). It is currently used for the total/free space display in the info menu, for the recorded number of bytes (recorders) and the MMC debug info (Ondios).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5721 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 110 insertions, 24 deletions

diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index c5f8d9d..7fd3291 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -985,16 +985,16 @@ voice: "Aufnahmeeinstellungen"
 new: "Aufnahmeeinstellungen"
 
 id: LANG_DISK_STAT
-desc: disk size info
-eng: "Disk: %d.%dGB"
+desc: DEPRECATED
+eng: ""
 voice: ""
-new: "HDD: %d,%dGB"
+new:
 
 id: LANG_DISK_FREE_STAT
-desc: disk size info
-eng: "Free: %d.%dGB"
-voice: "Freier Plattenplatz:"
-new: "Frei: %d,%dGB"
+desc: DEPRECATED
+eng: ""
+voice: ""
+new:
 
 id: LANG_POWEROFF
 desc: disk poweroff flag
@@ -2256,9 +2256,9 @@ voice: "Plus"
 new:
 
 id: VOICE_POINT
-desc: spoken only, decimal separator for composing numbers
+desc: DEPRECATED
 eng: ""
-voice: "Komma"
+voice: ""
 new:
 
 id: VOICE_MILLISECONDS
@@ -2322,15 +2322,15 @@ voice: "Prozent"
 new:
 
 id: VOICE_MEGABYTE
-desc: spoken only, a unit postfix
+desc: DEPRECATED
 eng: ""
-voice: "Megabyte"
+voice: ""
 new:
 
 id: VOICE_GIGABYTE
-desc: spoken only, a unit postfix
+desc: DEPRECATED
 eng: ""
-voice: "Gigabyte"
+voice: ""
 new:
 
 id: VOICE_MILLIAMPHOURS
@@ -2929,3 +2929,46 @@ desc: in battery settings
 eng: "NiMH"
 voice: "Nickel-Metallhydrid"
 new: "NiMH"
+
+id: LANG_POINT
+desc: decimal separator for composing numbers
+eng: "."
+voice: "Komma"
+new: ","
+
+id: LANG_BYTE
+desc: a unit postfix
+eng: "B"
+voice: ""
+new: "B"
+
+id: LANG_KILOBYTE
+desc: a unit postfix, also voiced
+eng: "KB"
+voice: "Kilobyte"
+new: "KB"
+
+id: LANG_MEGABYTE
+desc: a unit postfix, also voiced
+eng: "MB"
+voice: "Megabyte"
+new: "MB"
+
+id: LANG_GIGABYTE
+desc: a unit postfix, also voiced
+eng: "GB"
+voice: "Gigabyte"
+new: "GB"
+
+id: LANG_DISK_SIZE_INFO
+desc: disk size info
+eng: "HDD:"
+voice: ""
+new: "Disk:"
+
+id: LANG_DISK_FREE_INFO
+desc: disk size info
+eng: "Free:"
+voice: "Freier Plattenplatz:"
+new: "Frei:"
+
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 910bfa4..5323fa0 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -998,15 +998,15 @@ voice: "Recording Settings"
 new:
 
 id: LANG_DISK_STAT
-desc: disk size info
-eng: "Disk: %d.%dGB"
+desc: DEPRECATED
+eng: ""
 voice: ""
 new:
 
 id: LANG_DISK_FREE_STAT
-desc: disk size info
-eng: "Free: %d.%dGB"
-voice: "Free diskspace:"
+desc: DEPRECATED
+eng: ""
+voice: ""
 new:
 
 id: LANG_POWEROFF
@@ -2270,9 +2270,9 @@ voice: "plus"
 new:
 
 id: VOICE_POINT
-desc: spoken only, decimal separator for composing numbers
+desc: DEPRECATED
 eng: ""
-voice: "point"
+voice: ""
 new:
 
 id: VOICE_MILLISECONDS
@@ -2336,15 +2336,15 @@ voice: "percent"
 new:
 
 id: VOICE_MEGABYTE
-desc: spoken only, a unit postfix, currently not used
+desc: DEPRECATED
 eng: ""
-voice: "megabyte"
+voice: ""
 new:
 
 id: VOICE_GIGABYTE
-desc: spoken only, a unit postfix
+desc: DEPRECATED
 eng: ""
-voice: "gigabyte"
+voice: ""
 new:
 
 id: VOICE_MILLIAMPHOURS
@@ -2943,3 +2943,46 @@ desc: in battery settings
 eng: "NiMH"
 voice: "Nickel metal hydride"
 new:
+
+id: LANG_POINT
+desc: decimal separator for composing numbers
+eng: "."
+voice: "point"
+new:
+
+id: LANG_BYTE
+desc: a unit postfix
+eng: "B"
+voice: ""
+new:
+
+id: LANG_KILOBYTE
+desc: a unit postfix, also voiced
+eng: "KB"
+voice: "kilobyte"
+new:
+
+id: LANG_MEGABYTE
+desc: a unit postfix, also voiced
+eng: "MB"
+voice: "megabyte"
+new:
+
+id: LANG_GIGABYTE
+desc: a unit postfix, also voiced
+eng: "GB"
+voice: "gigabyte"
+new:
+
+id: LANG_DISK_SIZE_INFO
+desc: disk size info
+eng: "Disk:"
+voice: ""
+new:
+
+id: LANG_DISK_FREE_INFO
+desc: disk size info
+eng: "Free:"
+voice: "Free diskspace:"
+new:
+