From 094c7e635287e999f382681b0749ce7711e5ce7d Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Wed, 12 Aug 2015 19:43:01 +0200 Subject: prune: close directory earlier during loose-object directory traversal 27e1e22d (prune: factor out loose-object directory traversal, 2014-10-16) introduced a new function for_each_loose_file_in_objdir() with a helper for_each_file_in_obj_subdir(). The latter calls callbacks for each file found during a directory traversal and finally also a callback for the directory itself. git-prune uses the function to clean up the object directory. In particular, in the directory callback it calls rmdir(). On Windows XP, this rmdir call fails, because the directory is still open while the callback is called. Close the directory before calling the callback. Signed-off-by: Johannes Sixt Acked-by: Jeff King Signed-off-by: Junio C Hamano --- sha1_file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index bf1bdbcdf..7ea7a9335 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -3356,12 +3356,12 @@ static int for_each_file_in_obj_subdir(int subdir_nr, break; } } - strbuf_setlen(path, baselen); + closedir(dir); + strbuf_setlen(path, baselen); if (!r && subdir_cb) r = subdir_cb(subdir_nr, path->buf, data); - closedir(dir); return r; } -- cgit v1.2.1 From a62bc310bf033f38a23fb80f5ab2c9f6f05cd161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Sat, 22 Aug 2015 08:08:04 +0700 Subject: blame: remove obsolete comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit That "someday" in the comment happened two years later in b65982b (Optimize "diff-index --cached" using cache-tree - 2009-05-20) Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- builtin/blame.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index 06484c2e0..9a0df9215 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2379,11 +2379,6 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt, ce->ce_mode = create_ce_mode(mode); add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE); - /* - * We are not going to write this out, so this does not matter - * right now, but someday we might optimize diff-index --cached - * with cache-tree information. - */ cache_tree_invalidate_path(&the_index, path); return commit; -- cgit v1.2.1 From 895ff3b2c73c737b699a921fe71cea4dadefab7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Sat, 22 Aug 2015 08:08:05 +0700 Subject: add and use a convenience macro ce_intent_to_add() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- builtin/rm.c | 2 +- cache-tree.c | 2 +- cache.h | 1 + read-cache.c | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/builtin/rm.c b/builtin/rm.c index 3304bff42..74a7a43ef 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -212,7 +212,7 @@ static int check_local_mod(unsigned char *head, int index_only) * "intent to add" entry. */ if (local_changes && staged_changes) { - if (!index_only || !(ce->ce_flags & CE_INTENT_TO_ADD)) + if (!index_only || !ce_intent_to_add(ce)) string_list_append(&files_staged, name); } else if (!index_only) { diff --git a/cache-tree.c b/cache-tree.c index 32772b956..e590346a0 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -377,7 +377,7 @@ static int update_one(struct cache_tree *it, * they are not part of generated trees. Invalidate up * to root to force cache-tree users to read elsewhere. */ - if (ce->ce_flags & CE_INTENT_TO_ADD) { + if (ce_intent_to_add(ce)) { to_invalidate = 1; continue; } diff --git a/cache.h b/cache.h index 3d3244ba6..b1f053196 100644 --- a/cache.h +++ b/cache.h @@ -233,6 +233,7 @@ static inline unsigned create_ce_flags(unsigned stage) #define ce_uptodate(ce) ((ce)->ce_flags & CE_UPTODATE) #define ce_skip_worktree(ce) ((ce)->ce_flags & CE_SKIP_WORKTREE) #define ce_mark_uptodate(ce) ((ce)->ce_flags |= CE_UPTODATE) +#define ce_intent_to_add(ce) ((ce)->ce_flags & CE_INTENT_TO_ADD) #define ce_permissions(mode) (((mode) & 0100) ? 0755 : 0644) static inline unsigned int create_ce_mode(unsigned int mode) diff --git a/read-cache.c b/read-cache.c index 36ff89f29..fb80c47e3 100644 --- a/read-cache.c +++ b/read-cache.c @@ -311,7 +311,7 @@ int ie_match_stat(const struct index_state *istate, * by definition never matches what is in the work tree until it * actually gets added. */ - if (ce->ce_flags & CE_INTENT_TO_ADD) + if (ce_intent_to_add(ce)) return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED; changed = ce_match_stat_basic(ce, st); @@ -1231,7 +1231,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, if (cache_errno == ENOENT) fmt = deleted_fmt; - else if (ce->ce_flags & CE_INTENT_TO_ADD) + else if (ce_intent_to_add(ce)) fmt = added_fmt; /* must be before other checks */ else if (changed & TYPE_CHANGED) fmt = typechange_fmt; -- cgit v1.2.1 From 3b93d3f34be4f253723cb2f494afc181a859f603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Wed, 4 Nov 2015 10:53:53 +0100 Subject: l10n: fr.po: Fix typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Élie Bouttier --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 581167f99..3277f1c46 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8862,7 +8862,7 @@ msgstr "" "Si vous souhaitez indiquer l'information de suivi distant pour cette " "branche, vous pouvez le faire avec :\n" "\n" -"git branch --set-uptream-to=%s/ %s\n" +" git branch --set-upstream-to=%s/ %s\n" #: builtin/pull.c:476 #, c-format -- cgit v1.2.1 From 66db14c94c95f911f55575c7fdf74c026443d482 Mon Sep 17 00:00:00 2001 From: YOKOTA Hiroshi Date: Sun, 25 Oct 2015 01:58:41 +0900 Subject: gitk: Color name update Color name "green" was darken since Tcl/Tk 7.6. Because color name scheme was changed from "X11 colors" to "Web colors". Use "lime" to keep colors. See also: http://www.tcl.tk/cgi-bin/tct/tip/403.html Signed-off-by: YOKOTA Hiroshi --- gitk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gitk b/gitk index fcc606eab..d4fdad3cc 100755 --- a/gitk +++ b/gitk @@ -2251,7 +2251,7 @@ proc makewindow {} { set h [expr {[font metrics uifont -linespace] + 2}] set progresscanv .tf.bar.progress canvas $progresscanv -relief sunken -height $h -borderwidth 2 - set progressitem [$progresscanv create rect -1 0 0 $h -fill green] + set progressitem [$progresscanv create rect -1 0 0 $h -fill lime] set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow] set rprogitem [$progresscanv create rect -1 0 0 $h -fill red] } @@ -3379,7 +3379,7 @@ set rectmask { 0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00}; } -image create bitmap reficon-H -background black -foreground green \ +image create bitmap reficon-H -background black -foreground lime \ -data $rectdata -maskdata $rectmask image create bitmap reficon-o -background black -foreground "#ddddff" \ -data $rectdata -maskdata $rectmask @@ -12170,7 +12170,7 @@ if {[tk windowingsystem] eq "aqua"} { set extdifftool "meld" } -set colors {green red blue magenta darkgrey brown orange} +set colors {lime red blue magenta darkgrey brown orange} if {[tk windowingsystem] eq "win32"} { set uicolor SystemButtonFace set uifgcolor SystemButtonText @@ -12188,12 +12188,12 @@ if {[tk windowingsystem] eq "win32"} { } set diffcolors {red "#00a000" blue} set diffcontext 3 -set mergecolors {red blue green purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"} +set mergecolors {red blue lime purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"} set ignorespace 0 set worddiff "" set markbgcolor "#e0e0ff" -set headbgcolor green +set headbgcolor lime set headfgcolor black set headoutlinecolor black set remotebgcolor #ffddaa @@ -12208,7 +12208,7 @@ set linehoverfgcolor black set linehoveroutlinecolor black set mainheadcirclecolor yellow set workingfilescirclecolor red -set indexcirclecolor green +set indexcirclecolor lime set circlecolors {white blue gray blue blue} set linkfgcolor blue set circleoutlinecolor $fgcolor -- cgit v1.2.1 From b34df2f9bc3dfc6c830a536803c97872f771616e Mon Sep 17 00:00:00 2001 From: YOKOTA Hiroshi Date: Thu, 12 Nov 2015 12:34:43 +0900 Subject: gitk: Re-sync line number in Japanese message catalogue Signed-off-by: YOKOTA Hiroshi --- po/ja.po | 569 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 294 insertions(+), 275 deletions(-) diff --git a/po/ja.po b/po/ja.po index 59e42a89f..fd396061c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -26,7 +26,7 @@ msgstr "マージされていないファイルのリストを取得できませ msgid "Color words" msgstr "" -#: gitk:217 gitk:2381 gitk:8220 gitk:8253 +#: gitk:217 gitk:2381 gitk:8221 gitk:8254 msgid "Markup words" msgstr "" @@ -60,15 +60,15 @@ msgstr "git log 実行エラー:" msgid "Reading" msgstr "読み込み中" -#: gitk:496 gitk:4525 +#: gitk:496 gitk:4526 msgid "Reading commits..." msgstr "コミット読み込み中..." -#: gitk:499 gitk:1637 gitk:4528 +#: gitk:499 gitk:1637 gitk:4529 msgid "No commits selected" msgstr "コミットが選択されていません" -#: gitk:1445 gitk:4045 gitk:12432 +#: gitk:1445 gitk:4046 gitk:12447 msgid "Command line" msgstr "コマンド行" @@ -80,12 +80,12 @@ msgstr "git log の出力を解析できません:" msgid "No commit information available" msgstr "有効なコミットの情報がありません" -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 +#: gitk:1903 gitk:1932 gitk:4316 gitk:9684 gitk:11256 gitk:11536 msgid "OK" msgstr "OK" -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 -#: gitk:11242 gitk:11522 +#: gitk:1934 gitk:4318 gitk:9197 gitk:9276 gitk:9406 gitk:9455 gitk:9686 +#: gitk:11257 gitk:11537 msgid "Cancel" msgstr "キャンセル" @@ -137,15 +137,15 @@ msgstr "ビュー編集...(&E)" msgid "&Delete view" msgstr "ビュー削除(&D)" -#: gitk:2088 gitk:4043 +#: gitk:2088 msgid "&All files" msgstr "全てのファイル(&A)" -#: gitk:2083 gitk:4067 +#: gitk:2083 msgid "&View" msgstr "ビュー(&V)" -#: gitk:2093 gitk:2103 gitk:3012 +#: gitk:2093 gitk:2103 msgid "&About gitk" msgstr "gitk について(&A)" @@ -157,7 +157,7 @@ msgstr "キーバインディング(&K)" msgid "&Help" msgstr "ヘルプ(&H)" -#: gitk:2185 gitk:8652 +#: gitk:2185 gitk:8653 msgid "SHA1 ID:" msgstr "SHA1 ID:" @@ -173,53 +173,53 @@ msgstr "検索" msgid "commit" msgstr "コミット" -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 -#: gitk:6912 +#: gitk:2299 gitk:2301 gitk:4688 gitk:4711 gitk:4735 gitk:6756 gitk:6828 +#: gitk:6913 msgid "containing:" msgstr "含む:" -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 +#: gitk:2302 gitk:3527 gitk:3532 gitk:4764 msgid "touching paths:" msgstr "パスの一部:" -#: gitk:2303 gitk:4777 +#: gitk:2303 gitk:4778 msgid "adding/removing string:" msgstr "追加/除去する文字列:" -#: gitk:2304 gitk:4779 +#: gitk:2304 gitk:4780 msgid "changing lines matching:" msgstr "" -#: gitk:2313 gitk:2315 gitk:4766 +#: gitk:2313 gitk:2315 gitk:4767 msgid "Exact" msgstr "英字の大小を区別する" -#: gitk:2315 gitk:4854 gitk:6723 +#: gitk:2315 gitk:4855 gitk:6724 msgid "IgnCase" msgstr "英字の大小を区別しない" -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 +#: gitk:2315 gitk:4737 gitk:4853 gitk:6720 msgid "Regexp" msgstr "正規表現" -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 +#: gitk:2317 gitk:2318 gitk:4875 gitk:4905 gitk:4912 gitk:6849 gitk:6917 msgid "All fields" msgstr "全ての項目" -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 +#: gitk:2318 gitk:4872 gitk:4905 gitk:6787 msgid "Headline" msgstr "ヘッドライン" -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 +#: gitk:2319 gitk:4872 gitk:6787 gitk:6917 gitk:7390 msgid "Comments" msgstr "コメント" -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 -#: gitk:8845 +#: gitk:2319 gitk:4872 gitk:4877 gitk:4912 gitk:6787 gitk:7325 gitk:8831 +#: gitk:8846 msgid "Author" msgstr "作者" -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 +#: gitk:2319 gitk:4872 gitk:6787 gitk:7327 msgid "Committer" msgstr "コミット者" @@ -247,7 +247,7 @@ msgstr "文脈行数" msgid "Ignore space change" msgstr "空白の違いを無視" -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 +#: gitk:2378 gitk:2380 gitk:7960 gitk:8207 msgid "Line diff" msgstr "" @@ -259,110 +259,119 @@ msgstr "パッチ" msgid "Tree" msgstr "ツリー" -#: gitk:2617 gitk:2637 +#: gitk:2617 gitk:2638 msgid "Diff this -> selected" msgstr "これと選択したコミットのdiffを見る" -#: gitk:2618 gitk:2638 +#: gitk:2618 gitk:2639 msgid "Diff selected -> this" msgstr "選択したコミットとこれのdiffを見る" -#: gitk:2619 gitk:2639 +#: gitk:2619 gitk:2640 msgid "Make patch" msgstr "パッチ作成" -#: gitk:2620 gitk:9254 +#: gitk:2620 gitk:9255 msgid "Create tag" msgstr "タグ生成" -#: gitk:2621 gitk:9371 +#: gitk:2621 +msgid "Copy commit summary" +msgstr "" + +#: gitk:2622 gitk:9386 msgid "Write commit to file" msgstr "コミットをファイルに書き出す" -#: gitk:2622 gitk:9428 +#: gitk:2623 gitk:9443 msgid "Create new branch" msgstr "新規ブランチ生成" -#: gitk:2623 +#: gitk:2624 msgid "Cherry-pick this commit" msgstr "このコミットをチェリーピックする" -#: gitk:2624 +#: gitk:2625 msgid "Reset HEAD branch to here" msgstr "ブランチのHEADをここにリセットする" -#: gitk:2625 +#: gitk:2626 msgid "Mark this commit" msgstr "このコミットにマークをつける" -#: gitk:2626 +#: gitk:2627 msgid "Return to mark" msgstr "マークを付けた所に戻る" -#: gitk:2627 +#: gitk:2628 msgid "Find descendant of this and mark" msgstr "これとマークをつけた所との子孫を見つける" -#: gitk:2628 +#: gitk:2629 msgid "Compare with marked commit" msgstr "マークを付けたコミットと比較する" -#: gitk:2629 gitk:2640 +#: gitk:2630 gitk:2641 #, fuzzy msgid "Diff this -> marked commit" msgstr "これと選択したコミットのdiffを見る" -#: gitk:2630 gitk:2641 +#: gitk:2631 gitk:2642 #, fuzzy msgid "Diff marked commit -> this" msgstr "選択したコミットとこれのdiffを見る" -#: gitk:2631 +#: gitk:2632 #, fuzzy msgid "Revert this commit" msgstr "このコミットにマークをつける" -#: gitk:2647 +#: gitk:2648 msgid "Check out this branch" msgstr "このブランチをチェックアウトする" -#: gitk:2648 +#: gitk:2649 msgid "Remove this branch" msgstr "このブランチを除去する" -#: gitk:2649 +#: gitk:2650 msgid "Copy branch name" msgstr "" -#: gitk:2656 +#: gitk:2657 msgid "Highlight this too" msgstr "これもハイライトさせる" -#: gitk:2657 +#: gitk:2658 msgid "Highlight this only" msgstr "これだけをハイライトさせる" -#: gitk:2658 +#: gitk:2659 msgid "External diff" msgstr "外部diffツール" -#: gitk:2659 +#: gitk:2660 msgid "Blame parent commit" msgstr "親コミットから blame をかける" -#: gitk:2660 +#: gitk:2661 msgid "Copy path" msgstr "" -#: gitk:2667 +#: gitk:2668 msgid "Show origin of this line" msgstr "この行の出自を表示する" -#: gitk:2668 +#: gitk:2669 msgid "Run git gui blame on this line" msgstr "この行に git gui で blame をかける" -#: gitk:3014 +#: gitk:3013 +#, fuzzy +msgid "About gitk" +msgstr "gitk について(&A)" + +#: gitk:3015 #, fuzzy msgid "" "\n" @@ -379,320 +388,330 @@ msgstr "" "\n" "使用および再配布は GNU General Public License に従ってください" -#: gitk:3022 gitk:3089 gitk:9857 +#: gitk:3023 gitk:3090 gitk:9872 msgid "Close" msgstr "閉じる" -#: gitk:3043 +#: gitk:3044 msgid "Gitk key bindings" msgstr "Gitk キーバインディング" -#: gitk:3046 +#: gitk:3047 msgid "Gitk key bindings:" msgstr "Gitk キーバインディング:" -#: gitk:3048 +#: gitk:3049 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\t終了" -#: gitk:3049 +#: gitk:3050 #, fuzzy, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-F>\t\t検索" -#: gitk:3050 +#: gitk:3051 msgid "\t\tMove to first commit" msgstr "\t\t最初のコミットに移動" -#: gitk:3051 +#: gitk:3052 msgid "\t\tMove to last commit" msgstr "\t\t最後のコミットに移動" -#: gitk:3052 +#: gitk:3053 #, fuzzy msgid ", p, k\tMove up one commit" msgstr ", p, i\t一つ上のコミットに移動" -#: gitk:3053 +#: gitk:3054 #, fuzzy msgid ", n, j\tMove down one commit" msgstr ", n, k\t一つ下のコミットに移動" -#: gitk:3054 +#: gitk:3055 #, fuzzy msgid ", z, h\tGo back in history list" msgstr ", z, j\t履歴の前に戻る" -#: gitk:3055 +#: gitk:3056 msgid ", x, l\tGo forward in history list" msgstr ", x, l\t履歴の次へ進む" -#: gitk:3056 +#: gitk:3057 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "" -#: gitk:3057 +#: gitk:3058 msgid "\tMove up one page in commit list" msgstr "\tコミットリストの一つ上のページに移動" -#: gitk:3058 +#: gitk:3059 msgid "\tMove down one page in commit list" msgstr "\tコミットリストの一つ下のページに移動" -#: gitk:3059 +#: gitk:3060 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tコミットリストの一番上にスクロールする" -#: gitk:3060 +#: gitk:3061 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tコミットリストの一番下にスクロールする" -#: gitk:3061 +#: gitk:3062 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tコミットリストの一つ下の行にスクロールする" -#: gitk:3062 +#: gitk:3063 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tコミットリストの一つ下の行にスクロールする" -#: gitk:3063 +#: gitk:3064 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tコミットリストの上のページにスクロールする" -#: gitk:3064 +#: gitk:3065 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tコミットリストの下のページにスクロールする" -#: gitk:3065 +#: gitk:3066 msgid "\tFind backwards (upwards, later commits)" msgstr "\t後方を検索 (上方の・新しいコミット)" -#: gitk:3066 +#: gitk:3067 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\t前方を検索（下方の・古いコミット）" -#: gitk:3067 +#: gitk:3068 msgid ", b\tScroll diff view up one page" msgstr ", b\tdiff画面を上のページにスクロールする" -#: gitk:3068 +#: gitk:3069 msgid "\tScroll diff view up one page" msgstr "\tdiff画面を上のページにスクロールする" -#: gitk:3069 +#: gitk:3070 msgid "\t\tScroll diff view down one page" msgstr "\t\tdiff画面を下のページにスクロールする" -#: gitk:3070 +#: gitk:3071 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tdiff画面を上に18行スクロールする" -#: gitk:3071 +#: gitk:3072 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tdiff画面を下に18行スクロールする" -#: gitk:3072 +#: gitk:3073 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\t検索" -#: gitk:3073 +#: gitk:3074 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\t次を検索して移動" -#: gitk:3074 +#: gitk:3075 msgid "\tMove to next find hit" msgstr "\t次を検索して移動" -#: gitk:3075 +#: gitk:3076 #, fuzzy msgid "g\t\tGo to commit" msgstr "\t\t最後のコミットに移動" -#: gitk:3076 +#: gitk:3077 msgid "/\t\tFocus the search box" msgstr "/\t\t検索ボックスにフォーカス" -#: gitk:3077 +#: gitk:3078 msgid "?\t\tMove to previous find hit" msgstr "?\t\t前を検索して移動" -#: gitk:3078 +#: gitk:3079 msgid "f\t\tScroll diff view to next file" msgstr "f\t\t次のファイルにdiff画面をスクロールする" -#: gitk:3079 +#: gitk:3080 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tdiff画面の次を検索" -#: gitk:3080 +#: gitk:3081 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tdiff画面の前を検索" -#: gitk:3081 +#: gitk:3082 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\t文字サイズを拡大" -#: gitk:3082 +#: gitk:3083 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\t文字サイズを拡大" -#: gitk:3083 +#: gitk:3084 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\t文字サイズを縮小" -#: gitk:3084 +#: gitk:3085 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\t文字サイズを縮小" -#: gitk:3085 +#: gitk:3086 msgid "\t\tUpdate" msgstr "\t\t更新" -#: gitk:3550 gitk:3559 +#: gitk:3551 gitk:3560 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "一時ディレクトリ %s 生成時エラー:" -#: gitk:3572 +#: gitk:3573 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "\"%s\" のエラーが %s に発生:" -#: gitk:3635 +#: gitk:3636 msgid "command failed:" msgstr "コマンド失敗:" -#: gitk:3784 +#: gitk:3785 msgid "No such commit" msgstr "そのようなコミットはありません" -#: gitk:3798 +#: gitk:3799 msgid "git gui blame: command failed:" msgstr "git gui blame: コマンド失敗:" -#: gitk:3829 +#: gitk:3830 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "マージする HEAD を読み込めません: %s" -#: gitk:3837 +#: gitk:3838 #, tcl-format msgid "Error reading index: %s" msgstr "インデックス読み込みエラー: %s" -#: gitk:3862 +#: gitk:3863 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "git blame を始められません: %s" -#: gitk:3865 gitk:6754 +#: gitk:3866 gitk:6755 msgid "Searching" msgstr "検索中" -#: gitk:3897 +#: gitk:3898 #, tcl-format msgid "Error running git blame: %s" msgstr "git blame 実行エラー: %s" -#: gitk:3925 +#: gitk:3926 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "コミット %s に由来するその行は、このビューに表示されていません" -#: gitk:3939 +#: gitk:3940 msgid "External diff viewer failed:" msgstr "外部diffビューアが失敗:" -#: gitk:4070 +#: gitk:4044 +#, fuzzy +msgid "All files" +msgstr "全てのファイル(&A)" + +#: gitk:4068 +#, fuzzy +msgid "View" +msgstr "ビュー(&V)" + +#: gitk:4071 msgid "Gitk view definition" msgstr "Gitk ビュー定義" -#: gitk:4074 +#: gitk:4075 msgid "Remember this view" msgstr "このビューを記憶する" -#: gitk:4075 +#: gitk:4076 msgid "References (space separated list):" msgstr "リファレンス（スペース区切りのリスト）:" -#: gitk:4076 +#: gitk:4077 msgid "Branches & tags:" msgstr "ブランチ＆タグ:" -#: gitk:4077 +#: gitk:4078 msgid "All refs" msgstr "全てのリファレンス" -#: gitk:4078 +#: gitk:4079 msgid "All (local) branches" msgstr "全ての（ローカルな）ブランチ" -#: gitk:4079 +#: gitk:4080 msgid "All tags" msgstr "全てのタグ" -#: gitk:4080 +#: gitk:4081 msgid "All remote-tracking branches" msgstr "全てのリモート追跡ブランチ" -#: gitk:4081 +#: gitk:4082 msgid "Commit Info (regular expressions):" msgstr "コミット情報（正規表現）:" -#: gitk:4082 +#: gitk:4083 msgid "Author:" msgstr "作者:" -#: gitk:4083 +#: gitk:4084 msgid "Committer:" msgstr "コミット者:" -#: gitk:4084 +#: gitk:4085 msgid "Commit Message:" msgstr "コミットメッセージ:" -#: gitk:4085 +#: gitk:4086 msgid "Matches all Commit Info criteria" msgstr "コミット情報の全ての条件に一致" -#: gitk:4086 +#: gitk:4087 #, fuzzy msgid "Matches no Commit Info criteria" msgstr "コミット情報の全ての条件に一致" -#: gitk:4087 +#: gitk:4088 msgid "Changes to Files:" msgstr "変更したファイル:" -#: gitk:4088 +#: gitk:4089 msgid "Fixed String" msgstr "固定文字列" -#: gitk:4089 +#: gitk:4090 msgid "Regular Expression" msgstr "正規表現" -#: gitk:4090 +#: gitk:4091 msgid "Search string:" msgstr "検索文字列:" -#: gitk:4091 +#: gitk:4092 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -700,202 +719,202 @@ msgstr "" "コミット日時 (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:4092 +#: gitk:4093 msgid "Since:" msgstr "期間の始め:" -#: gitk:4093 +#: gitk:4094 msgid "Until:" msgstr "期間の終わり:" -#: gitk:4094 +#: gitk:4095 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "制限・省略するリビジョンの数（正の整数）:" -#: gitk:4095 +#: gitk:4096 msgid "Number to show:" msgstr "表示する数:" -#: gitk:4096 +#: gitk:4097 msgid "Number to skip:" msgstr "省略する数:" -#: gitk:4097 +#: gitk:4098 msgid "Miscellaneous options:" msgstr "その他のオプション:" -#: gitk:4098 +#: gitk:4099 msgid "Strictly sort by date" msgstr "厳密に日付順で並び替え" -#: gitk:4099 +#: gitk:4100 msgid "Mark branch sides" msgstr "側枝マーク" -#: gitk:4100 +#: gitk:4101 msgid "Limit to first parent" msgstr "最初の親に制限" -#: gitk:4101 +#: gitk:4102 msgid "Simple history" msgstr "簡易な履歴" -#: gitk:4102 +#: gitk:4103 msgid "Additional arguments to git log:" msgstr "git log への追加の引数:" -#: gitk:4103 +#: gitk:4104 msgid "Enter files and directories to include, one per line:" msgstr "含まれるファイル・ディレクトリを一行ごとに入力:" -#: gitk:4104 +#: gitk:4105 msgid "Command to generate more commits to include:" msgstr "コミット追加コマンド:" -#: gitk:4228 +#: gitk:4229 msgid "Gitk: edit view" msgstr "Gitk: ビュー編集" -#: gitk:4236 +#: gitk:4237 msgid "-- criteria for selecting revisions" msgstr "― リビジョンの選択条件" -#: gitk:4241 +#: gitk:4242 #, fuzzy msgid "View Name" msgstr "ビュー名:" -#: gitk:4316 +#: gitk:4317 msgid "Apply (F5)" msgstr "適用 (F5)" -#: gitk:4354 +#: gitk:4355 msgid "Error in commit selection arguments:" msgstr "コミット選択引数のエラー:" -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 +#: gitk:4410 gitk:4463 gitk:4925 gitk:4939 gitk:6209 gitk:12388 gitk:12389 msgid "None" msgstr "無し" -#: gitk:5021 gitk:5026 +#: gitk:5022 gitk:5027 msgid "Descendant" msgstr "子孫" -#: gitk:5022 +#: gitk:5023 msgid "Not descendant" msgstr "非子孫" -#: gitk:5029 gitk:5034 +#: gitk:5030 gitk:5035 msgid "Ancestor" msgstr "祖先" -#: gitk:5030 +#: gitk:5031 msgid "Not ancestor" msgstr "非祖先" -#: gitk:5324 +#: gitk:5325 msgid "Local changes checked in to index but not committed" msgstr "ステージされた、コミット前のローカルな変更" -#: gitk:5360 +#: gitk:5361 msgid "Local uncommitted changes, not checked in to index" msgstr "ステージされていない、コミット前のローカルな変更" -#: gitk:7134 +#: gitk:7135 msgid "and many more" msgstr "" -#: gitk:7137 +#: gitk:7138 msgid "many" msgstr "多数" -#: gitk:7328 +#: gitk:7329 msgid "Tags:" msgstr "タグ:" -#: gitk:7345 gitk:7351 gitk:8825 +#: gitk:7346 gitk:7352 gitk:8826 msgid "Parent" msgstr "親" -#: gitk:7356 +#: gitk:7357 msgid "Child" msgstr "子" -#: gitk:7365 +#: gitk:7366 msgid "Branch" msgstr "ブランチ" -#: gitk:7368 +#: gitk:7369 msgid "Follows" msgstr "下位" -#: gitk:7371 +#: gitk:7372 msgid "Precedes" msgstr "上位" -#: gitk:7966 +#: gitk:7967 #, tcl-format msgid "Error getting diffs: %s" msgstr "diff取得エラー: %s" -#: gitk:8650 +#: gitk:8651 msgid "Goto:" msgstr "Goto:" -#: gitk:8671 +#: gitk:8672 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "%s を含む SHA1 ID は複数存在します" -#: gitk:8678 +#: gitk:8679 #, tcl-format msgid "Revision %s is not known" msgstr "リビジョン %s は不明です" -#: gitk:8688 +#: gitk:8689 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1 id %s は不明です" -#: gitk:8690 +#: gitk:8691 #, tcl-format msgid "Revision %s is not in the current view" msgstr "リビジョン %s は現在のビューにはありません" -#: gitk:8832 gitk:8847 +#: gitk:8833 gitk:8848 msgid "Date" msgstr "日付" -#: gitk:8835 +#: gitk:8836 msgid "Children" msgstr "子" -#: gitk:8898 +#: gitk:8899 #, tcl-format msgid "Reset %s branch to here" msgstr "%s ブランチをここにリセットする" -#: gitk:8900 +#: gitk:8901 msgid "Detached head: can't reset" msgstr "切り離されたHEAD: リセットできません" -#: gitk:9005 gitk:9011 +#: gitk:9006 gitk:9012 msgid "Skipping merge commit " msgstr "コミットマージをスキップ: " -#: gitk:9020 gitk:9025 +#: gitk:9021 gitk:9026 msgid "Error getting patch ID for " msgstr "パッチ取得エラー: ID " -#: gitk:9021 gitk:9026 +#: gitk:9022 gitk:9027 msgid " - stopping\n" msgstr " - 停止\n" -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 +#: gitk:9032 gitk:9035 gitk:9043 gitk:9057 gitk:9066 msgid "Commit " msgstr "コミット " -#: gitk:9035 +#: gitk:9036 msgid "" " is the same patch as\n" " " @@ -903,7 +922,7 @@ msgstr "" " は下記のパッチと同等\n" " " -#: gitk:9043 +#: gitk:9044 msgid "" " differs from\n" " " @@ -911,7 +930,7 @@ msgstr "" " 下記からのdiff\n" " " -#: gitk:9045 +#: gitk:9046 msgid "" "Diff of commits:\n" "\n" @@ -919,131 +938,131 @@ msgstr "" "コミットのdiff:\n" "\n" -#: gitk:9057 gitk:9066 +#: gitk:9058 gitk:9067 #, tcl-format msgid " has %s children - stopping\n" msgstr " には %s の子があります - 停止\n" -#: gitk:9085 +#: gitk:9086 #, tcl-format msgid "Error writing commit to file: %s" msgstr "ファイルへのコミット書き出しエラー: %s" -#: gitk:9091 +#: gitk:9092 #, tcl-format msgid "Error diffing commits: %s" msgstr "コミットのdiff実行エラー: %s" -#: gitk:9137 +#: gitk:9138 msgid "Top" msgstr "Top" -#: gitk:9138 +#: gitk:9139 msgid "From" msgstr "From" -#: gitk:9143 +#: gitk:9144 msgid "To" msgstr "To" -#: gitk:9167 +#: gitk:9168 msgid "Generate patch" msgstr "パッチ生成" -#: gitk:9169 +#: gitk:9170 msgid "From:" msgstr "From:" -#: gitk:9178 +#: gitk:9179 msgid "To:" msgstr "To:" -#: gitk:9187 +#: gitk:9188 msgid "Reverse" msgstr "逆" -#: gitk:9189 gitk:9385 +#: gitk:9190 gitk:9400 msgid "Output file:" msgstr "出力ファイル:" -#: gitk:9195 +#: gitk:9196 msgid "Generate" msgstr "生成" -#: gitk:9233 +#: gitk:9234 msgid "Error creating patch:" msgstr "パッチ生成エラー:" -#: gitk:9256 gitk:9373 gitk:9430 +#: gitk:9257 gitk:9388 gitk:9445 msgid "ID:" msgstr "ID:" -#: gitk:9265 +#: gitk:9266 msgid "Tag name:" msgstr "タグ名:" -#: gitk:9268 +#: gitk:9269 msgid "Tag message is optional" msgstr "" -#: gitk:9270 +#: gitk:9271 #, fuzzy msgid "Tag message:" msgstr "タグ名:" -#: gitk:9274 gitk:9439 +#: gitk:9275 gitk:9454 msgid "Create" msgstr "生成" -#: gitk:9292 +#: gitk:9293 msgid "No tag name specified" msgstr "タグの名称が指定されていません" -#: gitk:9296 +#: gitk:9297 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "タグ \"%s\" は既に存在します" -#: gitk:9306 +#: gitk:9307 msgid "Error creating tag:" msgstr "タグ生成エラー:" -#: gitk:9382 +#: gitk:9397 msgid "Command:" msgstr "コマンド:" -#: gitk:9390 +#: gitk:9405 msgid "Write" msgstr "書き出し" -#: gitk:9408 +#: gitk:9423 msgid "Error writing commit:" msgstr "コミット書き出しエラー:" -#: gitk:9435 +#: gitk:9450 msgid "Name:" msgstr "名前:" -#: gitk:9458 +#: gitk:9473 msgid "Please specify a name for the new branch" msgstr "新しいブランチの名前を指定してください" -#: gitk:9463 +#: gitk:9478 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "ブランチ '%s' は既に存在します。上書きしますか？" -#: gitk:9530 +#: gitk:9545 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？" -#: gitk:9535 +#: gitk:9550 msgid "Cherry-picking" msgstr "チェリーピック中" -#: gitk:9544 +#: gitk:9559 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1053,7 +1072,7 @@ msgstr "" "あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ" "い。" -#: gitk:9550 +#: gitk:9565 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1061,22 +1080,22 @@ msgstr "" "マージの衝突によってチェリーピックは失敗しました。\n" "この解決のために git citool を実行したいですか？" -#: gitk:9566 gitk:9624 +#: gitk:9581 gitk:9639 msgid "No changes committed" msgstr "何の変更もコミットされていません" -#: gitk:9593 +#: gitk:9608 #, fuzzy, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "" "コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？" -#: gitk:9598 +#: gitk:9613 #, fuzzy msgid "Reverting" msgstr "リセット中" -#: gitk:9606 +#: gitk:9621 #, fuzzy, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1086,7 +1105,7 @@ msgstr "" "あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ" "い。" -#: gitk:9610 +#: gitk:9625 #, fuzzy msgid "" "Revert failed because of merge conflict.\n" @@ -1095,28 +1114,28 @@ msgstr "" "マージの衝突によってチェリーピックは失敗しました。\n" "この解決のために git citool を実行したいですか？" -#: gitk:9653 +#: gitk:9668 msgid "Confirm reset" msgstr "確認を取り消す" -#: gitk:9655 +#: gitk:9670 #, tcl-format msgid "Reset branch %s to %s?" msgstr "ブランチ %s を %s にリセットしますか？" -#: gitk:9657 +#: gitk:9672 msgid "Reset type:" msgstr "Reset タイプ:" -#: gitk:9660 +#: gitk:9675 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: 作業ツリーもインデックスもそのままにする" -#: gitk:9663 +#: gitk:9678 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixed: 作業ツリーをそのままにして、インデックスをリセット" -#: gitk:9666 +#: gitk:9681 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1124,19 +1143,19 @@ msgstr "" "Hard: 作業ツリーやインデックスをリセット\n" "（「全ての」ローカルな変更を破棄）" -#: gitk:9683 +#: gitk:9698 msgid "Resetting" msgstr "リセット中" -#: gitk:9743 +#: gitk:9758 msgid "Checking out" msgstr "チェックアウト" -#: gitk:9796 +#: gitk:9811 msgid "Cannot delete the currently checked-out branch" msgstr "現在チェックアウトされているブランチを削除することはできません" -#: gitk:9802 +#: gitk:9817 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1145,16 +1164,16 @@ msgstr "" "ブランチ %s には他のブランチに存在しないコミットがあります。\n" "本当にブランチ %s を削除しますか？" -#: gitk:9833 +#: gitk:9848 #, tcl-format msgid "Tags and heads: %s" msgstr "タグとHEAD: %s" -#: gitk:9850 +#: gitk:9865 msgid "Filter" msgstr "フィルター" -#: gitk:10146 +#: gitk:10161 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1162,220 +1181,220 @@ msgstr "" "コミット構造情報読み込みエラー; ブランチ及び上位/下位のタグ情報が不完全である" "ようです。" -#: gitk:11123 +#: gitk:11138 msgid "Tag" msgstr "タグ" -#: gitk:11127 +#: gitk:11142 msgid "Id" msgstr "ID" -#: gitk:11210 +#: gitk:11225 msgid "Gitk font chooser" msgstr "Gitk フォント選択" -#: gitk:11227 +#: gitk:11242 msgid "B" msgstr "B" -#: gitk:11230 +#: gitk:11245 msgid "I" msgstr "I" -#: gitk:11348 +#: gitk:11363 msgid "Commit list display options" msgstr "コミットリスト表示オプション" -#: gitk:11351 +#: gitk:11366 msgid "Maximum graph width (lines)" msgstr "最大グラフ幅（線の本数）" -#: gitk:11355 +#: gitk:11370 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "最大グラフ幅（ペインに対する％）" -#: gitk:11358 +#: gitk:11373 msgid "Show local changes" msgstr "ローカルな変更を表示" -#: gitk:11361 +#: gitk:11376 #, fuzzy msgid "Auto-select SHA1 (length)" msgstr "SHA1 の自動選択" -#: gitk:11365 +#: gitk:11380 msgid "Hide remote refs" msgstr "リモートリファレンスを隠す" -#: gitk:11369 +#: gitk:11384 msgid "Diff display options" msgstr "diff表示オプション" -#: gitk:11371 +#: gitk:11386 msgid "Tab spacing" msgstr "タブ空白幅" -#: gitk:11374 +#: gitk:11389 #, fuzzy msgid "Display nearby tags/heads" msgstr "近くのタグを表示する" -#: gitk:11377 +#: gitk:11392 msgid "Maximum # tags/heads to show" msgstr "" -#: gitk:11380 +#: gitk:11395 msgid "Limit diffs to listed paths" msgstr "diff をリストのパスに制限" -#: gitk:11383 +#: gitk:11398 msgid "Support per-file encodings" msgstr "ファイルごとのエンコーディングのサポート" -#: gitk:11389 gitk:11536 +#: gitk:11404 gitk:11551 msgid "External diff tool" msgstr "外部diffツール" -#: gitk:11390 +#: gitk:11405 msgid "Choose..." msgstr "選択..." -#: gitk:11395 +#: gitk:11410 #, fuzzy msgid "General options" msgstr "パッチ生成" -#: gitk:11398 +#: gitk:11413 msgid "Use themed widgets" msgstr "" -#: gitk:11400 +#: gitk:11415 msgid "(change requires restart)" msgstr "" -#: gitk:11402 +#: gitk:11417 msgid "(currently unavailable)" msgstr "" -#: gitk:11413 +#: gitk:11428 msgid "Colors: press to choose" msgstr "色: ボタンを押して選択" -#: gitk:11416 +#: gitk:11431 msgid "Interface" msgstr "インターフェイス" -#: gitk:11417 +#: gitk:11432 msgid "interface" msgstr "インターフェイス" -#: gitk:11420 +#: gitk:11435 msgid "Background" msgstr "背景" -#: gitk:11421 gitk:11451 +#: gitk:11436 gitk:11466 msgid "background" msgstr "背景" -#: gitk:11424 +#: gitk:11439 msgid "Foreground" msgstr "前景" -#: gitk:11425 +#: gitk:11440 msgid "foreground" msgstr "前景" -#: gitk:11428 +#: gitk:11443 msgid "Diff: old lines" msgstr "Diff: 旧バージョン" -#: gitk:11429 +#: gitk:11444 msgid "diff old lines" msgstr "diff 旧バージョン" -#: gitk:11433 +#: gitk:11448 msgid "Diff: new lines" msgstr "Diff: 新バージョン" -#: gitk:11434 +#: gitk:11449 msgid "diff new lines" msgstr "diff 新バージョン" -#: gitk:11438 +#: gitk:11453 msgid "Diff: hunk header" msgstr "Diff: hunkヘッダ" -#: gitk:11440 +#: gitk:11455 msgid "diff hunk header" msgstr "diff hunkヘッダ" -#: gitk:11444 +#: gitk:11459 msgid "Marked line bg" msgstr "マーク行の背景" -#: gitk:11446 +#: gitk:11461 msgid "marked line background" msgstr "マーク行の背景" -#: gitk:11450 +#: gitk:11465 msgid "Select bg" msgstr "選択の背景" -#: gitk:11459 +#: gitk:11474 msgid "Fonts: press to choose" msgstr "フォント: ボタンを押して選択" -#: gitk:11461 +#: gitk:11476 msgid "Main font" msgstr "主フォント" -#: gitk:11462 +#: gitk:11477 msgid "Diff display font" msgstr "Diff表示用フォント" -#: gitk:11463 +#: gitk:11478 msgid "User interface font" msgstr "UI用フォント" -#: gitk:11485 +#: gitk:11500 msgid "Gitk preferences" msgstr "Gitk 設定" -#: gitk:11494 +#: gitk:11509 #, fuzzy msgid "General" msgstr "生成" -#: gitk:11495 +#: gitk:11510 msgid "Colors" msgstr "" -#: gitk:11496 +#: gitk:11511 msgid "Fonts" msgstr "" -#: gitk:11546 +#: gitk:11561 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: 「%s」 の色を選択" -#: gitk:12059 +#: gitk:12074 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." msgstr "" -#: gitk:12269 +#: gitk:12284 msgid "Cannot find a git repository here." msgstr "ここにはgitリポジトリがありません。" -#: gitk:12316 +#: gitk:12331 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "あいまいな引数 '%s': リビジョンとファイル名の両方に解釈できます" -#: gitk:12328 +#: gitk:12343 msgid "Bad arguments to gitk:" msgstr "gitkへの不正な引数:" -- cgit v1.2.1 From 640495bd89dd72372a45132956df988fbeefc808 Mon Sep 17 00:00:00 2001 From: YOKOTA Hiroshi Date: Sat, 24 Oct 2015 19:53:23 +0900 Subject: gitk: Update Japanese message catalog Signed-off-by: YOKOTA Hiroshi --- po/ja.po | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/po/ja.po b/po/ja.po index fd396061c..79e4125c6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -127,11 +127,11 @@ msgstr "編集(&E)" #: gitk:2084 msgid "&New view..." -msgstr "新規ビュー...(&N)" +msgstr "新規ビュー(&N)..." #: gitk:2085 msgid "&Edit view..." -msgstr "ビュー編集...(&E)" +msgstr "ビュー編集(&E)..." #: gitk:2086 msgid "&Delete view" @@ -1236,13 +1236,12 @@ msgid "Tab spacing" msgstr "タブ空白幅" #: gitk:11389 -#, fuzzy msgid "Display nearby tags/heads" -msgstr "近くのタグを表示する" +msgstr "近くの タグ/head を表示する" #: gitk:11392 msgid "Maximum # tags/heads to show" -msgstr "" +msgstr "タグ/head の最大表示数" #: gitk:11395 msgid "Limit diffs to listed paths" @@ -1261,21 +1260,20 @@ msgid "Choose..." msgstr "選択..." #: gitk:11410 -#, fuzzy msgid "General options" -msgstr "パッチ生成" +msgstr "全体設定" #: gitk:11413 msgid "Use themed widgets" -msgstr "" +msgstr "テーマウィジェットを使用する" #: gitk:11415 msgid "(change requires restart)" -msgstr "" +msgstr "(変更には再起動が必要です)" #: gitk:11417 msgid "(currently unavailable)" -msgstr "" +msgstr "(現在は使用出来ません)" #: gitk:11428 msgid "Colors: press to choose" @@ -1364,15 +1362,15 @@ msgstr "Gitk 設定" #: gitk:11509 #, fuzzy msgid "General" -msgstr "生成" +msgstr "一般" #: gitk:11510 msgid "Colors" -msgstr "" +msgstr "色" #: gitk:11511 msgid "Fonts" -msgstr "" +msgstr "フォント" #: gitk:11561 #, tcl-format -- cgit v1.2.1 From cf2d5a0904cf7ff128fb61b7f8c5a2722101a481 Mon Sep 17 00:00:00 2001 From: YOKOTA Hiroshi Date: Sat, 24 Oct 2015 20:23:00 +0900 Subject: gitk: Translate more to Japanese catalog Signed-off-by: YOKOTA Hiroshi --- po/ja.po | 47 ++++++++++++++++------------------------------- 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/po/ja.po b/po/ja.po index 79e4125c6..6bd2fdc6e 100644 --- a/po/ja.po +++ b/po/ja.po @@ -312,19 +312,16 @@ msgid "Compare with marked commit" msgstr "マークを付けたコミットと比較する" #: gitk:2630 gitk:2641 -#, fuzzy msgid "Diff this -> marked commit" msgstr "これと選択したコミットのdiffを見る" #: gitk:2631 gitk:2642 -#, fuzzy msgid "Diff marked commit -> this" msgstr "選択したコミットとこれのdiffを見る" #: gitk:2632 -#, fuzzy msgid "Revert this commit" -msgstr "このコミットにマークをつける" +msgstr "このコミットを撤回する" #: gitk:2648 msgid "Check out this branch" @@ -367,9 +364,8 @@ msgid "Run git gui blame on this line" msgstr "この行に git gui で blame をかける" #: gitk:3013 -#, fuzzy msgid "About gitk" -msgstr "gitk について(&A)" +msgstr "gitk について" #: gitk:3015 #, fuzzy @@ -384,7 +380,7 @@ msgstr "" "\n" "Gitk - gitコミットビューア\n" "\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"Copyright \\u00a9 2005-2014 Paul Mackerras\n" "\n" "使用および再配布は GNU General Public License に従ってください" @@ -406,9 +402,9 @@ msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\t終了" #: gitk:3050 -#, fuzzy, tcl-format +#, tcl-format msgid "<%s-W>\t\tClose window" -msgstr "<%s-F>\t\t検索" +msgstr "<%s-W>\t\tウィンドウを閉じる" #: gitk:3051 msgid "\t\tMove to first commit" @@ -523,9 +519,8 @@ msgid "\tMove to next find hit" msgstr "\t次を検索して移動" #: gitk:3076 -#, fuzzy msgid "g\t\tGo to commit" -msgstr "\t\t最後のコミットに移動" +msgstr "g\t\t指定してコミットに移動" #: gitk:3077 msgid "/\t\tFocus the search box" @@ -691,9 +686,8 @@ msgid "Matches all Commit Info criteria" msgstr "コミット情報の全ての条件に一致" #: gitk:4087 -#, fuzzy msgid "Matches no Commit Info criteria" -msgstr "コミット情報の全ての条件に一致" +msgstr "コミット情報の全ての条件に不一致" #: gitk:4088 msgid "Changes to Files:" @@ -780,7 +774,6 @@ msgid "-- criteria for selecting revisions" msgstr "― リビジョンの選択条件" #: gitk:4242 -#, fuzzy msgid "View Name" msgstr "ビュー名:" @@ -1003,12 +996,11 @@ msgstr "タグ名:" #: gitk:9269 msgid "Tag message is optional" -msgstr "" +msgstr "タグメッセージを付ける事も出来ます" #: gitk:9271 -#, fuzzy msgid "Tag message:" -msgstr "タグ名:" +msgstr "タグメッセージ:" #: gitk:9275 gitk:9454 msgid "Create" @@ -1085,33 +1077,27 @@ msgid "No changes committed" msgstr "何の変更もコミットされていません" #: gitk:9608 -#, fuzzy, tcl-format +#, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" -msgstr "" -"コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？" +msgstr "コミット %s は既にブランチ %s に含まれています ― 本当にこれを撤回しますか？" #: gitk:9613 -#, fuzzy msgid "Reverting" -msgstr "リセット中" +msgstr "撤回中" #: gitk:9621 -#, fuzzy, tcl-format +#, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " "commit, reset or stash your changes and try again." -msgstr "" -"ファイル '%s' のローカルな変更のためにチェリーピックは失敗しました。\n" -"あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ" -"い。" +msgstr "ファイル '%s' のローカルな変更のために撤回は失敗しました。 あなたの変更に commit, reset, stash のいずれかを行ってからやり直してください。" #: gitk:9625 -#, fuzzy msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" msgstr "" -"マージの衝突によってチェリーピックは失敗しました。\n" +"マージの衝突によって撤回は失敗しました。\n" "この解決のために git citool を実行したいですか？" #: gitk:9668 @@ -1219,9 +1205,8 @@ msgid "Show local changes" msgstr "ローカルな変更を表示" #: gitk:11376 -#, fuzzy msgid "Auto-select SHA1 (length)" -msgstr "SHA1 の自動選択" +msgstr "SHA1 の自動選択 (選択文字数指定)" #: gitk:11380 msgid "Hide remote refs" -- cgit v1.2.1 From ecfeeed5a75720dc7d9363e7f572d3c7b425f6b8 Mon Sep 17 00:00:00 2001 From: YOKOTA Hiroshi Date: Sat, 24 Oct 2015 21:12:39 +0900 Subject: gitk: Translate Japanese catalog Signed-off-by: YOKOTA Hiroshi --- po/ja.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/po/ja.po b/po/ja.po index 6bd2fdc6e..219b40387 100644 --- a/po/ja.po +++ b/po/ja.po @@ -24,11 +24,11 @@ msgstr "マージされていないファイルのリストを取得できませ #: gitk:212 gitk:2381 msgid "Color words" -msgstr "" +msgstr "変更を着色" #: gitk:217 gitk:2381 gitk:8221 gitk:8254 msgid "Markup words" -msgstr "" +msgstr "変更をマークアップ" #: gitk:324 msgid "Error parsing revisions:" @@ -184,11 +184,11 @@ msgstr "パスの一部:" #: gitk:2303 gitk:4778 msgid "adding/removing string:" -msgstr "追加/除去する文字列:" +msgstr "追加/除去される文字列:" #: gitk:2304 gitk:4780 msgid "changing lines matching:" -msgstr "" +msgstr "変更される文字列" #: gitk:2313 gitk:2315 gitk:4767 msgid "Exact" @@ -249,7 +249,7 @@ msgstr "空白の違いを無視" #: gitk:2378 gitk:2380 gitk:7960 gitk:8207 msgid "Line diff" -msgstr "" +msgstr "行毎のdiff" #: gitk:2445 msgid "Patch" @@ -277,7 +277,7 @@ msgstr "タグ生成" #: gitk:2621 msgid "Copy commit summary" -msgstr "" +msgstr "コミットの要約をコピーする" #: gitk:2622 gitk:9386 msgid "Write commit to file" @@ -333,7 +333,7 @@ msgstr "このブランチを除去する" #: gitk:2650 msgid "Copy branch name" -msgstr "" +msgstr "ブランチ名をコピーする" #: gitk:2657 msgid "Highlight this too" @@ -353,7 +353,7 @@ msgstr "親コミットから blame をかける" #: gitk:2661 msgid "Copy path" -msgstr "" +msgstr "パス名をコピーする" #: gitk:2668 msgid "Show origin of this line" @@ -436,7 +436,7 @@ msgstr ", x, l\t履歴の次へ進む" #: gitk:3057 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" -msgstr "" +msgstr "<%s-n>\t履歴上で現在のコミットの親コミットの内のn(数字)番目のコミットへ移動" #: gitk:3058 msgid "\tMove up one page in commit list" -- cgit v1.2.1 From 3cc4c11007f2f82d7b1a99a2ade302c444787074 Mon Sep 17 00:00:00 2001 From: YOKOTA Hiroshi Date: Sat, 24 Oct 2015 21:25:42 +0900 Subject: gitk: Fix wrong translation Signed-off-by: YOKOTA Hiroshi --- po/ja.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 219b40387..057924488 100644 --- a/po/ja.po +++ b/po/ja.po @@ -417,17 +417,17 @@ msgstr "\t\t最後のコミットに移動" #: gitk:3053 #, fuzzy msgid ", p, k\tMove up one commit" -msgstr ", p, i\t一つ上のコミットに移動" +msgstr ", p, k\t一つ上のコミットに移動" #: gitk:3054 #, fuzzy msgid ", n, j\tMove down one commit" -msgstr ", n, k\t一つ下のコミットに移動" +msgstr ", n, j\t一つ下のコミットに移動" #: gitk:3055 #, fuzzy msgid ", z, h\tGo back in history list" -msgstr ", z, j\t履歴の前に戻る" +msgstr ", z, h\t履歴の前に戻る" #: gitk:3056 msgid ", x, l\tGo forward in history list" -- cgit v1.2.1 From a23630dec5c6ccd485a46f6ac1c460347ecc64be Mon Sep 17 00:00:00 2001 From: YOKOTA Hiroshi Date: Sat, 24 Oct 2015 21:31:08 +0900 Subject: gitk: Update Japanese translation Signed-off-by: YOKOTA Hiroshi --- po/ja.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/ja.po b/po/ja.po index 057924488..247552283 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1367,6 +1367,8 @@ msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." msgstr "" +"申し訳ありませんが、このバージョンの Tcl/Tk では gitk を実行出来ません。\n" +"Gitkの実行には Tcl/Tk 8.4 以上が必要です。" #: gitk:12284 msgid "Cannot find a git repository here." -- cgit v1.2.1 From 8032ab360abcc9b24df9914b40ff9ddf0ad0446b Mon Sep 17 00:00:00 2001 From: YOKOTA Hiroshi Date: Sat, 24 Oct 2015 21:35:56 +0900 Subject: gitk: Fix translation around copyright sign Signed-off-by: YOKOTA Hiroshi --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index 247552283..2caf92a84 100644 --- a/po/ja.po +++ b/po/ja.po @@ -380,7 +380,7 @@ msgstr "" "\n" "Gitk - gitコミットビューア\n" "\n" -"Copyright \\u00a9 2005-2014 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "使用および再配布は GNU General Public License に従ってください" -- cgit v1.2.1 From b9d3c9652e0df8065fd1be125e969e0ba1d078a0 Mon Sep 17 00:00:00 2001 From: YOKOTA Hiroshi Date: Sat, 24 Oct 2015 21:55:02 +0900 Subject: gitk: Update Japanese translation Signed-off-by: YOKOTA Hiroshi --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index 2caf92a84..40a7fca49 100644 --- a/po/ja.po +++ b/po/ja.po @@ -815,7 +815,7 @@ msgstr "ステージされていない、コミット前のローカルな変更 #: gitk:7135 msgid "and many more" -msgstr "" +msgstr "他多数" #: gitk:7138 msgid "many" -- cgit v1.2.1 From c670cf3518c80d69ca73d7125eba9eb173d72345 Mon Sep 17 00:00:00 2001 From: YOKOTA Hiroshi Date: Thu, 12 Nov 2015 15:14:34 +0900 Subject: gitk: Update fuzzy messages Signed-off-by: YOKOTA Hiroshi --- po/ja.po | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/po/ja.po b/po/ja.po index 40a7fca49..f3fcdd68c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -368,7 +368,6 @@ msgid "About gitk" msgstr "gitk について" #: gitk:3015 -#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -415,17 +414,14 @@ msgid "\t\tMove to last commit" msgstr "\t\t最後のコミットに移動" #: gitk:3053 -#, fuzzy msgid ", p, k\tMove up one commit" msgstr ", p, k\t一つ上のコミットに移動" #: gitk:3054 -#, fuzzy msgid ", n, j\tMove down one commit" msgstr ", n, j\t一つ下のコミットに移動" #: gitk:3055 -#, fuzzy msgid ", z, h\tGo back in history list" msgstr ", z, h\t履歴の前に戻る" @@ -624,14 +620,12 @@ msgid "External diff viewer failed:" msgstr "外部diffビューアが失敗:" #: gitk:4044 -#, fuzzy msgid "All files" -msgstr "全てのファイル(&A)" +msgstr "全てのファイル" #: gitk:4068 -#, fuzzy msgid "View" -msgstr "ビュー(&V)" +msgstr "ビュー" #: gitk:4071 msgid "Gitk view definition" @@ -1345,7 +1339,6 @@ msgid "Gitk preferences" msgstr "Gitk 設定" #: gitk:11509 -#, fuzzy msgid "General" msgstr "一般" -- cgit v1.2.1 From 6c54103e773c544a1efe959d12ea0fa098b3f643 Mon Sep 17 00:00:00 2001 From: YOKOTA Hiroshi Date: Sat, 24 Oct 2015 23:04:54 +0900 Subject: gitk: Change last translator line Signed-off-by: YOKOTA Hiroshi --- po/ja.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index f3fcdd68c..1e56b51f7 100644 --- a/po/ja.po +++ b/po/ja.po @@ -2,6 +2,7 @@ # Copyright (C) 2005-2009 Paul Mackerras # This file is distributed under the same license as the gitk package. # +# YOKOTA Hiroshi , 2015. # Mizar , 2009. # Junio C Hamano , 2009. msgid "" @@ -10,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2009-11-06 01:45+0900\n" -"Last-Translator: Mizar \n" +"Last-Translator: YOKOTA Hiroshi \n" "Language-Team: Japanese\n" "Language: \n" "MIME-Version: 1.0\n" -- cgit v1.2.1 From 0ded623a5f42f442a13fb665d115be2964f80f3a Mon Sep 17 00:00:00 2001 From: YOKOTA Hiroshi Date: Sat, 24 Oct 2015 23:07:55 +0900 Subject: gitk: Update year Signed-off-by: YOKOTA Hiroshi --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index 1e56b51f7..da77b4a38 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,5 +1,5 @@ # Japanese translations for gitk package. -# Copyright (C) 2005-2009 Paul Mackerras +# Copyright (C) 2005-2015 Paul Mackerras # This file is distributed under the same license as the gitk package. # # YOKOTA Hiroshi , 2015. -- cgit v1.2.1 From 0f8b604f91a32546b97882aea41c242963b6794e Mon Sep 17 00:00:00 2001 From: YOKOTA Hiroshi Date: Sat, 24 Oct 2015 23:21:25 +0900 Subject: gitk: Remove unused line Signed-off-by: YOKOTA Hiroshi --- po/ja.po | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/po/ja.po b/po/ja.po index da77b4a38..3f5d71789 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1376,21 +1376,3 @@ msgstr "あいまいな引数 '%s': リビジョンとファイル名の両方 #: gitk:12343 msgid "Bad arguments to gitk:" msgstr "gitkへの不正な引数:" - -#~ msgid "mc" -#~ msgstr "mc" - -#~ msgid "SHA1 ID: " -#~ msgstr "SHA1 ID: " - -#~ msgid "next" -#~ msgstr "次" - -#~ msgid "prev" -#~ msgstr "前" - -#~ msgid "CDate" -#~ msgstr "作成日" - -#~ msgid "Cannot find the git directory \"%s\"." -#~ msgstr "gitディレクトリ \"%s\" を見つけられません。" -- cgit v1.2.1 From e82470ac8cca8d3dc70788de5b86d41872695292 Mon Sep 17 00:00:00 2001 From: YOKOTA Hiroshi Date: Sun, 25 Oct 2015 01:32:28 +0900 Subject: gitk: Improve translation message Signed-off-by: YOKOTA Hiroshi --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index 3f5d71789..82c63eb20 100644 --- a/po/ja.po +++ b/po/ja.po @@ -433,7 +433,7 @@ msgstr ", x, l\t履歴の次へ進む" #: gitk:3057 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" -msgstr "<%s-n>\t履歴上で現在のコミットの親コミットの内のn(数字)番目のコミットへ移動" +msgstr "<%s-n(数字)>\t履歴上で現在のコミットの親コミットの内のn(数字)番目のコミットへ移動" #: gitk:3058 msgid "\tMove up one page in commit list" -- cgit v1.2.1 From e25f12247edf749952f056da8ae647c575d86aa4 Mon Sep 17 00:00:00 2001 From: YOKOTA Hiroshi Date: Sun, 25 Oct 2015 01:34:36 +0900 Subject: gitk: Update "Language:" header msgfmt(1) wants this header. Signed-off-by: YOKOTA Hiroshi --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index 82c63eb20..282607756 100644 --- a/po/ja.po +++ b/po/ja.po @@ -13,7 +13,7 @@ msgstr "" "PO-Revision-Date: 2009-11-06 01:45+0900\n" "Last-Translator: YOKOTA Hiroshi \n" "Language-Team: Japanese\n" -"Language: \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -- cgit v1.2.1 From a1420cd320d55c887d5cafb099a9128861331761 Mon Sep 17 00:00:00 2001 From: YOKOTA Hiroshi Date: Thu, 12 Nov 2015 13:01:44 +0900 Subject: gitk: Update revision date in Japanese PO file Signed-off-by: YOKOTA Hiroshi --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index 282607756..f143753db 100644 --- a/po/ja.po +++ b/po/ja.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-17 14:32+1000\n" -"PO-Revision-Date: 2009-11-06 01:45+0900\n" +"PO-Revision-Date: 2015-11-12 13:00+0900\n" "Last-Translator: YOKOTA Hiroshi \n" "Language-Team: Japanese\n" "Language: ja\n" -- cgit v1.2.1 From b33a15b08131514b593015cb3e719faf9db20208 Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Tue, 17 Nov 2015 11:05:56 +0000 Subject: push: add recurseSubmodules config option The --recurse-submodules command line parameter has existed for some time but it has no config file equivalent. Following the style of the corresponding parameter for git fetch, let's invent push.recurseSubmodules to provide a default for this parameter. This also requires the addition of --recurse-submodules=no to allow the configuration to be overridden on the command line when required. The most straightforward way to implement this appears to be to make push use code in submodule-config in a similar way to fetch. Signed-off-by: Mike Crowe Signed-off-by: Jeff King --- Documentation/config.txt | 14 ++++ Documentation/git-push.txt | 24 ++++--- builtin/push.c | 39 +++++++---- submodule-config.c | 29 ++++++++ submodule-config.h | 1 + submodule.h | 1 + t/t5531-deep-submodule-push.sh | 152 ++++++++++++++++++++++++++++++++++++++++- 7 files changed, 234 insertions(+), 26 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index b4b01948d..8c02e4348 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2226,6 +2226,20 @@ push.gpgSign:: override a value from a lower-priority config file. An explicit command-line flag always overrides this config option. +push.recurseSubmodules:: + Make sure all submodule commits used by the revisions to be pushed + are available on a remote-tracking branch. If the value is 'check' + then Git will verify that all submodule commits that changed in the + revisions to be pushed are available on at least one remote of the + submodule. If any commits are missing, the push will be aborted and + exit with non-zero status. If the value is 'on-demand' then all + submodules that changed in the revisions to be pushed will be + pushed. If on-demand was not able to push all necessary revisions + it will also be aborted and exit with non-zero status. If the value + is 'no' then default behavior of ignoring submodules when pushing + is retained. You may override this configuration at time of push by + specifying '--recurse-submodules=check|on-demand|no'. + rebase.stat:: Whether to show a diffstat of what changed upstream since the last rebase. False by default. diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 85a4d7d6d..4c775bcec 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -257,16 +257,20 @@ origin +master` to force a push to the `master` branch). See the is specified. This flag forces progress status even if the standard error stream is not directed to a terminal. ---recurse-submodules=check|on-demand:: - Make sure all submodule commits used by the revisions to be - pushed are available on a remote-tracking branch. If 'check' is - used Git will verify that all submodule commits that changed in - the revisions to be pushed are available on at least one remote - of the submodule. If any commits are missing the push will be - aborted and exit with non-zero status. If 'on-demand' is used - all submodules that changed in the revisions to be pushed will - be pushed. If on-demand was not able to push all necessary - revisions it will also be aborted and exit with non-zero status. +--no-recurse-submodules:: +--recurse-submodules=check|on-demand|no:: + May be used to make sure all submodule commits used by the + revisions to be pushed are available on a remote-tracking branch. + If 'check' is used Git will verify that all submodule commits that + changed in the revisions to be pushed are available on at least one + remote of the submodule. If any commits are missing the push will + be aborted and exit with non-zero status. If 'on-demand' is used + all submodules that changed in the revisions to be pushed will be + pushed. If on-demand was not able to push all necessary revisions + it will also be aborted and exit with non-zero status. A value of + 'no' or using '--no-recurse-submodules' can be used to override the + push.recurseSubmodules configuration variable when no submodule + recursion is required. --[no-]verify:: Toggle the pre-push hook (see linkgit:githooks[5]). The diff --git a/builtin/push.c b/builtin/push.c index 3bda430b6..f9b59b49a 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -9,6 +9,7 @@ #include "transport.h" #include "parse-options.h" #include "submodule.h" +#include "submodule-config.h" #include "send-pack.h" static const char * const push_usage[] = { @@ -20,7 +21,7 @@ static int thin = 1; static int deleterefs; static const char *receivepack; static int verbosity; -static int progress = -1; +static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT; static struct push_cas_option cas; @@ -452,22 +453,17 @@ static int do_push(const char *repo, int flags) static int option_parse_recurse_submodules(const struct option *opt, const char *arg, int unset) { - int *flags = opt->value; + int *recurse_submodules = opt->value; - if (*flags & (TRANSPORT_RECURSE_SUBMODULES_CHECK | - TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND)) + if (*recurse_submodules != RECURSE_SUBMODULES_DEFAULT) die("%s can only be used once.", opt->long_name); - if (arg) { - if (!strcmp(arg, "check")) - *flags |= TRANSPORT_RECURSE_SUBMODULES_CHECK; - else if (!strcmp(arg, "on-demand")) - *flags |= TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND; - else - die("bad %s argument: %s", opt->long_name, arg); - } else - die("option %s needs an argument (check|on-demand)", - opt->long_name); + if (unset) + *recurse_submodules = RECURSE_SUBMODULES_OFF; + else if (arg) + *recurse_submodules = parse_push_recurse_submodules_arg(opt->long_name, arg); + else + die("%s missing parameter", opt->long_name); return 0; } @@ -522,6 +518,10 @@ static int git_push_config(const char *k, const char *v, void *cb) return error("Invalid value for '%s'", k); } } + } else if (!strcmp(k, "push.recursesubmodules")) { + const char *value; + if (!git_config_get_value("push.recursesubmodules", &value)) + recurse_submodules = parse_push_recurse_submodules_arg(k, value); } return git_default_config(k, v, NULL); @@ -532,6 +532,7 @@ int cmd_push(int argc, const char **argv, const char *prefix) int flags = 0; int tags = 0; int push_cert = -1; + int recurse_submodules_from_cmdline = RECURSE_SUBMODULES_DEFAULT; int rc; const char *repo = NULL; /* default repository */ struct option options[] = { @@ -549,7 +550,7 @@ int cmd_push(int argc, const char **argv, const char *prefix) 0, CAS_OPT_NAME, &cas, N_("refname>:recurse-on-demand-on-command-line && + git add recurse-on-demand-on-command-line && + git commit -m "Recurse on-demand on command line junk" + ) && + ( + cd work && + git add gar/bage && + git commit -m "Recurse on-demand on command line for gar/bage" && + git push --recurse-submodules=on-demand ../pub.git master && + # Check that the supermodule commit got there + git fetch ../pub.git && + git diff --quiet FETCH_HEAD master && + # Check that the submodule commit got there too + cd gar/bage && + git diff --quiet origin/master master + ) +' + +test_expect_success 'push succeeds if submodule commit not on remote but using on-demand from config' ' + ( + cd work/gar/bage && + >recurse-on-demand-from-config && + git add recurse-on-demand-from-config && + git commit -m "Recurse on-demand from config junk" + ) && + ( + cd work && + git add gar/bage && + git commit -m "Recurse on-demand from config for gar/bage" && + git -c push.recurseSubmodules=on-demand push ../pub.git master && + # Check that the supermodule commit got there + git fetch ../pub.git && + git diff --quiet FETCH_HEAD master && + # Check that the submodule commit got there too + cd gar/bage && + git diff --quiet origin/master master + ) +' + +test_expect_success 'push fails if submodule commit not on remote using check from cmdline overriding config' ' + ( + cd work/gar/bage && + >recurse-check-on-command-line-overriding-config && + git add recurse-check-on-command-line-overriding-config && + git commit -m "Recurse on command-line overridiing config junk" + ) && + ( + cd work && + git add gar/bage && + git commit -m "Recurse on command-line overriding config for gar/bage" && + test_must_fail git -c push.recurseSubmodules=on-demand push --recurse-submodules=check ../pub.git master && + # Check that the supermodule commit did not get there + git fetch ../pub.git && + git diff --quiet FETCH_HEAD master^ && + # Check that the submodule commit did not get there + cd gar/bage && + git diff --quiet origin/master master^ + ) +' + +test_expect_success 'push succeeds if submodule commit not on remote using on-demand from cmdline overriding config' ' + ( + cd work/gar/bage && + >recurse-on-demand-on-command-line-overriding-config && + git add recurse-on-demand-on-command-line-overriding-config && + git commit -m "Recurse on-demand on command-line overriding config junk" + ) && + ( + cd work && + git add gar/bage && + git commit -m "Recurse on-demand on command-line overriding config for gar/bage" && + git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git master && + # Check that the supermodule commit got there + git fetch ../pub.git && + git diff --quiet FETCH_HEAD master && + # Check that the submodule commit got there + cd gar/bage && + git diff --quiet origin/master master + ) +' + +test_expect_success 'push succeeds if submodule commit disabling recursion from cmdline overriding config' ' + ( + cd work/gar/bage && + >recurse-disable-on-command-line-overriding-config && + git add recurse-disable-on-command-line-overriding-config && + git commit -m "Recurse disable on command-line overriding config junk" + ) && + ( + cd work && + git add gar/bage && + git commit -m "Recurse disable on command-line overriding config for gar/bage" && + git -c push.recurseSubmodules=check push --recurse-submodules=no ../pub.git master && + # Check that the supermodule commit got there + git fetch ../pub.git && + git diff --quiet FETCH_HEAD master && + # But that the submodule commit did not + ( cd gar/bage && git diff --quiet origin/master master^ ) && + # Now push it to avoid confusing future tests + git push --recurse-submodules=on-demand ../pub.git master + ) +' + +test_expect_success 'push succeeds if submodule commit disabling recursion from cmdline (alternative form) overriding config' ' + ( + cd work/gar/bage && + >recurse-disable-on-command-line-alt-overriding-config && + git add recurse-disable-on-command-line-alt-overriding-config && + git commit -m "Recurse disable on command-line alternative overriding config junk" + ) && + ( + cd work && + git add gar/bage && + git commit -m "Recurse disable on command-line alternative overriding config for gar/bage" && + git -c push.recurseSubmodules=check push --no-recurse-submodules ../pub.git master && + # Check that the supermodule commit got there + git fetch ../pub.git && + git diff --quiet FETCH_HEAD master && + # But that the submodule commit did not + ( cd gar/bage && git diff --quiet origin/master master^ ) && + # Now push it to avoid confusing future tests + git push --recurse-submodules=on-demand ../pub.git master + ) +' + +test_expect_success 'push fails if recurse submodules option passed as yes' ' + ( + cd work/gar/bage && + >recurse-push-fails-if-recurse-submodules-passed-as-yes && + git add recurse-push-fails-if-recurse-submodules-passed-as-yes && + git commit -m "Recurse push fails if recurse submodules option passed as yes" + ) && + ( + cd work && + git add gar/bage && + git commit -m "Recurse push fails if recurse submodules option passed as yes for gar/bage" && + test_must_fail git push --recurse-submodules=yes ../pub.git master && + test_must_fail git -c push.recurseSubmodules=yes push ../pub.git master && + git push --recurse-submodules=on-demand ../pub.git master + ) +' + test_expect_success 'push fails when commit on multiple branches if one branch has no remote' ' ( cd work/gar/bage && -- cgit v1.2.1 From 5d65fe312e22594b7fec7349945fb0072987716b Mon Sep 17 00:00:00 2001 From: Rob Mayoff Date: Fri, 13 Nov 2015 11:25:49 -0600 Subject: contrib/subtree: unwrap tag refs If a subtree was added using a tag ref, the tag ref is stored in the subtree commit message instead of the underlying commit's ref. To split or push subsequent changes to the subtree, the subtree command needs to unwrap the tag ref. This patch makes it do so. The problem was described in a message to the mailing list from Junio C Hamano dated 29 Apr 2014, with the subject "Re: git subtree issue in more recent versions". The archived message can be found at . Signed-off-by: Rob Mayoff Signed-off-by: Jeff King --- contrib/subtree/git-subtree.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index 9f0657185..5ed0ea5e9 100755 --- a/contrib/subtree/git-subtree.sh +++ b/contrib/subtree/git-subtree.sh @@ -245,7 +245,10 @@ find_latest_squash() case "$a" in START) sq="$b" ;; git-subtree-mainline:) main="$b" ;; - git-subtree-split:) sub="$b" ;; + git-subtree-split:) + sub="$(git rev-parse "$b^0")" || + die "could not rev-parse split hash $b from commit $sq" + ;; END) if [ -n "$sub" ]; then if [ -n "$main" ]; then @@ -278,7 +281,10 @@ find_existing_splits() case "$a" in START) sq="$b" ;; git-subtree-mainline:) main="$b" ;; - git-subtree-split:) sub="$b" ;; + git-subtree-split:) + sub="$(git rev-parse "$b^0")" || + die "could not rev-parse split hash $b from commit $sq" + ;; END) debug " Main is: '$main'" if [ -z "$main" -a -n "$sub" ]; then -- cgit v1.2.1 From f5c7cd9ecf2274547197fc8fc40564957fc9b99d Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Thu, 3 Dec 2015 13:10:34 +0000 Subject: push: test that --recurse-submodules on command line overrides config t5531 only checked that the push.recurseSubmodules config option was overridden by passing --recurse-submodules=check on the command line. Add new tests for overriding with --recurse-submodules=no, --no-recurse-submodules and --recurse-submodules=push too. Also correct minor typo in test commit message. Signed-off-by: Mike Crowe Signed-off-by: Junio C Hamano --- t/t5531-deep-submodule-push.sh | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh index 9fda7b0c1..721be32b0 100755 --- a/t/t5531-deep-submodule-push.sh +++ b/t/t5531-deep-submodule-push.sh @@ -126,24 +126,48 @@ test_expect_success 'push succeeds if submodule commit not on remote but using o ) ' -test_expect_success 'push fails if submodule commit not on remote using check from cmdline overriding config' ' +test_expect_success 'push recurse-submodules on command line overrides config' ' ( cd work/gar/bage && >recurse-check-on-command-line-overriding-config && git add recurse-check-on-command-line-overriding-config && - git commit -m "Recurse on command-line overridiing config junk" + git commit -m "Recurse on command-line overriding config junk" ) && ( cd work && git add gar/bage && git commit -m "Recurse on command-line overriding config for gar/bage" && + + # Ensure that we can override on-demand in the config + # to just check submodules test_must_fail git -c push.recurseSubmodules=on-demand push --recurse-submodules=check ../pub.git master && # Check that the supermodule commit did not get there git fetch ../pub.git && git diff --quiet FETCH_HEAD master^ && # Check that the submodule commit did not get there - cd gar/bage && - git diff --quiet origin/master master^ + (cd gar/bage && git diff --quiet origin/master master^) && + + # Ensure that we can override check in the config to + # disable submodule recursion entirely + (cd gar/bage && git diff --quiet origin/master master^) && + git -c push.recurseSubmodules=on-demand push --recurse-submodules=no ../pub.git master && + git fetch ../pub.git && + git diff --quiet FETCH_HEAD master && + (cd gar/bage && git diff --quiet origin/master master^) && + + # Ensure that we can override check in the config to + # disable submodule recursion entirely (alternative form) + git -c push.recurseSubmodules=on-demand push --no-recurse-submodules ../pub.git master && + git fetch ../pub.git && + git diff --quiet FETCH_HEAD master && + (cd gar/bage && git diff --quiet origin/master master^) && + + # Ensure that we can override check in the config to + # push the submodule too + git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git master && + git fetch ../pub.git && + git diff --quiet FETCH_HEAD master && + (cd gar/bage && git diff --quiet origin/master master) ) ' -- cgit v1.2.1 From d34141cd08fb1c6938eae329a7c3122b05e9eb01 Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Thu, 3 Dec 2015 13:10:35 +0000 Subject: push: follow the "last one wins" convention for --recurse-submodules Use the "last one wins" convention for --recurse-submodules rather than treating conflicting options as an error. Also, fix the declaration of the file-scope recurse_submodules global variable to put it on a separate line. Signed-off-by: Mike Crowe Signed-off-by: Junio C Hamano --- builtin/push.c | 12 +++--------- t/t5531-deep-submodule-push.sh | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index f9b59b49a..cc29277ea 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -21,7 +21,8 @@ static int thin = 1; static int deleterefs; static const char *receivepack; static int verbosity; -static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT; +static int progress = -1; +static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT; static struct push_cas_option cas; @@ -455,9 +456,6 @@ static int option_parse_recurse_submodules(const struct option *opt, { int *recurse_submodules = opt->value; - if (*recurse_submodules != RECURSE_SUBMODULES_DEFAULT) - die("%s can only be used once.", opt->long_name); - if (unset) *recurse_submodules = RECURSE_SUBMODULES_OFF; else if (arg) @@ -532,7 +530,6 @@ int cmd_push(int argc, const char **argv, const char *prefix) int flags = 0; int tags = 0; int push_cert = -1; - int recurse_submodules_from_cmdline = RECURSE_SUBMODULES_DEFAULT; int rc; const char *repo = NULL; /* default repository */ struct option options[] = { @@ -550,7 +547,7 @@ int cmd_push(int argc, const char **argv, const char *prefix) 0, CAS_OPT_NAME, &cas, N_("refname>:recurse-check-on-command-line-overriding-earlier-command-line && + git add recurse-check-on-command-line-overriding-earlier-command-line && + git commit -m "Recurse on command-line overridiing earlier command-line junk" + ) && + ( + cd work && + git add gar/bage && + git commit -m "Recurse on command-line overriding earlier command-line for gar/bage" && + + # should result in "check" + test_must_fail git push --recurse-submodules=on-demand --recurse-submodules=check ../pub.git master && + # Check that the supermodule commit did not get there + git fetch ../pub.git && + git diff --quiet FETCH_HEAD master^ && + # Check that the submodule commit did not get there + (cd gar/bage && git diff --quiet origin/master master^) && + + # should result in "no" + git push --recurse-submodules=on-demand --recurse-submodules=no ../pub.git master && + # Check that the supermodule commit did get there + git fetch ../pub.git && + git diff --quiet FETCH_HEAD master && + # Check that the submodule commit did not get there + (cd gar/bage && git diff --quiet origin/master master^) && + + # should result in "no" + git push --recurse-submodules=on-demand --no-recurse-submodules ../pub.git master && + # Check that the submodule commit did not get there + (cd gar/bage && git diff --quiet origin/master master^) && + + # But the options in the other order should push the submodule + git push --recurse-submodules=check --recurse-submodules=on-demand ../pub.git master && + # Check that the submodule commit did get there + git fetch ../pub.git && + (cd gar/bage && git diff --quiet origin/master master) + ) +' + test_expect_success 'push succeeds if submodule commit not on remote using on-demand from cmdline overriding config' ' ( cd work/gar/bage && -- cgit v1.2.1 From 7f0871c9549c875de2c2980ab12e3add5f2185f8 Mon Sep 17 00:00:00 2001 From: Audric Schiltknecht Date: Fri, 4 Dec 2015 18:35:57 -0500 Subject: l10n: fr.po: Fix typo Signed-off-by: Audric Schiltknecht --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 3277f1c46..5d4b1e066 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1913,7 +1913,7 @@ msgid "" "Everything below will be removed." msgstr "" "Ne touchez pas à la ligne ci-dessus\n" -"Tout se qui suit sera éliminé." +"Tout ce qui suit sera éliminé." #: wt-status.c:948 msgid "You have unmerged paths." -- cgit v1.2.1 From 4ae048e67e5f0d786b9febc438433d95f18e5937 Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Tue, 8 Dec 2015 10:36:22 +0100 Subject: git-p4: add option to keep empty commits A changelist that contains only excluded files due to a client spec was imported as an empty commit. Fix that issue by ignoring these commits. Add option "git-p4.keepEmptyCommits" to make the previous behavior available. Signed-off-by: Lars Schneider Helped-by: Pete Harlan Acked-by: Luke Diamand Signed-off-by: Junio C Hamano --- Documentation/git-p4.txt | 4 ++ git-p4.py | 44 +++++++----- t/t9826-git-p4-keep-empty-commits.sh | 134 +++++++++++++++++++++++++++++++++++ 3 files changed, 165 insertions(+), 17 deletions(-) create mode 100755 t/t9826-git-p4-keep-empty-commits.sh diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 82aa5d607..b3e768ee8 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -510,6 +510,10 @@ git-p4.useClientSpec:: option '--use-client-spec'. See the "CLIENT SPEC" section above. This variable is a boolean, not the name of a p4 client. +git-p4.keepEmptyCommits:: + A changelist that contains only excluded files will be imported + as an empty commit if this boolean option is set to true. + Submit variables ~~~~~~~~~~~~~~~~ git-p4.detectRenames:: diff --git a/git-p4.py b/git-p4.py index a57a28f4b..4ad7c6890 100755 --- a/git-p4.py +++ b/git-p4.py @@ -2235,12 +2235,6 @@ class P4Sync(Command, P4UserMap): filesToDelete = [] for f in files: - # if using a client spec, only add the files that have - # a path in the client - if self.clientSpecDirs: - if self.clientSpecDirs.map_in_client(f['path']) == "": - continue - filesForCommit.append(f) if f['action'] in self.delete_actions: filesToDelete.append(f) @@ -2308,25 +2302,41 @@ class P4Sync(Command, P4UserMap): gitStream.write(description) gitStream.write("\n") + def inClientSpec(self, path): + if not self.clientSpecDirs: + return True + inClientSpec = self.clientSpecDirs.map_in_client(path) + if not inClientSpec and self.verbose: + print('Ignoring file outside of client spec: {0}'.format(path)) + return inClientSpec + + def hasBranchPrefix(self, path): + if not self.branchPrefixes: + return True + hasPrefix = [p for p in self.branchPrefixes + if p4PathStartsWith(path, p)] + if hasPrefix and self.verbose: + print('Ignoring file outside of prefix: {0}'.format(path)) + return hasPrefix + def commit(self, details, files, branch, parent = ""): epoch = details["time"] author = details["user"] if self.verbose: - print "commit into %s" % branch - - # start with reading files; if that fails, we should not - # create a commit. - new_files = [] - for f in files: - if [p for p in self.branchPrefixes if p4PathStartsWith(f['path'], p)]: - new_files.append (f) - else: - sys.stderr.write("Ignoring file outside of prefix: %s\n" % f['path']) + print('commit into {0}'.format(branch)) if self.clientSpecDirs: self.clientSpecDirs.update_client_spec_path_cache(files) + files = [f for f in files + if self.inClientSpec(f['path']) and self.hasBranchPrefix(f['path'])] + + if not files and not gitConfigBool('git-p4.keepEmptyCommits'): + print('Ignoring revision {0} as it would produce an empty commit.' + .format(details['change'])) + return + self.gitStream.write("commit %s\n" % branch) # gitStream.write("mark :%s\n" % details["change"]) self.committedChanges.add(int(details["change"])) @@ -2350,7 +2360,7 @@ class P4Sync(Command, P4UserMap): print "parent %s" % parent self.gitStream.write("from %s\n" % parent) - self.streamP4Files(new_files) + self.streamP4Files(files) self.gitStream.write("\n") change = int(details["change"]) diff --git a/t/t9826-git-p4-keep-empty-commits.sh b/t/t9826-git-p4-keep-empty-commits.sh new file mode 100755 index 000000000..be12960d3 --- /dev/null +++ b/t/t9826-git-p4-keep-empty-commits.sh @@ -0,0 +1,134 @@ +#!/bin/sh + +test_description='Clone repositories and keep empty commits' + +. ./lib-git-p4.sh + +test_expect_success 'start p4d' ' + start_p4d +' + +test_expect_success 'Create a repo' ' + client_view "//depot/... //client/..." && + ( + cd "$cli" && + + mkdir -p subdir && + + >subdir/file1.txt && + p4 add subdir/file1.txt && + p4 submit -d "Add file 1" && + + >file2.txt && + p4 add file2.txt && + p4 submit -d "Add file 2" && + + >subdir/file3.txt && + p4 add subdir/file3.txt && + p4 submit -d "Add file 3" && + + >file4.txt && + p4 add file4.txt && + p4 submit -d "Add file 4" && + + p4 delete subdir/file3.txt && + p4 submit -d "Remove file 3" && + + p4 delete file4.txt && + p4 submit -d "Remove file 4" + ) +' + +test_expect_success 'Clone repo root path with all history' ' + client_view "//depot/... //client/..." && + test_when_finished cleanup_git && + ( + cd "$git" && + git init . && + git p4 clone --use-client-spec --destination="$git" //depot@all && + cat >expect <<-\EOF && +Remove file 4 +[git-p4: depot-paths = "//depot/": change = 6] + +Remove file 3 +[git-p4: depot-paths = "//depot/": change = 5] + +Add file 4 +[git-p4: depot-paths = "//depot/": change = 4] + +Add file 3 +[git-p4: depot-paths = "//depot/": change = 3] + +Add file 2 +[git-p4: depot-paths = "//depot/": change = 2] + +Add file 1 +[git-p4: depot-paths = "//depot/": change = 1] + + EOF + git log --format=%B >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Clone repo subdir with all history but keep empty commits' ' + client_view "//depot/subdir/... //client/subdir/..." && + test_when_finished cleanup_git && + ( + cd "$git" && + git init . && + git config git-p4.keepEmptyCommits true && + git p4 clone --use-client-spec --destination="$git" //depot@all && + cat >expect <<-\EOF && +Remove file 4 +[git-p4: depot-paths = "//depot/": change = 6] + +Remove file 3 +[git-p4: depot-paths = "//depot/": change = 5] + +Add file 4 +[git-p4: depot-paths = "//depot/": change = 4] + +Add file 3 +[git-p4: depot-paths = "//depot/": change = 3] + +Add file 2 +[git-p4: depot-paths = "//depot/": change = 2] + +Add file 1 +[git-p4: depot-paths = "//depot/": change = 1] + + EOF + git log --format=%B >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Clone repo subdir with all history' ' + client_view "//depot/subdir/... //client/subdir/..." && + test_when_finished cleanup_git && + ( + cd "$git" && + git init . && + git p4 clone --use-client-spec --destination="$git" --verbose //depot@all && + cat >expect <<-\EOF && +Remove file 3 +[git-p4: depot-paths = "//depot/": change = 5] + +Add file 3 +[git-p4: depot-paths = "//depot/": change = 3] + +Add file 1 +[git-p4: depot-paths = "//depot/": change = 1] + + EOF + git log --format=%B >actual && + test_cmp expect actual + ) +' + +test_expect_success 'kill p4d' ' + kill_p4d +' + +test_done -- cgit v1.2.1 From e850194c83985396435b01b70d2db00b6d3af02e Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 10 Dec 2015 16:33:05 -0500 Subject: ident: make xgetpwuid_self() a static local helper This function is defined in wrapper.c, but nobody besides ident.c uses it. And nobody is likely to in the future, either, as anything that cares about the user's name should be going through the ident code. Moving it here is a cleanup of the global namespace, but it will also enable further cleanups inside ident.c. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- git-compat-util.h | 3 --- ident.c | 12 ++++++++++++ wrapper.c | 12 ------------ 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/git-compat-util.h b/git-compat-util.h index 4fe10cc14..0feeae298 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -923,9 +923,6 @@ int access_or_die(const char *path, int mode, unsigned flag); /* Warn on an inaccessible file that ought to be accessible */ void warn_on_inaccessible(const char *path); -/* Get the passwd entry for the UID of the current process. */ -struct passwd *xgetpwuid_self(void); - #ifdef GMTIME_UNRELIABLE_ERRORS struct tm *git_gmtime(const time_t *); struct tm *git_gmtime_r(const time_t *, struct tm *); diff --git a/ident.c b/ident.c index 5ff1aadaa..d7c70e28d 100644 --- a/ident.c +++ b/ident.c @@ -23,6 +23,18 @@ static int author_ident_explicitly_given; #define get_gecos(struct_passwd) ((struct_passwd)->pw_gecos) #endif +static struct passwd *xgetpwuid_self(void) +{ + struct passwd *pw; + + errno = 0; + pw = getpwuid(getuid()); + if (!pw) + die(_("unable to look up current user in the passwd file: %s"), + errno ? strerror(errno) : _("no such user")); + return pw; +} + static void copy_gecos(const struct passwd *w, struct strbuf *name) { char *src; diff --git a/wrapper.c b/wrapper.c index 0e22d4381..dae5675a9 100644 --- a/wrapper.c +++ b/wrapper.c @@ -601,18 +601,6 @@ int access_or_die(const char *path, int mode, unsigned flag) return ret; } -struct passwd *xgetpwuid_self(void) -{ - struct passwd *pw; - - errno = 0; - pw = getpwuid(getuid()); - if (!pw) - die(_("unable to look up current user in the passwd file: %s"), - errno ? strerror(errno) : _("no such user")); - return pw; -} - char *xgetcwd(void) { struct strbuf sb = STRBUF_INIT; -- cgit v1.2.1 From 19ce497cf594a3c01af33a65b27b19e7459212d6 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 10 Dec 2015 16:35:36 -0500 Subject: ident: keep a flag for bogus default_email If we have to deduce the user's email address and can't come up with something plausible for the hostname, we simply write "(none)" or ".(none)" in the hostname. Later, our strict-check is forced to use strstr to look for this magic string. This is probably not a problem in practice, but it's rather ugly. Let's keep an extra flag that tells us the email is bogus, and check that instead. We could get away with simply setting the global in add_domainname(); it only gets called to write into git_default_email. However, let's make the code a little more obvious to future readers by actually passing a pointer to our "bogus" flag down the call-chain. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- ident.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/ident.c b/ident.c index d7c70e28d..085cfbe23 100644 --- a/ident.c +++ b/ident.c @@ -10,6 +10,7 @@ static struct strbuf git_default_name = STRBUF_INIT; static struct strbuf git_default_email = STRBUF_INIT; static struct strbuf git_default_date = STRBUF_INIT; +static int default_email_is_bogus; #define IDENT_NAME_GIVEN 01 #define IDENT_MAIL_GIVEN 02 @@ -82,7 +83,7 @@ static int add_mailname_host(struct strbuf *buf) return 0; } -static void add_domainname(struct strbuf *out) +static void add_domainname(struct strbuf *out, int *is_bogus) { char buf[1024]; struct hostent *he; @@ -90,17 +91,21 @@ static void add_domainname(struct strbuf *out) if (gethostname(buf, sizeof(buf))) { warning("cannot get host name: %s", strerror(errno)); strbuf_addstr(out, "(none)"); + *is_bogus = 1; return; } if (strchr(buf, '.')) strbuf_addstr(out, buf); else if ((he = gethostbyname(buf)) && strchr(he->h_name, '.')) strbuf_addstr(out, he->h_name); - else + else { strbuf_addf(out, "%s.(none)", buf); + *is_bogus = 1; + } } -static void copy_email(const struct passwd *pw, struct strbuf *email) +static void copy_email(const struct passwd *pw, struct strbuf *email, + int *is_bogus) { /* * Make up a fake email address @@ -111,7 +116,7 @@ static void copy_email(const struct passwd *pw, struct strbuf *email) if (!add_mailname_host(email)) return; /* read from "/etc/mailname" (Debian) */ - add_domainname(email); + add_domainname(email, is_bogus); } const char *ident_default_name(void) @@ -133,7 +138,8 @@ const char *ident_default_email(void) committer_ident_explicitly_given |= IDENT_MAIL_GIVEN; author_ident_explicitly_given |= IDENT_MAIL_GIVEN; } else - copy_email(xgetpwuid_self(), &git_default_email); + copy_email(xgetpwuid_self(), &git_default_email, + &default_email_is_bogus); strbuf_trim(&git_default_email); } return git_default_email.buf; @@ -325,8 +331,7 @@ const char *fmt_ident(const char *name, const char *email, name = pw->pw_name; } - if (strict && email == git_default_email.buf && - strstr(email, "(none)")) { + if (strict && email == git_default_email.buf && default_email_is_bogus) { fputs(env_hint, stderr); die("unable to auto-detect email address (got '%s')", email); } -- cgit v1.2.1 From f4f2c8f87e5c66ebdbdc61a0773188bd4a5bff88 Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Fri, 11 Dec 2015 23:37:11 +0800 Subject: l10n: git.pot: v2.7.0 round 1 (66 new, 29 removed) Generate po/git.pot from v2.7.0-rc0 for git v2.7.0 l10n round 1. Signed-off-by: Jiang Xin --- po/git.pot | 3027 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 1599 insertions(+), 1428 deletions(-) diff --git a/po/git.pot b/po/git.pot index d275f4042..168feac8d 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2015-09-15 06:45+0800\n" +"POT-Creation-Date: 2015-12-11 23:36+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,12 +29,12 @@ msgid "" "as appropriate to mark resolution and make a commit." msgstr "" -#: advice.c:101 builtin/merge.c:1227 +#: advice.c:101 builtin/merge.c:1225 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" #: advice.c:103 -msgid "Please, commit your changes before you can merge." +msgid "Please, commit your changes before merging." msgstr "" #: advice.c:104 @@ -58,76 +58,76 @@ msgstr "" msgid "git archive --remote [--exec ] --list" msgstr "" -#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327 +#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:428 +#: archive.c:429 msgid "fmt" msgstr "" -#: archive.c:428 +#: archive.c:429 msgid "archive format" msgstr "" -#: archive.c:429 builtin/log.c:1229 +#: archive.c:430 builtin/log.c:1228 msgid "prefix" msgstr "" -#: archive.c:430 +#: archive.c:431 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516 -#: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535 +#: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987 +#: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395 #: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153 msgid "file" msgstr "" -#: archive.c:432 builtin/archive.c:89 +#: archive.c:433 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" -#: archive.c:434 +#: archive.c:435 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:435 +#: archive.c:436 msgid "report archived files on stderr" msgstr "" -#: archive.c:436 +#: archive.c:437 msgid "store only" msgstr "" -#: archive.c:437 +#: archive.c:438 msgid "compress faster" msgstr "" -#: archive.c:445 +#: archive.c:446 msgid "compress better" msgstr "" -#: archive.c:448 +#: archive.c:449 msgid "list supported archive formats" msgstr "" -#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77 msgid "repo" msgstr "" -#: archive.c:451 builtin/archive.c:91 +#: archive.c:452 builtin/archive.c:91 msgid "retrieve the archive from remote repository " msgstr "" -#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479 msgid "command" msgstr "" -#: archive.c:453 builtin/archive.c:93 +#: archive.c:454 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" @@ -137,81 +137,81 @@ msgid "" "Use '\\!' for literal leading exclamation." msgstr "" -#: branch.c:60 +#: branch.c:61 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "" -#: branch.c:83 +#: branch.c:84 #, c-format msgid "Branch %s set up to track remote branch %s from %s by rebasing." msgstr "" -#: branch.c:84 +#: branch.c:85 #, c-format msgid "Branch %s set up to track remote branch %s from %s." msgstr "" -#: branch.c:88 +#: branch.c:89 #, c-format msgid "Branch %s set up to track local branch %s by rebasing." msgstr "" -#: branch.c:89 +#: branch.c:90 #, c-format msgid "Branch %s set up to track local branch %s." msgstr "" -#: branch.c:94 +#: branch.c:95 #, c-format msgid "Branch %s set up to track remote ref %s by rebasing." msgstr "" -#: branch.c:95 +#: branch.c:96 #, c-format msgid "Branch %s set up to track remote ref %s." msgstr "" -#: branch.c:99 +#: branch.c:100 #, c-format msgid "Branch %s set up to track local ref %s by rebasing." msgstr "" -#: branch.c:100 +#: branch.c:101 #, c-format msgid "Branch %s set up to track local ref %s." msgstr "" -#: branch.c:133 +#: branch.c:134 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "" -#: branch.c:162 +#: branch.c:163 #, c-format msgid "'%s' is not a valid branch name." msgstr "" -#: branch.c:167 +#: branch.c:168 #, c-format msgid "A branch named '%s' already exists." msgstr "" -#: branch.c:175 +#: branch.c:176 msgid "Cannot force update the current branch." msgstr "" -#: branch.c:195 +#: branch.c:196 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" -#: branch.c:197 +#: branch.c:198 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "" -#: branch.c:199 +#: branch.c:200 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -223,22 +223,22 @@ msgid "" "\"git push -u\" to set the upstream config as you push." msgstr "" -#: branch.c:243 +#: branch.c:244 #, c-format msgid "Not a valid object name: '%s'." msgstr "" -#: branch.c:263 +#: branch.c:264 #, c-format msgid "Ambiguous object name: '%s'." msgstr "" -#: branch.c:268 +#: branch.c:269 #, c-format msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:399 +#: branch.c:322 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" @@ -253,7 +253,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:87 builtin/commit.c:765 +#: bundle.c:87 builtin/commit.c:766 #, c-format msgid "could not open '%s'" msgstr "" @@ -262,9 +262,9 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708 -#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334 -#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358 +#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083 +#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334 +#: builtin/log.c:849 builtin/log.c:1456 builtin/log.c:1689 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "" @@ -304,7 +304,7 @@ msgstr "" msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261 +#: bundle.c:443 builtin/log.c:157 builtin/log.c:1366 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -322,13 +322,13 @@ msgstr "" msgid "index-pack died" msgstr "" -#: color.c:260 +#: color.c:275 #, c-format msgid "invalid color value: %.*s" msgstr "" -#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516 -#: builtin/am.c:2128 +#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520 +#: builtin/am.c:2149 #, c-format msgid "could not parse %s" msgstr "" @@ -486,54 +486,54 @@ msgstr "" msgid "Performing inexact rename detection" msgstr "" -#: diff.c:116 +#: diff.c:115 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:121 +#: diff.c:120 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:216 +#: diff.c:215 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:268 +#: diff.c:267 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:2998 +#: diff.c:3000 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:3394 +#: diff.c:3396 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:3557 +#: diff.c:3559 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3571 +#: diff.c:3573 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: dir.c:1853 +#: dir.c:1915 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:1936 +#: dir.c:1998 msgid "Untracked cache is disabled on this system." msgstr "" @@ -634,8 +634,8 @@ msgstr "" msgid "failed to read the cache" msgstr "" -#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375 -#: builtin/checkout.c:586 builtin/clone.c:715 +#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376 +#: builtin/checkout.c:587 builtin/clone.c:722 msgid "unable to write new index file" msgstr "" @@ -653,233 +653,233 @@ msgstr "" msgid "error building trees" msgstr "" -#: merge-recursive.c:687 +#: merge-recursive.c:686 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:698 +#: merge-recursive.c:697 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:712 merge-recursive.c:733 +#: merge-recursive.c:711 merge-recursive.c:732 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:723 +#: merge-recursive.c:722 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:763 +#: merge-recursive.c:762 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:765 +#: merge-recursive.c:764 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:788 builtin/clone.c:364 +#: merge-recursive.c:787 builtin/clone.c:369 #, c-format msgid "failed to open '%s'" msgstr "" -#: merge-recursive.c:796 +#: merge-recursive.c:795 #, c-format msgid "failed to symlink '%s'" msgstr "" -#: merge-recursive.c:799 +#: merge-recursive.c:798 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:937 +#: merge-recursive.c:936 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:941 +#: merge-recursive.c:940 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:957 +#: merge-recursive.c:956 msgid "unsupported object type in the tree" msgstr "" -#: merge-recursive.c:1032 merge-recursive.c:1046 +#: merge-recursive.c:1031 merge-recursive.c:1045 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -#: merge-recursive.c:1038 merge-recursive.c:1051 +#: merge-recursive.c:1037 merge-recursive.c:1050 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -#: merge-recursive.c:1092 +#: merge-recursive.c:1091 msgid "rename" msgstr "" -#: merge-recursive.c:1092 +#: merge-recursive.c:1091 msgid "renamed" msgstr "" -#: merge-recursive.c:1148 +#: merge-recursive.c:1147 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1170 +#: merge-recursive.c:1169 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1175 +#: merge-recursive.c:1174 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1229 +#: merge-recursive.c:1228 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1259 +#: merge-recursive.c:1258 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1458 +#: merge-recursive.c:1457 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1468 +#: merge-recursive.c:1467 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1473 merge-recursive.c:1671 +#: merge-recursive.c:1472 merge-recursive.c:1674 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1524 +#: merge-recursive.c:1523 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1527 +#: merge-recursive.c:1526 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1575 +#: merge-recursive.c:1578 msgid "modify" msgstr "" -#: merge-recursive.c:1575 +#: merge-recursive.c:1578 msgid "modified" msgstr "" -#: merge-recursive.c:1585 +#: merge-recursive.c:1588 msgid "content" msgstr "" -#: merge-recursive.c:1592 +#: merge-recursive.c:1595 msgid "add/add" msgstr "" -#: merge-recursive.c:1626 +#: merge-recursive.c:1629 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1640 +#: merge-recursive.c:1643 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1644 git-submodule.sh:1150 +#: merge-recursive.c:1647 git-submodule.sh:1025 msgid "submodule" msgstr "" -#: merge-recursive.c:1645 +#: merge-recursive.c:1648 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1731 +#: merge-recursive.c:1734 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1756 +#: merge-recursive.c:1759 msgid "file/directory" msgstr "" -#: merge-recursive.c:1762 +#: merge-recursive.c:1765 msgid "directory/file" msgstr "" -#: merge-recursive.c:1767 +#: merge-recursive.c:1770 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1777 +#: merge-recursive.c:1780 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1794 +#: merge-recursive.c:1797 msgid "Fatal merge failure, shouldn't happen." msgstr "" -#: merge-recursive.c:1813 +#: merge-recursive.c:1816 msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:1822 +#: merge-recursive.c:1825 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:1852 +#: merge-recursive.c:1855 #, c-format msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:1900 +#: merge-recursive.c:1903 msgid "Merging:" msgstr "" -#: merge-recursive.c:1913 +#: merge-recursive.c:1916 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:1950 +#: merge-recursive.c:1953 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2007 +#: merge-recursive.c:2010 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2018 builtin/merge.c:645 +#: merge-recursive.c:2021 builtin/merge.c:645 msgid "Unable to write index." msgstr "" @@ -909,31 +909,41 @@ msgstr "" msgid "unable to parse object: %s" msgstr "" -#: parse-options.c:563 +#: parse-options.c:570 msgid "..." msgstr "" -#: parse-options.c:581 +#: parse-options.c:588 #, c-format msgid "usage: %s" msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:585 +#: parse-options.c:592 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:588 +#: parse-options.c:595 #, c-format msgid " %s" msgstr "" -#: parse-options.c:622 +#: parse-options.c:629 msgid "-NUM" msgstr "" +#: parse-options-cb.c:108 +#, c-format +msgid "malformed object name '%s'" +msgstr "" + +#: path.c:752 +#, c-format +msgid "Could not make %s writable by group" +msgstr "" + #: pathspec.c:133 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" @@ -998,136 +1008,181 @@ msgstr "" msgid "unable to parse --pretty format" msgstr "" -#: progress.c:236 +#: progress.c:235 msgid "done" msgstr "" -#: read-cache.c:1296 +#: read-cache.c:1281 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1306 +#: read-cache.c:1291 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 +#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 #: builtin/merge.c:983 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: refs.c:3001 +#: refs/files-backend.c:2359 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs.c:3004 +#: refs/files-backend.c:2362 #, c-format msgid "could not delete references: %s" msgstr "" -#: refs.c:3013 +#: refs/files-backend.c:2371 #, c-format msgid "could not remove reference %s" msgstr "" -#: ref-filter.c:660 +#: ref-filter.c:245 +#, c-format +msgid "format: %%(end) atom used without corresponding atom" +msgstr "" + +#: ref-filter.c:704 +#, c-format +msgid "positive value expected contents:lines=%s" +msgstr "" + +#: ref-filter.c:833 +#, c-format +msgid "expected format: %%(color:)" +msgstr "" + +#: ref-filter.c:835 msgid "unable to parse format" msgstr "" -#: remote.c:792 +#: ref-filter.c:870 +#, c-format +msgid "expected format: %%(align:,)" +msgstr "" + +#: ref-filter.c:893 +#, c-format +msgid "improper format entered align:%s" +msgstr "" + +#: ref-filter.c:898 +#, c-format +msgid "positive width expected with the %%(align) atom" +msgstr "" + +#: ref-filter.c:1219 +#, c-format +msgid "malformed object at '%s'" +msgstr "" + +#: ref-filter.c:1561 +#, c-format +msgid "format: %%(end) atom missing" +msgstr "" + +#: ref-filter.c:1615 +#, c-format +msgid "malformed object name %s" +msgstr "" + +#: remote.c:756 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:796 +#: remote.c:760 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:800 +#: remote.c:764 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:808 +#: remote.c:772 msgid "Internal error" msgstr "" -#: remote.c:1723 remote.c:1766 +#: remote.c:1687 remote.c:1730 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1732 +#: remote.c:1696 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1735 +#: remote.c:1699 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1741 +#: remote.c:1705 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1756 +#: remote.c:1720 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1771 +#: remote.c:1735 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1782 +#: remote.c:1746 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1795 +#: remote.c:1759 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1817 +#: remote.c:1781 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:2124 +#: remote.c:2083 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2128 +#: remote.c:2087 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2131 +#: remote.c:2090 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "" -#: remote.c:2135 +#: remote.c:2094 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" -#: remote.c:2141 +#: remote.c:2100 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2144 +#: remote.c:2103 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1135,11 +1190,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2152 +#: remote.c:2111 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2155 +#: remote.c:2114 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1150,28 +1205,28 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2165 +#: remote.c:2124 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: revision.c:2198 +#: revision.c:2191 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2201 +#: revision.c:2194 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2395 +#: revision.c:2388 msgid "--first-parent is incompatible with --bisect" msgstr "" -#: run-command.c:83 +#: run-command.c:90 msgid "open /dev/null failed" msgstr "" -#: run-command.c:85 +#: run-command.c:92 #, c-format msgid "dup2(%d,%d) failed" msgstr "" @@ -1382,7 +1437,7 @@ msgstr "" msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:887 builtin/apply.c:4291 +#: sequencer.c:887 builtin/apply.c:4287 #, c-format msgid "cannot open %s: %s" msgstr "" @@ -1424,12 +1479,12 @@ msgstr "" msgid "Can't cherry-pick into empty head" msgstr "" -#: setup.c:243 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "" -#: sha1_name.c:453 +#: sha1_name.c:463 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -1465,7 +1520,7 @@ msgstr "" msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:1045 +#: submodule.c:1040 #, c-format msgid "Could not set core.worktree in %s" msgstr "" @@ -1476,7 +1531,7 @@ msgstr "" msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:543 trailer.c:548 builtin/remote.c:290 +#: trailer.c:543 trailer.c:548 builtin/remote.c:296 #, c-format msgid "more than one %s" msgstr "" @@ -1543,8 +1598,8 @@ msgstr "" msgid "could not open '%s' for writing" msgstr "" -#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688 -#: builtin/merge.c:1076 builtin/pull.c:380 +#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691 +#: builtin/merge.c:1074 builtin/pull.c:380 #, c-format msgid "could not open '%s' for reading" msgstr "" @@ -1572,17 +1627,17 @@ msgstr "" msgid "unable to get current working directory" msgstr "" -#: wrapper.c:631 +#: wrapper.c:647 #, c-format msgid "could not open %s for writing" msgstr "" -#: wrapper.c:642 builtin/am.c:424 +#: wrapper.c:658 builtin/am.c:425 #, c-format msgid "could not write to %s" msgstr "" -#: wrapper.c:648 +#: wrapper.c:664 #, c-format msgid "could not close %s" msgstr "" @@ -1909,27 +1964,27 @@ msgstr "" msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1437 +#: wt-status.c:1438 msgid "On branch " msgstr "" -#: wt-status.c:1445 +#: wt-status.c:1444 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1447 +#: wt-status.c:1446 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1452 +#: wt-status.c:1451 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1454 +#: wt-status.c:1453 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1457 +#: wt-status.c:1456 msgid "Not currently on any branch." msgstr "" @@ -2008,23 +2063,23 @@ msgstr "" msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1644 -msgid "HEAD (no branch)" +#: wt-status.c:1642 +msgid "Initial commit on " msgstr "" -#: wt-status.c:1650 -msgid "Initial commit on " +#: wt-status.c:1646 +msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1677 +#: wt-status.c:1675 msgid "gone" msgstr "" -#: wt-status.c:1679 wt-status.c:1687 +#: wt-status.c:1677 wt-status.c:1685 msgid "behind " msgstr "" -#: compat/precompose_utf8.c:55 builtin/clone.c:403 +#: compat/precompose_utf8.c:56 builtin/clone.c:408 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -2038,7 +2093,7 @@ msgstr "" msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:70 builtin/commit.c:277 +#: builtin/add.c:70 builtin/commit.c:278 msgid "updating files failed" msgstr "" @@ -2051,7 +2106,7 @@ msgstr "" msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:194 builtin/rev-parse.c:799 +#: builtin/add.c:194 builtin/rev-parse.c:796 msgid "Could not read the index" msgstr "" @@ -2086,15 +2141,15 @@ msgstr "" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110 +#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110 #: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545 -#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "" -#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19 -#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636 -#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114 +#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19 +#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 +#: builtin/log.c:1640 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "" @@ -2102,7 +2157,7 @@ msgstr "" msgid "interactive picking" msgstr "" -#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286 msgid "select hunks interactively" msgstr "" @@ -2159,181 +2214,181 @@ msgstr "" msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:358 +#: builtin/add.c:352 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:359 +#: builtin/add.c:353 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940 -#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938 +#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:40 msgid "index file corrupt" msgstr "" -#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "" -#: builtin/am.c:41 +#: builtin/am.c:42 #, c-format msgid "could not stat %s" msgstr "" -#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737 -#: builtin/merge.c:1079 +#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077 #, c-format msgid "could not read '%s'" msgstr "" -#: builtin/am.c:444 +#: builtin/am.c:445 msgid "could not parse author script" msgstr "" -#: builtin/am.c:521 +#: builtin/am.c:522 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/am.c:562 builtin/notes.c:300 +#: builtin/am.c:563 builtin/notes.c:300 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:599 builtin/notes.c:315 +#: builtin/am.c:600 builtin/notes.c:315 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/am.c:625 +#: builtin/am.c:626 msgid "fseek failed" msgstr "" -#: builtin/am.c:786 builtin/am.c:874 +#: builtin/am.c:787 builtin/am.c:875 #, c-format msgid "could not open '%s' for reading: %s" msgstr "" -#: builtin/am.c:793 +#: builtin/am.c:794 #, c-format msgid "could not open '%s' for writing: %s" msgstr "" -#: builtin/am.c:802 +#: builtin/am.c:803 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:867 +#: builtin/am.c:868 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:915 +#: builtin/am.c:916 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:918 builtin/am.c:926 +#: builtin/am.c:919 builtin/am.c:927 msgid "invalid Date line" msgstr "" -#: builtin/am.c:923 +#: builtin/am.c:924 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:1010 +#: builtin/am.c:1011 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:1015 builtin/clone.c:368 +#: builtin/am.c:1016 builtin/clone.c:373 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:1019 +#: builtin/am.c:1020 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1151 builtin/commit.c:362 +#: builtin/am.c:1152 builtin/commit.c:363 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1202 +#: builtin/am.c:1203 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1203 +#: builtin/am.c:1204 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1204 +#: builtin/am.c:1205 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1339 +#: builtin/am.c:1343 msgid "Patch is empty. Was it split wrong?" msgstr "" -#: builtin/am.c:1413 builtin/log.c:1345 +#: builtin/am.c:1417 builtin/log.c:1344 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/am.c:1440 +#: builtin/am.c:1444 #, c-format msgid "unable to parse commit %s" msgstr "" -#: builtin/am.c:1614 +#: builtin/am.c:1646 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1616 +#: builtin/am.c:1648 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1635 +#: builtin/am.c:1667 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1641 +#: builtin/am.c:1673 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1666 +#: builtin/am.c:1688 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1691 builtin/merge.c:632 +#: builtin/am.c:1712 builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/am.c:1698 +#: builtin/am.c:1719 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829 +#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829 #: builtin/merge.c:854 msgid "failed to write commit object" msgstr "" -#: builtin/am.c:1743 builtin/am.c:1747 +#: builtin/am.c:1764 builtin/am.c:1768 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1763 +#: builtin/am.c:1784 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: builtin/am.c:1768 +#: builtin/am.c:1789 msgid "Commit Body is:" msgstr "" @@ -2341,229 +2396,231 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1778 +#: builtin/am.c:1799 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1828 +#: builtin/am.c:1849 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1863 builtin/am.c:1934 +#: builtin/am.c:1884 builtin/am.c:1955 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1879 +#: builtin/am.c:1900 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1887 +#: builtin/am.c:1908 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1893 +#: builtin/am.c:1914 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "" -#: builtin/am.c:1937 +#: builtin/am.c:1958 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: builtin/am.c:1944 +#: builtin/am.c:1965 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" msgstr "" -#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308 +#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:2104 +#: builtin/am.c:2125 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2138 +#: builtin/am.c:2159 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2199 +#: builtin/am.c:2220 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2221 -msgid "git am [options] [(|)...]" +#: builtin/am.c:2253 +msgid "git am [] [(|)...]" msgstr "" -#: builtin/am.c:2222 -msgid "git am [options] (--continue | --skip | --abort)" +#: builtin/am.c:2254 +msgid "git am [] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2228 +#: builtin/am.c:2260 msgid "run interactively" msgstr "" -#: builtin/am.c:2230 +#: builtin/am.c:2262 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2232 +#: builtin/am.c:2264 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57 +#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "" -#: builtin/am.c:2235 +#: builtin/am.c:2267 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2238 +#: builtin/am.c:2270 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2240 +#: builtin/am.c:2272 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2242 +#: builtin/am.c:2274 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2244 +#: builtin/am.c:2276 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2246 +#: builtin/am.c:2278 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2249 +#: builtin/am.c:2281 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2252 +#: builtin/am.c:2284 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2253 builtin/apply.c:4563 +#: builtin/am.c:2285 builtin/apply.c:4554 msgid "action" msgstr "" -#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 -#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 -#: builtin/am.c:2281 +#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295 +#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307 +#: builtin/am.c:2313 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2262 builtin/apply.c:4587 +#: builtin/am.c:2294 builtin/apply.c:4578 msgid "root" msgstr "" -#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525 -#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93 -#: builtin/pull.c:167 +#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516 +#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93 +#: builtin/pull.c:167 builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 msgid "path" msgstr "" -#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672 -#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127 -#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664 -#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132 -#: parse-options.h:134 parse-options.h:243 +#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 +#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127 +#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645 +#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 +#: parse-options.h:134 parse-options.h:244 msgid "n" msgstr "" -#: builtin/am.c:2274 builtin/apply.c:4531 +#: builtin/am.c:2306 builtin/apply.c:4522 msgid "num" msgstr "" -#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438 +#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/tag.c:372 msgid "format" msgstr "" -#: builtin/am.c:2278 +#: builtin/am.c:2310 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2284 +#: builtin/am.c:2316 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2286 +#: builtin/am.c:2318 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2289 +#: builtin/am.c:2321 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2292 +#: builtin/am.c:2324 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2295 +#: builtin/am.c:2327 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2299 +#: builtin/am.c:2331 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2301 +#: builtin/am.c:2333 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225 -#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606 +#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225 +#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "" -#: builtin/am.c:2304 +#: builtin/am.c:2336 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2307 +#: builtin/am.c:2339 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2322 +#: builtin/am.c:2354 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" -#: builtin/am.c:2329 +#: builtin/am.c:2361 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2344 +#: builtin/am.c:2376 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2368 +#: builtin/am.c:2400 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2374 +#: builtin/am.c:2406 msgid "Resolve operation not in progress, we are not resuming." msgstr "" @@ -2571,62 +2628,62 @@ msgstr "" msgid "git apply [] [...]" msgstr "" -#: builtin/apply.c:112 +#: builtin/apply.c:111 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" -#: builtin/apply.c:127 +#: builtin/apply.c:126 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: builtin/apply.c:822 +#: builtin/apply.c:818 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: builtin/apply.c:831 +#: builtin/apply.c:827 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: builtin/apply.c:912 +#: builtin/apply.c:908 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: builtin/apply.c:944 +#: builtin/apply.c:940 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: builtin/apply.c:948 +#: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: builtin/apply.c:949 +#: builtin/apply.c:945 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: builtin/apply.c:956 +#: builtin/apply.c:952 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1419 +#: builtin/apply.c:1415 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1476 +#: builtin/apply.c:1472 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1493 +#: builtin/apply.c:1489 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2637,396 +2694,396 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1659 +#: builtin/apply.c:1655 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1661 +#: builtin/apply.c:1657 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1687 +#: builtin/apply.c:1683 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1723 +#: builtin/apply.c:1719 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1725 +#: builtin/apply.c:1721 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1728 +#: builtin/apply.c:1724 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1874 +#: builtin/apply.c:1870 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: builtin/apply.c:1903 +#: builtin/apply.c:1899 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:2054 +#: builtin/apply.c:2050 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2144 +#: builtin/apply.c:2140 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2148 +#: builtin/apply.c:2144 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2781 +#: builtin/apply.c:2777 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2900 +#: builtin/apply.c:2896 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:2912 +#: builtin/apply.c:2908 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2918 +#: builtin/apply.c:2914 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2938 +#: builtin/apply.c:2934 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:3039 +#: builtin/apply.c:3035 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:3045 +#: builtin/apply.c:3041 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:3066 +#: builtin/apply.c:3062 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3190 +#: builtin/apply.c:3186 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291 +#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3243 +#: builtin/apply.c:3239 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: builtin/apply.c:3271 builtin/apply.c:3493 +#: builtin/apply.c:3267 builtin/apply.c:3489 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3352 builtin/apply.c:3507 +#: builtin/apply.c:3348 builtin/apply.c:3503 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521 +#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3361 builtin/apply.c:3515 +#: builtin/apply.c:3357 builtin/apply.c:3511 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3463 +#: builtin/apply.c:3459 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3532 +#: builtin/apply.c:3528 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3534 +#: builtin/apply.c:3530 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3693 builtin/apply.c:3695 +#: builtin/apply.c:3689 builtin/apply.c:3691 #, c-format msgid "invalid path '%s'" msgstr "" -#: builtin/apply.c:3750 +#: builtin/apply.c:3746 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3753 +#: builtin/apply.c:3749 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3773 +#: builtin/apply.c:3769 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3778 +#: builtin/apply.c:3774 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3798 +#: builtin/apply.c:3794 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: builtin/apply.c:3802 +#: builtin/apply.c:3798 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3816 +#: builtin/apply.c:3812 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135 +#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:4052 +#: builtin/apply.c:4048 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:4081 +#: builtin/apply.c:4077 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: builtin/apply.c:4085 +#: builtin/apply.c:4081 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:4090 +#: builtin/apply.c:4086 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:4093 builtin/apply.c:4201 +#: builtin/apply.c:4089 builtin/apply.c:4197 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:4126 +#: builtin/apply.c:4122 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:4175 +#: builtin/apply.c:4171 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:4262 +#: builtin/apply.c:4258 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:4270 +#: builtin/apply.c:4266 msgid "internal error" msgstr "" -#: builtin/apply.c:4273 +#: builtin/apply.c:4269 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4283 +#: builtin/apply.c:4279 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4304 +#: builtin/apply.c:4300 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4307 +#: builtin/apply.c:4303 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4397 +#: builtin/apply.c:4393 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4408 +#: builtin/apply.c:4404 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4526 +#: builtin/apply.c:4517 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4529 +#: builtin/apply.c:4520 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4532 +#: builtin/apply.c:4523 msgid "remove leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4535 +#: builtin/apply.c:4526 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4537 +#: builtin/apply.c:4528 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4541 +#: builtin/apply.c:4532 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4543 +#: builtin/apply.c:4534 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4545 +#: builtin/apply.c:4536 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4547 +#: builtin/apply.c:4538 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4549 +#: builtin/apply.c:4540 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4551 +#: builtin/apply.c:4542 msgid "accept a patch that touches outside the working area" msgstr "" -#: builtin/apply.c:4553 +#: builtin/apply.c:4544 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4555 +#: builtin/apply.c:4546 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4557 +#: builtin/apply.c:4548 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412 +#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4562 +#: builtin/apply.c:4553 msgid "ensure at least lines of context match" msgstr "" -#: builtin/apply.c:4564 +#: builtin/apply.c:4555 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4567 builtin/apply.c:4570 +#: builtin/apply.c:4558 builtin/apply.c:4561 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4573 +#: builtin/apply.c:4564 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4575 +#: builtin/apply.c:4566 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4577 +#: builtin/apply.c:4568 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4579 +#: builtin/apply.c:4570 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4582 +#: builtin/apply.c:4573 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4585 +#: builtin/apply.c:4576 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4588 +#: builtin/apply.c:4579 msgid "prepend to all filenames" msgstr "" -#: builtin/apply.c:4610 +#: builtin/apply.c:4601 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4618 +#: builtin/apply.c:4609 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4621 +#: builtin/apply.c:4612 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4640 +#: builtin/apply.c:4631 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4654 +#: builtin/apply.c:4645 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4660 builtin/apply.c:4670 +#: builtin/apply.c:4651 builtin/apply.c:4661 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3088,95 +3145,95 @@ msgstr "" msgid " are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:2500 +#: builtin/blame.c:2519 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2501 +#: builtin/blame.c:2520 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2502 +#: builtin/blame.c:2521 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2503 +#: builtin/blame.c:2522 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2504 +#: builtin/blame.c:2523 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2505 +#: builtin/blame.c:2524 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2506 +#: builtin/blame.c:2525 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2507 +#: builtin/blame.c:2526 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2508 +#: builtin/blame.c:2527 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2509 +#: builtin/blame.c:2528 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2510 +#: builtin/blame.c:2529 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2511 +#: builtin/blame.c:2530 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2512 +#: builtin/blame.c:2531 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2513 +#: builtin/blame.c:2532 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2514 +#: builtin/blame.c:2533 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2515 +#: builtin/blame.c:2534 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2516 +#: builtin/blame.c:2535 msgid "Use revisions from instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2517 +#: builtin/blame.c:2536 msgid "Use 's contents as the final image" msgstr "" -#: builtin/blame.c:2518 builtin/blame.c:2519 +#: builtin/blame.c:2537 builtin/blame.c:2538 msgid "score" msgstr "" -#: builtin/blame.c:2518 +#: builtin/blame.c:2537 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2519 +#: builtin/blame.c:2538 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2520 +#: builtin/blame.c:2539 msgid "n,m" msgstr "" -#: builtin/blame.c:2520 +#: builtin/blame.c:2539 msgid "Process only line range n,m, counting from 1" msgstr "" @@ -3186,396 +3243,392 @@ msgstr "" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2601 +#: builtin/blame.c:2620 msgid "4 years, 11 months ago" msgstr "" -#: builtin/branch.c:24 +#: builtin/branch.c:25 msgid "git branch [] [-r | -a] [--merged | --no-merged]" msgstr "" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [] [-l] [-f] []" msgstr "" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [] [-r] (-d | -D) ..." msgstr "" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [] (-m | -M) [] " msgstr "" -#: builtin/branch.c:150 +#: builtin/branch.c:29 +msgid "git branch [] [-r | -a] [--points-at]" +msgstr "" + +#: builtin/branch.c:142 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -#: builtin/branch.c:154 +#: builtin/branch.c:146 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -#: builtin/branch.c:168 +#: builtin/branch.c:160 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" -#: builtin/branch.c:172 +#: builtin/branch.c:164 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -#: builtin/branch.c:185 +#: builtin/branch.c:177 msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:213 +#: builtin/branch.c:205 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:219 +#: builtin/branch.c:211 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:227 +#: builtin/branch.c:219 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "" -#: builtin/branch.c:243 +#: builtin/branch.c:235 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "" -#: builtin/branch.c:244 +#: builtin/branch.c:236 #, c-format msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:259 +#: builtin/branch.c:251 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "" -#: builtin/branch.c:260 +#: builtin/branch.c:252 #, c-format msgid "Error deleting branch '%s'" msgstr "" -#: builtin/branch.c:267 +#: builtin/branch.c:259 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:268 +#: builtin/branch.c:260 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:369 -#, c-format -msgid "branch '%s' does not point at a commit" -msgstr "" - -#: builtin/branch.c:452 +#: builtin/branch.c:303 #, c-format msgid "[%s: gone]" msgstr "" -#: builtin/branch.c:457 +#: builtin/branch.c:308 #, c-format msgid "[%s]" msgstr "" -#: builtin/branch.c:462 +#: builtin/branch.c:313 #, c-format msgid "[%s: behind %d]" msgstr "" -#: builtin/branch.c:464 +#: builtin/branch.c:315 #, c-format msgid "[behind %d]" msgstr "" -#: builtin/branch.c:468 +#: builtin/branch.c:319 #, c-format msgid "[%s: ahead %d]" msgstr "" -#: builtin/branch.c:470 +#: builtin/branch.c:321 #, c-format msgid "[ahead %d]" msgstr "" -#: builtin/branch.c:473 +#: builtin/branch.c:324 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:476 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:489 +#: builtin/branch.c:340 msgid " **** invalid ref ****" msgstr "" -#: builtin/branch.c:580 +#: builtin/branch.c:366 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: builtin/branch.c:583 +#: builtin/branch.c:369 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" -#: builtin/branch.c:589 +#: builtin/branch.c:375 #, c-format msgid "(HEAD detached at %s)" msgstr "" -#: builtin/branch.c:592 +#: builtin/branch.c:378 #, c-format msgid "(HEAD detached from %s)" msgstr "" -#: builtin/branch.c:596 +#: builtin/branch.c:382 msgid "(no branch)" msgstr "" -#: builtin/branch.c:643 -#, c-format -msgid "object '%s' does not point to a commit" -msgstr "" - -#: builtin/branch.c:691 -msgid "some refs could not be read" -msgstr "" - -#: builtin/branch.c:704 +#: builtin/branch.c:524 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:714 +#: builtin/branch.c:534 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:729 +#: builtin/branch.c:549 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:733 +#: builtin/branch.c:553 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:737 +#: builtin/branch.c:557 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:744 +#: builtin/branch.c:564 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:759 -#, c-format -msgid "malformed object name %s" -msgstr "" - -#: builtin/branch.c:781 +#: builtin/branch.c:587 #, c-format msgid "could not write branch description template: %s" msgstr "" -#: builtin/branch.c:811 +#: builtin/branch.c:616 msgid "Generic options" msgstr "" -#: builtin/branch.c:813 +#: builtin/branch.c:618 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:814 +#: builtin/branch.c:619 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:815 +#: builtin/branch.c:620 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:817 +#: builtin/branch.c:622 msgid "change upstream info" msgstr "" -#: builtin/branch.c:821 +#: builtin/branch.c:626 msgid "use colored output" msgstr "" -#: builtin/branch.c:822 +#: builtin/branch.c:627 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852 -#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581 -#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618 -#: builtin/tag.c:624 -msgid "commit" -msgstr "" - -#: builtin/branch.c:826 builtin/branch.c:832 +#: builtin/branch.c:629 builtin/branch.c:630 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:838 +#: builtin/branch.c:633 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:839 +#: builtin/branch.c:634 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:841 +#: builtin/branch.c:636 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:842 +#: builtin/branch.c:637 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:843 +#: builtin/branch.c:638 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:844 +#: builtin/branch.c:639 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:845 +#: builtin/branch.c:640 msgid "list branch names" msgstr "" -#: builtin/branch.c:846 +#: builtin/branch.c:641 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:848 +#: builtin/branch.c:643 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:849 +#: builtin/branch.c:644 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:852 -msgid "print only not merged branches" +#: builtin/branch.c:645 +msgid "print only branches that are merged" msgstr "" -#: builtin/branch.c:858 -msgid "print only merged branches" +#: builtin/branch.c:646 +msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:862 +#: builtin/branch.c:647 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:875 +#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366 +msgid "key" +msgstr "" + +#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367 +msgid "field name to sort on" +msgstr "" + +#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398 +#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564 +#: builtin/tag.c:369 +msgid "object" +msgstr "" + +#: builtin/branch.c:652 +msgid "print only branches of the object" +msgstr "" + +#: builtin/branch.c:670 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:879 builtin/clone.c:690 +#: builtin/branch.c:674 builtin/clone.c:697 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:901 +#: builtin/branch.c:694 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:912 builtin/branch.c:951 +#: builtin/branch.c:705 builtin/branch.c:747 msgid "branch name required" msgstr "" -#: builtin/branch.c:927 +#: builtin/branch.c:723 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:932 +#: builtin/branch.c:728 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:939 +#: builtin/branch.c:735 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:942 +#: builtin/branch.c:738 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:957 +#: builtin/branch.c:753 msgid "too many branches for a rename operation" msgstr "" -#: builtin/branch.c:962 +#: builtin/branch.c:758 msgid "too many branches to set new upstream" msgstr "" -#: builtin/branch.c:966 +#: builtin/branch.c:762 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012 +#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:973 +#: builtin/branch.c:769 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:985 +#: builtin/branch.c:781 msgid "too many branches to unset upstream" msgstr "" -#: builtin/branch.c:989 +#: builtin/branch.c:785 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:995 +#: builtin/branch.c:791 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:1009 +#: builtin/branch.c:805 msgid "it does not make sense to create 'HEAD' manually" msgstr "" -#: builtin/branch.c:1015 +#: builtin/branch.c:811 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:1018 +#: builtin/branch.c:814 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" -#: builtin/branch.c:1035 +#: builtin/branch.c:831 #, c-format msgid "" "\n" @@ -3583,12 +3636,12 @@ msgid "" "\n" msgstr "" -#: builtin/branch.c:1036 +#: builtin/branch.c:832 #, c-format msgid " git branch -d %s\n" msgstr "" -#: builtin/branch.c:1037 +#: builtin/branch.c:833 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr "" @@ -3613,9 +3666,7 @@ msgid "" msgstr "" #: builtin/cat-file.c:429 -msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] < " +msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" msgstr "" #: builtin/cat-file.c:466 @@ -3671,7 +3722,7 @@ msgid "git check-attr [-a | --all | ...] [--] ..." msgstr "" #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | ...] < " +msgid "git check-attr --stdin [-z] [-a | --all | ...]" msgstr "" #: builtin/check-attr.c:19 @@ -3690,7 +3741,7 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267 +#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "" @@ -3776,6 +3827,8 @@ msgid "write the content to temporary files" msgstr "" #: builtin/checkout-index.c:204 builtin/column.c:30 +#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181 msgid "string" msgstr "" @@ -3795,105 +3848,105 @@ msgstr "" msgid "git checkout [] [] -- ..." msgstr "" -#: builtin/checkout.c:133 builtin/checkout.c:166 +#: builtin/checkout.c:134 builtin/checkout.c:167 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:135 builtin/checkout.c:168 +#: builtin/checkout.c:136 builtin/checkout.c:169 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:151 +#: builtin/checkout.c:152 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:195 +#: builtin/checkout.c:196 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:212 +#: builtin/checkout.c:213 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:229 +#: builtin/checkout.c:230 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 -#: builtin/checkout.c:259 +#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 +#: builtin/checkout.c:260 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:262 builtin/checkout.c:265 +#: builtin/checkout.c:263 builtin/checkout.c:266 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:268 +#: builtin/checkout.c:269 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:279 builtin/checkout.c:473 +#: builtin/checkout.c:280 builtin/checkout.c:474 msgid "corrupt index file" msgstr "" -#: builtin/checkout.c:339 builtin/checkout.c:346 +#: builtin/checkout.c:340 builtin/checkout.c:347 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:495 +#: builtin/checkout.c:496 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:622 +#: builtin/checkout.c:623 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:660 +#: builtin/checkout.c:661 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:667 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:670 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:674 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:676 builtin/checkout.c:1065 +#: builtin/checkout.c:677 builtin/checkout.c:1066 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:678 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:730 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:736 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3908,7 +3961,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:755 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -3925,156 +3978,162 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:791 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:795 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:822 builtin/checkout.c:1060 +#: builtin/checkout.c:823 builtin/checkout.c:1061 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:967 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1006 builtin/worktree.c:210 +#: builtin/checkout.c:1007 builtin/worktree.c:213 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1035 +#: builtin/checkout.c:1036 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1074 +#: builtin/checkout.c:1075 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1077 builtin/checkout.c:1081 +#: builtin/checkout.c:1078 builtin/checkout.c:1082 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093 -#: builtin/checkout.c:1096 +#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094 +#: builtin/checkout.c:1097 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1101 +#: builtin/checkout.c:1102 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83 -#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317 -#: builtin/worktree.c:319 +#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320 +#: builtin/worktree.c:322 msgid "branch" msgstr "" -#: builtin/checkout.c:1135 +#: builtin/checkout.c:1136 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1137 +#: builtin/checkout.c:1138 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1139 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1140 msgid "detach the HEAD at named commit" msgstr "" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1141 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1143 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1143 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1144 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1146 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1148 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1149 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1149 builtin/merge.c:227 +#: builtin/checkout.c:1150 builtin/merge.c:227 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249 +#: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250 msgid "style" msgstr "" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1152 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1155 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1156 +#: builtin/checkout.c:1157 msgid "second guess 'git checkout '" msgstr "" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1159 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1181 +#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112 +#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560 +#: builtin/send-pack.c:168 +msgid "force progress reporting" +msgstr "" + +#: builtin/checkout.c:1191 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1198 +#: builtin/checkout.c:1208 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1203 +#: builtin/checkout.c:1213 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1239 +#: builtin/checkout.c:1249 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1256 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1261 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1255 +#: builtin/checkout.c:1265 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4110,7 +4169,7 @@ msgstr "" msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:317 +#: builtin/clean.c:315 msgid "" "Prompt help:\n" "1 - select a numbered item\n" @@ -4118,7 +4177,7 @@ msgid "" " - (empty) select nothing" msgstr "" -#: builtin/clean.c:321 +#: builtin/clean.c:319 msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -4130,36 +4189,36 @@ msgid "" " - (empty) finish selecting" msgstr "" -#: builtin/clean.c:537 +#: builtin/clean.c:535 #, c-format msgid "Huh (%s)?" msgstr "" -#: builtin/clean.c:679 +#: builtin/clean.c:677 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:716 +#: builtin/clean.c:714 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:737 +#: builtin/clean.c:735 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:778 +#: builtin/clean.c:776 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:803 +#: builtin/clean.c:801 msgid "Bye." msgstr "" -#: builtin/clean.c:811 +#: builtin/clean.c:809 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -4170,68 +4229,68 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:838 +#: builtin/clean.c:836 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:839 +#: builtin/clean.c:837 msgid "What now" msgstr "" -#: builtin/clean.c:847 +#: builtin/clean.c:845 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:864 +#: builtin/clean.c:862 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:895 +#: builtin/clean.c:893 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:897 +#: builtin/clean.c:895 msgid "force" msgstr "" -#: builtin/clean.c:898 +#: builtin/clean.c:896 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:900 +#: builtin/clean.c:898 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187 +#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709 +#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182 msgid "pattern" msgstr "" -#: builtin/clean.c:902 +#: builtin/clean.c:900 msgid "add to ignore rules" msgstr "" -#: builtin/clean.c:903 +#: builtin/clean.c:901 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:905 +#: builtin/clean.c:903 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:923 +#: builtin/clean.c:921 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:927 +#: builtin/clean.c:925 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:930 +#: builtin/clean.c:928 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -4241,16 +4300,11 @@ msgstr "" msgid "git clone [] [--] []" msgstr "" -#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224 -#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168 -msgid "force progress reporting" -msgstr "" - #: builtin/clone.c:59 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469 msgid "create a bare repository" msgstr "" @@ -4274,15 +4328,15 @@ msgstr "" msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:75 builtin/init-db.c:501 +#: builtin/clone.c:75 builtin/init-db.c:466 msgid "template-directory" msgstr "" -#: builtin/clone.c:76 builtin/init-db.c:502 +#: builtin/clone.c:76 builtin/init-db.c:467 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:78 +#: builtin/clone.c:78 builtin/submodule--helper.c:179 msgid "reference repository" msgstr "" @@ -4306,7 +4360,7 @@ msgstr "" msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659 +#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654 #: builtin/pull.c:186 msgid "depth" msgstr "" @@ -4319,11 +4373,11 @@ msgstr "" msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:91 builtin/init-db.c:510 +#: builtin/clone.c:91 builtin/init-db.c:475 msgid "gitdir" msgstr "" -#: builtin/clone.c:92 builtin/init-db.c:511 +#: builtin/clone.c:92 builtin/init-db.c:476 msgid "separate git dir from working tree" msgstr "" @@ -4335,173 +4389,174 @@ msgstr "" msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:298 +#: builtin/clone.c:300 #, c-format -msgid "reference repository '%s' is not a local repository." +msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" #: builtin/clone.c:302 #, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "" + +#: builtin/clone.c:307 +#, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: builtin/clone.c:305 +#: builtin/clone.c:310 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: builtin/clone.c:370 builtin/diff.c:84 +#: builtin/clone.c:375 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "" -#: builtin/clone.c:372 +#: builtin/clone.c:377 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:386 +#: builtin/clone.c:391 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:408 +#: builtin/clone.c:413 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:412 +#: builtin/clone.c:417 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:435 builtin/clone.c:619 +#: builtin/clone.c:442 builtin/clone.c:626 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:447 +#: builtin/clone.c:454 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" -#: builtin/clone.c:524 +#: builtin/clone.c:531 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:614 +#: builtin/clone.c:621 #, c-format msgid "Checking connectivity... " msgstr "" -#: builtin/clone.c:617 +#: builtin/clone.c:624 msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:681 +#: builtin/clone.c:688 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:712 +#: builtin/clone.c:719 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:799 +#: builtin/clone.c:808 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:801 +#: builtin/clone.c:810 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:831 +#: builtin/clone.c:842 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:835 +#: builtin/clone.c:846 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:846 +#: builtin/clone.c:857 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:849 +#: builtin/clone.c:860 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:862 +#: builtin/clone.c:873 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:868 builtin/fetch.c:1168 +#: builtin/clone.c:879 builtin/fetch.c:1166 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:878 +#: builtin/clone.c:889 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:888 +#: builtin/clone.c:899 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218 -#: builtin/worktree.c:245 +#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224 +#: builtin/worktree.c:221 builtin/worktree.c:248 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:906 +#: builtin/clone.c:917 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:924 +#: builtin/clone.c:935 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:926 +#: builtin/clone.c:937 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:951 -msgid "--dissociate given, but there is no --reference" -msgstr "" - -#: builtin/clone.c:968 +#: builtin/clone.c:975 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:971 +#: builtin/clone.c:978 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:976 +#: builtin/clone.c:983 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:980 +#: builtin/clone.c:987 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:1029 builtin/clone.c:1037 +#: builtin/clone.c:1036 builtin/clone.c:1044 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1040 +#: builtin/clone.c:1047 msgid "You appear to have cloned an empty repository." msgstr "" @@ -4537,15 +4592,15 @@ msgstr "" msgid "--command must be the first argument" msgstr "" -#: builtin/commit.c:37 +#: builtin/commit.c:38 msgid "git commit [] [--] ..." msgstr "" -#: builtin/commit.c:42 +#: builtin/commit.c:43 msgid "git status [] [--] ..." msgstr "" -#: builtin/commit.c:47 +#: builtin/commit.c:48 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4560,7 +4615,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: builtin/commit.c:60 +#: builtin/commit.c:61 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4574,14 +4629,14 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: builtin/commit.c:72 +#: builtin/commit.c:73 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -#: builtin/commit.c:77 +#: builtin/commit.c:78 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -4590,11 +4645,11 @@ msgid "" "\n" msgstr "" -#: builtin/commit.c:84 +#: builtin/commit.c:85 msgid "Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:87 +#: builtin/commit.c:88 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -4604,103 +4659,103 @@ msgid "" "the remaining commits.\n" msgstr "" -#: builtin/commit.c:304 +#: builtin/commit.c:305 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:345 +#: builtin/commit.c:346 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:351 +#: builtin/commit.c:352 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:364 +#: builtin/commit.c:365 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:366 +#: builtin/commit.c:367 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462 +#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:444 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:446 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:455 +#: builtin/commit.c:456 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:474 +#: builtin/commit.c:475 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:579 +#: builtin/commit.c:580 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:581 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:600 +#: builtin/commit.c:601 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:608 +#: builtin/commit.c:609 #, c-format msgid "invalid date format: %s" msgstr "" -#: builtin/commit.c:652 +#: builtin/commit.c:653 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:701 builtin/shortlog.c:273 +#: builtin/commit.c:702 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:703 +#: builtin/commit.c:704 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:707 +#: builtin/commit.c:708 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:729 +#: builtin/commit.c:730 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:733 +#: builtin/commit.c:734 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:784 +#: builtin/commit.c:785 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:802 +#: builtin/commit.c:803 #, c-format msgid "" "\n" @@ -4710,7 +4765,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:807 +#: builtin/commit.c:808 #, c-format msgid "" "\n" @@ -4720,14 +4775,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:820 +#: builtin/commit.c:821 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:827 +#: builtin/commit.c:828 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4735,335 +4790,341 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:847 +#: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:855 +#: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:862 +#: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:880 +#: builtin/commit.c:881 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:937 +#: builtin/commit.c:938 msgid "Error building trees" msgstr "" -#: builtin/commit.c:952 builtin/tag.c:495 +#: builtin/commit.c:953 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1054 +#: builtin/commit.c:1055 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "" -#: builtin/commit.c:1069 builtin/commit.c:1309 +#: builtin/commit.c:1070 builtin/commit.c:1310 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1106 +#: builtin/commit.c:1107 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1136 +#: builtin/commit.c:1137 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1145 +#: builtin/commit.c:1146 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1148 +#: builtin/commit.c:1149 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1150 +#: builtin/commit.c:1151 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1153 +#: builtin/commit.c:1154 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1163 +#: builtin/commit.c:1164 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1165 +#: builtin/commit.c:1166 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1173 +#: builtin/commit.c:1174 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1190 +#: builtin/commit.c:1191 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1192 +#: builtin/commit.c:1193 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1194 +#: builtin/commit.c:1195 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1196 +#: builtin/commit.c:1197 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1208 builtin/tag.c:730 +#: builtin/commit.c:1209 builtin/tag.c:475 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1213 +#: builtin/commit.c:1214 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1323 builtin/commit.c:1602 +#: builtin/commit.c:1324 builtin/commit.c:1605 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1325 builtin/commit.c:1604 +#: builtin/commit.c:1326 builtin/commit.c:1607 msgid "show branch information" msgstr "" -#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546 +#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546 +#: builtin/worktree.c:423 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1330 builtin/commit.c:1608 +#: builtin/commit.c:1331 builtin/commit.c:1611 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1333 builtin/commit.c:1611 +#: builtin/commit.c:1334 builtin/commit.c:1614 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:604 +#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "" -#: builtin/commit.c:1336 builtin/commit.c:1614 +#: builtin/commit.c:1337 builtin/commit.c:1617 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1339 +#: builtin/commit.c:1340 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1340 parse-options.h:155 +#: builtin/commit.c:1341 parse-options.h:155 msgid "when" msgstr "" -#: builtin/commit.c:1341 +#: builtin/commit.c:1342 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1343 +#: builtin/commit.c:1344 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1429 +#: builtin/commit.c:1430 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1431 +#: builtin/commit.c:1432 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1476 +#: builtin/commit.c:1477 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1479 +#: builtin/commit.c:1480 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1572 +#: builtin/commit.c:1575 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1573 +#: builtin/commit.c:1576 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1575 +#: builtin/commit.c:1578 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1576 builtin/tag.c:602 +#: builtin/commit.c:1579 builtin/tag.c:351 msgid "read message from file" msgstr "" -#: builtin/commit.c:1577 +#: builtin/commit.c:1580 msgid "author" msgstr "" -#: builtin/commit.c:1577 +#: builtin/commit.c:1580 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1578 builtin/gc.c:268 +#: builtin/commit.c:1581 builtin/gc.c:326 msgid "date" msgstr "" -#: builtin/commit.c:1578 +#: builtin/commit.c:1581 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392 -#: builtin/notes.c:555 builtin/tag.c:600 +#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392 +#: builtin/notes.c:555 builtin/tag.c:349 msgid "message" msgstr "" -#: builtin/commit.c:1579 +#: builtin/commit.c:1582 msgid "commit message" msgstr "" -#: builtin/commit.c:1580 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 +#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +msgid "commit" +msgstr "" + +#: builtin/commit.c:1583 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1581 +#: builtin/commit.c:1584 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1582 +#: builtin/commit.c:1585 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1583 +#: builtin/commit.c:1586 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1584 +#: builtin/commit.c:1587 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86 +#: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1586 +#: builtin/commit.c:1589 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1587 +#: builtin/commit.c:1590 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1588 +#: builtin/commit.c:1591 msgid "default" msgstr "" -#: builtin/commit.c:1588 builtin/tag.c:605 +#: builtin/commit.c:1591 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1589 +#: builtin/commit.c:1592 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156 +#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1594 +#: builtin/commit.c:1597 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1595 +#: builtin/commit.c:1598 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1596 +#: builtin/commit.c:1599 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1597 +#: builtin/commit.c:1600 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1598 +#: builtin/commit.c:1601 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1599 +#: builtin/commit.c:1602 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1600 +#: builtin/commit.c:1603 msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1604 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1612 +#: builtin/commit.c:1615 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1613 +#: builtin/commit.c:1616 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1618 +#: builtin/commit.c:1621 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1620 +#: builtin/commit.c:1623 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1649 +#: builtin/commit.c:1652 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1695 +#: builtin/commit.c:1698 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1702 +#: builtin/commit.c:1705 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1721 +#: builtin/commit.c:1724 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1732 +#: builtin/commit.c:1735 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1737 +#: builtin/commit.c:1740 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1785 +#: builtin/commit.c:1788 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5198,11 +5259,11 @@ msgstr "" msgid "respect include directives on lookup" msgstr "" -#: builtin/config.c:311 +#: builtin/config.c:303 msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:449 +#: builtin/config.c:441 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5212,16 +5273,16 @@ msgid "" "#\temail = %s\n" msgstr "" -#: builtin/config.c:583 +#: builtin/config.c:575 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/count-objects.c:55 +#: builtin/count-objects.c:77 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "" -#: builtin/count-objects.c:65 +#: builtin/count-objects.c:87 msgid "print sizes in human readable format" msgstr "" @@ -5335,7 +5396,7 @@ msgstr "" msgid "only consider tags matching " msgstr "" -#: builtin/describe.c:410 builtin/name-rev.c:318 +#: builtin/describe.c:410 builtin/name-rev.c:314 msgid "show abbreviated commit object as fallback" msgstr "" @@ -5512,7 +5573,7 @@ msgstr "" msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:118 builtin/log.c:1233 +#: builtin/fetch.c:118 builtin/log.c:1232 msgid "dir" msgstr "" @@ -5554,7 +5615,7 @@ msgstr "" msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:478 builtin/fetch.c:564 +#: builtin/fetch.c:478 builtin/fetch.c:566 msgid "[rejected]" msgstr "" @@ -5578,125 +5639,125 @@ msgstr "" msgid "[new ref]" msgstr "" -#: builtin/fetch.c:560 +#: builtin/fetch.c:561 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:560 +#: builtin/fetch.c:561 msgid "forced update" msgstr "" -#: builtin/fetch.c:566 +#: builtin/fetch.c:568 msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:600 builtin/fetch.c:842 +#: builtin/fetch.c:602 builtin/fetch.c:843 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: builtin/fetch.c:609 +#: builtin/fetch.c:611 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:627 +#: builtin/fetch.c:629 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:715 builtin/fetch.c:807 +#: builtin/fetch.c:716 builtin/fetch.c:808 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:726 +#: builtin/fetch.c:727 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:778 +#: builtin/fetch.c:779 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:779 +#: builtin/fetch.c:780 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:811 +#: builtin/fetch.c:812 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:812 builtin/remote.c:1034 +#: builtin/fetch.c:813 builtin/remote.c:1040 msgid "(none)" msgstr "" -#: builtin/fetch.c:832 +#: builtin/fetch.c:833 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:851 +#: builtin/fetch.c:852 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:854 +#: builtin/fetch.c:855 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:910 +#: builtin/fetch.c:911 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:1071 +#: builtin/fetch.c:1072 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1073 builtin/remote.c:90 +#: builtin/fetch.c:1074 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1091 +#: builtin/fetch.c:1092 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:1114 +#: builtin/fetch.c:1115 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1156 +#: builtin/fetch.c:1157 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1159 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1181 +#: builtin/fetch.c:1179 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1183 +#: builtin/fetch.c:1181 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1194 +#: builtin/fetch.c:1192 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1202 +#: builtin/fetch.c:1200 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -5705,23 +5766,23 @@ msgid "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" msgstr "" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:667 msgid "populate log with at most entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:670 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:676 +#: builtin/fmt-merge-msg.c:673 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:674 msgid "use as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:675 msgid "file to read from" msgstr "" @@ -5729,95 +5790,115 @@ msgstr "" msgid "git for-each-ref [] []" msgstr "" -#: builtin/for-each-ref.c:24 +#: builtin/for-each-ref.c:10 +msgid "git for-each-ref [--points-at ]" +msgstr "" + +#: builtin/for-each-ref.c:11 +msgid "git for-each-ref [(--merged | --no-merged) []]" +msgstr "" + +#: builtin/for-each-ref.c:12 +msgid "git for-each-ref [--contains []]" +msgstr "" + +#: builtin/for-each-ref.c:27 msgid "quote placeholders suitably for shells" msgstr "" -#: builtin/for-each-ref.c:26 +#: builtin/for-each-ref.c:29 msgid "quote placeholders suitably for perl" msgstr "" -#: builtin/for-each-ref.c:28 +#: builtin/for-each-ref.c:31 msgid "quote placeholders suitably for python" msgstr "" -#: builtin/for-each-ref.c:30 +#: builtin/for-each-ref.c:33 msgid "quote placeholders suitably for Tcl" msgstr "" -#: builtin/for-each-ref.c:33 +#: builtin/for-each-ref.c:36 msgid "show only matched refs" msgstr "" -#: builtin/for-each-ref.c:34 +#: builtin/for-each-ref.c:37 builtin/tag.c:372 msgid "format to use for the output" msgstr "" -#: builtin/for-each-ref.c:35 -msgid "key" +#: builtin/for-each-ref.c:41 +msgid "print only refs which points at the given object" msgstr "" -#: builtin/for-each-ref.c:36 -msgid "field name to sort on" +#: builtin/for-each-ref.c:43 +msgid "print only refs that are merged" msgstr "" -#: builtin/fsck.c:163 builtin/prune.c:137 +#: builtin/for-each-ref.c:44 +msgid "print only refs that are not merged" +msgstr "" + +#: builtin/for-each-ref.c:45 +msgid "print only refs which contain the commit" +msgstr "" + +#: builtin/fsck.c:156 builtin/prune.c:140 msgid "Checking connectivity" msgstr "" -#: builtin/fsck.c:568 +#: builtin/fsck.c:486 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:631 +#: builtin/fsck.c:553 msgid "git fsck [] [...]" msgstr "" -#: builtin/fsck.c:637 +#: builtin/fsck.c:559 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:638 +#: builtin/fsck.c:560 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:639 +#: builtin/fsck.c:561 msgid "report tags" msgstr "" -#: builtin/fsck.c:640 +#: builtin/fsck.c:562 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:641 +#: builtin/fsck.c:563 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:642 +#: builtin/fsck.c:564 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:643 +#: builtin/fsck.c:565 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:644 +#: builtin/fsck.c:566 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:645 +#: builtin/fsck.c:567 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:647 +#: builtin/fsck.c:569 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:648 builtin/prune.c:107 +#: builtin/fsck.c:570 builtin/prune.c:107 msgid "show progress" msgstr "" -#: builtin/fsck.c:707 +#: builtin/fsck.c:631 msgid "Checking objects" msgstr "" @@ -5825,54 +5906,64 @@ msgstr "" msgid "git gc []" msgstr "" -#: builtin/gc.c:55 +#: builtin/gc.c:72 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: builtin/gc.c:100 +#: builtin/gc.c:139 #, c-format msgid "insanely long object directory %.*s" msgstr "" -#: builtin/gc.c:269 +#: builtin/gc.c:290 +#, c-format +msgid "" +"The last gc run reported the following. Please correct the root cause\n" +"and remove %s.\n" +"Automatic cleanup will not be performed until the file is removed.\n" +"\n" +"%s" +msgstr "" + +#: builtin/gc.c:327 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:271 +#: builtin/gc.c:329 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:272 +#: builtin/gc.c:330 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:273 +#: builtin/gc.c:331 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:315 +#: builtin/gc.c:373 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -#: builtin/gc.c:317 +#: builtin/gc.c:375 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:318 +#: builtin/gc.c:376 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -#: builtin/gc.c:336 +#: builtin/gc.c:397 #, c-format msgid "" "gc is already running on machine '%s' pid % (use --force if not)" msgstr "" -#: builtin/gc.c:364 +#: builtin/gc.c:441 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5906,199 +5997,195 @@ msgstr "" msgid "cannot open '%s'" msgstr "" -#: builtin/grep.c:638 +#: builtin/grep.c:633 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:640 +#: builtin/grep.c:635 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:642 +#: builtin/grep.c:637 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:644 +#: builtin/grep.c:639 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:647 +#: builtin/grep.c:642 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:649 +#: builtin/grep.c:644 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:651 +#: builtin/grep.c:646 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:653 +#: builtin/grep.c:648 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:655 +#: builtin/grep.c:650 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:658 +#: builtin/grep.c:653 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:660 +#: builtin/grep.c:655 msgid "descend at most levels" msgstr "" -#: builtin/grep.c:664 +#: builtin/grep.c:659 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:667 +#: builtin/grep.c:662 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:670 +#: builtin/grep.c:665 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:673 +#: builtin/grep.c:668 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:676 +#: builtin/grep.c:671 msgid "show line numbers" msgstr "" -#: builtin/grep.c:677 +#: builtin/grep.c:672 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:678 +#: builtin/grep.c:673 msgid "show filenames" msgstr "" -#: builtin/grep.c:680 +#: builtin/grep.c:675 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:682 +#: builtin/grep.c:677 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:684 +#: builtin/grep.c:679 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:687 +#: builtin/grep.c:682 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:689 +#: builtin/grep.c:684 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:691 +#: builtin/grep.c:686 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:692 +#: builtin/grep.c:687 msgid "highlight matches" msgstr "" -#: builtin/grep.c:694 +#: builtin/grep.c:689 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:696 +#: builtin/grep.c:691 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:699 +#: builtin/grep.c:694 msgid "show context lines before and after matches" msgstr "" -#: builtin/grep.c:702 +#: builtin/grep.c:697 msgid "show context lines before matches" msgstr "" -#: builtin/grep.c:704 +#: builtin/grep.c:699 msgid "show context lines after matches" msgstr "" -#: builtin/grep.c:705 +#: builtin/grep.c:700 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:708 +#: builtin/grep.c:703 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:710 +#: builtin/grep.c:705 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:713 +#: builtin/grep.c:708 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:715 +#: builtin/grep.c:710 msgid "match " msgstr "" -#: builtin/grep.c:717 +#: builtin/grep.c:712 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:729 +#: builtin/grep.c:724 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:731 +#: builtin/grep.c:726 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:733 +#: builtin/grep.c:728 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:737 +#: builtin/grep.c:732 msgid "pager" msgstr "" -#: builtin/grep.c:737 +#: builtin/grep.c:732 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:740 +#: builtin/grep.c:735 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:741 builtin/show-ref.c:189 -msgid "show usage" -msgstr "" - -#: builtin/grep.c:808 +#: builtin/grep.c:793 msgid "no pattern given." msgstr "" -#: builtin/grep.c:866 +#: builtin/grep.c:851 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:892 +#: builtin/grep.c:877 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:897 +#: builtin/grep.c:882 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:900 +#: builtin/grep.c:885 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:908 +#: builtin/grep.c:893 msgid "both --cached and trees are given." msgstr "" @@ -6109,10 +6196,10 @@ msgid "" msgstr "" #: builtin/hash-object.c:81 -msgid "git hash-object --stdin-paths < " +msgid "git hash-object --stdin-paths" msgstr "" -#: builtin/hash-object.c:92 builtin/tag.c:614 +#: builtin/hash-object.c:92 msgid "type" msgstr "" @@ -6183,80 +6270,80 @@ msgstr "" msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 +#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format msgid "failed to exec '%s': %s" msgstr "" -#: builtin/help.c:215 +#: builtin/help.c:208 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man..cmd' instead." msgstr "" -#: builtin/help.c:227 +#: builtin/help.c:220 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man..path' instead." msgstr "" -#: builtin/help.c:354 +#: builtin/help.c:337 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:371 +#: builtin/help.c:354 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:379 +#: builtin/help.c:362 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:428 +#: builtin/help.c:411 msgid "Defining attributes per path" msgstr "" -#: builtin/help.c:429 +#: builtin/help.c:412 msgid "Everyday Git With 20 Commands Or So" msgstr "" -#: builtin/help.c:430 +#: builtin/help.c:413 msgid "A Git glossary" msgstr "" -#: builtin/help.c:431 +#: builtin/help.c:414 msgid "Specifies intentionally untracked files to ignore" msgstr "" -#: builtin/help.c:432 +#: builtin/help.c:415 msgid "Defining submodule properties" msgstr "" -#: builtin/help.c:433 +#: builtin/help.c:416 msgid "Specifying revisions and ranges for Git" msgstr "" -#: builtin/help.c:434 +#: builtin/help.c:417 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "" -#: builtin/help.c:435 +#: builtin/help.c:418 msgid "An overview of recommended workflows with Git" msgstr "" -#: builtin/help.c:447 +#: builtin/help.c:430 msgid "The common Git guides are:\n" msgstr "" -#: builtin/help.c:468 builtin/help.c:485 +#: builtin/help.c:451 builtin/help.c:468 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/help.c:501 +#: builtin/help.c:484 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "" @@ -6549,87 +6636,62 @@ msgstr "" msgid "--verify with no packfile name given" msgstr "" -#: builtin/init-db.c:36 -#, c-format -msgid "Could not make %s writable by group" -msgstr "" - -#: builtin/init-db.c:63 -#, c-format -msgid "insanely long template name %s" -msgstr "" - -#: builtin/init-db.c:68 +#: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/init-db.c:74 +#: builtin/init-db.c:61 #, c-format msgid "cannot stat template '%s'" msgstr "" -#: builtin/init-db.c:81 +#: builtin/init-db.c:66 #, c-format msgid "cannot opendir '%s'" msgstr "" -#: builtin/init-db.c:98 +#: builtin/init-db.c:77 #, c-format msgid "cannot readlink '%s'" msgstr "" -#: builtin/init-db.c:100 -#, c-format -msgid "insanely long symlink %s" -msgstr "" - -#: builtin/init-db.c:103 +#: builtin/init-db.c:79 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" -#: builtin/init-db.c:107 +#: builtin/init-db.c:85 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" -#: builtin/init-db.c:111 +#: builtin/init-db.c:89 #, c-format msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:137 -#, c-format -msgid "insanely long template path %s" -msgstr "" - -#: builtin/init-db.c:145 +#: builtin/init-db.c:118 #, c-format msgid "templates not found %s" msgstr "" -#: builtin/init-db.c:158 +#: builtin/init-db.c:131 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" msgstr "" -#: builtin/init-db.c:212 -#, c-format -msgid "insane git directory %s" -msgstr "" - -#: builtin/init-db.c:344 builtin/init-db.c:347 +#: builtin/init-db.c:309 builtin/init-db.c:312 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:375 +#: builtin/init-db.c:340 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:378 +#: builtin/init-db.c:343 #, c-format msgid "unable to move %s to %s" msgstr "" @@ -6637,55 +6699,55 @@ msgstr "" #. TRANSLATORS: The first '%s' is either "Reinitialized #. existing" or "Initialized empty", the second " shared" or #. "", and the last '%s%s' is the verbatim directory name. -#: builtin/init-db.c:434 +#: builtin/init-db.c:399 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:435 +#: builtin/init-db.c:400 msgid "Reinitialized existing" msgstr "" -#: builtin/init-db.c:435 +#: builtin/init-db.c:400 msgid "Initialized empty" msgstr "" -#: builtin/init-db.c:436 +#: builtin/init-db.c:401 msgid " shared" msgstr "" -#: builtin/init-db.c:483 +#: builtin/init-db.c:448 msgid "" "git init [-q | --quiet] [--bare] [--template=] [--" "shared[=]] []" msgstr "" -#: builtin/init-db.c:506 +#: builtin/init-db.c:471 msgid "permissions" msgstr "" -#: builtin/init-db.c:507 +#: builtin/init-db.c:472 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:541 builtin/init-db.c:546 +#: builtin/init-db.c:506 builtin/init-db.c:511 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:550 +#: builtin/init-db.c:515 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:571 +#: builtin/init-db.c:536 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" "dir=)" msgstr "" -#: builtin/init-db.c:599 +#: builtin/init-db.c:564 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -6769,217 +6831,217 @@ msgstr "" msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:814 +#: builtin/log.c:813 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:828 +#: builtin/log.c:827 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:838 +#: builtin/log.c:837 msgid "Not a range." msgstr "" -#: builtin/log.c:944 +#: builtin/log.c:943 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:1023 +#: builtin/log.c:1022 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1051 +#: builtin/log.c:1050 msgid "git format-patch [] [ | ]" msgstr "" -#: builtin/log.c:1096 +#: builtin/log.c:1095 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1211 +#: builtin/log.c:1210 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1214 +#: builtin/log.c:1213 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1218 +#: builtin/log.c:1217 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1220 +#: builtin/log.c:1219 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1222 +#: builtin/log.c:1221 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1223 +#: builtin/log.c:1222 msgid "sfx" msgstr "" -#: builtin/log.c:1224 +#: builtin/log.c:1223 msgid "use instead of '.patch'" msgstr "" -#: builtin/log.c:1226 +#: builtin/log.c:1225 msgid "start numbering patches at instead of 1" msgstr "" -#: builtin/log.c:1228 +#: builtin/log.c:1227 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1230 +#: builtin/log.c:1229 msgid "Use [] instead of [PATCH]" msgstr "" -#: builtin/log.c:1233 +#: builtin/log.c:1232 msgid "store resulting files in " msgstr "" -#: builtin/log.c:1236 +#: builtin/log.c:1235 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1239 +#: builtin/log.c:1238 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1241 +#: builtin/log.c:1240 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1243 +#: builtin/log.c:1242 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1245 +#: builtin/log.c:1244 msgid "Messaging" msgstr "" -#: builtin/log.c:1246 +#: builtin/log.c:1245 msgid "header" msgstr "" -#: builtin/log.c:1247 +#: builtin/log.c:1246 msgid "add email header" msgstr "" -#: builtin/log.c:1248 builtin/log.c:1250 +#: builtin/log.c:1247 builtin/log.c:1249 msgid "email" msgstr "" -#: builtin/log.c:1248 +#: builtin/log.c:1247 msgid "add To: header" msgstr "" -#: builtin/log.c:1250 +#: builtin/log.c:1249 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1252 +#: builtin/log.c:1251 msgid "ident" msgstr "" -#: builtin/log.c:1253 +#: builtin/log.c:1252 msgid "set From address to (or committer ident if absent)" msgstr "" -#: builtin/log.c:1255 +#: builtin/log.c:1254 msgid "message-id" msgstr "" -#: builtin/log.c:1256 +#: builtin/log.c:1255 msgid "make first mail a reply to " msgstr "" -#: builtin/log.c:1257 builtin/log.c:1260 +#: builtin/log.c:1256 builtin/log.c:1259 msgid "boundary" msgstr "" -#: builtin/log.c:1258 +#: builtin/log.c:1257 msgid "attach the patch" msgstr "" -#: builtin/log.c:1261 +#: builtin/log.c:1260 msgid "inline the patch" msgstr "" -#: builtin/log.c:1265 +#: builtin/log.c:1264 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1267 +#: builtin/log.c:1266 msgid "signature" msgstr "" -#: builtin/log.c:1268 +#: builtin/log.c:1267 msgid "add a signature" msgstr "" -#: builtin/log.c:1270 +#: builtin/log.c:1269 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1271 +#: builtin/log.c:1270 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1360 +#: builtin/log.c:1359 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1362 +#: builtin/log.c:1361 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1370 +#: builtin/log.c:1369 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1372 +#: builtin/log.c:1371 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1374 +#: builtin/log.c:1373 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1397 +#: builtin/log.c:1396 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1399 +#: builtin/log.c:1398 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1496 +#: builtin/log.c:1495 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1559 +#: builtin/log.c:1558 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1607 +#: builtin/log.c:1606 msgid "git cherry [-v] [ [ []]]" msgstr "" -#: builtin/log.c:1661 +#: builtin/log.c:1660 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "" -#: builtin/log.c:1672 builtin/log.c:1674 builtin/log.c:1686 +#: builtin/log.c:1671 builtin/log.c:1673 builtin/log.c:1685 #, c-format msgid "Unknown commit %s" msgstr "" @@ -7080,35 +7142,35 @@ msgstr "" msgid "git ls-tree [] [...]" msgstr "" -#: builtin/ls-tree.c:127 +#: builtin/ls-tree.c:128 msgid "only show trees" msgstr "" -#: builtin/ls-tree.c:129 +#: builtin/ls-tree.c:130 msgid "recurse into subtrees" msgstr "" -#: builtin/ls-tree.c:131 +#: builtin/ls-tree.c:132 msgid "show trees when recursing" msgstr "" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "terminate entries with NUL byte" msgstr "" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:136 msgid "include object size" msgstr "" -#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 +#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 msgid "list only filenames" msgstr "" -#: builtin/ls-tree.c:142 +#: builtin/ls-tree.c:143 msgid "use full path names" msgstr "" -#: builtin/ls-tree.c:144 +#: builtin/ls-tree.c:145 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" @@ -7333,72 +7395,72 @@ msgstr "" msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1081 +#: builtin/merge.c:1079 #, c-format msgid "could not close '%s'" msgstr "" -#: builtin/merge.c:1208 +#: builtin/merge.c:1206 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1224 +#: builtin/merge.c:1222 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1231 +#: builtin/merge.c:1229 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1234 +#: builtin/merge.c:1232 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1243 +#: builtin/merge.c:1241 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1251 +#: builtin/merge.c:1249 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1268 +#: builtin/merge.c:1266 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1270 +#: builtin/merge.c:1268 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1276 +#: builtin/merge.c:1274 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1278 +#: builtin/merge.c:1276 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1333 +#: builtin/merge.c:1331 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1336 +#: builtin/merge.c:1334 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: builtin/merge.c:1339 +#: builtin/merge.c:1337 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1342 +#: builtin/merge.c:1340 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" @@ -7408,46 +7470,46 @@ msgstr "" msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1462 +#: builtin/merge.c:1460 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1469 +#: builtin/merge.c:1467 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1501 +#: builtin/merge.c:1499 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1524 builtin/merge.c:1603 +#: builtin/merge.c:1522 builtin/merge.c:1601 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1528 +#: builtin/merge.c:1526 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1594 +#: builtin/merge.c:1592 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1596 +#: builtin/merge.c:1594 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1605 +#: builtin/merge.c:1603 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1617 +#: builtin/merge.c:1615 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7633,48 +7695,48 @@ msgstr "" msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:256 builtin/remote.c:722 builtin/repack.c:362 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:255 +#: builtin/name-rev.c:251 msgid "git name-rev [] ..." msgstr "" -#: builtin/name-rev.c:256 +#: builtin/name-rev.c:252 msgid "git name-rev [] --all" msgstr "" -#: builtin/name-rev.c:257 +#: builtin/name-rev.c:253 msgid "git name-rev [] --stdin" msgstr "" -#: builtin/name-rev.c:309 +#: builtin/name-rev.c:305 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:306 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:308 msgid "only use refs matching " msgstr "" -#: builtin/name-rev.c:314 +#: builtin/name-rev.c:310 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:315 +#: builtin/name-rev.c:311 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:316 +#: builtin/name-rev.c:312 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:322 +#: builtin/name-rev.c:318 msgid "dereference tags in the input (internal use)" msgstr "" @@ -7797,7 +7859,7 @@ msgstr "" msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:174 builtin/tag.c:477 +#: builtin/notes.c:174 builtin/tag.c:248 #, c-format msgid "could not create file '%s'" msgstr "" @@ -7815,12 +7877,12 @@ msgstr "" msgid "The note contents have been left in %s" msgstr "" -#: builtin/notes.c:232 builtin/tag.c:695 +#: builtin/notes.c:232 builtin/tag.c:440 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:234 builtin/tag.c:698 +#: builtin/notes.c:234 builtin/tag.c:443 #, c-format msgid "could not open or read '%s'" msgstr "" @@ -7828,7 +7890,7 @@ msgstr "" #: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 #: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507 #: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653 -#: builtin/notes.c:877 builtin/tag.c:711 +#: builtin/notes.c:877 builtin/tag.c:456 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" @@ -7862,11 +7924,6 @@ msgstr "" msgid "note contents in a file" msgstr "" -#: builtin/notes.c:398 builtin/notes.c:401 builtin/notes.c:561 -#: builtin/notes.c:564 builtin/tag.c:630 -msgid "object" -msgstr "" - #: builtin/notes.c:399 builtin/notes.c:562 msgid "reuse and edit specified note object" msgstr "" @@ -7987,7 +8044,7 @@ msgstr "" msgid "use notes from " msgstr "" -#: builtin/notes.c:1012 builtin/remote.c:1588 +#: builtin/notes.c:1012 builtin/remote.c:1647 #, c-format msgid "Unknown subcommand: %s" msgstr "" @@ -8193,20 +8250,24 @@ msgstr "" msgid "git prune [-n] [-v] [--expire