Merge lp:~therve/landscape-client/fix-name into lp:~landscape/landscape-client/trunk

[Thomas Herve]

Rename the "Management service" to "Landscape service", trying to catch the different instances of it.

[Alberto Donato (ack)]

+1, looks good!

review: Approve

[Matthew Paul Thomas (mpt)]

review: Approve (design)

[Geoff Teale (tealeg)]

+1 Approve

review: Approve

[Benjamin Kerensa (bkerensa)]

I noticed in this commit their is some inconsistency in landscape/ui/view/ui/landscape-client-settings.glade
in regards to casing of "Management Service".

=== 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-08-27 15:54:19 +0000
@@ -1,6 +1,6 @@
 [Desktop Entry]
-_Name=Management Service
-_Comment=Management Service Preferences
+_Name=Landscape Service
+_Comment=Landscape Management Service Preferences
 Exec=landscape-client-ui-install
 Icon=preferences-management-service
 Terminal=False

=== modified file 'landscape/ui/view/configuration.py'
--- landscape/ui/view/configuration.py	2012-03-28 14:15:39 +0000
+++ landscape/ui/view/configuration.py	2012-08-27 15:54:19 +0000
@@ -52,7 +52,7 @@
 
     def __init__(self, controller):
         super(ClientSettingsDialog, self).__init__(
-            title=_("Management Service"),
+            title=_("Landscape Service"),
             flags=Gtk.DialogFlags.MODAL)
         self.set_default_icon_name("preferences-management-service")
         self.set_resizable(False)

=== modified file 'landscape/ui/view/ui/landscape-client-settings.glade'
--- landscape/ui/view/ui/landscape-client-settings.glade	2012-05-30 17:57:21 +0000
+++ landscape/ui/view/ui/landscape-client-settings.glade	2012-08-27 15:54:19 +0000
@@ -157,7 +157,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Management service:</property>
+                    <property name="label" translatable="yes">Landscape service:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>

=== modified file 'po/fr.po'
--- po/fr.po	2012-05-30 18:10:34 +0000
+++ po/fr.po	2012-08-27 15:54:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-30 14:57-0300\n"
+"POT-Creation-Date: 2012-08-27 17:32+0200\n"
 "PO-Revision-Date: 2012-03-28 20:07+0100\n"
 "Last-Translator: Thomas Hervé <[e-mail]>\n"
 "Language-Team: français <>\n"
@@ -58,8 +58,8 @@
 
 #: ../landscape/ui/view/configuration.py:55
 #: ../applications/landscape-client-settings.desktop.in.h:1
-msgid "Management Service"
-msgstr "Service de gestion"
+msgid "Landscape Service"
+msgstr "Service Landscape"
 
 #: ../landscape/ui/view/configuration.py:124
 msgid "None"
@@ -105,8 +105,8 @@
 msgstr "En apprendre plus..."
 
 #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:3
-msgid "Management service:"
-msgstr "Service de gestion:"
+msgid "Landscape service:"
+msgstr "Nom d'hôte du serveur Landscape:"
 
 #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:4
 msgid "Account name:"
@@ -138,8 +138,9 @@
 "de dialogue."
 
 #: ../applications/landscape-client-settings.desktop.in.h:2
-msgid "Management Service Preferences"
-msgstr "Préférences du service de gestion"
+#, fuzzy
+msgid "Landscape Management Service Preferences"
+msgstr "Préférences du service de gestion Landscape"
 
 #: ../polkit-1/com.canonical.LandscapeClientSettings.policy.in.h:1
 msgid "Allow the user to read and write Landscape Client settings."
@@ -183,15 +184,3 @@
 #: ../scripts/landscape-client-ui-install:62
 msgid "Install"
 msgstr "Installer"
-
-#~ msgid "Password:"
-#~ msgstr "Mot de passe:"
-
-#~ msgid ""
-#~ "Landscape is an easy to use systems management and monitoring service "
-#~ "offered by Canonical that helps administrators manage multiple machines "
-#~ "efficiently."
-#~ msgstr ""
-#~ "Landscape est un système de gestion et de surveillance proposé en tant "
-#~ "que service par Canonical, qui aide les administrateurs à gérer plusieurs "
-#~ "machine efficacement."

=== modified file 'po/landscape-client.pot'
--- po/landscape-client.pot	2012-05-30 18:10:34 +0000
+++ po/landscape-client.pot	2012-08-27 15:54:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-30 14:57-0300\n"
+"POT-Creation-Date: 2012-08-27 17:32+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -57,7 +57,7 @@
 
 #: ../landscape/ui/view/configuration.py:55
 #: ../applications/landscape-client-settings.desktop.in.h:1
-msgid "Management Service"
+msgid "Landscape Service"
 msgstr ""
 
 #: ../landscape/ui/view/configuration.py:124
@@ -101,7 +101,7 @@
 msgstr ""
 
 #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:3
-msgid "Management service:"
+msgid "Landscape service:"
 msgstr ""
 
 #: ../landscape/ui/view/ui/landscape-client-settings.glade.h:4
@@ -131,7 +131,7 @@
 msgstr ""
 
 #: ../applications/landscape-client-settings.desktop.in.h:2
-msgid "Management Service Preferences"
+msgid "Landscape Management Service Preferences"
 msgstr ""
 
 #: ../polkit-1/com.canonical.LandscapeClientSettings.policy.in.h:1