summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2013-12-26 19:09:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-12-26 19:09:19 +0000
commit7bb3e3b9ee22f2771c9fa71593c71910bbbcafac (patch)
tree575b223736c994bf5db1fdd38024d924e2955890
parentea227306d68c7097b9cb079b1bfa6157c1ec2d30 (diff)
parent64ec7929485746ff958537187fedb410ee629008 (diff)
downloadframeworks_base-7bb3e3b9ee22f2771c9fa71593c71910bbbcafac.zip
frameworks_base-7bb3e3b9ee22f2771c9fa71593c71910bbbcafac.tar.gz
frameworks_base-7bb3e3b9ee22f2771c9fa71593c71910bbbcafac.tar.bz2
Merge "Import translations. DO NOT MERGE" into klp-dev
-rw-r--r--packages/VpnDialogs/res/values-am/strings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/VpnDialogs/res/values-am/strings.xml b/packages/VpnDialogs/res/values-am/strings.xml
index 7fc9897..a305e30 100644
--- a/packages/VpnDialogs/res/values-am/strings.xml
+++ b/packages/VpnDialogs/res/values-am/strings.xml
@@ -17,8 +17,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="prompt" msgid="8359175999006833462">"<xliff:g id="APP">%s</xliff:g> የ VPN ተያያዥ ለመፍጠር ሞክሯል።"</string>
- <string name="warning" msgid="5470743576660160079">"በማስከተል፣ ትግበራው ሁሉንም የአውታረ መረብ ትራፊክ እንዲያጨናግፍ ፈቃድ እየሰጡ ነው።"<b>" ትግበራውን ካላመኑት አይቀበሉ።"</b>" አለበለዚያ፣ ውሂብዎ በተንኮል አዘል ሶፍትዌር ስጋት ውስጥ ይገኛል።"</string>
- <string name="accept" msgid="2889226408765810173">"ይህን ትግበራ አምናለሁ"</string>
+ <string name="warning" msgid="5470743576660160079">"በማስከተል፣ መተግበሪያው ሁሉንም የአውታረ መረብ ትራፊክ እንዲያጨናግፍ ፈቃድ እየሰጡ ነው።"<b>" መተግበሪያውን ካላመኑት አይቀበሉ።"</b>" አለበለዚያ፣ ውሂብዎ በተንኮል አዘል ሶፍትዌር ስጋት ውስጥ ይገኛል።"</string>
+ <string name="accept" msgid="2889226408765810173">"ይህን መተግበሪያ አምናለሁ"</string>
<string name="legacy_title" msgid="192936250066580964">"VPN ተያይዟል"</string>
<string name="configure" msgid="4905518375574791375">"አዋቅር"</string>
<string name="disconnect" msgid="971412338304200056">"አለያይ"</string>