summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2011-02-22 14:49:15 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-22 14:49:15 -0800
commit8903c33870f919bbbfdb3131e3d38c1ac97369ca (patch)
tree36b00db7ef13bf62e7d76b0186abe8d61c856bbe
parent247dd6735cd4672ea9aa2a39256913e815835d9b (diff)
parent08a65d2c5b75ac57428d7da718f3e2569f321d4c (diff)
downloadandroid_packages_apps_HTMLViewer-8903c33870f919bbbfdb3131e3d38c1ac97369ca.tar.gz
android_packages_apps_HTMLViewer-8903c33870f919bbbfdb3131e3d38c1ac97369ca.tar.bz2
android_packages_apps_HTMLViewer-8903c33870f919bbbfdb3131e3d38c1ac97369ca.zip
am 08a65d2c: resolved conflicts for merge of 20c7965d to gingerbread-plus-aosp
* commit '08a65d2c5b75ac57428d7da718f3e2569f321d4c': Import revised translations. DO NOT MERGE
-rw-r--r--res/values-sv/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e9ad8d4..43a4da7 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -17,4 +17,6 @@
<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>