Skip to content

Commit 02c0675

Browse files
DeweyReedDeweyReed
committed
Change string-array to strings
1 parent 93c422d commit 02c0675

File tree

6 files changed

+160
-207
lines changed

6 files changed

+160
-207
lines changed

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

Lines changed: 26 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -329,16 +329,14 @@
329329
<string name="scheduler_repeat_today">今天</string>
330330
<string name="scheduler_wrong_timer_id">计划任务需要一个计时器</string>
331331
<string name="scheduler_wrong_every_days">这个数值应在1到127之间</string>
332-
<string-array name="scheduler_set">
333-
<item>"计划任务已设为不到1分钟后"</item>
334-
<item>"计划任务已设为 <xliff:g id="DAYS">%1$s</xliff:g>后"</item>
335-
<item>"计划任务已设为 <xliff:g id="HOURS">%2$s</xliff:g>后"</item>
336-
<item>"计划任务已设为 <xliff:g id="DAYS">%1$s</xliff:g><xliff:g id="HOURS">%2$s</xliff:g>后"</item>
337-
<item>"计划任务已设为 <xliff:g id="MINUTES">%3$s</xliff:g>后"</item>
338-
<item>"计划任务已设为 <xliff:g id="DAYS">%1$s</xliff:g><xliff:g id="MINUTES">%3$s</xliff:g>后"</item>
339-
<item>"计划任务已设为 <xliff:g id="HOURS">%2$s</xliff:g><xliff:g id="MINUTES">%3$s</xliff:g>后"</item>
340-
<item>"计划任务已设为 <xliff:g id="DAYS">%1$s</xliff:g><xliff:g id="HOURS">%2$s</xliff:g><xliff:g id="MINUTES">%3$s</xliff:g>后"</item>
341-
</string-array>
332+
<string name="scheduler_set1">"计划任务已设为不到1分钟后"</string>
333+
<string name="scheduler_set2">"计划任务已设为 <xliff:g id="DAYS">%1$s</xliff:g>后"</string>
334+
<string name="scheduler_set3">"计划任务已设为 <xliff:g id="HOURS">%2$s</xliff:g>后"</string>
335+
<string name="scheduler_set4">"计划任务已设为 <xliff:g id="DAYS">%1$s</xliff:g><xliff:g id="HOURS">%2$s</xliff:g>后"</string>
336+
<string name="scheduler_set5">"计划任务已设为 <xliff:g id="MINUTES">%3$s</xliff:g>后"</string>
337+
<string name="scheduler_set6">"计划任务已设为 <xliff:g id="DAYS">%1$s</xliff:g><xliff:g id="MINUTES">%3$s</xliff:g>后"</string>
338+
<string name="scheduler_set7">"计划任务已设为 <xliff:g id="HOURS">%2$s</xliff:g><xliff:g id="MINUTES">%3$s</xliff:g>后"</string>
339+
<string name="scheduler_set8">"计划任务已设为 <xliff:g id="DAYS">%1$s</xliff:g><xliff:g id="HOURS">%2$s</xliff:g><xliff:g id="MINUTES">%3$s</xliff:g>后"</string>
342340
<string name="scheduler_schedule_failed">设置计划失败 %s</string>
343341
<string name="scheduler_canceled_template">%1$s 已取消</string>
344342
<string name="scheduler_starts_action_template">开启 %1$s</string>
@@ -477,21 +475,15 @@
477475
<!--Timer preferences-->
478476
<string name="pref_category_title_timer_setting">计时器设置</string>
479477
<string name="pref_screen_title">屏幕亮度</string>
480-
<string-array name="pref_screen_titles">
481-
<item>常亮</item>
482-
<item>暗淡</item>
483-
<item>默认</item>
484-
</string-array>
478+
<string name="pref_screen_title_on">常亮</string>
479+
<string name="pref_screen_title_dim">暗淡</string>
480+
<string name="pref_screen_title_default">默认</string>
485481
<string name="pref_screen_timing_title">屏幕亮度应用时机</string>
486-
<string-array name="pref_screen_timing_titles">
487-
<item>当使用应用时</item>
488-
<item>当使用应用且有计时器运行时</item>
489-
</string-array>
482+
<string name="pref_screen_timing_title_open">当使用应用时</string>
483+
<string name="pref_screen_timing_title_running">当使用应用且有计时器运行时</string>
490484
<string name="pref_notifier_plus_title">在通知步骤增加时间时</string>
491-
<string-array name="pref_notifier_plus_titles">
492-
<item>返回上一步并将时间设为1分钟</item>
493-
<item>在当前步骤增加时间</item>
494-
</string-array>
485+
<string name="pref_notifier_plus_title_return">返回上一步并将时间设为1分钟</string>
486+
<string name="pref_notifier_plus_title_time">在当前步骤增加时间</string>
495487
<string name="pref_tweak_time_title">更多的时间微调选项</string>
496488
<string name="pref_tweak_time_on">已启用</string>
497489
<string name="pref_tweak_time_off">已禁用</string>
@@ -505,11 +497,9 @@
505497
<string name="settings_floating_window_pip_pip">画中画</string>
506498
<string name="settings_floating_window_pip_floating_failed">创建悬浮窗失败，重试一下吧</string>
507499
<string name="pref_phone_call">当手机在通话时</string>
508-
<string-array name="pref_phone_call_titles">
509-
<item>什么也不做</item>
510-
<item>暂停所有计时器</item>
511-
<item>暂停并在通话后恢复所有计时器</item>
512-
</string-array>
500+
<string name="pref_phone_call_title_nothing">什么也不做</string>
501+
<string name="pref_phone_call_title_pause">暂停所有计时器</string>
502+
<string name="pref_phone_call_title_pause_resume">暂停并在通话后恢复所有计时器</string>
513503
<string name="pref_show_timer_total_time">编辑时的总时间</string>
514504
<string name="pref_show_timer_total_time_on">显示计时器和组的总时间</string>
515505
<string name="pref_show_timer_total_time_off">隐藏</string>
@@ -524,33 +514,20 @@
524514
<!--Scheduler preferences-->
525515
<string name="pref_category_title_scheduler_setting">计划任务设置</string>
526516
<string name="pref_week_start_title">一周的第一天</string>
527-
<string-array name="pref_week_start_titles">
528-
<item>星期一</item>
529-
<item>星期二</item>
530-
<item>星期三</item>
531-
<item>星期四</item>
532-
<item>星期五</item>
533-
<item>星期六</item>
534-
<item>星期日</item>
535-
</string-array>
536517
<!--Notification preferences-->
537518
<string name="pref_category_notif">通知</string>
538519
<string name="pref_open_notif_setting">打开通知设置</string>
539520
<!--Audio preferences-->
540521
<string name="pref_category_title_audio">音频</string>
541522
<string name="pref_audio_focus_type_title">音频焦点类型</string>
542-
<string-array name="pref_audio_focus_titles">
543-
<item>暂停其它播放</item>
544-
<item>停止其他播放</item>
545-
<item>降低其他播放音量</item>
546-
<item>什么也不做</item>
547-
</string-array>
523+
<string name="pref_audio_focus_title_pause">暂停其它播放</string>
524+
<string name="pref_audio_focus_title_stop">停止其他播放</string>
525+
<string name="pref_audio_focus_title_lower">降低其他播放音量</string>
526+
<string name="pref_audio_focus_title_none">什么也不做</string>
548527
<string name="pref_audio_type_title">音频类型</string>
549-
<string-array name="pref_audio_type_titles">
550-
<item>闹钟</item>
551-
<item>媒体</item>
552-
<item>通知</item>
553-
</string-array>
528+
<string name="pref_audio_type_title_alarm">闹钟</string>
529+
<string name="pref_audio_type_title_media">媒体</string>
530+
<string name="pref_audio_type_title_notification">通知</string>
554531
<string name="pref_audio_volume_title">音量</string>
555532
<!--Other preferences-->
556533
<string name="pref_title_other">其他</string>
@@ -651,4 +628,4 @@
651628
<string name="billing_help_title">帮助</string>
652629
<string name="billing_help_contact">反馈</string>
653630
<string name="billing_help_email_title">计时机器付款问题</string>
654-
</resources>
631+
</resources>

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

