[gitg/gnome-3-30] Revert "Use Unicode typography in user-visible strings"



commit 4d51270509a743140e3521d181de470dab656316
Author: Alberto Fanjul <albertofanjul gmail com>
Date:   Mon Nov 5 10:42:29 2018 +0100

    Revert "Use Unicode typography in user-visible strings"
    
    This reverts commit bdb9637aaba076dc83c0e76667d2c0ca2e1a85b6.

 data/org.gnome.gitg.gschema.xml.in   |  2 +-
 gitg/commit/gitg-commit.vala         | 28 ++++++++++++++--------------
 gitg/gitg-application.vala           |  8 ++++----
 gitg/gitg-author-details-dialog.vala |  4 ++--
 gitg/gitg-ref-action-rename.vala     |  2 +-
 gitg/gitg-window.vala                |  2 +-
 libgitg/gitg-date.vala               |  8 ++++----
 7 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/data/org.gnome.gitg.gschema.xml.in b/data/org.gnome.gitg.gschema.xml.in
index b15eed4d..8f903d54 100644
--- a/data/org.gnome.gitg.gschema.xml.in
+++ b/data/org.gnome.gitg.gschema.xml.in
@@ -75,7 +75,7 @@
       <summary>When to Collapse Inactive Lanes</summary>
       <description>
         Setting that indicates when an inactive lane should be collapsed.
-        Valid values are 0 — 4, where 0 indicates “early” and 4 indicates “late”.
+        Valid values are 0 - 4, where 0 indicates 'early' and 4 indicates 'late'.
       </description>
     </key>
     <key name="collapse-inactive-lanes-enabled" type="b">
