This is an automated email from the git hooks/post-receive script. a n d r e p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository thunar-plugins/thunar-vcs-plugin.
commit 9c91cda35a2d621d8ca9307eba0ca59b97ba8fa0 Author: Andre Miranda <andre...@xfce.org> Date: Sun Jun 24 15:24:32 2018 -0300 Use C_() instead of Q_() --- configure.ac.in | 2 +- thunar-vcs-plugin/tvp-git-action.c | 48 +++++++++++++++++++------------------- thunar-vcs-plugin/tvp-svn-action.c | 48 +++++++++++++++++++------------------- 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 8bf5980..b4fe592 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -66,7 +66,7 @@ dnl ******************************** AC_PROG_CC() AC_PROG_LD() AC_PROG_INSTALL() -IT_PROG_INTLTOOL() +IT_PROG_INTLTOOL([0.36.3]) AM_PROG_CC_C_O() dnl ************************** diff --git a/thunar-vcs-plugin/tvp-git-action.c b/thunar-vcs-plugin/tvp-git-action.c index ab8f266..1df627f 100644 --- a/thunar-vcs-plugin/tvp-git-action.c +++ b/thunar-vcs-plugin/tvp-git-action.c @@ -232,36 +232,36 @@ tvp_git_action_create_menu_item (ThunarxMenuItem *item) menu = thunarx_menu_new (); thunarx_menu_item_set_menu (item, menu); - add_subaction (item, menu, "tvp::git::add", Q_("Menu|Add"), _("Add"), "list-add", "--add"); - add_subaction_u(menu, "tvp::git::bisect", Q_("Menu|Bisect"), _("Bisect"), NULL, _("Bisect")); + add_subaction (item, menu, "tvp::git::add", C_("Menu", "Add"), _("Add"), "list-add", "--add"); + add_subaction_u(menu, "tvp::git::bisect", C_("Menu", "Bisect"), _("Bisect"), NULL, _("Bisect")); if (tvp_action->property.is_file) - add_subaction (item, menu, "tvp::git::blame", Q_("Menu|Blame"), _("Blame"), "gtk-index", "--blame"); + add_subaction (item, menu, "tvp::git::blame", C_("Menu", "Blame"), _("Blame"), "gtk-index", "--blame"); if (tvp_action->property.is_parent) - add_subaction (item, menu, "tvp::git::branch", Q_("Menu|Branch"), _("Branch"), NULL, "--branch"); - add_subaction_u(menu, "tvp::git::checkout", Q_("Menu|Checkout"), _("Checkout"), "gtk-connect", _("Checkout")); - add_subaction (item, menu, "tvp::git::clean", Q_("Menu|Clean"), _("Clean"), "edit-clear", "--clean"); + add_subaction (item, menu, "tvp::git::branch", C_("Menu", "Branch"), _("Branch"), NULL, "--branch"); + add_subaction_u(menu, "tvp::git::checkout", C_("Menu", "Checkout"), _("Checkout"), "gtk-connect", _("Checkout")); + add_subaction (item, menu, "tvp::git::clean", C_("Menu", "Clean"), _("Clean"), "edit-clear", "--clean"); if (tvp_action->property.is_parent) - add_subaction (item, menu, "tvp::git::clone", Q_("Menu|Clone"), _("Clone"), "edit-copy", "--clone"); - add_subaction_u(menu, "tvp::git::commit", Q_("Menu|Commit"), _("Commit"), "gtk-apply", _("Commit")); - add_subaction_u(menu, "tvp::git::diff", Q_("Menu|Diff"), _("Diff"), "edit-find-replace", _("Diff")); - add_subaction_u(menu, "tvp::git::fetch", Q_("Menu|Fetch"), _("Fetch"), NULL, _("Fetch")); - add_subaction_u(menu, "tvp::git::grep", Q_("Menu|Grep"), _("Grep"), NULL, _("Grep")); - add_subaction_u(menu, "tvp::git::init", Q_("Menu|Init"), _("Init"), NULL, _("Init")); - add_subaction (item, menu, "tvp::git::log", Q_("Menu|Log"), _("Log"), "gtk-index", "--log"); - add_subaction_u(menu, "tvp::git::merge", Q_("Menu|Merge"), _("Merge"), NULL, _("Merge")); + add_subaction (item, menu, "tvp::git::clone", C_("Menu", "Clone"), _("Clone"), "edit-copy", "--clone"); + add_subaction_u(menu, "tvp::git::commit", C_("Menu", "Commit"), _("Commit"), "gtk-apply", _("Commit")); + add_subaction_u(menu, "tvp::git::diff", C_("Menu", "Diff"), _("Diff"), "edit-find-replace", _("Diff")); + add_subaction_u(menu, "tvp::git::fetch", C_("Menu", "Fetch"), _("Fetch"), NULL, _("Fetch")); + add_subaction_u(menu, "tvp::git::grep", C_("Menu", "Grep"), _("Grep"), NULL, _("Grep")); + add_subaction_u(menu, "tvp::git::init", C_("Menu", "Init"), _("Init"), NULL, _("Init")); + add_subaction (item, menu, "tvp::git::log", C_("Menu", "Log"), _("Log"), "gtk-index", "--log"); + add_subaction_u(menu, "tvp::git::merge", C_("Menu", "Merge"), _("Merge"), NULL, _("Merge")); if (!tvp_action->property.is_parent) - add_subaction (item, menu, "tvp::git::move", Q_("Menu|Move"), _("Move"), "gtk-dnd-multiple", "--move"); - add_subaction_u(menu, "tvp::git::pull", Q_("Menu|Pull"), _("Pull"), NULL, _("Pull")); - add_subaction_u(menu, "tvp::git::push", Q_("Menu|Push"), _("Push"), NULL, _("Push")); - add_subaction_u(menu, "tvp::git::rebase", Q_("Menu|Rebase"), _("Rebase"), NULL, _("Rebase")); - add_subaction (item, menu, "tvp::git::reset", Q_("Menu|Reset"), _("Reset"), "edit-undo", "--reset"); - add_subaction_u(menu, "tvp::git::remove", Q_("Menu|Remove"), _("Remove"), "edit-delete", _("Remove")); - add_subaction_u(menu, "tvp::git::show", Q_("Menu|Show"), _("Show"), NULL, _("Show")); + add_subaction (item, menu, "tvp::git::move", C_("Menu", "Move"), _("Move"), "gtk-dnd-multiple", "--move"); + add_subaction_u(menu, "tvp::git::pull", C_("Menu", "Pull"), _("Pull"), NULL, _("Pull")); + add_subaction_u(menu, "tvp::git::push", C_("Menu", "Push"), _("Push"), NULL, _("Push")); + add_subaction_u(menu, "tvp::git::rebase", C_("Menu", "Rebase"), _("Rebase"), NULL, _("Rebase")); + add_subaction (item, menu, "tvp::git::reset", C_("Menu", "Reset"), _("Reset"), "edit-undo", "--reset"); + add_subaction_u(menu, "tvp::git::remove", C_("Menu", "Remove"), _("Remove"), "edit-delete", _("Remove")); + add_subaction_u(menu, "tvp::git::show", C_("Menu", "Show"), _("Show"), NULL, _("Show")); if (tvp_action->property.is_parent) - add_subaction (item, menu, "tvp::git::stash", Q_("Menu|Stash"), _("Stash"), "document-save", "--stash"); + add_subaction (item, menu, "tvp::git::stash", C_("Menu", "Stash"), _("Stash"), "document-save", "--stash"); if (tvp_action->property.is_parent) - add_subaction (item, menu, "tvp::git::status", Q_("Menu|Status"), _("Status"), "dialog-information", "--status"); - add_subaction_u(menu, "tvp::git::tag", Q_("Menu|Tag"), _("Tag"), NULL, _("Tag")); + add_subaction (item, menu, "tvp::git::status", C_("Menu", "Status"), _("Status"), "dialog-information", "--status"); + add_subaction_u(menu, "tvp::git::tag", C_("Menu", "Tag"), _("Tag"), NULL, _("Tag")); } diff --git a/thunar-vcs-plugin/tvp-svn-action.c b/thunar-vcs-plugin/tvp-svn-action.c index 034f1bc..88fb561 100644 --- a/thunar-vcs-plugin/tvp-svn-action.c +++ b/thunar-vcs-plugin/tvp-svn-action.c @@ -270,12 +270,12 @@ tvp_svn_action_create_menu_item (ThunarxMenuItem *item) /* No version control or version control (parent) */ if (tvp_action->property.parent_version_control && (tvp_action->property.is_parent || tvp_action->property.directory_no_version_control || tvp_action->property.file_no_version_control)) { - add_subaction (item, menu, "tvp::add", Q_("Menu|Add"), _("Add"), "list-add", "--add"); + add_subaction (item, menu, "tvp::add", C_("Menu", "Add"), _("Add"), "list-add", "--add"); } /* Version control (file) */ if (tvp_action->property.file_version_control) { - add_subaction (item, menu, "tvp::blame", Q_("Menu|Blame"), _("Blame"), "gtk-index", "--blame"); + add_subaction (item, menu, "tvp::blame", C_("Menu", "Blame"), _("Blame"), "gtk-index", "--blame"); } /* No need subitem = gtk_menu_item_new_with_label (_("Cat")); @@ -287,52 +287,52 @@ tvp_svn_action_create_menu_item (ThunarxMenuItem *item) *//* Version control (file) */ if (tvp_action->property.file_version_control) { - add_subaction_u (menu, "tvp::changelist", Q_("Menu|Changelist"), _("Changelist"), "gtk-index", _("Changelist")); + add_subaction_u (menu, "tvp::changelist", C_("Menu", "Changelist"), _("Changelist"), "gtk-index", _("Changelist")); } /* No version control (parent) */ if (tvp_action->property.is_parent && !tvp_action->property.parent_version_control) { - add_subaction (item, menu, "tvp::checkout", Q_("Menu|Checkout"), _("Checkout"), "gtk-connect", "--checkout"); + add_subaction (item, menu, "tvp::checkout", C_("Menu", "Checkout"), _("Checkout"), "gtk-connect", "--checkout"); } /* Version control (parent) */ if (tvp_action->property.is_parent && tvp_action->property.parent_version_control) { - add_subaction (item, menu, "tvp::cleanup", Q_("Menu|Cleanup"), _("Cleanup"), "edit-clear", "--cleanup"); + add_subaction (item, menu, "tvp::cleanup", C_("Menu", "Cleanup"), _("Cleanup"), "edit-clear", "--cleanup"); } /* Version control (all) */ if ((tvp_action->property.is_parent && tvp_action->property.parent_version_control) || tvp_action->property.directory_version_control || tvp_action->property.file_version_control) { - add_subaction (item, menu, "tvp::commit", Q_("Menu|Commit"), _("Commit"), "gtk-apply", "--commit"); + add_subaction (item, menu, "tvp::commit", C_("Menu", "Commit"), _("Commit"), "gtk-apply", "--commit"); } /* Version control (no parent) */ if (!tvp_action->property.is_parent && tvp_action->property.parent_version_control && (tvp_action->property.directory_version_control || tvp_action->property.file_version_control)) { - add_subaction (item, menu, "tvp::copy", Q_("Menu|Copy"), _("Copy"), "edit-copy", "--copy"); + add_subaction (item, menu, "tvp::copy", C_("Menu", "Copy"), _("Copy"), "edit-copy", "--copy"); } /* Version control (no parent) */ if (!tvp_action->property.is_parent && tvp_action->property.parent_version_control && (tvp_action->property.directory_version_control || tvp_action->property.file_version_control)) { - add_subaction (item, menu, "tvp::delete", Q_("Menu|Delete"), _("Delete"), "edit-delete", "--delete"); + add_subaction (item, menu, "tvp::delete", C_("Menu", "Delete"), _("Delete"), "edit-delete", "--delete"); } /* Version control (all) */ if ((tvp_action->property.is_parent && tvp_action->property.parent_version_control) || tvp_action->property.directory_version_control || tvp_action->property.file_version_control) { - add_subaction (item, menu, "tvp::diff", Q_("Menu|Diff"), _("Diff"), "gtk-convert", "--diff"); + add_subaction (item, menu, "tvp::diff", C_("Menu", "Diff"), _("Diff"), "gtk-convert", "--diff"); } /* Version control and No version control (parent) */ if (tvp_action->property.is_parent || tvp_action->property.directory_version_control || tvp_action->property.file_version_control) { - add_subaction (item, menu, "tvp::export", Q_("Menu|Export"), _("Export"), "document-save", "--export"); + add_subaction (item, menu, "tvp::export", C_("Menu", "Export"), _("Export"), "document-save", "--export"); } /* No version control (all) */ if (!tvp_action->property.parent_version_control && (tvp_action->property.is_parent || tvp_action->property.directory_no_version_control || tvp_action->property.file_no_version_control)) { - add_subaction (item, menu, "tvp::import", Q_("Menu|Import"), _("Import"), "network-workgroup", "--import"); + add_subaction (item, menu, "tvp::import", C_("Menu", "Import"), _("Import"), "network-workgroup", "--import"); } /* Version control (all) */ if ((tvp_action->property.is_parent && tvp_action->property.parent_version_control) || tvp_action->property.directory_version_control || tvp_action->property.file_version_control) { - add_subaction_u (menu, "tvp::info", Q_("Menu|Info"), _("Info"), "dialog-information", _("Info")); + add_subaction_u (menu, "tvp::info", C_("Menu", "Info"), _("Info"), "dialog-information", _("Info")); } /* Ehmm... subitem = gtk_menu_item_new_with_label (_("List")); @@ -342,12 +342,12 @@ tvp_svn_action_create_menu_item (ThunarxMenuItem *item) *//* Version control (all) */ if ((tvp_action->property.is_parent && tvp_action->property.parent_version_control) || tvp_action->property.directory_version_control || tvp_action->property.file_version_control) { - add_subaction (item, menu, "tvp::lock", Q_("Menu|Lock"), _("Lock"), "dialog-password", "--lock"); + add_subaction (item, menu, "tvp::lock", C_("Menu", "Lock"), _("Lock"), "dialog-password", "--lock"); } /* Version control (all) */ if ((tvp_action->property.is_parent && tvp_action->property.parent_version_control) || tvp_action->property.directory_version_control || tvp_action->property.file_version_control) { - add_subaction (item, menu, "tvp::log", Q_("Menu|Log"), _("Log"), "gtk-index", "--log"); + add_subaction (item, menu, "tvp::log", C_("Menu", "Log"), _("Log"), "gtk-index", "--log"); } /* Ehmm ... subitem = gtk_menu_item_new_with_label (_("Merge")); @@ -362,7 +362,7 @@ tvp_svn_action_create_menu_item (ThunarxMenuItem *item) *//* Version control (no parent) */ if (!tvp_action->property.is_parent && tvp_action->property.parent_version_control && (tvp_action->property.directory_version_control || tvp_action->property.file_version_control)) { - add_subaction (item, menu, "tvp::move", Q_("Menu|Move"), _("Move"), "gtk-dnd-multiple", "--move"); + add_subaction (item, menu, "tvp::move", C_("Menu", "Move"), _("Move"), "gtk-dnd-multiple", "--move"); } /* Merged subitem = gtk_menu_item_new_with_label (_("Delete Properties")); @@ -373,48 +373,48 @@ tvp_svn_action_create_menu_item (ThunarxMenuItem *item) *//* Version control */ if ((tvp_action->property.is_parent && tvp_action->property.parent_version_control) || tvp_action->property.directory_version_control || tvp_action->property.file_version_control) { - add_subaction (item, menu, "tvp::properties", Q_("Menu|Edit Properties"), _("Edit Properties"), "gtk-edit", "--properties"); + add_subaction (item, menu, "tvp::properties", C_("Menu", "Edit Properties"), _("Edit Properties"), "gtk-edit", "--properties"); } /* Version control (parent) */ if (tvp_action->property.is_parent && tvp_action->property.parent_version_control) { - add_subaction (item, menu, "tvp::relocate", Q_("Menu|Relocate"), _("Relocate"), "edit-find-replace", "--relocate"); + add_subaction (item, menu, "tvp::relocate", C_("Menu", "Relocate"), _("Relocate"), "edit-find-replace", "--relocate"); } /* Changed subitem = gtk_menu_item_new_with_label (_("Mark Resolved")); */if ((tvp_action->property.is_parent && tvp_action->property.parent_version_control) || tvp_action->property.directory_version_control || tvp_action->property.file_version_control) { - add_subaction (item, menu, "tvp::resolved", Q_("Menu|Resolved"), _("Resolved"), "gtk-yes", "--resolved"); + add_subaction (item, menu, "tvp::resolved", C_("Menu", "Resolved"), _("Resolved"), "gtk-yes", "--resolved"); }/* *//* Version control (file) */ if (tvp_action->property.file_version_control) { - add_subaction_u (menu, "tvp::resolve", Q_("Menu|Resolve"), _("Resolve"), "gtk-yes", _("Resolve")); + add_subaction_u (menu, "tvp::resolve", C_("Menu", "Resolve"), _("Resolve"), "gtk-yes", _("Resolve")); } /* Version control (all) */ if ((tvp_action->property.is_parent && tvp_action->property.parent_version_control) || tvp_action->property.directory_version_control || tvp_action->property.file_version_control) { - add_subaction (item, menu, "tvp::revert", Q_("Menu|Revert"), _("Revert"), "edit-undo", "--revert"); + add_subaction (item, menu, "tvp::revert", C_("Menu", "Revert"), _("Revert"), "edit-undo", "--revert"); } /* Version control (all) */ if ((tvp_action->property.is_parent && tvp_action->property.parent_version_control) || tvp_action->property.directory_version_control || tvp_action->property.file_version_control) { - add_subaction (item, menu, "tvp::status", Q_("Menu|Status"), _("Status"), "dialog-information", "--status"); + add_subaction (item, menu, "tvp::status", C_("Menu", "Status"), _("Status"), "dialog-information", "--status"); } /* Version control (parent) */ if (tvp_action->property.is_parent && tvp_action->property.parent_version_control) { - add_subaction (item, menu, "tvp::switch", Q_("Menu|Switch"), _("Switch"), "go-jump", "--switch"); + add_subaction (item, menu, "tvp::switch", C_("Menu", "Switch"), _("Switch"), "go-jump", "--switch"); } /* Version control (all) */ if ((tvp_action->property.is_parent && tvp_action->property.parent_version_control) || tvp_action->property.directory_version_control || tvp_action->property.file_version_control) { - add_subaction (item, menu, "tvp::unlock", Q_("Menu|Unlock"), _("Unlock"), NULL, "--unlock"); + add_subaction (item, menu, "tvp::unlock", C_("Menu", "Unlock"), _("Unlock"), NULL, "--unlock"); } /* Version control (all) */ if ((tvp_action->property.is_parent && tvp_action->property.parent_version_control) || tvp_action->property.directory_version_control || tvp_action->property.file_version_control) { - add_subaction (item, menu, "tvp::update", Q_("Menu|Update"), _("Update"), "view-refresh", "--update"); + add_subaction (item, menu, "tvp::update", C_("Menu", "Update"), _("Update"), "view-refresh", "--update"); } } -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits