commit 270c183d17da169befda61db8a04edd7a154befd
author Scott Kennedy <skennedy@google.com> Fri Sep 13 00:21:03 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 13 00:21:04 2013 +0000
tree f3cd27033b3e7f8e90c83467087fdecc6bb08632
parent ba716af3e291308fe633a21115fcd615ccd1a0a2
parent c22844a1e53db18c9d6d71989daf1eac92ad01ca

Merge "Add strings for hierarchical folders" into jb-ub-mail-ur10

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d4106d6..5453934 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -935,4 +935,8 @@
          LIMIT=30] -->
     <string name="turn_auto_sync_on_dialog_confirm_btn">Turn on</string>
 
+    <!-- Button in conversation list to show more folders [CHAR LIMIT=50] -->
+    <string name="show_n_more_folders">Show <xliff:g id="number">%1$s</xliff:g> more folders</string>
+    <!-- Button in conversation list to hide folders [CHAR LIMIT=50] -->
+    <string name="hide_folders">Hide folders</string>
 </resources>