summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorBrint E. Kriebel <bekit@cyngn.com>2014-09-02 20:33:02 -0700
committerBrint E. Kriebel <bekit@cyngn.com>2014-09-02 20:33:02 -0700
commit9d2db09a55d982be17e6ddfa2ad2cb6e71f4c532 (patch)
tree06c674c266a1699da404537c30a87e785963496f /res
parentc780ac1d535c3233b1d69471030759ed4f5e5a32 (diff)
parent93716e36397322fa24cbd3498c521732702d8836 (diff)
downloadandroid_packages_apps_Trebuchet-9d2db09a55d982be17e6ddfa2ad2cb6e71f4c532.tar.gz
android_packages_apps_Trebuchet-9d2db09a55d982be17e6ddfa2ad2cb6e71f4c532.tar.bz2
android_packages_apps_Trebuchet-9d2db09a55d982be17e6ddfa2ad2cb6e71f4c532.zip
Merge branch 'cm-11.0' into stable/cm-11.0
Diffstat (limited to 'res')
-rw-r--r--res/values-af/cm_strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 9d6173e3b..ef4a5a1c4 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -19,7 +19,7 @@
<string name="launcher_settings">LANSEERDER INSTELLINGS</string>
<string name="home_screen_settings">TUIS SKERM INSTELLINGS</string>
<string name="drawer_settings">LAAI INSTELLINGS</string>
- <string name="app_settings">PROG INSTELLINGS</string>
+ <string name="app_settings">PROGRAM INSTELLINGS</string>
<string name="setting_state_on">AAN</string>
<string name="setting_state_off">AF</string>
<string name="search_panel_gel">Google Now</string>