Danny Lingit branch -r -d(D) currently says "delete remote branch", which should be "remote-tracking branch". --- builtin/branch.c | 6 +++--- po/bg.po | 6 +++--- po/ca.po | 6 +++--- po/de.po | 6 +++--- po/fr.po | 6 +++--- po/git.pot | 6 +++--- po/it.po | 6 +++--- po/pt_PT.po | 6 +++--- po/sv.po | 6 +++--- po/vi.po | 6 +++--- po/zh_CN.po | 6 +++--- 11 files changed, 33 insertions(+), 33 deletions(-)
Show changes to 11 files +33 −33
builtin/branch.c, po/bg.po, po/ca.po, po/de.po, po/fr.po, po/git.pot, po/it.po, po/pt_PT.po, po/sv.po, po/vi.po, po/zh_CN.po
diff --git a/builtin/branch.c b/builtin/branch.c index dc6f0b2..3560c51 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -242,7 +242,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, sha1, &flags); if (!target) { error(remote_branch - ? _("remote branch '%s' not found.") + ? _("remote-tracking branch '%s' not found.") : _("branch '%s' not found."), bname.buf); ret = 1; continue; @@ -257,7 +257,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, if (delete_ref(name, sha1, REF_NODEREF)) { error(remote_branch - ? _("Error deleting remote branch '%s'") + ? _("Error deleting remote-tracking branch '%s'") : _("Error deleting branch '%s'"), bname.buf); ret = 1; @@ -265,7 +265,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, } if (!quiet) { printf(remote_branch - ? _("Deleted remote branch %s (was %s).\n") + ? _("Deleted remote-tracking branch %s (was %s).\n") : _("Deleted branch %s (was %s).\n"), bname.buf, (flags & REF_ISBROKEN) ? "broken" diff --git a/po/bg.po b/po/bg.po index ccdd11e..8abde0f 100644 --- a/po/bg.po +++ b/po/bg.po @@ -3037,7 +3037,7 @@ msgstr "Не можете да изтриете клона „%s“, защот #: builtin/branch.c:245 #, c-format -msgid "remote branch '%s' not found." +msgid "remote-tracking branch '%s' not found." msgstr "отдалеченият клон „%s“ не може да бъде открит." #: builtin/branch.c:246 @@ -3047,7 +3047,7 @@ msgstr "клонът „%s“ не може да бъде открит." #: builtin/branch.c:260 #, c-format -msgid "Error deleting remote branch '%s'" +msgid "Error deleting remote-tracking branch '%s'" msgstr "Грешка при изтриването на отдалечения клон „%s“" #: builtin/branch.c:261 @@ -3057,7 +3057,7 @@ msgstr "Грешка при изтриването на клона „%s“" #: builtin/branch.c:268 #, c-format -msgid "Deleted remote branch %s (was %s).\n" +msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Изтрит отдалечен клон „%s“ (той сочеше към „%s“).\n" #: builtin/branch.c:269 diff --git a/po/ca.po b/po/ca.po index a649508..8d5992d 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2857,7 +2857,7 @@ msgstr "No es pot suprimir la branca '%s', en la qual sou actualment." #: builtin/branch.c:245 #, c-format -msgid "remote branch '%s' not found." +msgid "remote-tracking branch '%s' not found." msgstr "no s'ha trobat la branca remota '%s'." #: builtin/branch.c:246 @@ -2867,7 +2867,7 @@ msgstr "no s'ha trobat la branca '%s'." #: builtin/branch.c:260 #, c-format -msgid "Error deleting remote branch '%s'" +msgid "Error deleting remote-tracking branch '%s'" msgstr "Error en suprimir la branca remota '%s'" #: builtin/branch.c:261 @@ -2877,7 +2877,7 @@ msgstr "Error en suprimir la branca '%s'" #: builtin/branch.c:268 #, c-format -msgid "Deleted remote branch %s (was %s).\n" +msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "S'ha suprimit la branca remota %s (ha estat %s).\n" #: builtin/branch.c:269 diff --git a/po/de.po b/po/de.po index 11fbd0f..5c7c0e2 100644 --- a/po/de.po +++ b/po/de.po @@ -2907,7 +2907,7 @@ msgstr "" #: builtin/branch.c:245 #, c-format -msgid "remote branch '%s' not found." +msgid "remote-tracking branch '%s' not found." msgstr "Remote-Branch '%s' nicht gefunden" #: builtin/branch.c:246 @@ -2917,7 +2917,7 @@ msgstr "Branch '%s' nicht gefunden." #: builtin/branch.c:260 #, c-format -msgid "Error deleting remote branch '%s'" +msgid "Error deleting remote-tracking branch '%s'" msgstr "Fehler beim Entfernen des Remote-Branches '%s'" #: builtin/branch.c:261 @@ -2927,7 +2927,7 @@ msgstr "Fehler beim Entfernen des Branches '%s'" #: builtin/branch.c:268 #, c-format -msgid "Deleted remote branch %s (was %s).\n" +msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Remote-Branch %s entfernt (war %s).\n" #: builtin/branch.c:269 diff --git a/po/fr.po b/po/fr.po index 3235879..2b5ea7a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2945,7 +2945,7 @@ msgstr "Impossible de supprimer la branche '%s' sur laquelle vous êtes." #: builtin/branch.c:245 #, c-format -msgid "remote branch '%s' not found." +msgid "remote-tracking branch '%s' not found." msgstr "branche distante %s' non trouvée." #: builtin/branch.c:246 @@ -2955,7 +2955,7 @@ msgstr "branche '%s' non trouvée." #: builtin/branch.c:260 #, c-format -msgid "Error deleting remote branch '%s'" +msgid "Error deleting remote-tracking branch '%s'" msgstr "Erreur lors de la suppression de la branche distante '%s'" #: builtin/branch.c:261 @@ -2965,7 +2965,7 @@ msgstr "Erreur lors de la suppression de la branche '%s'" #: builtin/branch.c:268 #, c-format -msgid "Deleted remote branch %s (was %s).\n" +msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Branche distante %s supprimée (précédemment %s).\n" #: builtin/branch.c:269 diff --git a/po/git.pot b/po/git.pot index 91fa5a1..4263f6e 100644 --- a/po/git.pot +++ b/po/git.pot @@ -2708,7 +2708,7 @@ msgstr "" #: builtin/branch.c:245 #, c-format -msgid "remote branch '%s' not found." +msgid "remote-tracking branch '%s' not found." msgstr "" #: builtin/branch.c:246 @@ -2718,7 +2718,7 @@ msgstr "" #: builtin/branch.c:260 #, c-format -msgid "Error deleting remote branch '%s'" +msgid "Error deleting remote-tracking branch '%s'" msgstr "" #: builtin/branch.c:261 @@ -2728,7 +2728,7 @@ msgstr "" #: builtin/branch.c:268 #, c-format -msgid "Deleted remote branch %s (was %s).\n" +msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "" #: builtin/branch.c:269 diff --git a/po/it.po b/po/it.po index 9080219..e391e29 100644 --- a/po/it.po +++ b/po/it.po @@ -1514,7 +1514,7 @@ msgstr "" #: builtin/branch.c:202 #, c-format -msgid "remote branch '%s' not found." +msgid "remote-tracking branch '%s' not found." msgstr "il branch remoto '%s' non è stato trovato." #: builtin/branch.c:203 @@ -1536,7 +1536,7 @@ msgstr "" #: builtin/branch.c:225 #, c-format -msgid "Error deleting remote branch '%s'" +msgid "Error deleting remote-tracking branch '%s'" msgstr "Errore nella rimozione del branch remoto '%s'" #: builtin/branch.c:226 @@ -1546,7 +1546,7 @@ msgstr "Errore nella rimozione del branch '%s'" #: builtin/branch.c:233 #, c-format -msgid "Deleted remote branch %s (was %s).\n" +msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Ramo remoto %s eliminato (era %s).\n" #: builtin/branch.c:234 diff --git a/po/pt_PT.po b/po/pt_PT.po index 689ad1b..6ef1b35 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -1379,7 +1379,7 @@ msgstr "" #: builtin/branch.c:202 #, c-format -msgid "remote branch '%s' not found." +msgid "remote-tracking branch '%s' not found." msgstr "rama remota '%s não encontrada." #: builtin/branch.c:203 @@ -1401,7 +1401,7 @@ msgstr "" #: builtin/branch.c:225 #, c-format -msgid "Error deleting remote branch '%s'" +msgid "Error deleting remote-tracking branch '%s'" msgstr "" #: builtin/branch.c:226 @@ -1411,7 +1411,7 @@ msgstr "Erro a eliminar rama '%s'" #: builtin/branch.c:233 #, c-format -msgid "Deleted remote branch %s (was %s).\n" +msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "" #: builtin/branch.c:234 diff --git a/po/sv.po b/po/sv.po index 0440443..e71d1d2 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2811,7 +2811,7 @@ msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande. #: builtin/branch.c:245 #, c-format -msgid "remote branch '%s' not found." +msgid "remote-tracking branch '%s' not found." msgstr "fjärrgrenen \"%s\" hittades inte." #: builtin/branch.c:246 @@ -2821,7 +2821,7 @@ msgstr "grenen \"%s\" hittades inte." #: builtin/branch.c:260 #, c-format -msgid "Error deleting remote branch '%s'" +msgid "Error deleting remote-tracking branch '%s'" msgstr "Fel vid borttagning av fjärrgrenen \"%s\"" #: builtin/branch.c:261 @@ -2831,7 +2831,7 @@ msgstr "Fel vid borttagning av grenen \"%s\"" #: builtin/branch.c:268 #, c-format -msgid "Deleted remote branch %s (was %s).\n" +msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Tog bort fjärrgrenen %s (var %s).\n" #: builtin/branch.c:269 diff --git a/po/vi.po b/po/vi.po index 9c2bba8..c6ceb5a 100644 --- a/po/vi.po +++ b/po/vi.po @@ -2842,7 +2842,7 @@ msgstr "Không thể xóa nhánh “%s” cái mà bạn hiện nay đang ở." #: builtin/branch.c:245 #, c-format -msgid "remote branch '%s' not found." +msgid "remote-tracking branch '%s' not found." msgstr "không tìm thấy nhánh máy chủ “%s”." #: builtin/branch.c:246 @@ -2852,7 +2852,7 @@ msgstr "không tìm thấy nhánh “%s”." #: builtin/branch.c:260 #, c-format -msgid "Error deleting remote branch '%s'" +msgid "Error deleting remote-tracking branch '%s'" msgstr "Gặp lỗi khi đang xóa nhánh trên máy chủ “%s”" #: builtin/branch.c:261 @@ -2862,7 +2862,7 @@ msgstr "Gặp lỗi khi xóa bỏ nhánh “%s”" #: builtin/branch.c:268 #, c-format -msgid "Deleted remote branch %s (was %s).\n" +msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Nhánh trên máy chủ \"%s\" đã bị xóa (từng là %s).\n" #: builtin/branch.c:269 diff --git a/po/zh_CN.po b/po/zh_CN.po index 2b8d2cb..93b1916 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2822,7 +2822,7 @@ msgstr "无法删除您当前所在的分支 '%s'。" #: builtin/branch.c:245 #, c-format -msgid "remote branch '%s' not found." +msgid "remote-tracking branch '%s' not found." msgstr "远程分支 '%s' 未发现。" #: builtin/branch.c:246 @@ -2832,7 +2832,7 @@ msgstr "分支 '%s' 未发现。" #: builtin/branch.c:260 #, c-format -msgid "Error deleting remote branch '%s'" +msgid "Error deleting remote-tracking branch '%s'" msgstr "删除远程分支 '%s' 时出错" #: builtin/branch.c:261 @@ -2842,7 +2842,7 @@ msgstr "删除分支 '%s' 时出错" #: builtin/branch.c:268 #, c-format -msgid "Deleted remote branch %s (was %s).\n" +msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "已删除远程分支 %s（曾为 %s）。\n" #: builtin/branch.c:269
-- 2.3.7.windows.1
