[gitg/quotes] Fix quotes on messages
- From: Alberto Fanjul <albfan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg/quotes] Fix quotes on messages
- Date: Tue, 1 Feb 2022 18:45:50 +0000 (UTC)
commit 31e979cd7e13cf7a207d2caa74041da3874d90ee
Author: Alberto Fanjul <albertofanjul gmail com>
Date: Tue Feb 1 16:03:37 2022 +0100
Fix quotes on messages
gitg/gitg-commit-action-cherry-pick.vala | 10 +++++-----
gitg/gitg-ref-action-checkout.vala | 2 +-
gitg/gitg-ref-action-merge.vala | 18 +++++++++---------
3 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/gitg/gitg-commit-action-cherry-pick.vala b/gitg/gitg-commit-action-cherry-pick.vala
index 0065d434..0beb27ec 100644
--- a/gitg/gitg-commit-action-cherry-pick.vala
+++ b/gitg/gitg-commit-action-cherry-pick.vala
@@ -114,7 +114,7 @@ class CommitActionCherryPick : GitgExt.UIElement, GitgExt.Action, GitgExt.Commit
}
catch (Error e)
{
- notification.error(_("Failed to lookup the commit for branch %s:
%s").printf(@"'$theirs_name'", e.message));
+ notification.error(_("Failed to lookup the commit for branch “%s“:
%s").printf(theirs_name, e.message));
return null;
}
@@ -150,11 +150,11 @@ class CommitActionCherryPick : GitgExt.UIElement, GitgExt.Action, GitgExt.Commit
if (ishead)
{
- message = _("The cherry pick of %s onto %s has caused conflicts, would you like to
checkout branch %s with the cherry pick to your working directory to resolve the
conflicts?").printf(@"'$ours_name'", @"'$theirs_name'", @"'$theirs_name'");
+ message = _("The cherry pick of “%s“ onto “%s“ has caused conflicts, would you like
to checkout branch “%s“ with the cherry pick to your working directory to resolve the
conflicts?").printf(ours_name, theirs_name, theirs_name);
}
else
{
- message = _("The cherry-pick of %s onto %s has caused conflicts, would you like to
checkout the cherry pick to your working directory to resolve the conflicts?").printf(@"'$ours_name'",
@"'$theirs_name'");
+ message = _("The cherry-pick of “%s“ onto “%s“ has caused conflicts, would you like
to checkout the cherry pick to your working directory to resolve the conflicts?").printf(ours_name,
theirs_name);
}
var q = new GitgExt.UserQuery.full(_("Cherry pick has conflicts"),
@@ -196,7 +196,7 @@ class CommitActionCherryPick : GitgExt.UIElement, GitgExt.Action, GitgExt.Commit
var shortid = id.to_string()[0:6];
var name = destination.parsed_name.shortname;
- var notification = new SimpleNotification(_("Cherry pick %s onto %s").printf(@"'$shortid'",
@"'$name'"));
+ var notification = new SimpleNotification(_("Cherry pick “%s“ onto “%s“").printf(shortid,
name));
application.notifications.add(notification);
@@ -258,7 +258,7 @@ class CommitActionCherryPick : GitgExt.UIElement, GitgExt.Action, GitgExt.Commit
var name = dest.parsed_name.shortname;
var subitem = new Gtk.MenuItem.with_label(name);
- subitem.tooltip_text = _("Cherry pick onto %s").printf(@"'$name'");
+ subitem.tooltip_text = _("Cherry pick onto “%s“").printf(name);
subitem.show();
subitem.activate.connect(() => {
diff --git a/gitg/gitg-ref-action-checkout.vala b/gitg/gitg-ref-action-checkout.vala
index 8a691d83..e8126272 100644
--- a/gitg/gitg-ref-action-checkout.vala
+++ b/gitg/gitg-ref-action-checkout.vala
@@ -69,7 +69,7 @@ class RefActionCheckout : GitgExt.UIElement, GitgExt.Action, GitgExt.RefAction,
public async bool checkout()
{
var repo = application.repository;
- var notification = new SimpleNotification(_("Checkout
%s").printf(@"'$(reference.parsed_name.shortname)'"));
+ var notification = new SimpleNotification(_("Checkout
“%s“").printf(reference.parsed_name.shortname));
bool retval = false;
application.notifications.add(notification);
diff --git a/gitg/gitg-ref-action-merge.vala b/gitg/gitg-ref-action-merge.vala
index 7815c2bf..e5b06e86 100644
--- a/gitg/gitg-ref-action-merge.vala
+++ b/gitg/gitg-ref-action-merge.vala
@@ -139,11 +139,11 @@ class RefActionMerge : GitgExt.UIElement, GitgExt.Action, GitgExt.RefAction, Obj
if (source.parsed_name.rtype == RefType.REMOTE)
{
- msg = @"Merge remote branch '$theirs_name'";
+ msg = @"Merge remote branch “$theirs_name“";
}
else
{
- msg = @"Merge branch '$theirs_name'";
+ msg = @"Merge branch “$theirs_name“";
}
msg += "\n\nConflicts:\n";
@@ -181,11 +181,11 @@ class RefActionMerge : GitgExt.UIElement, GitgExt.Action, GitgExt.RefAction, Obj
if (ishead)
{
- message = _("The merge of %s into %s has caused conflicts, would you like to checkout
branch %s with the merge to your working directory to resolve the conflicts?").printf(@"'$theirs_name'",
@"'$ours_name'", @"'$ours_name'");
+ message = _("The merge of “%s“ into “%s“ has caused conflicts, would you like to
checkout branch “%s“ with the merge to your working directory to resolve the conflicts?").printf(theirs_name,
ours_name, ours_name);
}
else
{
- message = _("The merge of %s into %s has caused conflicts, would you like to checkout
the merge to your working directory to resolve the conflicts?").printf(@"'$theirs_name'", @"'$ours_name'");
+ message = _("The merge of “%s“ into “%s“ has caused conflicts, would you like to
checkout the merge to your working directory to resolve the conflicts?").printf(theirs_name, ours_name);
}
var q = new GitgExt.UserQuery.full(_("Merge has conflicts"),
@@ -219,7 +219,7 @@ class RefActionMerge : GitgExt.UIElement, GitgExt.Action, GitgExt.RefAction, Obj
var ours_name = reference.parsed_name.shortname;
var theirs_name = source.parsed_name.shortname;
- var notification = new SimpleNotification(_("Merge %s into %s").printf(@"'$theirs_name'",
@"'$ours_name'"));
+ var notification = new SimpleNotification(_("Merge “%s“ into “%s“").printf(theirs_name,
ours_name));
application.notifications.add(notification);
try
@@ -259,11 +259,11 @@ class RefActionMerge : GitgExt.UIElement, GitgExt.Action, GitgExt.RefAction, Obj
if (source.parsed_name.rtype == RefType.REMOTE)
{
- msg = @"Merge remote branch '$theirs_name'";
+ msg = @"Merge remote branch “$theirs_name“";
}
else
{
- msg = @"Merge branch '$theirs_name'";
+ msg = @"Merge branch “$theirs_name“";
}
var oid = yield d_support.commit_index(notification,
@@ -275,7 +275,7 @@ class RefActionMerge : GitgExt.UIElement, GitgExt.Action, GitgExt.RefAction, Obj
if (oid != null)
{
- notification.success(_("Successfully merged %s into %s").printf(@"'$theirs_name'",
@"'$ours_name'"));
+ notification.success(_("Successfully merged “%s“ into “%s“").printf(theirs_name,
ours_name));
}
return oid;
@@ -317,7 +317,7 @@ class RefActionMerge : GitgExt.UIElement, GitgExt.Action, GitgExt.RefAction, Obj
var item = new Gtk.MenuItem.with_label(name);
item.show();
- item.tooltip_text = _("Merge %s into branch %s").printf(@"'$name'",
@"'$(reference.parsed_name.shortname)'");
+ item.tooltip_text = _("Merge “%s“ into branch “%s“").printf(name,
reference.parsed_name.shortname);
item.activate.connect(() => {
activate_source(source);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]