summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-05-02 19:22:30 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-05-02 19:22:30 +0200
commita0ce80942766948d4cd1036b97e2ee721ed8ecce (patch)
tree5d596eea5771aa9f494d2b1fcf6b3b44da2d401c /packages/SettingsProvider
parenta3f7b1e4871de0b508bbefb0236d258d47a38f15 (diff)
parent0e4f9e2f03e376f0816c1e653bf97fe1d0176794 (diff)
downloadframeworks_base-a0ce80942766948d4cd1036b97e2ee721ed8ecce.zip
frameworks_base-a0ce80942766948d4cd1036b97e2ee721ed8ecce.tar.gz
frameworks_base-a0ce80942766948d4cd1036b97e2ee721ed8ecce.tar.bz2
Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_base into replicant-6.0HEADreplicant-6.0-0001replicant-6.0
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r--packages/SettingsProvider/res/values-ast-rES/strings.xml2
-rw-r--r--packages/SettingsProvider/res/values-sr-rCS/strings.xml22
2 files changed, 23 insertions, 1 deletions
diff --git a/packages/SettingsProvider/res/values-ast-rES/strings.xml b/packages/SettingsProvider/res/values-ast-rES/strings.xml
index fa15ee4..01de760 100644
--- a/packages/SettingsProvider/res/values-ast-rES/strings.xml
+++ b/packages/SettingsProvider/res/values-ast-rES/strings.xml
@@ -19,5 +19,5 @@
-->
<resources>
<!-- Name of the activity for Settings storage. -->
- <string name="app_label">Axustes d\'almacenamientu</string>
+ <string name="app_label">Almacenamientu d\'axustes</string>
</resources>
diff --git a/packages/SettingsProvider/res/values-sr-rCS/strings.xml b/packages/SettingsProvider/res/values-sr-rCS/strings.xml
new file mode 100644
index 0000000..ce94a95
--- /dev/null
+++ b/packages/SettingsProvider/res/values-sr-rCS/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2007, 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.
+ */
+-->
+<resources>
+ <!-- Name of the activity for Settings storage. -->
+</resources>