Merge lp:~ballogy/gnome-control-center-signon/no-hardcode-ubuntu into lp:gnome-control-center-signon

[Balló György]

Generalize the term of Ubuntu

Use the term "computer" instead of "Ubuntu", because the latter confuses users of other GNU/Linux distributions.

Related bug report:
https://bugs.launchpad.net/gnome-control-center-signon/+bug/1076047

[Alberto Mardegan (mardy)]

Thanks György! :-) Looks good to me.

review: Approve

[David King (amigadave)]

As this changes the legal notice, we should at least get a signoff from legal before approving it.

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/gnome-control-center-signon-autolanding/1/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/gnome-control-center-signon-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/1/console
    FAILURE: http://s-jenkins:8080/job/gnome-control-center-signon-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/1/console

review: Needs Fixing (continuous-integration)

[Víctor R. Ruiz (vrruiz)]

I modified Jenkins configuration to build in raring.

[Balló György (ballogy)]

Is there any progress?

[Alberto Mardegan (mardy)]

Hi György. Please see the related bug report for the design team's reply.

In short, we don't want to change that in Ubuntu. If you could come up with another patch which makes "Ubuntu" a variable which can be overridden at build time, we would certainly welcome that.

For the legal notice file, you could probably create a "legal-notice.page.in" file and substitute the "Ubuntu"/"your computer" text via autoconf.

(this is just a suggestion: other solutions which preserve the Ubuntu name when the package is built in Ubuntu are acceptable)

[Alberto Mardegan (mardy)]

review: Needs Fixing

[Balló György (ballogy)]

Thanks for the response. Unfortunately, I don't have the knowledge how to fix the patch in this way.

It would be nice if upstream developers would solve this problem.

Unmerged revisions

125. By Balló György on 2012-12-03

Generalize the term of Ubuntu

Use the term "computer" instead of "Ubuntu", because the latter confuse users of other GNU/Linux distributions.

=== modified file 'help/C/legal-notice.page'
--- help/C/legal-notice.page	2012-09-25 13:14:37 +0000
+++ help/C/legal-notice.page	2012-12-03 02:15:28 +0000
@@ -36,18 +36,18 @@
 
     <p>You provide Ubuntu Online Accounts with your name and password(s)
     (credentials) for those online services you want Ubuntu Online Accounts to
-    authenticate while using Ubuntu.</p>
+    authenticate while using your computer.</p>
 
     <p>Ubuntu Online Accounts collects and stores your credentials when you
     enter them in the web authentication dialog and uses them, and
     authentication cookies, to provide authentication to those online services
-    each time you access them while using Ubuntu.</p>
+    each time you access them while using your computer.</p>
 
     <p>By using Ubuntu Online Accounts you consent to:</p>
     <list>
       <item><p>the collection and use of your credentials in this way;</p></item>
       <item><p>the use of authentication cookies; and</p></item>
-      <item><p>the storage of your credentials and the authentication cookies on your Ubuntu computer.</p></item>
+      <item><p>the storage of your credentials and the authentication cookies on your computer.</p></item>
     </list>
     <p>Canonical will not access or use your credentials or authentication
     cookies in any other way.</p>
@@ -70,7 +70,7 @@
     <p>You may cease using Ubuntu Online Accounts at any time. If you cease
     using Ubuntu Online Accounts, or wish to cease using it for certain online
     services, please ensure that you have removed all of your credentials from
-    the “Online Accounts” entry of your Ubuntu System Settings.</p>
+    the “Online Accounts” entry of your system settings.</p>
   </section>
 
   <section id="changes">
 
=== modified file 'libaccount-plugin/oauth-plugin.c'
--- libaccount-plugin/oauth-plugin.c	2012-11-05 13:27:05 +0000
+++ libaccount-plugin/oauth-plugin.c	2012-12-03 02:15:28 +0000
@@ -581,7 +581,7 @@
                       G_CALLBACK (on_infobar_response), self);
 
     provider = ap_plugin_get_provider ((ApPlugin *)self);
-    text = g_strdup_printf (_("Please authorize Ubuntu to access "
+    text = g_strdup_printf (_("Please authorize this computer to access "
                               "your %s account"),
                             ag_provider_get_display_name (provider));
     infobar_label = gtk_label_new (text);
 
=== modified file 'src/cc-credentials-account-details-page.vala'
--- src/cc-credentials-account-details-page.vala	2012-10-25 14:42:58 +0000
+++ src/cc-credentials-account-details-page.vala	2012-12-03 02:15:28 +0000
@@ -459,7 +459,7 @@
 
         if (needs_attention)
         {
-            frame_label.label = _("Please authorize Ubuntu to access your %s account:").printf
+            frame_label.label = _("Please authorize this computer to access your %s account:").printf
                                 (provider_display_name);
 
             action_notebook.page = ActionPage.ACCESS_BUTTON;
@@ -490,11 +490,11 @@
                                                   Gtk.MessageType.QUESTION,
                                                   Gtk.ButtonsType.NONE,
                                                   "%s",
-                                                  _("Are you sure that you wish to remove this Ubuntu Web Account?"));
+                                                  _("Are you sure that you wish to remove this web account?"));
         var manager = accounts_store.manager;
         var provider = manager.get_provider (current_account.get_provider_name ());
         var provider_display_name = provider.get_display_name ();
-        var secondary_text = _("The Web Account which manages the integration of %s with your applications will be removed.").printf (provider_display_name)
+        var secondary_text = _("The web account which manages the integration of %s with your applications will be removed.").printf (provider_display_name)
                                + "\n\n"
                                + _("Your online %s account is not affected.").printf (provider_display_name);
         confirmation.secondary_text = secondary_text;