summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authornebkat <nebkat@teamhacksung.org>2012-03-28 18:08:22 +0100
committernebkat <nebkat@teamhacksung.org>2012-12-24 10:12:26 +0000
commit3c512865bfc4243ccab4103320407dcd1e58d874 (patch)
treeb1e03685752187600c90fcdc0899fd1e2fc9ac1a /res/values
parent1650f04a9d18c97589176962e1b89b658d65bca8 (diff)
downloadpackages_apps_trebuchet-3c512865bfc4243ccab4103320407dcd1e58d874.zip
packages_apps_trebuchet-3c512865bfc4243ccab4103320407dcd1e58d874.tar.gz
packages_apps_trebuchet-3c512865bfc4243ccab4103320407dcd1e58d874.tar.bz2
Hotseat: Number Icons
Conflicts: res/values/strings.xml res/xml/preferences.xml src/com/beansoft/launcher/preference/PreferencesProvider.java src/com/cyanogenmod/trebuchet/Hotseat.java Change-Id: I839171c99f4050ad9dc03fbe82c8ed7be41cb4c0
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 281b01b..849b964 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -384,8 +384,10 @@ s -->
<string name="preferences_interface_dock_title">Dock</string>
<string name="preferences_interface_dock_pages_title">Pages</string>
<string name="preferences_interface_dock_pages_summary">Number of pages in the dock</string>
- <string name="preferences_interface_dock_default_page_title">Default Page</string>
+ <string name="preferences_interface_dock_default_page_title">Default page</string>
<string name="preferences_interface_dock_default_page_summary">Choose the default page</string>
+ <string name="preferences_interface_dock_icons_title">Icons</string>
+ <string name="preferences_interface_dock_icons_summary">Number of icons/columns in the dock</string>
<string name="preferences_interface_dock_divider_title">Show dock divider</string>
<string name="preferences_interface_dock_divider_summary">Show divider between homescreen and dock</string>