From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Tue, 7 Feb 2017 04:20:22 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
X-Git-Tag: android-x86-7.1-r1~13
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b6c42417253b3c1f87e393ff77b502add2c0b8b3;hp=de172c7727a3306e5088c839738fad6231821eaa;p=android-x86%2Fpackages-apps-Settings.git

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
---

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index f8a3fe959c..b1eee9171c 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -2897,7 +2897,7 @@
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimització de la bateria"</string>
-    <string name="additional_battery_info" msgid="4754099329165411970">"Alerta d\'ús"</string>
+    <string name="additional_battery_info" msgid="4754099329165411970">"Alertes d\'ús"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"No optimitzen la bateria"</string>
     <string name="high_power_on" msgid="6216293998227583810">"No optimitzen la bateria"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimitza l\'ús de la bateria"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8a9a3507f7..205e7c1a62 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1521,7 +1521,7 @@
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
     <string name="security_settings_billing_desc" msgid="8061019011821282358">"Denne app kan koste penge:"</string>
-    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Send en premium-sms"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Send en overtakseret sms"</string>
     <string name="computing_size" msgid="1599186977475211186">"Beregner..."</string>
     <string name="invalid_size_value" msgid="1582744272718752951">"Pakkestørrelsen kunne ikke beregnes."</string>
     <string name="empty_list_msg" msgid="3552095537348807772">"Du har ikke installeret nogen apps fra tredjepart."</string>
@@ -3166,9 +3166,9 @@
     <string name="page_tab_title_support" msgid="6330657582897417458">"Support"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Mindste bredde"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"Ingen installerede apps har anmodet adgang til premium-sms"</string>
-    <string name="premium_sms_warning" msgid="9086859595338944882">"Premium-sms kan koste dig penge, som opkræves via din mobilregning. Hvis du aktiverer tilladelsen for en app, kan du sende premium-sms-beskeder ved hjælp af denne app."</string>
-    <string name="premium_sms_access" msgid="4660047004791638305">"Adgang til premium-sms"</string>
+    <string name="premium_sms_none" msgid="8268105565738040566">"Ingen installerede apps har anmodet adgang til overtakseret sms"</string>
+    <string name="premium_sms_warning" msgid="9086859595338944882">"Overtakseret sms kan koste dig penge, som opkræves via din mobilregning. Hvis du aktiverer tilladelsen for en app, kan du sende overtakserede sms-beskeder ved hjælp af denne app."</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"Adgang til overtakseret sms"</string>
     <string name="bluetooth_disabled" msgid="1558295505487648234">"Deaktiveret"</string>
     <string name="demo_mode" msgid="2655748420527206870">"Demotilstand"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Vi er her for at hjælpe dig"</string>