Merge remote-tracking branch 'upstream/lineage-23.0' into HEAD
Change-Id: Icf6f1affcfa7e8f90fe820aba7578376196dd8a8
diff --git a/java/com/android/dialer/app/res/values-pt-rBR/cm_strings.xml b/java/com/android/dialer/app/res/values-pt-rBR/cm_strings.xml
index 4edbdc6..da59d9e 100644
--- a/java/com/android/dialer/app/res/values-pt-rBR/cm_strings.xml
+++ b/java/com/android/dialer/app/res/values-pt-rBR/cm_strings.xml
@@ -32,6 +32,6 @@
<string name="call_via_dialog_title">Ligar via\u2026</string>
<string name="call_log_stats_title">Estatísticas</string>
<string name="action_menu_helplines">Linhas de apoio</string>
- <string name="default_dialer_text">Você deve definir o Telefone como o app de telefone padrão para usá-lo.</string>
- <string name="default_dialer_action">Definir como padrão</string>
+ <string name="default_dialer_text">Você deve configurar o Telefone como o app de telefone padrão para usá-lo.</string>
+ <string name="default_dialer_action">Configurar como padrão</string>
</resources>
diff --git a/java/com/android/dialer/callstats/res/values-pt-rBR/cm_strings.xml b/java/com/android/dialer/callstats/res/values-pt-rBR/cm_strings.xml
index 03cfde0..2f19f83 100644
--- a/java/com/android/dialer/callstats/res/values-pt-rBR/cm_strings.xml
+++ b/java/com/android/dialer/callstats/res/values-pt-rBR/cm_strings.xml
@@ -36,7 +36,7 @@
<string name="date_qs_lastquarter">Trimestre passado</string>
<string name="date_qs_lastyear">Ano passado</string>
<string name="call_stats_date_filter">Ajustar intervalo de tempo</string>
- <string name="call_stats_reset_filter">Redefinir intervalo de tempo</string>
+ <string name="call_stats_reset_filter">Reconfigurar intervalo de tempo</string>
<string name="call_stats_sort_by_duration">Classificar pela duração das chamadas</string>
<string name="call_stats_sort_by_count">Classificar pelo número de chamadas</string>
<string name="call_stats_title_for_number">Este número</string>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ka/lineage_strings.xml b/java/com/android/voicemail/impl/configui/res/values-ka/lineage_strings.xml
new file mode 100644
index 0000000..4d004e6
--- /dev/null
+++ b/java/com/android/voicemail/impl/configui/res/values-ka/lineage_strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 The LineageOS 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="config_override_preference_title">VVM-გამართვის ჩანაცვლება</string>
+</resources>