diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/lang/english.lang | 171 | ||||
-rw-r--r-- | apps/settings.h | 2 | ||||
-rw-r--r-- | apps/settings_list.c | 2 |
3 files changed, 57 insertions, 118 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 7a3b257429..bb11e9082d 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -3980,16 +3980,13 @@ | |||
3980 | desc: select the time format of time in status bar | 3980 | desc: select the time format of time in status bar |
3981 | user: core | 3981 | user: core |
3982 | <source> | 3982 | <source> |
3983 | *: none | 3983 | *: "Time Format" |
3984 | rtc: "Time Format" | ||
3985 | </source> | 3984 | </source> |
3986 | <dest> | 3985 | <dest> |
3987 | *: none | 3986 | *: "Time Format" |
3988 | rtc: "Time Format" | ||
3989 | </dest> | 3987 | </dest> |
3990 | <voice> | 3988 | <voice> |
3991 | *: none | 3989 | *: "Time Format" |
3992 | rtc: "Time Format" | ||
3993 | </voice> | 3990 | </voice> |
3994 | </phrase> | 3991 | </phrase> |
3995 | <phrase> | 3992 | <phrase> |
@@ -3997,16 +3994,13 @@ | |||
3997 | desc: option for 12 hour clock | 3994 | desc: option for 12 hour clock |
3998 | user: core | 3995 | user: core |
3999 | <source> | 3996 | <source> |
4000 | *: none | 3997 | *: "12 Hour Clock" |
4001 | rtc: "12 Hour Clock" | ||
4002 | </source> | 3998 | </source> |
4003 | <dest> | 3999 | <dest> |
4004 | *: none | 4000 | *: "12 Hour Clock" |
4005 | rtc: "12 Hour Clock" | ||
4006 | </dest> | 4001 | </dest> |
4007 | <voice> | 4002 | <voice> |
4008 | *: none | 4003 | *: "12 Hour Clock" |
4009 | rtc: "12 Hour Clock" | ||
4010 | </voice> | 4004 | </voice> |
4011 | </phrase> | 4005 | </phrase> |
4012 | <phrase> | 4006 | <phrase> |
@@ -4014,16 +4008,13 @@ | |||
4014 | desc: option for 24 hour clock | 4008 | desc: option for 24 hour clock |
4015 | user: core | 4009 | user: core |
4016 | <source> | 4010 | <source> |
4017 | *: none | 4011 | *: "24 Hour Clock" |
4018 | rtc: "24 Hour Clock" | ||
4019 | </source> | 4012 | </source> |
4020 | <dest> | 4013 | <dest> |
4021 | *: none | 4014 | *: "24 Hour Clock" |
4022 | rtc: "24 Hour Clock" | ||
4023 | </dest> | 4015 | </dest> |
4024 | <voice> | 4016 | <voice> |
4025 | *: none | 4017 | *: "24 Hour Clock" |
4026 | rtc: "24 Hour Clock" | ||
4027 | </voice> | 4018 | </voice> |
4028 | </phrase> | 4019 | </phrase> |
4029 | <phrase> | 4020 | <phrase> |
@@ -4220,16 +4211,13 @@ | |||
4220 | desc: Maximum 3-letter abbreviation for monthname | 4211 | desc: Maximum 3-letter abbreviation for monthname |
4221 | user: core | 4212 | user: core |
4222 | <source> | 4213 | <source> |
4223 | *: none | 4214 | *: "Jan" |
4224 | rtc: "Jan" | ||
4225 | </source> | 4215 | </source> |
4226 | <dest> | 4216 | <dest> |
4227 | *: none | 4217 | *: "Jan" |
4228 | rtc: "Jan" | ||
4229 | </dest> | 4218 | </dest> |
4230 | <voice> | 4219 | <voice> |
4231 | *: none | 4220 | *: "January" |
4232 | rtc: "January" | ||
4233 | </voice> | 4221 | </voice> |
4234 | </phrase> | 4222 | </phrase> |
4235 | <phrase> | 4223 | <phrase> |
@@ -4237,16 +4225,13 @@ | |||
4237 | desc: Maximum 3-letter abbreviation for monthname | 4225 | desc: Maximum 3-letter abbreviation for monthname |
4238 | user: core | 4226 | user: core |
4239 | <source> | 4227 | <source> |
4240 | *: none | 4228 | *: "Feb" |
4241 | rtc: "Feb" | ||
4242 | </source> | 4229 | </source> |
4243 | <dest> | 4230 | <dest> |
4244 | *: none | 4231 | *: "Feb" |
4245 | rtc: "Feb" | ||
4246 | </dest> | 4232 | </dest> |
4247 | <voice> | 4233 | <voice> |
4248 | *: none | 4234 | *: "February" |
4249 | rtc: "February" | ||
4250 | </voice> | 4235 | </voice> |
4251 | </phrase> | 4236 | </phrase> |
4252 | <phrase> | 4237 | <phrase> |
@@ -4254,16 +4239,13 @@ | |||
4254 | desc: Maximum 3-letter abbreviation for monthname | 4239 | desc: Maximum 3-letter abbreviation for monthname |
4255 | user: core | 4240 | user: core |
4256 | <source> | 4241 | <source> |
4257 | *: none | 4242 | *: "Mar" |
4258 | rtc: "Mar" | ||
4259 | </source> | 4243 | </source> |
4260 | <dest> | 4244 | <dest> |
4261 | *: none | 4245 | *: "Mar" |
4262 | rtc: "Mar" | ||
4263 | </dest> | 4246 | </dest> |
4264 | <voice> | 4247 | <voice> |
4265 | *: none | 4248 | *: "March" |
4266 | rtc: "March" | ||
4267 | </voice> | 4249 | </voice> |
4268 | </phrase> | 4250 | </phrase> |
4269 | <phrase> | 4251 | <phrase> |
@@ -4271,16 +4253,13 @@ | |||
4271 | desc: Maximum 3-letter abbreviation for monthname | 4253 | desc: Maximum 3-letter abbreviation for monthname |
4272 | user: core | 4254 | user: core |
4273 | <source> | 4255 | <source> |
4274 | *: none | 4256 | *: "Apr" |
4275 | rtc: "Apr" | ||
4276 | </source> | 4257 | </source> |
4277 | <dest> | 4258 | <dest> |
4278 | *: none | 4259 | *: "Apr" |
4279 | rtc: "Apr" | ||
4280 | </dest> | 4260 | </dest> |
4281 | <voice> | 4261 | <voice> |
4282 | *: none | 4262 | *: "April" |
4283 | rtc: "April" | ||
4284 | </voice> | 4263 | </voice> |
4285 | </phrase> | 4264 | </phrase> |
4286 | <phrase> | 4265 | <phrase> |
@@ -4288,16 +4267,13 @@ | |||
4288 | desc: Maximum 3-letter abbreviation for monthname | 4267 | desc: Maximum 3-letter abbreviation for monthname |
4289 | user: core | 4268 | user: core |
4290 | <source> | 4269 | <source> |
4291 | *: none | 4270 | *: "May" |
4292 | rtc: "May" | ||
4293 | </source> | 4271 | </source> |
4294 | <dest> | 4272 | <dest> |
4295 | *: none | 4273 | *: "May" |
4296 | rtc: "May" | ||
4297 | </dest> | 4274 | </dest> |
4298 | <voice> | 4275 | <voice> |
4299 | *: none | 4276 | *: "May" |
4300 | rtc: "May" | ||
4301 | </voice> | 4277 | </voice> |
4302 | </phrase> | 4278 | </phrase> |
4303 | <phrase> | 4279 | <phrase> |
@@ -4305,16 +4281,13 @@ | |||
4305 | desc: Maximum 3-letter abbreviation for monthname | 4281 | desc: Maximum 3-letter abbreviation for monthname |
4306 | user: core | 4282 | user: core |
4307 | <source> | 4283 | <source> |
4308 | *: none | 4284 | *: "Jun" |
4309 | rtc: "Jun" | ||
4310 | </source> | 4285 | </source> |
4311 | <dest> | 4286 | <dest> |
4312 | *: none | 4287 | *: "Jun" |
4313 | rtc: "Jun" | ||
4314 | </dest> | 4288 | </dest> |
4315 | <voice> | 4289 | <voice> |
4316 | *: none | 4290 | *: "June" |
4317 | rtc: "June" | ||
4318 | </voice> | 4291 | </voice> |
4319 | </phrase> | 4292 | </phrase> |
4320 | <phrase> | 4293 | <phrase> |
@@ -4322,16 +4295,13 @@ | |||
4322 | desc: Maximum 3-letter abbreviation for monthname | 4295 | desc: Maximum 3-letter abbreviation for monthname |
4323 | user: core | 4296 | user: core |
4324 | <source> | 4297 | <source> |
4325 | *: none | 4298 | *: "Jul" |
4326 | rtc: "Jul" | ||
4327 | </source> | 4299 | </source> |
4328 | <dest> | 4300 | <dest> |
4329 | *: none | 4301 | *: "Jul" |
4330 | rtc: "Jul" | ||
4331 | </dest> | 4302 | </dest> |
4332 | <voice> | 4303 | <voice> |
4333 | *: none | 4304 | *: "July" |
4334 | rtc: "July" | ||
4335 | </voice> | 4305 | </voice> |
4336 | </phrase> | 4306 | </phrase> |
4337 | <phrase> | 4307 | <phrase> |
@@ -4339,16 +4309,13 @@ | |||
4339 | desc: Maximum 3-letter abbreviation for monthname | 4309 | desc: Maximum 3-letter abbreviation for monthname |
4340 | user: core | 4310 | user: core |
4341 | <source> | 4311 | <source> |
4342 | *: none | 4312 | *: "Aug" |
4343 | rtc: "Aug" | ||
4344 | </source> | 4313 | </source> |
4345 | <dest> | 4314 | <dest> |
4346 | *: none | 4315 | *: "Aug" |
4347 | rtc: "Aug" | ||
4348 | </dest> | 4316 | </dest> |
4349 | <voice> | 4317 | <voice> |
4350 | *: none | 4318 | *: "August" |
4351 | rtc: "August" | ||
4352 | </voice> | 4319 | </voice> |
4353 | </phrase> | 4320 | </phrase> |
4354 | <phrase> | 4321 | <phrase> |
@@ -4356,16 +4323,13 @@ | |||
4356 | desc: Maximum 3-letter abbreviation for monthname | 4323 | desc: Maximum 3-letter abbreviation for monthname |
4357 | user: core | 4324 | user: core |
4358 | <source> | 4325 | <source> |
4359 | *: none | 4326 | *: "Sep" |
4360 | rtc: "Sep" | ||
4361 | </source> | 4327 | </source> |
4362 | <dest> | 4328 | <dest> |
4363 | *: none | 4329 | *: "Sep" |
4364 | rtc: "Sep" | ||
4365 | </dest> | 4330 | </dest> |
4366 | <voice> | 4331 | <voice> |
4367 | *: none | 4332 | *: "September" |
4368 | rtc: "September" | ||
4369 | </voice> | 4333 | </voice> |
4370 | </phrase> | 4334 | </phrase> |
4371 | <phrase> | 4335 | <phrase> |
@@ -4373,16 +4337,13 @@ | |||
4373 | desc: Maximum 3-letter abbreviation for monthname | 4337 | desc: Maximum 3-letter abbreviation for monthname |
4374 | user: core | 4338 | user: core |
4375 | <source> | 4339 | <source> |
4376 | *: none | 4340 | *: "Oct" |
4377 | rtc: "Oct" | ||
4378 | </source> | 4341 | </source> |
4379 | <dest> | 4342 | <dest> |
4380 | *: none | 4343 | *: "Oct" |
4381 | rtc: "Oct" | ||
4382 | </dest> | 4344 | </dest> |
4383 | <voice> | 4345 | <voice> |
4384 | *: none | 4346 | *: "October" |
4385 | rtc: "October" | ||
4386 | </voice> | 4347 | </voice> |
4387 | </phrase> | 4348 | </phrase> |
4388 | <phrase> | 4349 | <phrase> |
@@ -4390,16 +4351,13 @@ | |||
4390 | desc: Maximum 3-letter abbreviation for monthname | 4351 | desc: Maximum 3-letter abbreviation for monthname |
4391 | user: core | 4352 | user: core |
4392 | <source> | 4353 | <source> |
4393 | *: none | 4354 | *: "Nov" |
4394 | rtc: "Nov" | ||
4395 | </source> | 4355 | </source> |
4396 | <dest> | 4356 | <dest> |
4397 | *: none | 4357 | *: "Nov" |
4398 | rtc: "Nov" | ||
4399 | </dest> | 4358 | </dest> |
4400 | <voice> | 4359 | <voice> |
4401 | *: none | 4360 | *: "November" |
4402 | rtc: "November" | ||
4403 | </voice> | 4361 | </voice> |
4404 | </phrase> | 4362 | </phrase> |
4405 | <phrase> | 4363 | <phrase> |
@@ -4407,16 +4365,13 @@ | |||
4407 | desc: Maximum 3-letter abbreviation for monthname | 4365 | desc: Maximum 3-letter abbreviation for monthname |
4408 | user: core | 4366 | user: core |
4409 | <source> | 4367 | <source> |
4410 | *: none | 4368 | *: "Dec" |
4411 | rtc: "Dec" | ||
4412 | </source> | 4369 | </source> |
4413 | <dest> | 4370 | <dest> |
4414 | *: none | 4371 | *: "Dec" |
4415 | rtc: "Dec" | ||
4416 | </dest> | 4372 | </dest> |
4417 | <voice> | 4373 | <voice> |
4418 | *: none | 4374 | *: "December" |
4419 | rtc: "December" | ||
4420 | </voice> | 4375 | </voice> |
4421 | </phrase> | 4376 | </phrase> |
4422 | <phrase> | 4377 | <phrase> |
@@ -10198,16 +10153,13 @@ | |||
10198 | desc: spoken only, for wall clock announce | 10153 | desc: spoken only, for wall clock announce |
10199 | user: core | 10154 | user: core |
10200 | <source> | 10155 | <source> |
10201 | *: none | 10156 | *: "" |
10202 | rtc: "" | ||
10203 | </source> | 10157 | </source> |
10204 | <dest> | 10158 | <dest> |
10205 | *: none | 10159 | *: "" |
10206 | rtc: "" | ||
10207 | </dest> | 10160 | </dest> |
10208 | <voice> | 10161 | <voice> |
10209 | *: none | 10162 | *: "o'clock" |
10210 | rtc: "o'clock" | ||
10211 | </voice> | 10163 | </voice> |
10212 | </phrase> | 10164 | </phrase> |
10213 | <phrase> | 10165 | <phrase> |
@@ -10215,16 +10167,13 @@ | |||
10215 | desc: spoken only, for wall clock announce | 10167 | desc: spoken only, for wall clock announce |
10216 | user: core | 10168 | user: core |
10217 | <source> | 10169 | <source> |
10218 | *: none | 10170 | *: "" |
10219 | rtc: "" | ||
10220 | </source> | 10171 | </source> |
10221 | <dest> | 10172 | <dest> |
10222 | *: none | 10173 | *: "" |
10223 | rtc: "" | ||
10224 | </dest> | 10174 | </dest> |
10225 | <voice> | 10175 | <voice> |
10226 | *: none | 10176 | *: "P M" |
10227 | rtc: "P M" | ||
10228 | </voice> | 10177 | </voice> |
10229 | </phrase> | 10178 | </phrase> |
10230 | <phrase> | 10179 | <phrase> |
@@ -10232,16 +10181,13 @@ | |||
10232 | desc: spoken only, for wall clock announce | 10181 | desc: spoken only, for wall clock announce |
10233 | user: core | 10182 | user: core |
10234 | <source> | 10183 | <source> |
10235 | *: none | 10184 | *: "" |
10236 | rtc: "" | ||
10237 | </source> | 10185 | </source> |
10238 | <dest> | 10186 | <dest> |
10239 | *: none | 10187 | *: "" |
10240 | rtc: "" | ||
10241 | </dest> | 10188 | </dest> |
10242 | <voice> | 10189 | <voice> |
10243 | *: none | 10190 | *: "A M" |
10244 | rtc: "A M" | ||
10245 | </voice> | 10191 | </voice> |
10246 | </phrase> | 10192 | </phrase> |
10247 | <phrase> | 10193 | <phrase> |
@@ -10249,16 +10195,13 @@ | |||
10249 | desc: spoken only, for wall clock announce | 10195 | desc: spoken only, for wall clock announce |
10250 | user: core | 10196 | user: core |
10251 | <source> | 10197 | <source> |
10252 | *: none | 10198 | *: "" |
10253 | rtc: "" | ||
10254 | </source> | 10199 | </source> |
10255 | <dest> | 10200 | <dest> |
10256 | *: none | 10201 | *: "" |
10257 | rtc: "" | ||
10258 | </dest> | 10202 | </dest> |
10259 | <voice> | 10203 | <voice> |
10260 | *: none | 10204 | *: "oh" |
10261 | rtc: "oh" | ||
10262 | </voice> | 10205 | </voice> |
10263 | </phrase> | 10206 | </phrase> |
10264 | <phrase> | 10207 | <phrase> |
diff --git a/apps/settings.h b/apps/settings.h index fc82c8bf45..b72eec6f8b 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -480,9 +480,7 @@ struct user_settings | |||
480 | int qs_items[QUICKSCREEN_ITEM_COUNT]; | 480 | int qs_items[QUICKSCREEN_ITEM_COUNT]; |
481 | #endif | 481 | #endif |
482 | 482 | ||
483 | #if CONFIG_RTC | ||
484 | int timeformat; /* time format: 0=24 hour clock, 1=12 hour clock */ | 483 | int timeformat; /* time format: 0=24 hour clock, 1=12 hour clock */ |
485 | #endif | ||
486 | 484 | ||
487 | #ifdef HAVE_DISK_STORAGE | 485 | #ifdef HAVE_DISK_STORAGE |
488 | int disk_spindown; /* time until disk spindown, in seconds (0=off) */ | 486 | int disk_spindown; /* time until disk spindown, in seconds (0=off) */ |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 027ed6a87c..bc03672aeb 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -1003,11 +1003,9 @@ const struct settings_list settings[] = { | |||
1003 | CHOICE_SETTING(F_THEMESETTING, battery_display, LANG_BATTERY_DISPLAY, 0, | 1003 | CHOICE_SETTING(F_THEMESETTING, battery_display, LANG_BATTERY_DISPLAY, 0, |
1004 | "battery display", graphic_numeric, NULL, 2, | 1004 | "battery display", graphic_numeric, NULL, 2, |
1005 | ID2P(LANG_DISPLAY_GRAPHIC), ID2P(LANG_DISPLAY_NUMERIC)), | 1005 | ID2P(LANG_DISPLAY_GRAPHIC), ID2P(LANG_DISPLAY_NUMERIC)), |
1006 | #if CONFIG_RTC | ||
1007 | CHOICE_SETTING(0, timeformat, LANG_TIMEFORMAT, 0, | 1006 | CHOICE_SETTING(0, timeformat, LANG_TIMEFORMAT, 0, |
1008 | "time format", "24hour,12hour", NULL, 2, | 1007 | "time format", "24hour,12hour", NULL, 2, |
1009 | ID2P(LANG_24_HOUR_CLOCK), ID2P(LANG_12_HOUR_CLOCK)), | 1008 | ID2P(LANG_24_HOUR_CLOCK), ID2P(LANG_12_HOUR_CLOCK)), |
1010 | #endif | ||
1011 | #endif /* HAVE_LCD_BITMAP */ | 1009 | #endif /* HAVE_LCD_BITMAP */ |
1012 | OFFON_SETTING(0,show_icons, LANG_SHOW_ICONS ,true,"show icons", NULL), | 1010 | OFFON_SETTING(0,show_icons, LANG_SHOW_ICONS ,true,"show icons", NULL), |
1013 | /* system */ | 1011 | /* system */ |