diff --git a/gitg/commit/gitg-commit.vala b/gitg/commit/gitg-commit.vala
index df779000..26af7dda 100644
--- a/gitg/commit/gitg-commit.vala
+++ b/gitg/commit/gitg-commit.vala
@@ -229,7 +229,7 @@ namespace GitgCommit
                                }
                                catch (Error e)
                                {
-                                       var msg = _("Failed to stage the removal of submodule 
“%s”").printf(sub.path);
+                                       var msg = _("Failed to stage the removal of submodule 
`%s'").printf(sub.path);
                                        application.show_infobar(msg, e.message, Gtk.MessageType.ERROR);
 
                                        return false;
@@ -245,7 +245,7 @@ namespace GitgCommit
                                }
                                catch (Error e)
                                {
-                                       var msg = _("Failed to open the repository of submodule “%s” while 
trying to stage").printf(sub.path);
+                                       var msg = _("Failed to open the repository of submodule `%s' while 
trying to stage").printf(sub.path);
                                        application.show_infobar(msg, e.message, Gtk.MessageType.ERROR);
 
                                        return false;
@@ -260,7 +260,7 @@ namespace GitgCommit
                                        }
                                        catch (Error e)
                                        {
-                                               var msg = _("Failed to lookup the working directory commit of 
submodule “%s” while trying to stage").printf(sub.path);
+                                               var msg = _("Failed to lookup the working directory commit of 
submodule `%s' while trying to stage").printf(sub.path);
                                                application.show_infobar(msg, e.message, 
Gtk.MessageType.ERROR);
 
                                                return false;
@@ -273,7 +273,7 @@ namespace GitgCommit
                                }
                                catch (Error e)
                                {
-                                       var msg = _("Failed to stage the submodule “%s”").printf(sub.path);
+                                       var msg = _("Failed to stage the submodule `%s'").printf(sub.path);
                                        application.show_infobar(msg, e.message, Gtk.MessageType.ERROR);
 
                                        return false;
@@ -295,7 +295,7 @@ namespace GitgCommit
                                }
                                catch (Error e)
                                {
-                                       var msg = _("Failed to stage the removal of file 
“%s”").printf(file.path);
+                                       var msg = _("Failed to stage the removal of file 
`%s'").printf(file.path);
                                        application.show_infobar(msg, e.message, Gtk.MessageType.ERROR);
 
                                        return false;
@@ -309,7 +309,7 @@ namespace GitgCommit
                                }
                                catch (Error e)
                                {
-                                       var msg = _("Failed to stage the file “%s”").printf(file.path);
+                                       var msg = _("Failed to stage the file `%s'").printf(file.path);
                                        application.show_infobar(msg, e.message, Gtk.MessageType.ERROR);
 
                                        return false;
@@ -647,16 +647,16 @@ namespace GitgCommit
                {
                        return yield unstage_item(file,
                                                  (file.flags & Ggit.StatusFlags.INDEX_NEW) != 0,
-                                                 _("Failed to unstage the removal of file 
“%s”").printf(file.path),
-                                                 _("Failed to unstage the file “%s”").printf(file.path));
+                                                 _("Failed to unstage the removal of file 
`%s'").printf(file.path),
+                                                 _("Failed to unstage the file `%s'").printf(file.path));
                }
 
                private async bool unstage_submodule(Gitg.StageStatusSubmodule sub)
                {
                        return yield unstage_item(sub,
                                                  (sub.flags & Ggit.SubmoduleStatus.INDEX_ADDED) != 0,
-                                                 _("Failed to unstage the removal of submodule 
“%s”").printf(sub.path),
-                                                 _("Failed to unstage the submodule “%s”").printf(sub.path));
+                                                 _("Failed to unstage the removal of submodule 
`%s'").printf(sub.path),
+                                                 _("Failed to unstage the submodule `%s'").printf(sub.path));
                }
 
                private void unstage_submodule_at(Gitg.Commit commit)
@@ -1483,7 +1483,7 @@ namespace GitgCommit
 
                        if (items.length == 1)
                        {
-                               secondary = _("Are you sure you want to permanently discard all changes made 
to the file “%s”?").printf(items[0].path);
+                               secondary = _("Are you sure you want to permanently discard all changes made 
to the file `%s'?").printf(items[0].path);
                        }
                        else
                        {
@@ -1494,7 +1494,7 @@ namespace GitgCommit
                                        paths[i] = @"`$(items[i].path)'";
                                }
 
-                               secondary = _("Are you sure you want to permanently discard all changes made 
to the files %s and “%s”?").printf(string.joinv(", ", paths), items[items.length - 1].path);
+                               secondary = _("Are you sure you want to permanently discard all changes made 
to the files %s and `%s'?").printf(string.joinv(", ", paths), items[items.length - 1].path);
                        }
 
                        var q = new GitgExt.UserQuery();
@@ -1598,7 +1598,7 @@ namespace GitgCommit
 
                        if (items.length == 1)
                        {
-                               secondary = _("Are you sure you want to permanently delete the file 
“%s”?").printf(items[0].path);
+                               secondary = _("Are you sure you want to permanently delete the file 
`%s'?").printf(items[0].path);
                        }
                        else
                        {
@@ -1609,7 +1609,7 @@ namespace GitgCommit
                                        paths[i] = @"`$(items[i].path)'";
                                }
 
-                               secondary = _("Are you sure you want to permanently delete the files %s and 
“%s”?").printf(string.joinv(", ", paths), items[items.length - 1].path);
+                               secondary = _("Are you sure you want to permanently delete the files %s and 
`%s'?").printf(string.joinv(", ", paths), items[items.length - 1].path);
                        }
 
                        var q = new GitgExt.UserQuery();
diff --git a/gitg/gitg-application.vala b/gitg/gitg-application.vala
index e6f935fb..85f33988 100644
--- a/gitg/gitg-application.vala
+++ b/gitg/gitg-application.vala
@@ -54,7 +54,7 @@ public class Application : Gtk.Application
 
                public const OptionEntry[] entries = {
                        {"version", 'v', OptionFlags.NO_ARG, OptionArg.CALLBACK,
-                        (void *)show_version_and_quit, N_("Show the application’s version"), null},
+                        (void *)show_version_and_quit, N_("Show the application's version"), null},
 
                        {"activity", '\0', 0, OptionArg.STRING,
                         ref activity, N_("Start gitg with a particular activity"), null},
@@ -95,7 +95,7 @@ public class Application : Gtk.Application
 
        private GitgExt.CommandLines parse_command_line(ref unowned string[] argv) throws OptionError
        {
-               var ctx = new OptionContext(_("— Git repository viewer"));
+               var ctx = new OptionContext(_("- Git repository viewer"));
 
                ctx.add_main_entries(Options.entries, Config.GETTEXT_PACKAGE);
                ctx.add_group(Gtk.get_option_group(true));
@@ -228,7 +228,7 @@ public class Application : Gtk.Application
                                    "Ignacio Casal Quinteiro <icq gnome org>"};
 
                string copyright = "Copyright \xc2\xa9 2012 Jesse van den Kieboom";
-               string comments = _("gitg is a Git repository viewer for GTK+/GNOME");
+               string comments = _("gitg is a Git repository viewer for gtk+/GNOME");
 
                unowned List<Gtk.Window> wnds = get_windows();
 
@@ -370,7 +370,7 @@ public class Application : Gtk.Application
                {
                        if (e is Gitg.InitError.THREADS_UNSAFE)
                        {
-                               var errmsg = _("We are terribly sorry, but gitg requires libgit2 (a library 
on which gitg depends) to be compiled with threading support.\n\nIf you manually compiled libgit2, then 
please configure libgit2 with -DTHREADSAFE:BOOL=ON.\n\nOtherwise, report a bug in your distributions’ bug 
reporting system for providing libgit2 without threading support.");
+                               var errmsg = _("We are terribly sorry, but gitg requires libgit2 (a library 
on which gitg depends) to be compiled with threading support.\n\nIf you manually compiled libgit2, then 
please configure libgit2 with -DTHREADSAFE:BOOL=ON.\n\nOtherwise, report a bug in your distributions' bug 
reporting system for providing libgit2 without threading support.");
 
                                init_error(errmsg);
                                error("%s", errmsg);
diff --git a/gitg/gitg-author-details-dialog.vala b/gitg/gitg-author-details-dialog.vala
index 4b4f557e..c2d86405 100644
--- a/gitg/gitg-author-details-dialog.vala
+++ b/gitg/gitg-author-details-dialog.vala
@@ -114,10 +114,10 @@ namespace Gitg
 
                private void build_repository()
                {
-                       title = "%s — %s".printf(d_repository_name, _("Author Details"));
+                       title = "%s - %s".printf(d_repository_name, _("Author Details"));
 
                        // Translators: %s is the repository name
-                       d_checkbutton_override_global.label = _("Override global details for repository 
“%s”:").printf(d_repository_name);
+                       d_checkbutton_override_global.label = _("Override global details for repository 
'%s':").printf(d_repository_name);
                        d_checkbutton_override_global.active = (config_is_local("user.name") || 
config_is_local("user.email"));
 
                        d_checkbutton_override_global.notify["active"].connect(update_sensitivity);
diff --git a/gitg/gitg-ref-action-rename.vala b/gitg/gitg-ref-action-rename.vala
index a7921db2..098de699 100644
--- a/gitg/gitg-ref-action-rename.vala
+++ b/gitg/gitg-ref-action-rename.vala
@@ -97,7 +97,7 @@ class RefActionRename : GitgExt.UIElement, GitgExt.Action, GitgExt.RefAction, Ob
 
                if (!Ggit.Ref.is_valid_name(@"$prefix$new_text"))
                {
-                       var msg = _("The specified name “%s” contains invalid characters").printf(new_text);
+                       var msg = _("The specified name ‘%s’ contains invalid characters").printf(new_text);
 
                        action_interface.application.show_infobar(_("Invalid name"),
                                                                  msg,
diff --git a/gitg/gitg-window.vala b/gitg/gitg-window.vala
index 1a7b1401..1c68cb8f 100644
--- a/gitg/gitg-window.vala
+++ b/gitg/gitg-window.vala
@@ -952,7 +952,7 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable
                {
                        string repo_name = path.get_basename();
 
-                       var title = _("“%s” is not a Git repository.").printf(repo_name);
+                       var title = _("'%s' is not a Git repository.").printf(repo_name);
                        show_infobar(title, e.message, Gtk.MessageType.WARNING);
 
                        return;
diff --git a/libgitg/gitg-date.vala b/libgitg/gitg-date.vala
index 9e4e8010..19cff8e0 100644
--- a/libgitg/gitg-date.vala
+++ b/libgitg/gitg-date.vala
@@ -371,14 +371,14 @@ public class Date : Object, Initable
                                /* Translators: this is a strftime type date format which is
                                   used when the date is in the current year and uses a 24 hour
                                   clock.*/
-                               return dt.format(_("%b %e, %H∶%M"));
+                               return dt.format(_("%b %e, %H:%M"));
                        }
                        else
                        {
                                /* Translators: this is a strftime type date format which is
                                   used when the date is in the current year and uses a 12 hour
                                   clock.*/
-                               return dt.format(_("%b %e, %I∶%M %p"));
+                               return dt.format(_("%b %e, %I:%M %p"));
                        }
                }
                else
@@ -388,14 +388,14 @@ public class Date : Object, Initable
                                /* Translators: this is a strftime type date format which is
                                   used when the date is not in the current year and uses a 24
                                   hour clock.*/
-                               return dt.format(_("%b %e %Y, %H∶%M"));
+                               return dt.format(_("%b %e %Y, %H:%M"));
                        }
                        else
                        {
                                /* Translators: this is a strftime type date format which is
                                   used when the date is not in the current year and uses a 12
                                   hour clock.*/
-                               return dt.format(_("%b %e %Y, %I∶%M %p"));
+                               return dt.format(_("%b %e %Y, %I:%M %p"));
                        }
                }
        }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]