summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrint E. Kriebel <bekit@cyngn.com>2014-09-02 20:31:52 -0700
committerBrint E. Kriebel <bekit@cyngn.com>2014-09-02 20:31:52 -0700
commit37ac893ec26d61904804b6f1c1588daecf667534 (patch)
tree5966b2184ab072ca77b877d47dd6e92f842642fc
parent9c8cdb09e9446e421fc6da63bb9ca08040d0abf4 (diff)
parent08b682cecfb33d52abe86832d736be46d4fe2f6d (diff)
downloadandroid_packages_apps_Nfc-37ac893ec26d61904804b6f1c1588daecf667534.tar.gz
android_packages_apps_Nfc-37ac893ec26d61904804b6f1c1588daecf667534.tar.bz2
android_packages_apps_Nfc-37ac893ec26d61904804b6f1c1588daecf667534.zip
Merge branch 'cm-11.0' into stable/cm-11.0
-rw-r--r--res/values-es-rXA/strings.xml2
-rw-r--r--res/values-ku/strings.xml4
-rw-r--r--res/values-lb/strings.xml12
-rw-r--r--res/values-ta/strings.xml2
4 files changed, 15 insertions, 5 deletions
diff --git a/res/values-es-rXA/strings.xml b/res/values-es-rXA/strings.xml
index d443f00d..05489cfd 100644
--- a/res/values-es-rXA/strings.xml
+++ b/res/values-es-rXA/strings.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name">Serviciu Nfc</string>
<string name="nfcUserLabel">Nfc</string>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index e95dc467..dda4a128 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name">Nfc خزمەتگوزاری</string>
<string name="nfcUserLabel">Nfc</string>
@@ -35,5 +35,5 @@
<string name="could_not_use_app">نه‌توانرا به‌کاربهێنرێ <xliff:g id="app">%1$s</xliff:g></string>
<string name="pay_with">ناساندن له‌گه‌ڵ</string>
<string name="complete_with">ته‌واوکردن له‌گه‌ڵ</string>
- <string name="default_pay_app_removed">تۆ خزمه‌تگوزاری په‌سه‌ند ده‌که‌یت بۆ تاپ &amp; ناساندن سڕدرایه‌وه‌. یه‌کێکی تر؟</string>
+ <string name="default_pay_app_removed">تۆ خزمه‌تگوزاری په‌سه‌ند ده‌که‌یت بۆ تاپ وamp; ناساندن سڕدرایه‌وه‌. یه‌کێکی تر؟</string>
</resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 85d0fa46..48995434 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -1,13 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name">NFC-Service</string>
<string name="nfcUserLabel">NFC</string>
<string name="inbound_me_profile_title">Kontakt iwwer NFC empfaangen</string>
+ <string name="inbound_me_profile_text">Dréck fir dës Persoun als Kontakt anzedroen.</string>
<string name="outbound_me_profile_title">NFC-Interaktioun ofgeschloss</string>
<string name="outbound_me_profile_text">Untippe fir dëser Persoun deng Kontakt-Informatiounen ze ginn.</string>
<string name="accessibility_nfc_enabled">NFC aktivéiert.</string>
+ <string name="touch">Dréck fir ze beamen</string>
+ <string name="beam_progress">Beam gëtt empfaangen...</string>
+ <string name="beam_outgoing">Beamen...</string>
<string name="beam_complete">Beam ofgeschloss</string>
+ <string name="cancel">Ofbriechen</string>
<string name="beam_touch_to_view">Dréck fir ze kucken</string>
+ <string name="beam_try_again">Bréng d\'Apparater nees beieneen</string>
+ <string name="connected_headset">Verbonnen</string>
+ <string name="pairing_headset">Verbannen</string>
+ <string name="pairing_headset_failed">Konnt net verbannen</string>
<string name="pair_yes">Jo</string>
<string name="pair_no">Nee</string>
</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index c700658b..90f8a6f0 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<!--Generated by crowdin.com-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="cancel">ரத்து</string>
</resources>