Merge remote-tracking branch 'lineageos/cm-13.0' into replicant-6.0replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1

4 files changed, 68 insertions, 2 deletions

diff --git a/res/values-kab-rDZ/strings.xml b/res/values-kab-rDZ/strings.xml
new file mode 100644
index 0000000..46937f1
--- /dev/null
+++ b/res/values-kab-rDZ/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-2015 The CyanogenMod Project
+     Copyright (C) 2017 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">
+  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+</resources>
diff --git a/res/values-sc-rIT/strings.xml b/res/values-sc-rIT/strings.xml
new file mode 100644
index 0000000..46937f1
--- /dev/null
+++ b/res/values-sc-rIT/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-2015 The CyanogenMod Project
+     Copyright (C) 2017 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">
+  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+</resources>
diff --git a/res/values-vec-rIT/strings.xml b/res/values-vec-rIT/strings.xml
new file mode 100644
index 0000000..46937f1
--- /dev/null
+++ b/res/values-vec-rIT/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-2015 The CyanogenMod Project
+     Copyright (C) 2017 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">
+  <!-- Fingerprint setup -->
+  <!-- secure lock screen -->
+</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f16ced1..0b3670e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -61,7 +61,7 @@
   <string name="services_explanation" product="default">這些服務用來增強您的手機的功能。資料將根據 LineageOS 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 來使用。</string>
   <string name="services_privacy_policy">隱私權政策</string>
   <string name="services_help_improve_cm">協助改善 <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
-  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> 經由自動傳送診斷及使用資料給 LineageOS。這些資料不會被用於識別您的身份，而是用於幫助團隊致力於諸如電池壽命、應用程式效能和新的 <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> 功能。</string>
+  <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> 經由自動傳送診斷及使用資料給 LineageOS。這些資料不會被用於辨識您的身份，而是用於幫助團隊致力於諸如電池壽命、應用程式效能和新的 <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g> 功能。</string>
   <string name="services_apply_theme">套用 <xliff:g id="name" example="Material">%s</xliff:g> 主題</string>
   <string name="services_apply_theme_label"><xliff:g id="name" example="Apply the Material theme">%s</xliff:g>正在幫把您的圖示、桌布…等變成個獨一無二的視覺效果。</string>
   <string name="services_os_nav_keys_label"><b>使用虛擬按鍵</b>替代實體按鍵。</string>
@@ -77,7 +77,7 @@
   <string name="fingerprint_setup_summary">若要使用您的指紋感應器解鎖您的螢幕，您需要︰</string>
   <string name="fingerprint_setup_backup_lock_method">設定第二個解鎖方式</string>
   <string name="fingerprint_setup_add_fingerprint">新增您的指紋</string>
-  <string name="fingerprint_setup_screen_lock_setup">設定螢幕鎖定</string>
+  <string name="fingerprint_setup_screen_lock_setup">設定畫面鎖定</string>
   <string name="sim_locale_changed">檢測到 %1$s 張 SIM 卡</string>
   <!-- secure lock screen -->
   <string name="settings_lockscreen_setup_title">選擇螢幕鎖類型</string>