len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 10:37:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix red from 6f5af8e53c

Browse source 
Change-Id: I02dbc3e91856eaef081446ca77919e6182a85e1d
This commit is contained in:
Aidan MacDonald 2022-04-17 17:20:43 +01:00
parent fca7b8e2ff
commit 1af92e5ff8
45 changed files with 215 additions and 341 deletions
Download patch file Download diff file Expand all files Collapse all files

13
apps/lang/arabic.lang
View file

@ -766,20 +766,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "الصيغة"
*: "الصيغة"
</dest>
<voice>
*: none
recording: "Format"
*: "Format"
</voice>
</phrase>
<phrase>

13
apps/lang/basque.lang
View file

@ -5263,20 +5263,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Formatua"
*: "Formatua"
</dest>
<voice>
*: none
recording: "Formatua"
*: "Formatua"
</voice>
</phrase>
<phrase>

13
apps/lang/bulgarian.lang
View file

@ -5268,20 +5268,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Формат"
*: "Формат"
</dest>
<voice>
*: none
recording: "Формат"
*: "Формат"
</voice>
</phrase>
<phrase>

13
apps/lang/catala.lang
View file

@ -5257,20 +5257,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Format"
*: "Format"
</dest>
<voice>
*: none
recording: "Format"
*: "Format"
</voice>
</phrase>
<phrase>

13
apps/lang/chinese-simp.lang
View file

@ -7487,20 +7487,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "格式"
*: "格式"
</dest>
<voice>
*: none
recording: "格式"
*: "格式"
</voice>
</phrase>
<phrase>

13
apps/lang/chinese-trad.lang
View file

@ -7422,20 +7422,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "格式"
*: "格式"
</dest>
<voice>
*: none
recording: "格式"
*: "格式"
</voice>
</phrase>
<phrase>

13
apps/lang/czech.lang
View file

@ -5254,20 +5254,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Formát"
*: "Formát"
</dest>
<voice>
*: none
recording: "Formát"
*: "Formát"
</voice>
</phrase>
<phrase>

13
apps/lang/dansk.lang
View file

@ -8326,20 +8326,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Format"
*: "Format"
</dest>
<voice>
*: none
recording: "Format"
*: "Format"
</voice>
</phrase>
<phrase>

13
apps/lang/deutsch.lang
View file

@ -5240,20 +5240,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Format"
*: "Format"
</dest>
<voice>
*: none
recording: "Format"
*: "Format"
</voice>
</phrase>
<phrase>

13
apps/lang/english-us.lang
View file

@ -4959,20 +4959,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Format"
*: "Format"
</dest>
<voice>
*: none
recording: "Format"
*: "Format"
</voice>
</phrase>
<phrase>

13
apps/lang/english.lang
View file

@ -5019,20 +5019,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Format"
*: "Format"
</dest>
<voice>
*: none
recording: "Format"
*: "Format"
</voice>
</phrase>
<phrase>

13
apps/lang/espanol.lang
View file

@ -8699,20 +8699,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Formato"
*: "Formato"
</dest>
<voice>
*: none
recording: "Formato"
*: "Formato"
</voice>
</phrase>
<phrase>

13
apps/lang/finnish.lang
View file

@ -8258,20 +8258,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Muoto"
*: "Muoto"
</dest>
<voice>
*: none
recording: "Muoto"
*: "Muoto"
</voice>
</phrase>
<phrase>

13
apps/lang/francais.lang
View file

@ -4994,20 +4994,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Format"
*: "Format"
</dest>
<voice>
*: none
recording: "Format"
*: "Format"
</voice>
</phrase>
<phrase>

13
apps/lang/galego.lang
View file

@ -7221,20 +7221,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Formato"
*: "Formato"
</dest>
<voice>
*: none
recording: "Formato"
*: "Formato"
</voice>
</phrase>
<phrase>

13
apps/lang/greek.lang
View file

@ -5217,20 +5217,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Τύπος"
*: "Τύπος"
</dest>
<voice>
*: none
recording: "Τύπος"
*: "Τύπος"
</voice>
</phrase>
<phrase>

13
apps/lang/hebrew.lang
View file

@ -5296,20 +5296,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "תבנית"
*: "תבנית"
</dest>
<voice>
*: none
recording: "תבנית"
*: "תבנית"
</voice>
</phrase>
<phrase>

