Merge commit 'jtellier/set-account-name-translator-hint'

diff --combined src/empathy-accounts-dialog.c
index 0a193e34e4ad1b507947afa335164bd453cb2fc2,74c9e7bd5d7e59364ea85a2eed0baede1fe0f346..c28dbd30dbe591c9083de6484593ee2a3cba5dd7
--- 1/src/empathy-accounts-dialog.c
--- 2/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@@ -201,9 -201,11 +201,11 @@@ get_default_display_name (EmpathyAccoun
  
            /* To translators: The first parameter is the login id and the
             * second one is the server. The resulting string will be something
-            * like: "MyUserName on chat.freenode.net" */
-           default_display_name =
-               g_strdup_printf (_("%s on %s"), login_id, server);
+            * like: "MyUserName on chat.freenode.net".
+            * You should reverse the order of these arguments if the
+            * server should come before the login id in your locale.*/
+           default_display_name = g_strdup_printf (_("%1$s on %2$s"),
+               login_id, server);
          }
        else
          {
@@@ -245,6 -247,34 +247,6 @@@ empathy_account_dialog_account_created_
      g_object_unref (settings);
  }
  
 -static GtkWidget *
 -get_account_setup_widget (EmpathyAccountSettings *settings,
 -    EmpathyAccountWidget **widget_object)
 -{
 -  const gchar *proto = empathy_account_settings_get_protocol (settings);
 -  EmpathyConnectionManagers *cm =
 -      empathy_connection_managers_dup_singleton ();
 -  GList *cms = empathy_connection_managers_get_cms (cm);
 -  GList *l;
 -
 -  for (l = cms; l; l = l->next)
 -    {
 -      TpConnectionManager *tp_cm = l->data;
 -      if (tp_connection_manager_has_protocol (tp_cm, proto))
 -        {
 -          g_object_unref (cm);
 -          *widget_object = empathy_account_widget_new_for_protocol (proto,
 -              settings, FALSE);
 -          return empathy_account_widget_get_widget (*widget_object);
 -        }
 -    }
 -
 -  g_object_unref (cm);
 -  *widget_object = empathy_account_widget_new_for_protocol ("generic", settings,
 -      FALSE);
 -  return empathy_account_widget_get_widget (*widget_object);
 -}
 -
  static void
  account_dialog_create_settings_widget (EmpathyAccountsDialog *dialog,
      EmpathyAccountSettings *settings)
@@@ -253,10 -283,7 +255,10 @@@
    EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
    gchar *icon_name;
  
 -  priv->settings_widget = get_account_setup_widget (settings, &widget_object);
 +  widget_object = empathy_account_widget_new_for_protocol (settings, FALSE);
 +
 +  priv->settings_widget = empathy_account_widget_get_widget (widget_object);
 +
    g_signal_connect (widget_object, "account-created",
          G_CALLBACK (empathy_account_dialog_account_created_cb), dialog);
    g_signal_connect (widget_object, "cancelled",
@@@ -1208,7 -1235,7 +1210,7 @@@ static voi
  accounts_dialog_button_help_clicked_cb (GtkWidget *button,
      EmpathyAccountsDialog *dialog)
  {
 -  empathy_url_show (button, "ghelp:empathy?empathy-create-account");
 +  empathy_url_show (button, "ghelp:empathy?accounts-window");
  }
  
  static void