diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2009-08-16 22:00:38 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2009-08-16 22:00:38 +0000 |
commit | c0897a8002d493244efd69fca5c433dbafe8d5be (patch) | |
tree | 0be8a3283280c96d3b9f85e00e5c1ee505b7d77e | |
parent | b395f89a31a51fad6311acd671ffd9487e32c130 (diff) | |
download | rockbox-c0897a8002d493244efd69fca5c433dbafe8d5be.tar.gz rockbox-c0897a8002d493244efd69fca5c433dbafe8d5be.zip |
remove the rockbox info line saying the AA size and replace it with skin RAM usage
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22364 a1c6a512-1295-4272-9138-f99709370657
31 files changed, 95 insertions, 189 deletions
diff --git a/apps/lang/arabic.lang b/apps/lang/arabic.lang index 4f719fbe87..03a679e8a0 100644 --- a/apps/lang/arabic.lang +++ b/apps/lang/arabic.lang | |||
@@ -4647,19 +4647,16 @@ | |||
4647 | </phrase> | 4647 | </phrase> |
4648 | <phrase> | 4648 | <phrase> |
4649 | id: LANG_ALBUMART | 4649 | id: LANG_ALBUMART |
4650 | desc: Display the expected AA size | 4650 | desc: deprecated |
4651 | user: core | 4651 | user: |
4652 | <source> | 4652 | <source> |
4653 | *: none | 4653 | *: none |
4654 | albumart: "Album Art:" | ||
4655 | </source> | 4654 | </source> |
4656 | <dest> | 4655 | <dest> |
4657 | *: none | 4656 | *: none |
4658 | albumart: "صورة الألبوم:" | ||
4659 | </dest> | 4657 | </dest> |
4660 | <voice> | 4658 | <voice> |
4661 | *: none | 4659 | *: none |
4662 | albumart: "Album Art:" | ||
4663 | </voice> | 4660 | </voice> |
4664 | </phrase> | 4661 | </phrase> |
4665 | <phrase> | 4662 | <phrase> |
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang index a08bb3694b..6e191fa728 100644 --- a/apps/lang/catala.lang +++ b/apps/lang/catala.lang | |||
@@ -11950,19 +11950,16 @@ | |||
11950 | </phrase> | 11950 | </phrase> |
11951 | <phrase> | 11951 | <phrase> |
11952 | id: LANG_ALBUMART | 11952 | id: LANG_ALBUMART |
11953 | desc: Display the expected AA size | 11953 | desc: deprecated |
11954 | user: core | 11954 | user: |
11955 | <source> | 11955 | <source> |
11956 | *: none | 11956 | *: none |
11957 | albumart: "Album Art:" | ||
11958 | </source> | 11957 | </source> |
11959 | <dest> | 11958 | <dest> |
11960 | *: none | 11959 | *: none |
11961 | albumart: "Caratula:" | ||
11962 | </dest> | 11960 | </dest> |
11963 | <voice> | 11961 | <voice> |
11964 | *: none | 11962 | *: none |
11965 | albumart: "Caratula" | ||
11966 | </voice> | 11963 | </voice> |
11967 | </phrase> | 11964 | </phrase> |
11968 | <phrase> | 11965 | <phrase> |
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang index f14631f2e6..c2dfbd10f2 100644 --- a/apps/lang/chinese-simp.lang +++ b/apps/lang/chinese-simp.lang | |||
@@ -11981,19 +11981,16 @@ | |||
11981 | </phrase> | 11981 | </phrase> |
11982 | <phrase> | 11982 | <phrase> |
11983 | id: LANG_ALBUMART | 11983 | id: LANG_ALBUMART |
11984 | desc: Display the expected AA size | 11984 | desc: deprecated |
11985 | user: core | 11985 | user: |
11986 | <source> | 11986 | <source> |
11987 | *: none | 11987 | *: none |
11988 | albumart: "Album Art:" | ||
11989 | </source> | 11988 | </source> |
11990 | <dest> | 11989 | <dest> |
11991 | *: none | 11990 | *: none |
11992 | albumart: "专辑封面:" | ||
11993 | </dest> | 11991 | </dest> |
11994 | <voice> | 11992 | <voice> |
11995 | *: none | 11993 | *: none |
11996 | albumart: "专辑封面" | ||
11997 | </voice> | 11994 | </voice> |
11998 | </phrase> | 11995 | </phrase> |
11999 | <phrase> | 11996 | <phrase> |
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang index 75fd47669e..dfdbf4b748 100644 --- a/apps/lang/chinese-trad.lang +++ b/apps/lang/chinese-trad.lang | |||
@@ -11613,19 +11613,16 @@ | |||
11613 | </phrase> | 11613 | </phrase> |
11614 | <phrase> | 11614 | <phrase> |
11615 | id: LANG_ALBUMART | 11615 | id: LANG_ALBUMART |
11616 | desc: Display the expected AA size | 11616 | desc: deprecated |
11617 | user: core | 11617 | user: |
11618 | <source> | 11618 | <source> |
11619 | *: none | 11619 | *: none |
11620 | albumart: "Album Art:" | ||
11621 | </source> | 11620 | </source> |
11622 | <dest> | 11621 | <dest> |
11623 | *: none | 11622 | *: none |
11624 | albumart: "專輯封面" | ||
11625 | </dest> | 11623 | </dest> |
11626 | <voice> | 11624 | <voice> |
11627 | *: none | 11625 | *: none |
11628 | albumart: "專輯封面" | ||
11629 | </voice> | 11626 | </voice> |
11630 | </phrase> | 11627 | </phrase> |
11631 | <phrase> | 11628 | <phrase> |
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang index fca480a47b..59bd91c0a8 100644 --- a/apps/lang/dansk.lang +++ b/apps/lang/dansk.lang | |||
@@ -12000,19 +12000,16 @@ | |||
12000 | </phrase> | 12000 | </phrase> |
12001 | <phrase> | 12001 | <phrase> |
12002 | id: LANG_ALBUMART | 12002 | id: LANG_ALBUMART |
12003 | desc: Display the expected AA size | 12003 | desc: deprecated |
12004 | user: core | 12004 | user: |
12005 | <source> | 12005 | <source> |
12006 | *: none | 12006 | *: none |
12007 | albumart: "Album Art:" | ||
12008 | </source> | 12007 | </source> |
12009 | <dest> | 12008 | <dest> |
12010 | *: none | 12009 | *: none |
12011 | albumart: "Album cover:" | ||
12012 | </dest> | 12010 | </dest> |
12013 | <voice> | 12011 | <voice> |
12014 | *: none | 12012 | *: none |
12015 | albumart: "Album cover:" | ||
12016 | </voice> | 12013 | </voice> |
12017 | </phrase> | 12014 | </phrase> |
12018 | <phrase> | 12015 | <phrase> |
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang index b6034d1808..a009ee7e8e 100644 --- a/apps/lang/deutsch.lang +++ b/apps/lang/deutsch.lang | |||
@@ -11978,19 +11978,16 @@ | |||
11978 | </phrase> | 11978 | </phrase> |
11979 | <phrase> | 11979 | <phrase> |
11980 | id: LANG_ALBUMART | 11980 | id: LANG_ALBUMART |
11981 | desc: Display the expected AA size | 11981 | desc: deprecated |
11982 | user: core | 11982 | user: |
11983 | <source> | 11983 | <source> |
11984 | *: none | 11984 | *: none |
11985 | albumart: "Album Art:" | ||
11986 | </source> | 11985 | </source> |
11987 | <dest> | 11986 | <dest> |
11988 | *: none | 11987 | *: none |
11989 | albumart: "Covergröße:" | ||
11990 | </dest> | 11988 | </dest> |
11991 | <voice> | 11989 | <voice> |
11992 | *: none | 11990 | *: none |
11993 | albumart: "Covergröße" | ||
11994 | </voice> | 11991 | </voice> |
11995 | </phrase> | 11992 | </phrase> |
11996 | <phrase> | 11993 | <phrase> |
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 2e4cb2d96f..e0fb2ee3e2 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -12162,19 +12162,16 @@ | |||
12162 | </phrase> | 12162 | </phrase> |
12163 | <phrase> | 12163 | <phrase> |
12164 | id: LANG_ALBUMART | 12164 | id: LANG_ALBUMART |
12165 | desc: Display the expected AA size | 12165 | desc: deprecated |
12166 | user: core | 12166 | user: |
12167 | <source> | 12167 | <source> |
12168 | *: none | 12168 | *: none |
12169 | albumart: "Album Art:" | ||
12170 | </source> | 12169 | </source> |
12171 | <dest> | 12170 | <dest> |
12172 | *: none | 12171 | *: none |
12173 | albumart: "Album Art:" | ||
12174 | </dest> | 12172 | </dest> |
12175 | <voice> | 12173 | <voice> |
12176 | *: none | 12174 | *: none |
12177 | albumart: "Album Art:" | ||
12178 | </voice> | 12175 | </voice> |
12179 | </phrase> | 12176 | </phrase> |
12180 | <phrase> | 12177 | <phrase> |
@@ -12660,3 +12657,17 @@ | |||
12660 | pitchscreen: "Rate" | 12657 | pitchscreen: "Rate" |
12661 | </voice> | 12658 | </voice> |
12662 | </phrase> | 12659 | </phrase> |
12660 | <phrase> | ||
12661 | id: LANG_SKIN_RAM_USAGE | ||
12662 | desc: how much RAM the skins are using | ||
12663 | user: core | ||
12664 | <source> | ||
12665 | *: "Skin RAM usage:" | ||
12666 | </source> | ||
12667 | <dest> | ||
12668 | *: "Skin RAM usage:" | ||
12669 | </dest> | ||
12670 | <voice> | ||
12671 | *: "Skin RAM usage" | ||
12672 | </voice> | ||
12673 | </phrase> | ||
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang index bb7c411334..4e4e80745f 100644 --- a/apps/lang/espanol.lang +++ b/apps/lang/espanol.lang | |||
@@ -11960,19 +11960,16 @@ | |||
11960 | </phrase> | 11960 | </phrase> |
11961 | <phrase> | 11961 | <phrase> |
11962 | id: LANG_ALBUMART | 11962 | id: LANG_ALBUMART |
11963 | desc: Display the expected AA size | 11963 | desc: deprecated |
11964 | user: core | 11964 | user: |
11965 | <source> | 11965 | <source> |
11966 | *: none | 11966 | *: none |
11967 | albumart: "Album Art:" | ||
11968 | </source> | 11967 | </source> |
11969 | <dest> | 11968 | <dest> |
11970 | *: none | 11969 | *: none |
11971 | albumart: "Carátula:" | ||
11972 | </dest> | 11970 | </dest> |
11973 | <voice> | 11971 | <voice> |
11974 | *: none | 11972 | *: none |
11975 | albumart: "Carátula" | ||
11976 | </voice> | 11973 | </voice> |
11977 | </phrase> | 11974 | </phrase> |
11978 | <phrase> | 11975 | <phrase> |
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang index 327cd0199c..c3d36c4b42 100644 --- a/apps/lang/finnish.lang +++ b/apps/lang/finnish.lang | |||
@@ -11969,19 +11969,16 @@ | |||
11969 | </phrase> | 11969 | </phrase> |
11970 | <phrase> | 11970 | <phrase> |
11971 | id: LANG_ALBUMART | 11971 | id: LANG_ALBUMART |
11972 | desc: Display the expected AA size | 11972 | desc: deprecated |
11973 | user: core | 11973 | user: |
11974 | <source> | 11974 | <source> |
11975 | *: none | 11975 | *: none |
11976 | albumart: "Album Art:" | ||
11977 | </source> | 11976 | </source> |
11978 | <dest> | 11977 | <dest> |
11979 | *: none | 11978 | *: none |
11980 | albumart: "Kansikuva:" | ||
11981 | </dest> | 11979 | </dest> |
11982 | <voice> | 11980 | <voice> |
11983 | *: none | 11981 | *: none |
11984 | albumart: "Kansikuva:" | ||
11985 | </voice> | 11982 | </voice> |
11986 | </phrase> | 11983 | </phrase> |
11987 | <phrase> | 11984 | <phrase> |
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang index 1b28bd98e4..29d9caa29b 100644 --- a/apps/lang/francais.lang +++ b/apps/lang/francais.lang | |||
@@ -12016,19 +12016,16 @@ | |||
12016 | </phrase> | 12016 | </phrase> |
12017 | <phrase> | 12017 | <phrase> |
12018 | id: LANG_ALBUMART | 12018 | id: LANG_ALBUMART |
12019 | desc: Display the expected AA size | 12019 | desc: deprecated |
12020 | user: core | 12020 | user: |
12021 | <source> | 12021 | <source> |
12022 | *: none | 12022 | *: none |
12023 | albumart: "Album Art:" | ||
12024 | </source> | 12023 | </source> |
12025 | <dest> | 12024 | <dest> |
12026 | *: none | 12025 | *: none |
12027 | albumart: "Illustration album:" | ||
12028 | </dest> | 12026 | </dest> |
12029 | <voice> | 12027 | <voice> |
12030 | *: none | 12028 | *: none |
12031 | albumart: "Illustration album" | ||
12032 | </voice> | 12029 | </voice> |
12033 | </phrase> | 12030 | </phrase> |
12034 | <phrase> | 12031 | <phrase> |
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang index 20871ffdfc..ffea2dd1fe 100644 --- a/apps/lang/greek.lang +++ b/apps/lang/greek.lang | |||
@@ -11958,19 +11958,16 @@ | |||
11958 | </phrase> | 11958 | </phrase> |
11959 | <phrase> | 11959 | <phrase> |
11960 | id: LANG_ALBUMART | 11960 | id: LANG_ALBUMART |
11961 | desc: Display the expected AA size | 11961 | desc: deprecated |
11962 | user: core | 11962 | user: |
11963 | <source> | 11963 | <source> |
11964 | *: none | 11964 | *: none |
11965 | albumart: "Album Art:" | ||
11966 | </source> | 11965 | </source> |
11967 | <dest> | 11966 | <dest> |
11968 | *: none | 11967 | *: none |
11969 | albumart: "Εξώφυλλο άλμπουμ:" | ||
11970 | </dest> | 11968 | </dest> |
11971 | <voice> | 11969 | <voice> |
11972 | *: none | 11970 | *: none |
11973 | albumart: "Εξώφυλλο άλμπουμ:" | ||
11974 | </voice> | 11971 | </voice> |
11975 | </phrase> | 11972 | </phrase> |
11976 | <phrase> | 11973 | <phrase> |
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang index fd76989bf2..d6501b818f 100644 --- a/apps/lang/hebrew.lang +++ b/apps/lang/hebrew.lang | |||
@@ -11961,19 +11961,16 @@ | |||
11961 | </phrase> | 11961 | </phrase> |
11962 | <phrase> | 11962 | <phrase> |
11963 | id: LANG_ALBUMART | 11963 | id: LANG_ALBUMART |
11964 | desc: Display the expected AA size | 11964 | desc: deprecated |
11965 | user: core | 11965 | user: |
11966 | <source> | 11966 | <source> |
11967 | *: none | 11967 | *: none |
11968 | albumart: "Album Art:" | ||
11969 | </source> | 11968 | </source> |
11970 | <dest> | 11969 | <dest> |
11971 | *: none | 11970 | *: none |
11972 | albumart: "תמונת אלבום:" | ||
11973 | </dest> | 11971 | </dest> |
11974 | <voice> | 11972 | <voice> |
11975 | *: none | 11973 | *: none |
11976 | albumart: "Album Art:" | ||
11977 | </voice> | 11974 | </voice> |
11978 | </phrase> | 11975 | </phrase> |
11979 | <phrase> | 11976 | <phrase> |
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang index f7ce0f5441..e2462101bb 100644 --- a/apps/lang/italiano.lang +++ b/apps/lang/italiano.lang | |||
@@ -12086,19 +12086,16 @@ | |||
12086 | </phrase> | 12086 | </phrase> |
12087 | <phrase> | 12087 | <phrase> |
12088 | id: LANG_ALBUMART | 12088 | id: LANG_ALBUMART |
12089 | desc: Display the expected AA size | 12089 | desc: deprecated |
12090 | user: core | 12090 | user: |
12091 | <source> | 12091 | <source> |
12092 | *: none | 12092 | *: none |
12093 | albumart: "Album Art:" | ||
12094 | </source> | 12093 | </source> |
12095 | <dest> | 12094 | <dest> |
12096 | *: none | 12095 | *: none |
12097 | albumart: "Album Art:" | ||
12098 | </dest> | 12096 | </dest> |
12099 | <voice> | 12097 | <voice> |
12100 | *: none | 12098 | *: none |
12101 | albumart: "Album Art:" | ||
12102 | </voice> | 12099 | </voice> |
12103 | </phrase> | 12100 | </phrase> |
12104 | <phrase> | 12101 | <phrase> |
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang index 215b1248c1..475305e8c2 100644 --- a/apps/lang/japanese.lang +++ b/apps/lang/japanese.lang | |||
@@ -12084,19 +12084,16 @@ | |||
12084 | </phrase> | 12084 | </phrase> |
12085 | <phrase> | 12085 | <phrase> |
12086 | id: LANG_ALBUMART | 12086 | id: LANG_ALBUMART |
12087 | desc: Display the expected AA size | 12087 | desc: deprecated |
12088 | user: core | 12088 | user: |
12089 | <source> | 12089 | <source> |
12090 | *: none | 12090 | *: none |
12091 | albumart: "Album Art:" | ||
12092 | </source> | 12091 | </source> |
12093 | <dest> | 12092 | <dest> |
12094 | *: none | 12093 | *: none |
12095 | albumart: "アルバムアート:" | ||
12096 | </dest> | 12094 | </dest> |
12097 | <voice> | 12095 | <voice> |
12098 | *: none | 12096 | *: none |
12099 | albumart: "アルバムアート:" | ||
12100 | </voice> | 12097 | </voice> |
12101 | </phrase> | 12098 | </phrase> |
12102 | <phrase> | 12099 | <phrase> |
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang index 89268d19c0..4d6baf5873 100644 --- a/apps/lang/korean.lang +++ b/apps/lang/korean.lang | |||
@@ -10293,19 +10293,16 @@ | |||
10293 | </phrase> | 10293 | </phrase> |
10294 | <phrase> | 10294 | <phrase> |
10295 | id: LANG_ALBUMART | 10295 | id: LANG_ALBUMART |
10296 | desc: Display the expected AA size | 10296 | desc: deprecated |
10297 | user: core | 10297 | user: |
10298 | <source> | 10298 | <source> |
10299 | *: none | 10299 | *: none |
10300 | albumart: "Album Art:" | ||
10301 | </source> | 10300 | </source> |
10302 | <dest> | 10301 | <dest> |
10303 | *: none | 10302 | *: none |
10304 | albumart: "앨범재킷:" | ||
10305 | </dest> | 10303 | </dest> |
10306 | <voice> | 10304 | <voice> |
10307 | *: none | 10305 | *: none |
10308 | albumart: "앨범재킷:" | ||
10309 | </voice> | 10306 | </voice> |
10310 | </phrase> | 10307 | </phrase> |
10311 | <phrase> | 10308 | <phrase> |
diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang index 9d37d9aa56..2874b332e8 100644 --- a/apps/lang/lietuviu.lang +++ b/apps/lang/lietuviu.lang | |||
@@ -12148,19 +12148,16 @@ | |||
12148 | </phrase> | 12148 | </phrase> |
12149 | <phrase> | 12149 | <phrase> |
12150 | id: LANG_ALBUMART | 12150 | id: LANG_ALBUMART |
12151 | desc: Display the expected AA size | 12151 | desc: deprecated |
12152 | user: core | 12152 | user: |
12153 | <source> | 12153 | <source> |
12154 | *: none | 12154 | *: none |
12155 | albumart: "Album Art:" | ||
12156 | </source> | 12155 | </source> |
12157 | <dest> | 12156 | <dest> |
12158 | *: none | 12157 | *: none |
12159 | albumart: "Albumo viršelis:" | ||
12160 | </dest> | 12158 | </dest> |
12161 | <voice> | 12159 | <voice> |
12162 | *: none | 12160 | *: none |
12163 | albumart: "Albumo viršelis:" | ||
12164 | </voice> | 12161 | </voice> |
12165 | </phrase> | 12162 | </phrase> |
12166 | <phrase> | 12163 | <phrase> |
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang index 95a32c8b26..bbfca3e9b5 100644 --- a/apps/lang/magyar.lang +++ b/apps/lang/magyar.lang | |||
@@ -11350,19 +11350,16 @@ | |||
11350 | </phrase> | 11350 | </phrase> |
11351 | <phrase> | 11351 | <phrase> |
11352 | id: LANG_ALBUMART | 11352 | id: LANG_ALBUMART |
11353 | desc: Display the expected AA size | 11353 | desc: deprecated |
11354 | user: core | 11354 | user: |
11355 | <source> | 11355 | <source> |
11356 | *: none | 11356 | *: none |
11357 | albumart: "Album Art:" | ||
11358 | </source> | 11357 | </source> |
11359 | <dest> | 11358 | <dest> |
11360 | *: none | 11359 | *: none |
11361 | albumart: "Lemezborító:" | ||
11362 | </dest> | 11360 | </dest> |
11363 | <voice> | 11361 | <voice> |
11364 | *: none | 11362 | *: none |
11365 | albumart: "Album Art:" | ||
11366 | </voice> | 11363 | </voice> |
11367 | </phrase> | 11364 | </phrase> |
11368 | <phrase> | 11365 | <phrase> |
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang index d2193918a2..7dd410da7c 100644 --- a/apps/lang/nederlands.lang +++ b/apps/lang/nederlands.lang | |||
@@ -11967,19 +11967,16 @@ | |||
11967 | </phrase> | 11967 | </phrase> |
11968 | <phrase> | 11968 | <phrase> |
11969 | id: LANG_ALBUMART | 11969 | id: LANG_ALBUMART |
11970 | desc: Display the expected AA size | 11970 | desc: deprecated |
11971 | user: core | 11971 | user: |
11972 | <source> | 11972 | <source> |
11973 | *: none | 11973 | *: none |
11974 | albumart: "Album Art:" | ||
11975 | </source> | 11974 | </source> |
11976 | <dest> | 11975 | <dest> |
11977 | *: none | 11976 | *: none |
11978 | albumart: "Hoes afbeelding:" | ||
11979 | </dest> | 11977 | </dest> |
11980 | <voice> | 11978 | <voice> |
11981 | *: none | 11979 | *: none |
11982 | albumart: "" | ||
11983 | </voice> | 11980 | </voice> |
11984 | </phrase> | 11981 | </phrase> |
11985 | <phrase> | 11982 | <phrase> |
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang index 8faf0abda3..eb39fd45a7 100644 --- a/apps/lang/norsk.lang +++ b/apps/lang/norsk.lang | |||
@@ -12006,19 +12006,16 @@ | |||
12006 | </phrase> | 12006 | </phrase> |
12007 | <phrase> | 12007 | <phrase> |
12008 | id: LANG_ALBUMART | 12008 | id: LANG_ALBUMART |
12009 | desc: Display the expected AA size | 12009 | desc: deprecated |
12010 | user: core | 12010 | user: |
12011 | <source> | 12011 | <source> |
12012 | *: none | 12012 | *: none |
12013 | albumart: "Album Art:" | ||
12014 | </source> | 12013 | </source> |
12015 | <dest> | 12014 | <dest> |
12016 | *: none | 12015 | *: none |
12017 | albumart: "Albumbilde:" | ||
12018 | </dest> | 12016 | </dest> |
12019 | <voice> | 12017 | <voice> |
12020 | *: none | 12018 | *: none |
12021 | albumart: "Albumbilde:" | ||
12022 | </voice> | 12019 | </voice> |
12023 | </phrase> | 12020 | </phrase> |
12024 | <phrase> | 12021 | <phrase> |
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang index 9718e8ff52..dffc71a37e 100644 --- a/apps/lang/polski.lang +++ b/apps/lang/polski.lang | |||
@@ -12086,19 +12086,16 @@ | |||
12086 | </phrase> | 12086 | </phrase> |
12087 | <phrase> | 12087 | <phrase> |
12088 | id: LANG_ALBUMART | 12088 | id: LANG_ALBUMART |
12089 | desc: Display the expected AA size | 12089 | desc: deprecated |
12090 | user: core | 12090 | user: |
12091 | <source> | 12091 | <source> |
12092 | *: none | 12092 | *: none |
12093 | albumart: "Album Art:" | ||
12094 | </source> | 12093 | </source> |
12095 | <dest> | 12094 | <dest> |
12096 | *: none | 12095 | *: none |
12097 | albumart: "Okładka albumu:" | ||
12098 | </dest> | 12096 | </dest> |
12099 | <voice> | 12097 | <voice> |
12100 | *: none | 12098 | *: none |
12101 | albumart: "Okładka albumu" | ||
12102 | </voice> | 12099 | </voice> |
12103 | </phrase> | 12100 | </phrase> |
12104 | <phrase> | 12101 | <phrase> |
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang index 8a588c6c26..924a918002 100644 --- a/apps/lang/portugues-brasileiro.lang +++ b/apps/lang/portugues-brasileiro.lang | |||
@@ -12076,19 +12076,16 @@ | |||
12076 | </phrase> | 12076 | </phrase> |
12077 | <phrase> | 12077 | <phrase> |
12078 | id: LANG_ALBUMART | 12078 | id: LANG_ALBUMART |
12079 | desc: Display the expected AA size | 12079 | desc: deprecated |
12080 | user: core | 12080 | user: |
12081 | <source> | 12081 | <source> |
12082 | *: none | 12082 | *: none |
12083 | albumart: "Album Art:" | ||
12084 | </source> | 12083 | </source> |
12085 | <dest> | 12084 | <dest> |
12086 | *: none | 12085 | *: none |
12087 | albumart: "Capa:" | ||
12088 | </dest> | 12086 | </dest> |
12089 | <voice> | 12087 | <voice> |
12090 | *: none | 12088 | *: none |
12091 | albumart: "Capa:" | ||
12092 | </voice> | 12089 | </voice> |
12093 | </phrase> | 12090 | </phrase> |
12094 | <phrase> | 12091 | <phrase> |
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang index 8418d937c1..4573d95831 100644 --- a/apps/lang/portugues.lang +++ b/apps/lang/portugues.lang | |||
@@ -10873,19 +10873,16 @@ | |||
10873 | </phrase> | 10873 | </phrase> |
10874 | <phrase> | 10874 | <phrase> |
10875 | id: LANG_ALBUMART | 10875 | id: LANG_ALBUMART |
10876 | desc: Display the expected AA size | 10876 | desc: deprecated |
10877 | user: core | 10877 | user: |
10878 | <source> | 10878 | <source> |
10879 | *: none | 10879 | *: none |
10880 | albumart: "Album Art:" | ||
10881 | </source> | 10880 | </source> |
10882 | <dest> | 10881 | <dest> |
10883 | *: none | 10882 | *: none |
10884 | albumart: "Capa de Álbum:" | ||
10885 | </dest> | 10883 | </dest> |
10886 | <voice> | 10884 | <voice> |
10887 | *: none | 10885 | *: none |
10888 | albumart: "Capa de Álbum:" | ||
10889 | </voice> | 10886 | </voice> |
10890 | </phrase> | 10887 | </phrase> |
10891 | <phrase> | 10888 | <phrase> |
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang index 117a97cf80..644c493d43 100644 --- a/apps/lang/romaneste.lang +++ b/apps/lang/romaneste.lang | |||
@@ -11994,19 +11994,16 @@ | |||
11994 | </phrase> | 11994 | </phrase> |
11995 | <phrase> | 11995 | <phrase> |
11996 | id: LANG_ALBUMART | 11996 | id: LANG_ALBUMART |
11997 | desc: Display the expected AA size | 11997 | desc: deprecated |
11998 | user: core | 11998 | user: |
11999 | <source> | 11999 | <source> |
12000 | *: none | 12000 | *: none |
12001 | albumart: "Album Art:" | ||
12002 | </source> | 12001 | </source> |
12003 | <dest> | 12002 | <dest> |
12004 | *: none | 12003 | *: none |
12005 | albumart: "Coperta Album:" | ||
12006 | </dest> | 12004 | </dest> |
12007 | <voice> | 12005 | <voice> |
12008 | *: none | 12006 | *: none |
12009 | albumart: "Coperta Album:" | ||
12010 | </voice> | 12007 | </voice> |
12011 | </phrase> | 12008 | </phrase> |
12012 | <phrase> | 12009 | <phrase> |
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang index ac973434ba..beac83ec0d 100644 --- a/apps/lang/russian.lang +++ b/apps/lang/russian.lang | |||
@@ -11971,19 +11971,16 @@ | |||
11971 | </phrase> | 11971 | </phrase> |
11972 | <phrase> | 11972 | <phrase> |
11973 | id: LANG_ALBUMART | 11973 | id: LANG_ALBUMART |
11974 | desc: Display the expected AA size | 11974 | desc: deprecated |
11975 | user: core | 11975 | user: |
11976 | <source> | 11976 | <source> |
11977 | *: none | 11977 | *: none |
11978 | albumart: "Album Art:" | ||
11979 | </source> | 11978 | </source> |
11980 | <dest> | 11979 | <dest> |
11981 | *: none | 11980 | *: none |
11982 | albumart: "Обложка альбома:" | ||
11983 | </dest> | 11981 | </dest> |
11984 | <voice> | 11982 | <voice> |
11985 | *: none | 11983 | *: none |
11986 | albumart: "Обложка альбома" | ||
11987 | </voice> | 11984 | </voice> |
11988 | </phrase> | 11985 | </phrase> |
11989 | <phrase> | 11986 | <phrase> |
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang index 0688496fb4..811d2d05e7 100644 --- a/apps/lang/srpski.lang +++ b/apps/lang/srpski.lang | |||
@@ -11974,19 +11974,16 @@ | |||
11974 | </phrase> | 11974 | </phrase> |
11975 | <phrase> | 11975 | <phrase> |
11976 | id: LANG_ALBUMART | 11976 | id: LANG_ALBUMART |
11977 | desc: Display the expected AA size | 11977 | desc: deprecated |
11978 | user: core | 11978 | user: |
11979 | <source> | 11979 | <source> |
11980 | *: none | 11980 | *: none |
11981 | albumart: "Album Art:" | ||
11982 | </source> | 11981 | </source> |
11983 | <dest> | 11982 | <dest> |
11984 | *: none | 11983 | *: none |
11985 | albumart: "Омот албума:" | ||
11986 | </dest> | 11984 | </dest> |
11987 | <voice> | 11985 | <voice> |
11988 | *: none | 11986 | *: none |
11989 | albumart: "Омот албума:" | ||
11990 | </voice> | 11987 | </voice> |
11991 | </phrase> | 11988 | </phrase> |
11992 | <phrase> | 11989 | <phrase> |
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang index a09e1a2701..ff6a0db176 100644 --- a/apps/lang/svenska.lang +++ b/apps/lang/svenska.lang | |||
@@ -12082,19 +12082,16 @@ | |||
12082 | </phrase> | 12082 | </phrase> |
12083 | <phrase> | 12083 | <phrase> |
12084 | id: LANG_ALBUMART | 12084 | id: LANG_ALBUMART |
12085 | desc: Display the expected AA size | 12085 | desc: deprecated |
12086 | user: core | 12086 | user: |
12087 | <source> | 12087 | <source> |
12088 | *: none | 12088 | *: none |
12089 | albumart: "Album Art:" | ||
12090 | </source> | 12089 | </source> |
12091 | <dest> | 12090 | <dest> |
12092 | *: none | 12091 | *: none |
12093 | albumart: "Skivomslag:" | ||
12094 | </dest> | 12092 | </dest> |
12095 | <voice> | 12093 | <voice> |
12096 | *: none | 12094 | *: none |
12097 | albumart: "Skivomslag:" | ||
12098 | </voice> | 12095 | </voice> |
12099 | </phrase> | 12096 | </phrase> |
12100 | <phrase> | 12097 | <phrase> |
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang index 720d4dcbc0..08ddf8ee2c 100644 --- a/apps/lang/tagalog.lang +++ b/apps/lang/tagalog.lang | |||
@@ -11975,19 +11975,16 @@ | |||
11975 | </phrase> | 11975 | </phrase> |
11976 | <phrase> | 11976 | <phrase> |
11977 | id: LANG_ALBUMART | 11977 | id: LANG_ALBUMART |
11978 | desc: Display the expected AA size | 11978 | desc: deprecated |
11979 | user: core | 11979 | user: |
11980 | <source> | 11980 | <source> |
11981 | *: none | 11981 | *: none |
11982 | albumart: "Album Art:" | ||
11983 | </source> | 11982 | </source> |
11984 | <dest> | 11983 | <dest> |
11985 | *: none | 11984 | *: none |
11986 | albumart: "Album Arte:" | ||
11987 | </dest> | 11985 | </dest> |
11988 | <voice> | 11986 | <voice> |
11989 | *: none | 11987 | *: none |
11990 | albumart: "" | ||
11991 | </voice> | 11988 | </voice> |
11992 | </phrase> | 11989 | </phrase> |
11993 | <phrase> | 11990 | <phrase> |
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang index 82787e531b..8055e17723 100644 --- a/apps/lang/thai.lang +++ b/apps/lang/thai.lang | |||
@@ -11536,19 +11536,16 @@ | |||
11536 | </phrase> | 11536 | </phrase> |
11537 | <phrase> | 11537 | <phrase> |
11538 | id: LANG_ALBUMART | 11538 | id: LANG_ALBUMART |
11539 | desc: Display the expected AA size | 11539 | desc: deprecated |
11540 | user: core | 11540 | user: |
11541 | <source> | 11541 | <source> |
11542 | *: none | 11542 | *: none |
11543 | albumart: "Album Art:" | ||
11544 | </source> | 11543 | </source> |
11545 | <dest> | 11544 | <dest> |
11546 | *: none | 11545 | *: none |
11547 | albumart: "ภาพประกอบอัลบัม:" | ||
11548 | </dest> | 11546 | </dest> |
11549 | <voice> | 11547 | <voice> |
11550 | *: none | 11548 | *: none |
11551 | albumart: "Album Art:" | ||
11552 | </voice> | 11549 | </voice> |
11553 | </phrase> | 11550 | </phrase> |
11554 | <phrase> | 11551 | <phrase> |
diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang index 44ab18b48c..641870e122 100644 --- a/apps/lang/ukrainian.lang +++ b/apps/lang/ukrainian.lang | |||
@@ -12085,19 +12085,16 @@ | |||
12085 | </phrase> | 12085 | </phrase> |
12086 | <phrase> | 12086 | <phrase> |
12087 | id: LANG_ALBUMART | 12087 | id: LANG_ALBUMART |
12088 | desc: Display the expected AA size | 12088 | desc: deprecated |
12089 | user: core | 12089 | user: |
12090 | <source> | 12090 | <source> |
12091 | *: none | 12091 | *: none |
12092 | albumart: "Album Art:" | ||
12093 | </source> | 12092 | </source> |
12094 | <dest> | 12093 | <dest> |
12095 | *: none | 12094 | *: none |
12096 | albumart: "Обкладинка Альбому:" | ||
12097 | </dest> | 12095 | </dest> |
12098 | <voice> | 12096 | <voice> |
12099 | *: none | 12097 | *: none |
12100 | albumart: "Обкладинка Альбому:" | ||
12101 | </voice> | 12098 | </voice> |
12102 | </phrase> | 12099 | </phrase> |
12103 | <phrase> | 12100 | <phrase> |
diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang index 60fee71ba8..fda6c361c0 100644 --- a/apps/lang/walon.lang +++ b/apps/lang/walon.lang | |||
@@ -12081,19 +12081,16 @@ | |||
12081 | </phrase> | 12081 | </phrase> |
12082 | <phrase> | 12082 | <phrase> |
12083 | id: LANG_ALBUMART | 12083 | id: LANG_ALBUMART |
12084 | desc: Display the expected AA size | 12084 | desc: deprecated |
12085 | user: core | 12085 | user: |
12086 | <source> | 12086 | <source> |
12087 | *: none | 12087 | *: none |
12088 | albumart: "Album Art:" | ||
12089 | </source> | 12088 | </source> |
12090 | <dest> | 12089 | <dest> |
12091 | *: none | 12090 | *: none |
12092 | albumart: "Imådje albom:" | ||
12093 | </dest> | 12091 | </dest> |
12094 | <voice> | 12092 | <voice> |
12095 | *: none | 12093 | *: none |
12096 | albumart: "imådje albom" | ||
12097 | </voice> | 12094 | </voice> |
12098 | </phrase> | 12095 | </phrase> |
12099 | <phrase> | 12096 | <phrase> |
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 033f7e2675..132eab9960 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -50,6 +50,7 @@ | |||
50 | #include "version.h" | 50 | #include "version.h" |
51 | #include "time.h" | 51 | #include "time.h" |
52 | #include "wps.h" | 52 | #include "wps.h" |
53 | #include "skin_engine/skin_buffer.h" | ||
53 | 54 | ||
54 | static const struct browse_folder_info config = {ROCKBOX_DIR, SHOW_CFG}; | 55 | static const struct browse_folder_info config = {ROCKBOX_DIR, SHOW_CFG}; |
55 | 56 | ||
@@ -144,9 +145,7 @@ enum infoscreenorder | |||
144 | INFO_DISK1, /* capacity or internal capacity/free on hotswap */ | 145 | INFO_DISK1, /* capacity or internal capacity/free on hotswap */ |
145 | INFO_DISK2, /* free space or external capacity/free on hotswap */ | 146 | INFO_DISK2, /* free space or external capacity/free on hotswap */ |
146 | INFO_BUFFER, | 147 | INFO_BUFFER, |
147 | #ifdef HAVE_ALBUMART | 148 | INFO_SKIN_USAGE, /* ram usage of the skins */ |
148 | INFO_ALBUMART, | ||
149 | #endif | ||
150 | INFO_VERSION, | 149 | INFO_VERSION, |
151 | INFO_COUNT | 150 | INFO_COUNT |
152 | }; | 151 | }; |
@@ -158,6 +157,13 @@ static const unsigned char *kbyte_units[] = | |||
158 | ID2P(LANG_GIGABYTE) | 157 | ID2P(LANG_GIGABYTE) |
159 | }; | 158 | }; |
160 | 159 | ||
160 | static const unsigned char *byte_units[] = | ||
161 | { | ||
162 | ID2P(LANG_BYTE), | ||
163 | ID2P(LANG_KILOBYTE), | ||
164 | ID2P(LANG_MEGABYTE) | ||
165 | }; | ||
166 | |||
161 | static char* info_getname(int selected_item, void *data, | 167 | static char* info_getname(int selected_item, void *data, |
162 | char *buffer, size_t buffer_len) | 168 | char *buffer, size_t buffer_len) |
163 | { | 169 | { |
@@ -250,22 +256,10 @@ static char* info_getname(int selected_item, void *data, | |||
250 | snprintf(buffer, buffer_len, SIZE_FMT, str(LANG_DISK_SIZE_INFO), s1); | 256 | snprintf(buffer, buffer_len, SIZE_FMT, str(LANG_DISK_SIZE_INFO), s1); |
251 | #endif | 257 | #endif |
252 | break; | 258 | break; |
253 | #ifdef HAVE_ALBUMART | 259 | case INFO_SKIN_USAGE: |
254 | case INFO_ALBUMART: /* album art dimenstions */ | 260 | output_dyn_value(s1, sizeof s1, skin_buffer_usage(), byte_units, true); |
255 | { | 261 | snprintf(buffer, buffer_len, "%s %s", str(LANG_SKIN_RAM_USAGE), s1); |
256 | int width = 0, height = 0; | 262 | break; |
257 | if (wps_uses_albumart(&width, &height)) | ||
258 | { | ||
259 | snprintf(buffer, buffer_len, "%s %dx%d", str(LANG_ALBUMART), | ||
260 | width, height); | ||
261 | } | ||
262 | else | ||
263 | { | ||
264 | snprintf(buffer, buffer_len, "%s %s", str(LANG_ALBUMART), | ||
265 | str(LANG_SET_BOOL_NO)); | ||
266 | } | ||
267 | } break; | ||
268 | #endif | ||
269 | } | 263 | } |
270 | return buffer; | 264 | return buffer; |
271 | } | 265 | } |
@@ -347,23 +341,11 @@ static int info_speak_item(int selected_item, void * data) | |||
347 | output_dyn_value(NULL, 0, info->size, kbyte_units, true); | 341 | output_dyn_value(NULL, 0, info->size, kbyte_units, true); |
348 | #endif | 342 | #endif |
349 | break; | 343 | break; |
350 | #ifdef HAVE_ALBUMART | 344 | case INFO_SKIN_USAGE: |
351 | case INFO_ALBUMART: /* album art dimenstions */ | 345 | talk_id(LANG_SKIN_RAM_USAGE, false); |
352 | { | 346 | output_dyn_value(NULL, 0, skin_buffer_usage(), byte_units, true); |
353 | int width = 0, height = 0; | 347 | break; |
354 | if (wps_uses_albumart(&width, &height)) | 348 | |
355 | { | ||
356 | talk_id(LANG_ALBUMART, false); | ||
357 | talk_value(width, UNIT_PIXEL, true); | ||
358 | talk_value(height, UNIT_PIXEL, true); | ||
359 | } | ||
360 | else | ||
361 | { | ||
362 | talk_id(LANG_ALBUMART, false); | ||
363 | talk_id(LANG_SET_BOOL_NO, true); | ||
364 | } | ||
365 | } break; | ||
366 | #endif | ||
367 | } | 349 | } |
368 | return 0; | 350 | return 0; |
369 | } | 351 | } |