13
apps/lang/hrvatski.lang
View file

@ -5260,20 +5260,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Oblik"
*: "Oblik"
</dest>
<voice>
*: none
recording: "Oblik"
*: "Oblik"
</voice>
</phrase>
<phrase>

13
apps/lang/italiano.lang
View file

@ -4932,20 +4932,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Formato"
*: "Formato"
</dest>
<voice>
*: none
recording: "Formato"
*: "Formato"
</voice>
</phrase>
<phrase>

13
apps/lang/japanese.lang
View file

@ -5271,20 +5271,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "フォーマット"
*: "フォーマット"
</dest>
<voice>
*: none
recording: "フォーマット"
*: "フォーマット"
</voice>
</phrase>
<phrase>

13
apps/lang/korean.lang
View file

@ -8283,20 +8283,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "파일 형식"
*: "파일 형식"
</dest>
<voice>
*: none
recording: "파일 형식"
*: "파일 형식"
</voice>
</phrase>
<phrase>

13
apps/lang/latviesu.lang
View file

@ -5262,20 +5262,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Formāts"
*: "Formāts"
</dest>
<voice>
*: none
recording: "formaats"
*: "formaats"
</voice>
</phrase>
<phrase>

13
apps/lang/lietuviu.lang
View file

@ -5338,20 +5338,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Formatas"
*: "Formatas"
</dest>
<voice>
*: none
recording: "Formatas"
*: "Formatas"
</voice>
</phrase>
<phrase>

13
apps/lang/magyar.lang
View file

@ -4924,20 +4924,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Formátum"
*: "Formátum"
</dest>
<voice>
*: none
recording: "Format"
*: "Format"
</voice>
</phrase>
<phrase>

13
apps/lang/nederlands.lang
View file

@ -7621,20 +7621,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Bestandsformaat"
*: "Bestandsformaat"
</dest>
<voice>
*: none
recording: "Bestandsformaat"
*: "Bestandsformaat"
</voice>
</phrase>
<phrase>

13
apps/lang/norsk-nynorsk.lang
View file

@ -8237,20 +8237,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Format"
*: "Format"
</dest>
<voice>
*: none
recording: "Format"
*: "Format"
</voice>
</phrase>
<phrase>

13
apps/lang/norsk.lang
View file

@ -7772,20 +7772,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Format"
*: "Format"
</dest>
<voice>
*: none
recording: "Format"
*: "Format"
</voice>
</phrase>
<phrase>

13
apps/lang/polski.lang
View file

@ -4953,20 +4953,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Format"
*: "Format"
</dest>
<voice>
*: none
recording: "Format"
*: "Format"
</voice>
</phrase>
<phrase>

13
apps/lang/portugues-brasileiro.lang
View file

@ -5262,20 +5262,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Formato"
*: "Formato"
</dest>
<voice>
*: none
recording: "Formato"
*: "Formato"
</voice>
</phrase>
<phrase>

13
apps/lang/portugues.lang
View file

@ -7216,20 +7216,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Formato"
*: "Formato"
</dest>
<voice>
*: none
recording: "Formato"
*: "Formato"
</voice>
</phrase>
<phrase>

13
apps/lang/romaneste.lang
View file

@ -4180,20 +4180,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Format"
*: "Format"
</dest>
<voice>
*: none
recording: "Format"
*: "Format"
</voice>
</phrase>
<phrase>

13
apps/lang/russian.lang
View file

@ -7220,20 +7220,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Формат"
*: "Формат"
</dest>
<voice>
*: none
recording: "Формат"
*: "Формат"
</voice>
</phrase>
<phrase>

13
apps/lang/slovak.lang
View file

@ -4945,20 +4945,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Formát"
*: "Formát"
</dest>
<voice>
*: none
recording: "Formát"
*: "Formát"
</voice>
</phrase>
<phrase>

13
apps/lang/slovenscina.lang
View file

@ -4741,20 +4741,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Format"
*: "Format"
</dest>
<voice>
*: none
recording: "Format"
*: "Format"
</voice>
</phrase>
<phrase>

13
apps/lang/srpski.lang
View file

@ -4931,20 +4931,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Формат"
*: "Формат"
</dest>
<voice>
*: none
recording: "Формат"
*: "Формат"
</voice>
</phrase>
<phrase>

13
apps/lang/svenska.lang
View file

