summaryrefslogtreecommitdiffstats
path: root/res/values-es
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-07 23:50:24 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-10-07 23:50:24 +0000
commit4dffc62f2b5462ddcd01051c9b479e8e91055376 (patch)
tree80afdab2635af0425aca44dc2df05dd652ebcaa7 /res/values-es
parent66273f82ba3a6097a4189d453df35aac4b1407b5 (diff)
parenta920c1b1ca4e2a7d34ea0a08fb06b7cca0a3e8fd (diff)
downloadplatform_packages_services_Telecomm-master.tar.gz
platform_packages_services_Telecomm-master.tar.bz2
platform_packages_services_Telecomm-master.zip
Merge "Merge Android 12"HEADmaster
Diffstat (limited to 'res/values-es')
-rw-r--r--res/values-es/config.xml23
-rw-r--r--res/values-es/strings.xml2
2 files changed, 1 insertions, 24 deletions
diff --git a/res/values-es/config.xml b/res/values-es/config.xml
deleted file mode 100644
index 5b355dfbb..000000000
--- a/res/values-es/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<!-- Telecomm resources that may need to be customized for different hardware or product
- builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="call_diagnostic_service_package_name" msgid="2953253648590374717"></string>
-</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b7b9cff0d..e124de414 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -99,7 +99,7 @@
<string name="notification_channel_call_blocking" msgid="2028807677868598710">"Bloqueo de llamadas"</string>
<string name="notification_channel_background_calls" msgid="7785659903711350506">"Llamadas en segundo plano"</string>
<string name="notification_channel_disconnected_calls" msgid="8228636543997645757">"Llamadas interrumpidas"</string>
- <string name="notification_channel_in_call_service_crash" msgid="7313237519166984267">"Aplicaciones para teléfonos con fallos"</string>
+ <string name="notification_channel_in_call_service_crash" msgid="7313237519166984267">"Aplicaciones para teléfonos con bloqueos"</string>
<string name="alert_outgoing_call" msgid="5319895109298927431">"Si haces esta llamada, se finalizará la de <xliff:g id="OTHER_APP">%1$s</xliff:g>."</string>
<string name="alert_redirect_outgoing_call_or_not" msgid="665409645789521636">"Elige cómo quieres hacer esta llamada"</string>
<string name="alert_place_outgoing_call_with_redirection" msgid="5221065030959024121">"Redirigir llamada con <xliff:g id="OTHER_APP">%1$s</xliff:g>"</string>