am 684f1cf4: resolved conflicts for merge of 6a1413b1 to gingerbread-plus-aosp
* commit '684f1cf41bd48cadc94dc5f3f20d6fdadd5c1640':
Import revised translations. DO NOT MERGE
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ed45b76..ed487f7 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"عارض HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"الدخول إلى محتوى DRM."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"للسماح للتطبيقات بالدخول إلى محتوى DRM المحمي."</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 116835c..cb5f0ce 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTML визуализатор"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Достъп до DRM съдържание."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Разрешава достъп на приложението до DRM защитено съдържание."</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 8e3075f..1752cf4 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"Lector d\'HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Accés a contingut DRM."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Permet a l\'aplicació accedir a contingut protegit mitjançant DRM."</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index e8fa24c..02898f8 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTML Viewer"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Access DRM content."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Allows application to access DRM-protected content."</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 82264ef..52f7a97 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"مشاهده گر HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"دسترسی به محتوای DRM."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"به برنامه کاربردی اجازه می دهد به محتوای محافظت شده توسط DRM دسترسی پیدا کند."</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 6a04203..6f63dd5 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTML-lukija"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"DRM-suojatun sisällön käyttö."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Sallii sovelluksen käyttää DRM-suojattua sisältöä."</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e61a5f1..6910929 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTML pregledač"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Pristupite DRM sadržaju."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Omogućuje aplikaciji da pristupi sadržaju koji štiti DRM."</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index bde648b..7b045eb 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTML megtekintő"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Hozzáférés DRM-tartalmakhoz."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Az alkalmazás hozzáférhet DRM-védett tartalmakhoz."</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 4d2fb4a..4b0229b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"Penampil HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Akses konten DRM."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Izinkan aplikasi mengakses konten yang dilindungi DRM."</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f65edba..0dbd3bb 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"מציג HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"גישה לתוכן DRM."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"אפשר ליישום לגשת לתוכן המוגן באמצעות DRM."</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 9f339e3..a36e26c 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTML skaitytojas"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Pasiekti DRM turinį."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Leidžia programai pasiekti DRM apsaugotą turinį."</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 16321c3..86e8347 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTML skatītājs"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Piekļuve saturam, kas aizsargāts saskaņā ar cipariska satura tiesību pārvaldību."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Ļauj lietojumprogrammai piekļūt saturam, kas aizsargāts saskaņā ar cipariska satura tiesību pārvaldību."</string>
</resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index aacbd2e..fbb190e 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"Visualisaziun HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Access al cuntegn DRM"</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Autorisar l\'applicaziun d\'acceder a cuntegn protegì DRM."</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index bb8a48b..642a37a 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"Ecran de vizualizare HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Accesaţi conţinutul protejat prin DRM."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Permite accesul aplicaţiei la conţinutul protejat prin DRM."</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 7d65c0d..0a02fc4 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"Zobrazovač HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Získať prístup k obsahu DRM."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Umožní aplikácii získať prístup k obsahu chránenému technológiou DRM."</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c168800..99b0426 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"Pregledovalnik HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Dostop do vsebine DRM."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Omogoča programu dostop do vsebine z zaščito DRM."</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a1a6747..e22fa5e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTML приказивач"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Приступ DRM садржају."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Омогућава апликацији да приступи садржају заштићеном DRM-ом."</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 43a4da7..e9ad8d4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTML-visningsprogram"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Åtkomst till DRM-innehåll."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Tillåter att en app får åtkomst till DRM-skyddat innehåll."</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 6d0d84d..3ff252c 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"โปรแกรมดู HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"เข้าถึงเนื้อหา DRM"</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"อนุญาตให้แอปพลิเคชันเข้าถึงเนื้อหาที่ป้องกันด้วย DRM"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f053492..762de26 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"Tagatingin ng HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"I-access ang DRM na nilalaman."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Payagan ang application na i-access ang nilalamang protektado ng DRM."</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 13e3d41..02898f8 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"HTML Viewer"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Доступ до DRM-вмісту."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Дозволяє доступ програми до вмісту, захищеного DRM."</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 3205480..5c86b8b 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -17,6 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="3773515048729290843">"Trình xem HTML"</string>
- <string name="permlab_accessDrm" msgid="7850026158655780930">"Truy cập nội dung DRM."</string>
- <string name="permdesc_accessDrm" msgid="36218014609780329">"Cho phép ứng dụng truy cập nội dung được bảo vệ bởi DRM"</string>
</resources>
