[meld] Use Unicode in translatable strings
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Use Unicode in translatable strings
- Date: Sun, 1 Oct 2017 23:27:16 +0000 (UTC)
commit b9832e7274a4e1d26e8fb314e843aa4da679c37d
Author: Piotr Drąg <piotrdrag gmail com>
Date: Sun Oct 1 14:22:03 2017 +0200
Use Unicode in translatable strings
See https://developer.gnome.org/hig/stable/typography.html
https://bugzilla.gnome.org/show_bug.cgi?id=788392
bin/meld | 2 +-
data/org.gnome.meld.gschema.xml | 8 ++++----
data/ui/filediff.ui | 4 ++--
data/ui/vcview.ui | 2 +-
meld/dirdiff.py | 4 ++--
meld/filediff.py | 8 ++++----
meld/meldapp.py | 6 +++---
meld/meldwindow.py | 8 ++++----
meld/misc.py | 2 +-
meld/patchdialog.py | 2 +-
10 files changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/bin/meld b/bin/meld
index 8fb0a08..5c7c932 100755
--- a/bin/meld
+++ b/bin/meld
@@ -224,7 +224,7 @@ def setup_resources():
try:
provider.load_from_path(css_file)
except GLib.GError as err:
- print(_("Couldn't load Meld-specific CSS (%s)\n%s") % (css_file, err))
+ print(_("Couldn’t load Meld-specific CSS (%s)\n%s") % (css_file, err))
Gtk.StyleContext.add_provider_for_screen(
Gdk.Screen.get_default(), provider,
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
diff --git a/data/org.gnome.meld.gschema.xml b/data/org.gnome.meld.gschema.xml
index 2780943..26c831c 100644
--- a/data/org.gnome.meld.gschema.xml
+++ b/data/org.gnome.meld.gschema.xml
@@ -63,7 +63,7 @@
<key name="detect-encodings" type="as">
<default>[]</default>
<summary>Additional automatically detected text encodings</summary>
- <description>Meld will use these text encodings to try to decode loaded text files before trying
any other encodings. In addition to the encodings in this list, UTF-8 and the current locale-default encoding
will always be used; other encodings may also be tried, depending on the user's locale.</description>
+ <description>Meld will use these text encodings to try to decode loaded text files before trying
any other encodings. In addition to the encodings in this list, UTF-8 and the current locale-default encoding
will always be used; other encodings may also be tried, depending on the user’s locale.</description>
</key>
@@ -86,7 +86,7 @@
<key name="highlight-syntax" type='b'>
<default>false</default>
<summary>Highlight syntax</summary>
- <description>Whether to highlight syntax in comparisons. Because of Meld's own color highlighting,
this is off by default.</description>
+ <description>Whether to highlight syntax in comparisons. Because of Meld’s own color highlighting,
this is off by default.</description>
</key>
<key name="style-scheme" type="s">
<default>"classic"</default>
@@ -167,7 +167,7 @@
<key name="folder-time-resolution" type="i">
<default>100</default>
<summary>File timestamp resolution</summary>
- <description>When comparing based on mtime, this is the minimum difference in nanoseconds between
two files before they're considered to have different mtimes. This is useful when comparing files between
filesystems with different timestamp resolution.</description>
+ <description>When comparing based on mtime, this is the minimum difference in nanoseconds between
two files before they’re considered to have different mtimes. This is useful when comparing files between
filesystems with different timestamp resolution.</description>
</key>
<key name="folder-filter-text" type="b">
<default>true</default>
@@ -249,7 +249,7 @@
]
</default>
<summary>Text-based filters</summary>
- <description>List of predefined text-based regex filters that, if active, will remove text from
being used in a file comparison. The text will still be displayed, but won't contribute to the comparison
itself.</description>
+ <description>List of predefined text-based regex filters that, if active, will remove text from
being used in a file comparison. The text will still be displayed, but won’t contribute to the comparison
itself.</description>
</key>
</schema>
</schemalist>
diff --git a/data/ui/filediff.ui b/data/ui/filediff.ui
index 3765f46..ebe8f75 100644
--- a/data/ui/filediff.ui
+++ b/data/ui/filediff.ui
@@ -5,7 +5,7 @@
<object class="GtkActionGroup" id="FilediffActions">
<child>
<object class="GtkAction" id="MakePatch">
- <property name="label" translatable="yes">Format as Patch...</property>
+ <property name="label" translatable="yes">Format as Patch…</property>
<property name="tooltip" translatable="yes">Create a patch using differences between files</property>
<signal name="activate" handler="make_patch" swapped="no"/>
</object>
@@ -185,7 +185,7 @@
<property name="skip_taskbar_hint">True</property>
<property name="message_type">warning</property>
<property name="text" translatable="yes">Save changes to documents before closing?</property>
- <property name="secondary_text" translatable="yes">If you don't save, changes will be permanently
lost.</property>
+ <property name="secondary_text" translatable="yes">If you don’t save, changes will be permanently
lost.</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
diff --git a/data/ui/vcview.ui b/data/ui/vcview.ui
index c2f0677..b72fa59 100644
--- a/data/ui/vcview.ui
+++ b/data/ui/vcview.ui
@@ -14,7 +14,7 @@
</child>
<child>
<object class="GtkAction" id="VcCommit">
- <property name="label" translatable="yes">Co_mmit...</property>
+ <property name="label" translatable="yes">Co_mmit…</property>
<property name="tooltip" translatable="yes">Commit changes to version control</property>
<property name="icon_name">vc-commit-24</property>
<signal name="activate" handler="on_button_commit_clicked" swapped="no"/>
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index d308a2d..8d27d86 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -883,7 +883,7 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
formatted_entries = [[] for i in range(self.num_panes)]
for pane, root, f1, f2 in shadowed_entries:
paths = [os.path.join(root, f) for f in (f1, f2)]
- entry_str = _("'%s' hidden by '%s'") % (paths[0], paths[1])
+ entry_str = _("“%s” hidden by “%s”") % (paths[0], paths[1])
formatted_entries[pane].append(entry_str)
if invalid_filenames or shadowed_entries:
@@ -955,7 +955,7 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
except (OSError, IOError, shutil.Error) as err:
misc.error_dialog(
_("Error copying file"),
- _("Couldn't copy %s\nto %s.\n\n%s") % (
+ _("Couldn’t copy %s\nto %s.\n\n%s") % (
GLib.markup_escape_text(src),
GLib.markup_escape_text(dst),
GLib.markup_escape_text(str(err)),
diff --git a/meld/filediff.py b/meld/filediff.py
index fecab93..831f476 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1470,7 +1470,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
msgarea = self.msgarea_mgr[pane].new_from_text_and_icon(
'dialog-warning-symbolic', primary, secondary)
msgarea.add_button(_("Save Anyway"), Gtk.ResponseType.ACCEPT)
- msgarea.add_button(_("Don't Save"), Gtk.ResponseType.CLOSE)
+ msgarea.add_button(_("Don’t Save"), Gtk.ResponseType.CLOSE)
def on_file_changed_response(msgarea, response_id, *args):
self.msgarea_mgr[pane].clear()
@@ -1499,9 +1499,9 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
(_("_Save as UTF-8"), Gtk.ResponseType.OK),
]
reencode = misc.modal_dialog(
- primary=_(u"Couldn't encode text as “%s”") % encoding,
+ primary=_(u"Couldn’t encode text as “%s”") % encoding,
secondary=_(
- u"File “%s” contains characters that can't be encoded "
+ u"File “%s” contains characters that can’t be encoded "
u"using encoding “%s”.\n"
u"Would you like to save as UTF-8?") % (
bufdata.label, encoding),
@@ -1542,7 +1542,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
gfile.get_parse_name())
misc.error_dialog(
primary=_("Could not save file %s.") % filename,
- secondary=_("Couldn't save file due to:\n%s") % (
+ secondary=_("Couldn’t save file due to:\n%s") % (
GLib.markup_escape_text(str(err))),
)
self.state = melddoc.STATE_SAVING_ERROR
diff --git a/meld/meldapp.py b/meld/meldapp.py
index 7e98f67..f826371 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -288,9 +288,9 @@ class MeldApp(Gtk.Application):
parser.local_error(_("too many arguments (wanted 0-3, got %d)") %
len(args))
elif options.auto_merge and len(args) < 3:
- parser.local_error(_("can't auto-merge less than 3 files"))
+ parser.local_error(_("can’t auto-merge less than 3 files"))
elif options.auto_merge and any([os.path.isdir(f) for f in args]):
- parser.local_error(_("can't auto-merge directories"))
+ parser.local_error(_("can’t auto-merge directories"))
if parser.should_exit:
cleanup()
@@ -346,7 +346,7 @@ class MeldApp(Gtk.Application):
try:
for p, f in zip(paths, files):
if f.get_path() is None:
- raise ValueError(_("invalid path or URI \"%s\"") % p)
+ raise ValueError(_("invalid path or URI “%s”") % p)
tab = self.open_files(
files, window=window,
close_on_error=close_on_error,
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index b412a4d..cbfeb93 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -47,13 +47,13 @@ class MeldWindow(gnomeglade.Component):
actions = (
("FileMenu", None, _("_File")),
- ("New", Gtk.STOCK_NEW, _("_New Comparison..."), "<Primary>N",
+ ("New", Gtk.STOCK_NEW, _("_New Comparison…"), "<Primary>N",
_("Start a new comparison"),
self.on_menu_file_new_activate),
("Save", Gtk.STOCK_SAVE, None, None,
_("Save the current file"),
self.on_menu_save_activate),
- ("SaveAs", Gtk.STOCK_SAVE_AS, _("Save As..."), "<Primary><shift>S",
+ ("SaveAs", Gtk.STOCK_SAVE_AS, _("Save As…"), "<Primary><shift>S",
_("Save the current file with a different name"),
self.on_menu_save_as_activate),
("Close", Gtk.STOCK_CLOSE, None, None,
@@ -73,7 +73,7 @@ class MeldWindow(gnomeglade.Component):
self.on_menu_copy_activate),
("Paste", Gtk.STOCK_PASTE, None, None, _("Paste the clipboard"),
self.on_menu_paste_activate),
- ("Find", Gtk.STOCK_FIND, _("Find..."), None, _("Search for text"),
+ ("Find", Gtk.STOCK_FIND, _("Find…"), None, _("Search for text"),
self.on_menu_find_activate),
("FindNext", None, _("Find Ne_xt"), "<Primary>G",
_("Search forwards for the same text"),
@@ -82,7 +82,7 @@ class MeldWindow(gnomeglade.Component):
_("Search backwards for the same text"),
self.on_menu_find_previous_activate),
("Replace", Gtk.STOCK_FIND_AND_REPLACE,
- _("_Replace..."), "<Primary>H",
+ _("_Replace…"), "<Primary>H",
_("Find and replace text"),
self.on_menu_replace_activate),
diff --git a/meld/misc.py b/meld/misc.py
index b8b102f..a26d10a 100644
--- a/meld/misc.py
+++ b/meld/misc.py
@@ -200,7 +200,7 @@ def colour_lookup_with_fallback(name, attribute):
if not style_attr:
import sys
print(_(
- "Couldn't find colour scheme details for %s-%s; "
+ "Couldn’t find colour scheme details for %s-%s; "
"this is a bad install") % (name, attribute), file=sys.stderr)
sys.exit(1)
diff --git a/meld/patchdialog.py b/meld/patchdialog.py
index bad68f4..c668d4c 100644
--- a/meld/patchdialog.py
+++ b/meld/patchdialog.py
@@ -128,7 +128,7 @@ class PatchDialog(Component):
filename = GLib.markup_escape_text(gfile.get_parse_name())
error_dialog(
primary=_("Could not save file %s.") % filename,
- secondary=_("Couldn't save file due to:\n%s") % (
+ secondary=_("Couldn’t save file due to:\n%s") % (
GLib.markup_escape_text(str(err))),
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