@ -5270,20 +5270,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Format"
*: "Format"
</dest>
<voice>
*: none
recording: "Format"
*: "Format"
</voice>
</phrase>
<phrase>

13
apps/lang/tagalog.lang
View file

@ -5259,20 +5259,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Format"
*: "Format"
</dest>
<voice>
*: none
recording: "Format"
*: "Format"
</voice>
</phrase>
<phrase>

13
apps/lang/thai.lang
View file

@ -5241,20 +5241,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "รูปแบบ"
*: "รูปแบบ"
</dest>
<voice>
*: none
recording: "Format"
*: "Format"
</voice>
</phrase>
<phrase>

13
apps/lang/turkce.lang
View file

@ -12186,20 +12186,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Ses Formatı"
*: "Ses Formatı"
</dest>
<voice>
*: none
recording: "Ses Formatı"
*: "Ses Formatı"
</voice>
</phrase>
<phrase>

13
apps/lang/ukrainian.lang
View file

@ -5260,20 +5260,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Формат"
*: "Формат"
</dest>
<voice>
*: none
recording: "Формат"
*: "Формат"
</voice>
</phrase>
<phrase>

13
apps/lang/vlaams.lang
View file

@ -8219,20 +8219,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Bestandsformaat"
*: "Bestandsformaat"
</dest>
<voice>
*: none
recording: "Bestandsformaat"
*: "Bestandsformaat"
</voice>
</phrase>
<phrase>

13
apps/lang/walon.lang
View file

@ -5281,20 +5281,17 @@
</voice>
</phrase>
<phrase>
id: LANG_RECORDING_FORMAT
desc: audio format item in recording menu
id: LANG_FORMAT
desc: audio format
user: core
<source>
*: none
recording: "Format"
*: "Format"
</source>
<dest>
*: none
recording: "Cogne"
*: "Cogne"
</dest>
<voice>
*: none
recording: "Cogne"
*: "Cogne"
</voice>
</phrase>
<phrase>

4
apps/menus/recording_menu.c
View file

@ -261,7 +261,7 @@ static int recformat_func(void)
};
int rec_format = global_settings.rec_format;
bool res = set_option(str(LANG_RECORDING_FORMAT), &rec_format, INT,
bool res = set_option(str(LANG_FORMAT), &rec_format, INT,
names, REC_NUM_FORMATS, NULL );
if (rec_format != global_settings.rec_format)
@ -272,7 +272,7 @@ static int recformat_func(void)
return res;
} /* recformat */
MENUITEM_FUNCTION(recformat, 0, ID2P(LANG_RECORDING_FORMAT),
MENUITEM_FUNCTION(recformat, 0, ID2P(LANG_FORMAT),
recformat_func, NULL, NULL, Icon_Menu_setting);
MENUITEM_FUNCTION(enc_global_config_menu_item, 0, ID2P(LANG_ENCODER_SETTINGS),

4
apps/screens.c
View file

@ -382,7 +382,7 @@ static const int id3_headers[]=
LANG_ID3_YEAR,
LANG_ID3_LENGTH,
LANG_ID3_PLAYLIST,
LANG_RECORDING_FORMAT,
LANG_FORMAT,
LANG_ID3_BITRATE,
LANG_ID3_FREQUENCY,
LANG_ID3_TRACK_GAIN,
@ -605,7 +605,7 @@ static const char * id3_get_or_speak_info(int selected_item, void* data,
talk_number(info->playlist_amount, true);
}
break;
case LANG_RECORDING_FORMAT:
case LANG_FORMAT:
if (id3->codectype >= AFMT_NUM_CODECS)
return NULL;
snprintf(buffer, buffer_len, "%s", audio_formats[id3->codectype].label);

2
apps/settings_list.c
View file

@ -1468,7 +1468,7 @@ const struct settings_list settings[] = {
LANG_FREQUENCY,INT(REC_FREQ_DEFAULT),
"rec frequency",REC_FREQ_CFG_VAL_LIST,UNUSED},
{F_T_INT|F_RECSETTING,&global_settings.rec_format,
LANG_RECORDING_FORMAT,INT(REC_FORMAT_DEFAULT),
LANG_FORMAT,INT(REC_FORMAT_DEFAULT),
"rec format",REC_FORMAT_CFG_VAL_LIST,UNUSED},
/** Encoder settings start - keep these together **/
/* aiff_enc */