am ba1b0524: Merge "CB: Enable or Disable broadcast messages"
* commit 'ba1b05249dd2e13b04a963da15249907847f52b1':
CB: Enable or Disable broadcast messages
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 30cd444..d536535 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -16,8 +16,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="7559008249836700599">"エリアメール"</string>
- <string name="sms_cb_settings" msgid="971917159442705371">"エリアメールの設定"</string>
+ <string name="app_label" msgid="7559008249836700599">"緊急警報"</string>
+ <string name="sms_cb_settings" msgid="971917159442705371">"緊急警報の設定"</string>
<string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
<string name="no_cell_broadcasts" msgid="5409324337492758562">"お住まいの地域で有効な警報はありません。[設定]メニューオプションで警報の設定を変更できます。"</string>
<string name="menu_preferences" msgid="3596514894131599202">"設定"</string>
@@ -43,7 +43,7 @@
<string name="cmas_exercise_alert" msgid="2892255514938370321">"緊急警報（訓練）"</string>
<string name="cmas_operator_defined_alert" msgid="8755372450810011476">"緊急警報（オペレーター）"</string>
<string name="pws_other_message_identifiers" msgid="1813329661891149820">"緊急警報"</string>
- <string name="cb_other_message_identifiers" msgid="7083176204482365281">"エリアメール"</string>
+ <string name="cb_other_message_identifiers" msgid="7083176204482365281">"緊急警報"</string>
<string name="emergency_alert_settings_title" msgid="5427868392642771940">"緊急警報の設定"</string>
<string name="enable_emergency_alerts_title" msgid="1411195469162410084">"通知を有効にする"</string>
<string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"緊急警報の内容を表示する"</string>
diff --git a/tests/res/values-ca/strings.xml b/tests/res/values-ca/strings.xml
index 1236037..cf507e0 100644
--- a/tests/res/values-ca/strings.xml
+++ b/tests/res/values-ca/strings.xml
@@ -41,6 +41,5 @@
<string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Envia UMTS UCS-2 amb idioma"</string>
<string name="button_delay_broadcast" msgid="5138650276363839541">"Retarda 5 segons abans d\'enviar"</string>
<string name="message_id_label" msgid="4365322663037110887">"Id. del missatge:"</string>
- <!-- no translation found for category_id_label (8472814003810180738) -->
- <skip />
+ <string name="category_id_label" msgid="8472814003810180738">"Categoria:"</string>
</resources>
diff --git a/tests/res/values-ja/strings.xml b/tests/res/values-ja/strings.xml
index ef764d6..9866894 100644
--- a/tests/res/values-ja/strings.xml
+++ b/tests/res/values-ja/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="2102435118079140813">"エリアメールのテスト"</string>
+ <string name="app_label" msgid="2102435118079140813">"緊急警報のテスト"</string>
<string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS標準放送を送信"</string>
<string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWSキャンセルブロードキャストを送信"</string>
<string name="button_etws_test_type" msgid="6353906188028139901">"ETWSテストブロードキャストを送信"</string>
