Skip to content

Commit b3644b5

Browse files
committed
Reuse step names' resources
1 parent aaa9e3f commit b3644b5

File tree

9 files changed

+4
-34
lines changed

9 files changed

+4
-34
lines changed

app-base/src/main/res/values-es/strings.xml

-4
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,6 @@
359359
<string name="theme_pick_back">Regresar</string>
360360
<string name="theme_step_color_dialog_title">Seleccionar color de etapa</string>
361361
<string name="theme_step_color_title">Color de etapa</string>
362-
<string name="theme_step_color_normal">Etapa normal</string>
363-
<string name="theme_step_color_notifier">Etapa notificador</string>
364-
<string name="theme_step_color_start">Iniciar etapa</string>
365-
<string name="theme_step_color_end">Etapa final</string>
366362
<string name="backup_local_backup">Local</string>
367363
<string name="backup_app_settings">Ajustes de aplicación</string>
368364
<string name="backup_next_step">Siguiente etapa</string>

app-base/src/main/res/values-nl/strings.xml

-4
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,6 @@
311311
<string name="edit_add_normal_desp">Normale stap toevoegen</string>
312312
<string name="beep_count_intro_0_meaning">0 om te blijven piepen tot het einde van de stap</string>
313313
<string name="pref_phone_call_title_nothing">Doe niets</string>
314-
<string name="theme_step_color_end">Eindstap</string>
315314
<string name="billing_not_supported">Abonnementen worden momenteel niet ondersteund</string>
316315
<string name="behaviour_vibration_help">De telefoon laten trillen bij de stap</string>
317316
<string name="one_layout_edit">Opmaak bewerken</string>
@@ -325,7 +324,6 @@
325324
<string name="pref_screen_timing_title_open">Wanneer de app geopend is</string>
326325
<string name="behaviour_notification_help">Toon aan het begin van een stap nog een melding</string>
327326
<string name="half_option">Herinnering halverwege</string>
328-
<string name="theme_step_color_notifier">Meldingsstap</string>
329327
<string name="intro_start_edit_behaviour">Klik om een herinnering te bewerken. Maak voorlopig eerst de tutorial af</string>
330328
<string name="sample_timer_template_3_stages_1">Fase 1</string>
331329
<string name="edit_group">Groep</string>
@@ -400,7 +398,6 @@
400398
\n
401399
\nDit kan een tijdelijk probleem zijn, dus probeer het over een paar minuten opnieuw.</string>
402400
<string name="edit_add_start_too_many">Er is al een beginstap</string>
403-
<string name="theme_step_color_normal">Normale stap</string>
404401
<string name="one_action_show_float">Zwevend venster</string>
405402
<string name="record_other_data">Overige</string>
406403
<string name="beep_count_intro_usage">Voer de tijden in waarna de piep moet stoppen</string>
@@ -557,7 +554,6 @@
557554
<string name="voice_variable_group_loop_desp">Groep huidige lus</string>
558555
<string name="scheduler_repeat_today">Vandaag</string>
559556
<string name="dark_theme_scheduled_dark_now">Overgeschakeld naar het donkere thema</string>
560-
<string name="theme_step_color_start">Beginstap</string>
561557
<string name="one_layout_click_hint">Klik wat rond om te zien wat er kan worden aangepast</string>
562558
<string name="intro_start_sample_timer_name">Trainingsplan</string>
563559
<string name="app_name">TimeR Machine</string>

app-base/src/main/res/values-pt/strings.xml

-4
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@
126126
<string name="theme_light_status_bar">Barra de status clara</string>
127127
<string name="theme_title">Tema do aplicativo</string>
128128
<string name="theme_pick_colors">Personalizada</string>
129-
<string name="theme_step_color_normal">Etapa normal</string>
130129
<string name="cloud_backup_account_issue_notif_desp">Não é possível encontrar sua conta. Clique aqui para entrar</string>
131130
<string name="cloud_backup_state_running">Em progresso</string>
132131
<string name="cloud_backup_state_up_to_date">Atualizado</string>
@@ -402,9 +401,6 @@
402401
<string name="theme_pick_back">Voltar</string>
403402
<string name="theme_step_color_dialog_title">Selecionar cor de etapa</string>
404403
<string name="theme_step_color_title">Cor de etapa</string>
405-
<string name="theme_step_color_notifier">Etapa notificador</string>
406-
<string name="theme_step_color_start">Iniciar etapa</string>
407-
<string name="theme_step_color_end">Etapa final</string>
408404
<string name="backup_local_backup">Local</string>
409405
<string name="backup_app_data">Dados do aplicativo</string>
410406
<string name="backup_app_settings">Configurações do aplicativo</string>

