Merge lp:~bkerensa/landscape-client/trunk into lp:~landscape/landscape-client/trunk

[Benjamin Kerensa]

* Adjust name in System Settings UI to better reflect nature of application and be less ambiguous

[lp:~bkerensa/landscape-client/trunk]

565. By Benjamin Kerensa on 2012-05-23

Polished Registration Key Name

[Dean Henrichsmeyer (dean)]

This branch doesn't just include a fix related to #1001468, it incorporates changes related to #962974. Please keep branches related to a single bug when they're not related.

review: Disapprove

Unmerged revisions

565. By Benjamin Kerensa on 2012-05-23

Polished Registration Key Name

564. By Benjamin Kerensa on 2012-05-23

Adjusted Name in UI

=== modified file 'applications/landscape-client-settings.desktop.in'
--- applications/landscape-client-settings.desktop.in	2012-03-23 10:04:18 +0000
+++ applications/landscape-client-settings.desktop.in	2012-05-23 01:01:18 +0000
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Management Service
+_Name=Landscape Administration
 _Comment=Management Service Preferences
 Exec=landscape-client-ui-install
 Icon=preferences-management-service
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-03-28 17:06:17 +0000
+++ debian/changelog	2012-05-23 01:01:18 +0000
@@ -1,3 +1,16 @@
+landscape-client (12.04.3-0ubuntu0.12.04.2) quantal; urgency=low
+
+
+  * Polish Registration Key Name (LP: #1001468)
+
+ -- Benjamin Kerensa <[e-mail]>  Tue, 22 May 2012 17:56:55 -0700
+
+landscape-client (12.04.3-0ubuntu0.12.04.1) quantal; urgency=low
+
+  * Adjust name reflected in UI (LP: #962974) 
+
+ -- Benjamin Kerensa <[e-mail]>  Tue, 22 May 2012 17:36:54 -0700
+
 landscape-client (12.04.3-0ubuntu0.12.04.0) precise; urgency=low
 
   * Warn on unicode entry into settings UI (LP: #956612).
 
=== modified file 'landscape/broker/config.py'
--- landscape/broker/config.py	2012-05-11 21:56:37 +0000
+++ landscape/broker/config.py	2012-05-23 01:01:18 +0000
@@ -40,7 +40,7 @@
 
         parser.add_option("-a", "--account-name", metavar="NAME",
                           help="The account this computer belongs to.")
-        parser.add_option("-p", "--registration-key", metavar="PASSWORD",
+        parser.add_option("-p", "--registration-key", metavar="KEY",
                           help="The account-wide key used for "
                                "registering clients.")
         parser.add_option("-t", "--computer-title", metavar="TITLE",