Lines changed: 26 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -329,16 +329,14 @@
329329
<string name="scheduler_repeat_today">今天</string>
330330
<string name="scheduler_wrong_timer_id">計劃任務需要一個計時器</string>
331331
<string name="scheduler_wrong_every_days">這個數值應在1到127之間</string>
332-
<string-array name="scheduler_set">
333-
<item>"計劃任務設定在 1 分鐘內響起"</item>
334-
<item>"計劃任務設定在 <xliff:g id="DAYS">%1$s</xliff:g>後響起"</item>
335-
<item>"計劃任務設定在 <xliff:g id="HOURS">%2$s</xliff:g>後響起"</item>
336-
<item>"計劃任務設定在 <xliff:g id="DAYS">%1$s</xliff:g><xliff:g id="HOURS">%2$s</xliff:g>後響起"</item>
337-
<item>"計劃任務設定在 <xliff:g id="MINUTES">%3$s</xliff:g>後響起"</item>
338-
<item>"計劃任務設定在 <xliff:g id="DAYS">%1$s</xliff:g><xliff:g id="MINUTES">%3$s</xliff:g>後響起"</item>
339-
<item>"計劃任務設定在 <xliff:g id="HOURS">%2$s</xliff:g><xliff:g id="MINUTES">%3$s</xliff:g>後響起"</item>
340-
<item>"計劃任務設定在 <xliff:g id="DAYS">%1$s</xliff:g><xliff:g id="HOURS">%2$s</xliff:g><xliff:g id="MINUTES">%3$s</xliff:g>後響起"</item>
341-
</string-array>
332+
<string name="scheduler_set1">"計劃任務設定在 1 分鐘內響起"</string>
333+
<string name="scheduler_set2">"計劃任務設定在 <xliff:g id="DAYS">%1$s</xliff:g>後響起"</string>
334+
<string name="scheduler_set3">"計劃任務設定在 <xliff:g id="HOURS">%2$s</xliff:g>後響起"</string>
335+
<string name="scheduler_set4">"計劃任務設定在 <xliff:g id="DAYS">%1$s</xliff:g><xliff:g id="HOURS">%2$s</xliff:g>後響起"</string>
336+
<string name="scheduler_set5">"計劃任務設定在 <xliff:g id="MINUTES">%3$s</xliff:g>後響起"</string>
337+
<string name="scheduler_set6">"計劃任務設定在 <xliff:g id="DAYS">%1$s</xliff:g><xliff:g id="MINUTES">%3$s</xliff:g>後響起"</string>
338+
<string name="scheduler_set7">"計劃任務設定在 <xliff:g id="HOURS">%2$s</xliff:g><xliff:g id="MINUTES">%3$s</xliff:g>後響起"</string>
339+
<string name="scheduler_set8">"計劃任務設定在 <xliff:g id="DAYS">%1$s</xliff:g><xliff:g id="HOURS">%2$s</xliff:g><xliff:g id="MINUTES">%3$s</xliff:g>後響起"</string>
342340
<string name="scheduler_schedule_failed">設置計劃失敗 %s</string>
343341
<string name="scheduler_canceled_template">%1$s 已取消</string>
344342
<string name="scheduler_starts_action_template">開啟 %1$s</string>
@@ -477,21 +475,15 @@
477475
<!--Timer preferences-->
478476
<string name="pref_category_title_timer_setting">計時器設置</string>
479477
<string name="pref_screen_title">屏幕亮度</string>
480-
<string-array name="pref_screen_titles">
481-
<item>常亮</item>
482-
<item>暗淡</item>
483-
<item>默認</item>
484-
</string-array>
478+
<string name="pref_screen_title_on">常亮</string>
479+
<string name="pref_screen_title_dim">暗淡</string>
480+
<string name="pref_screen_title_default">默認</string>
485481
<string name="pref_screen_timing_title">屏幕亮度應用時機</string>
486-
<string-array name="pref_screen_timing_titles">
487-
<item>當使用應用時</item>
488-
<item>當使用應用且有計時器運行時</item>
489-
</string-array>
482+
<string name="pref_screen_timing_title_open">當使用應用時</string>
483+
<string name="pref_screen_timing_title_running">當使用應用且有計時器運行時</string>
490484
<string name="pref_notifier_plus_title">在通知步驟增加時間時</string>
491-
<string-array name="pref_notifier_plus_titles">
492-
<item>返回上一步並將時間設為1分鐘</item>
493-
<item>在當前步驟增加時間</item>
494-
</string-array>
485+
<string name="pref_notifier_plus_title_return">返回上一步並將時間設為1分鐘</string>
486+
<string name="pref_notifier_plus_title_time">在當前步驟增加時間</string>
495487
<string name="pref_tweak_time_title">更多的時間微調選項</string>
496488
<string name="pref_tweak_time_on">已啟用</string>
497489
<string name="pref_tweak_time_off">已禁用</string>
@@ -505,11 +497,9 @@
505497
<string name="settings_floating_window_pip_pip">畫中畫</string>
506498
<string name="settings_floating_window_pip_floating_failed">創建懸浮窗失敗，重試一下吧</string>
507499
<string name="pref_phone_call">當手機在通話時</string>
508-
<string-array name="pref_phone_call_titles">
509-
<item>什麼也不做</item>
510-
<item>暫停所有計時器</item>
511-
<item>暫停並在通話後恢復所有計時器</item>
512-
</string-array>
500+
<string name="pref_phone_call_title_nothing">什麼也不做</string>
501+
<string name="pref_phone_call_title_pause">暫停所有計時器</string>
502+
<string name="pref_phone_call_title_pause_resume">暫停並在通話後恢復所有計時器</string>
513503
<string name="pref_show_timer_total_time">編輯時的總時間</string>
514504
<string name="pref_show_timer_total_time_on">顯示計時器和組的總時間</string>
515505
<string name="pref_show_timer_total_time_off">隱藏</string>
@@ -524,33 +514,20 @@
524514
<!--Scheduler preferences-->
525515
<string name="pref_category_title_scheduler_setting">計劃任務設置</string>
526516
<string name="pref_week_start_title">一週的第一天</string>
527-
<string-array name="pref_week_start_titles">
528-
<item>星期一</item>
529-
<item>星期二</item>
530-
<item>星期三</item>
531-
<item>星期四</item>
532-
<item>星期五</item>
533-
<item>星期六</item>
534-
<item>星期日</item>
535-
</string-array>
536517
<!--Notification preferences-->
537518
<string name="pref_category_notif">通知</string>
538519
<string name="pref_open_notif_setting">打開通知設置</string>
539520
<!--Audio preferences-->
540521
<string name="pref_category_title_audio">音頻</string>
541522
<string name="pref_audio_focus_type_title">音頻焦點類型</string>
542-
<string-array name="pref_audio_focus_titles">
543-
<item>暫停其它播放</item>
544-
<item>停止其他播放</item>
545-
<item>降低其他播放音量</item>
546-
<item>什麼也不做</item>
547-
</string-array>
523+
<string name="pref_audio_focus_title_pause">暫停其它播放</string>
524+
<string name="pref_audio_focus_title_stop">停止其他播放</string>
525+
<string name="pref_audio_focus_title_lower">降低其他播放音量</string>
526+
<string name="pref_audio_focus_title_none">什麼也不做</string>
548527
<string name="pref_audio_type_title">音頻類型</string>
549-
<string-array name="pref_audio_type_titles">
550-
<item>鬧鐘</item>
551-
<item>媒體</item>
552-
<item>通知</item>
553-
</string-array>
528+
<string name="pref_audio_type_title_alarm">鬧鐘</string>
529+
<string name="pref_audio_type_title_media">媒體</string>
530+
<string name="pref_audio_type_title_notification">通知</string>
554531
<string name="pref_audio_volume_title">音量</string>
555532
<!--Other preferences-->
556533
<string name="pref_title_other">其他</string>
@@ -651,4 +628,4 @@
651628
<string name="billing_help_title">幫助</string>
652629
<string name="billing_help_contact">反饋</string>
653630
<string name="billing_help_email_title">計時機器付款問題</string>
654-
</resources>
631+
</resources>

0 commit comments

Comments
 (0)