app-base/src/main/res/values-ru/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,6 @@
351351
\nНажмите на <b>стрелку вправо</b> внизу, чтобы начать руководство.</string>
352352
<string name="billing_cancel_anytime">Периодический платёж. Можно отменить в любое время.</string>
353353
<string name="notif_channel_b_notif_desp">Используется напоминаниями в уведомлениях</string>
354-
<string name="theme_step_color_start">Начальный шаг</string>
355-
<string name="theme_step_color_end">Конечный шаг</string>
356354
<string name="help_tutorial">Руководство</string>
357355
<string name="help_whitelist_desp">Предотвратите приложение от остановки во время его работы</string>
358356
<string name="pref_reminder">Напоминания</string>

app-base/src/main/res/values-zh-rCN/strings.xml

-4
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,6 @@
377377
<string name="theme_pick_back">返回</string>
378378
<string name="theme_step_color_dialog_title">选择步骤颜色</string>
379379
<string name="theme_step_color_title">步骤颜色</string>
380-
<string name="theme_step_color_normal">普通步骤</string>
381-
<string name="theme_step_color_notifier">通知步骤</string>
382-
<string name="theme_step_color_start">起始步骤</string>
383-
<string name="theme_step_color_end">结束步骤</string>
384380
<!--Backup-->
385381
<string name="backup_local_backup">本地</string>
386382
<string name="backup_app_data">应用数据</string>

app-base/src/main/res/values-zh-rHK/strings.xml

-4
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,6 @@
377377
<string name="theme_pick_back">返回</string>
378378
<string name="theme_step_color_dialog_title">選擇步驟顏色</string>
379379
<string name="theme_step_color_title">步驟顏色</string>
380-
<string name="theme_step_color_normal">普通步驟</string>
381-
<string name="theme_step_color_notifier">通知步驟</string>
382-
<string name="theme_step_color_start">起始步驟</string>
383-
<string name="theme_step_color_end">結束步驟</string>
384380
<!--Backup-->
385381
<string name="backup_local_backup">本地</string>
386382
<string name="backup_app_data">應用數據</string>

app-base/src/main/res/values-zh-rTW/strings.xml

-4
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,6 @@
377377
<string name="theme_pick_back">返回</string>
378378
<string name="theme_step_color_dialog_title">選擇步驟顏色</string>
379379
<string name="theme_step_color_title">步驟顏色</string>
380-
<string name="theme_step_color_normal">普通步驟</string>
381-
<string name="theme_step_color_notifier">通知步驟</string>
382-
<string name="theme_step_color_start">起始步驟</string>
383-
<string name="theme_step_color_end">結束步驟</string>
384380
<!--Backup-->
385381
<string name="backup_local_backup">本地</string>
386382
<string name="backup_app_data">應用資料</string>

app-base/src/main/res/values/strings.xml

-4
Original file line numberDiff line numberDiff line change
@@ -483,10 +483,6 @@
483483

484484
<string name="theme_step_color_dialog_title">Pick Step Color</string>
485485
<string name="theme_step_color_title">Step Color</string>
486-
<string name="theme_step_color_normal">Normal step</string>
487-
<string name="theme_step_color_notifier">Notifier step</string>
488-
<string name="theme_step_color_start">Start step</string>
489-
<string name="theme_step_color_end">End step</string>
490486

491487
<!--Backup-->
492488
<string name="backup_local_backup">Local</string>

app-settings/src/main/java/xyz/aprildown/timer/app/settings/theme/ThemeFragment.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -212,25 +212,25 @@ class ThemeFragment :
212212
items += Group(context.getString(RBase.string.theme_step_color_title))
213213

214214
items += StepColor(
215-
context.getString(RBase.string.theme_step_color_normal),
215+
context.getString(RBase.string.edit_add_normal),
216216
StepType.NORMAL,
217217
StepType.NORMAL.getTypeColor(context),
218218
this
219219
)
220220
items += StepColor(
221-
context.getString(RBase.string.theme_step_color_notifier),
221+
context.getString(RBase.string.edit_add_notifier),
222222
StepType.NOTIFIER,
223223
StepType.NOTIFIER.getTypeColor(context),
224224
this
225225
)
226226
items += StepColor(
227-
context.getString(RBase.string.theme_step_color_start),
227+
context.getString(RBase.string.edit_add_start),
228228
StepType.START,
229229
StepType.START.getTypeColor(context),
230230
this
231231
)
232232
items += StepColor(
233-
context.getString(RBase.string.theme_step_color_end),
233+
context.getString(RBase.string.edit_add_end),
234234
StepType.END,
235235
StepType.END.getTypeColor(context),
236236
this

0 commit comments

Comments
 (0)