[geary] Unify three variants of "try reconnecting" strings

[Michael Gratton <mjog src gnome org>]

commit 1807a187bdfdf22b9b75c9dd1dac3901df103bd6
Author: Michael Gratton <mike vee net>
Date:   Mon Feb 11 08:16:17 2019 +1100

    Unify three variants of "try reconnecting" strings
    
    See #210

 src/client/components/main-window-info-bar.vala | 17 ++++++++++++++---
 ui/main-window.ui                               |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/src/client/components/main-window-info-bar.vala b/src/client/components/main-window-info-bar.vala
index 5553555d..9bc590fc 100644
--- a/src/client/components/main-window-info-bar.vala
+++ b/src/client/components/main-window-info-bar.vala
@@ -47,7 +47,8 @@ public class MainWindowInfoBar : Gtk.InfoBar {
                 title = _("Problem connecting to incoming server for %s".printf(account));
                 // Translators: String substitution is the server name
                 descr = _("Could not connect to %s, check your Internet access and the server name and try 
again").printf(server);
-                retry = _("Retry connecting now");
+                // Translators: Tooltip label for Retry button
+                retry = _("Try reconnecting");
 
             } else if (report.problem_type == Geary.ProblemType.CONNECTION_ERROR &&
                        service_report.service.protocol == Geary.Protocol.SMTP) {
@@ -55,8 +56,8 @@ public class MainWindowInfoBar : Gtk.InfoBar {
                 title = _("Problem connecting to outgoing server for %s".printf(account));
                 // Translators: String substitution is the server name
                 descr = _("Could not connect to %s, check your Internet access and the server name and try 
again").printf(server);
-                retry = _("Try reconnecting now");
-                retry = _("Retry connecting now");
+                // Translators: Tooltip label for Retry button
+                retry = _("Try reconnecting");
 
             } else if (report.problem_type == Geary.ProblemType.NETWORK_ERROR &&
                        service_report.service.protocol == Geary.Protocol.IMAP) {
@@ -64,6 +65,7 @@ public class MainWindowInfoBar : Gtk.InfoBar {
                 title = _("Problem with connection to incoming server for %s").printf(account);
                 // Translators: String substitution is the server name
                 descr = _("Network error talking to %s, check your Internet access and try 
again").printf(server);
+                // Translators: Tooltip label for Retry button
                 retry = _("Try reconnecting");
 
             } else if (report.problem_type == Geary.ProblemType.NETWORK_ERROR &&
@@ -72,6 +74,7 @@ public class MainWindowInfoBar : Gtk.InfoBar {
                 title = _("Problem with connection to outgoing server for %s").printf(account);
                 // Translators: String substitution is the server name
                 descr = _("Network error talking to %s, check your Internet access and try 
again").printf(server);
+                // Translators: Tooltip label for Retry button
                 retry = _("Try reconnecting");
 
             } else if (report.problem_type == Geary.ProblemType.SERVER_ERROR &&
@@ -80,6 +83,7 @@ public class MainWindowInfoBar : Gtk.InfoBar {
                 title = _("Problem communicating with incoming server for %s").printf(account);
                 // Translators: String substitution is the server name
                 descr = _("Geary did not understand a message from %s or vice versa, please file a bug 
report").printf(server);
+                // Translators: Tooltip label for Retry button
                 retry = _("Try reconnecting");
 
             } else if (report.problem_type == Geary.ProblemType.SERVER_ERROR &&
@@ -88,6 +92,7 @@ public class MainWindowInfoBar : Gtk.InfoBar {
                 // Translators: First string substitution is the server
                 // name, second is the account name
                 descr = _("Could not communicate with %s for %s, check the server name and try again in a 
moment").printf(server, account);
+                // Translators: Tooltip label for Retry button
                 retry = _("Try reconnecting");
 
             } else if (report.problem_type == Geary.ProblemType.AUTHENTICATION &&
@@ -95,6 +100,7 @@ public class MainWindowInfoBar : Gtk.InfoBar {
                 // Translators: String substitution is the account name
                 title = _("Incoming mail server password required for %s").printf(account);
                 descr = _("Messages cannot be received without the correct password.");
+                // Translators: Tooltip label for Retry button
                 retry = _("Retry receiving email, you will be prompted for a password");
 
             } else if (report.problem_type == Geary.ProblemType.AUTHENTICATION &&
@@ -102,6 +108,7 @@ public class MainWindowInfoBar : Gtk.InfoBar {
                 // Translators: String substitution is the account name
                 title = _("Outgoing mail server password required for %s").printf(account);
                 descr = _("Messages cannot be sent without the correct password.");
+                // Translators: Tooltip label for Retry button
                 retry = _("Retry sending queued messages, you will be prompted for a password");
 
             } else if (report.problem_type == Geary.ProblemType.UNTRUSTED &&
@@ -109,6 +116,7 @@ public class MainWindowInfoBar : Gtk.InfoBar {
                 // Translators: String substitution is the account name
                 title = _("Incoming mail server security is not trusted for %s").printf(account);
                 descr = _("Messages will not be received until checked.");
+                // Translators: Tooltip label for Retry button
                 retry = _("Check security details");
 
             } else if (report.problem_type == Geary.ProblemType.UNTRUSTED &&
@@ -116,6 +124,7 @@ public class MainWindowInfoBar : Gtk.InfoBar {
                 // Translators: String substitution is the account name
                 title = _("Outgoing mail server security is not trusted for %s").printf(account);
                 descr = _("Messages cannot be sent until checked.");
+                // Translators: Tooltip label for Retry button
                 retry = _("Check security details");
 
             } else if (report.problem_type == Geary.ProblemType.GENERIC_ERROR &&
@@ -123,6 +132,7 @@ public class MainWindowInfoBar : Gtk.InfoBar {
                 // Translators: String substitution is the account name
                 title = _("A problem occurred checking mail for %s").printf(account);
                 descr = _("Something went wrong, please file a bug report if the problem persists");
+                // Translators: Tooltip label for Retry button
                 retry = _("Try reconnecting");
 
             } else if (report.problem_type == Geary.ProblemType.GENERIC_ERROR &&
@@ -130,6 +140,7 @@ public class MainWindowInfoBar : Gtk.InfoBar {
                 // Translators: String substitution is the account name
                 title = _("A problem occurred sending mail for %s").printf(account);
                 descr = _("Something went wrong, please file a bug report if the problem persists");
+                // Translators: Tooltip label for Retry button
                 retry = _("Retry sending queued messages");
 
             } else {
diff --git a/ui/main-window.ui b/ui/main-window.ui
index 87f6f94b..7a1b0210 100644
--- a/ui/main-window.ui
+++ b/ui/main-window.ui
@@ -262,7 +262,7 @@ You will not be able to send or receive email until it is re-connected.</propert
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes" comments="Button tooltip 
for retrying an account problem">Retry connecting now</property>
+                                <property name="tooltip_text" translatable="yes" comments="Button tooltip 
for retrying an account problem">Try reconnecting</property>
                                 <signal name="clicked" handler="on_service_problem_retry" swapped="no"/>
                               </object>
                               <packing>