Merge lp:~brendan-donegan/checkbox/bug926417_cli_plus_help into lp:checkbox

[Brendan Donegan]

Change checkbox-cli text to be clearer about what the + key does.

[Marc Tardif (cr3)]

Looks good, I also took the opportunity of putting your string in the gettext function so that it can be internationalized. Merging...

review: Approve

=== modified file 'checkbox_cli/cli_interface.py'
--- checkbox_cli/cli_interface.py	2011-10-18 18:25:14 +0000
+++ checkbox_cli/cli_interface.py	2012-02-07 13:16:19 +0000
@@ -280,7 +280,7 @@
         for option in keys:
             dialog.add_option(option)
 
-        dialog.add_option("Plus to expand options", "+")
+        dialog.add_option("Combine with character above to expand node", "+")
         dialog.add_option("Space when finished", " ")
 
         do_expand = False

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-06 20:04:05 +0000
+++ debian/changelog	2012-02-07 13:16:19 +0000
@@ -12,7 +12,10 @@
   [Daniel Manrique]
   * Changed way of obtaining preferred browser to ensure we honor the user's
     preference rather than Chromium's clobbering of
-    /etc/alternatives/gnome-www-browser (LP: #925603) 
+    /etc/alternatives/gnome-www-browser (LP: #925603)
+
+  [Brendan Donegan]
+  * Changed checkbox-cli text to clearly explain what + does (LP: #926417)
 
  -- Daniel Manrique <[e-mail]>  Mon, 06 Feb 2012 14:55:58 -0500