From 3c1189861c313ce74b7866da33a841385dfe1141 Mon Sep 17 00:00:00 2001 From: Alexander Shopov Date: Sun, 14 Jun 2026 22:58:44 +0200 Subject: [PATCH 1/4] git-gui i18n: Update Bulgarian translation (562t) Signed-off-by: Alexander Shopov --- po/bg.po | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/po/bg.po b/po/bg.po index ff5adb25cc..472863da3b 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: git-gui master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-07-22 17:37+0200\n" -"PO-Revision-Date: 2026-01-19 10:12+0100\n" +"POT-Creation-Date: 2026-06-02 19:13+0200\n" +"PO-Revision-Date: 2026-06-14 22:57+0200\n" "Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" "Language: bg\n" @@ -43,18 +43,21 @@ msgstr "Прекалено ниска версия на git, необходим msgid "git returned:" msgstr "git върна:" +msgid "Invalid configuration:" +msgstr "Неправилна настройка:" + +msgid "Unusable repo/worktree:" +msgstr "Неизползваемо хранилище/раб. дърво:" + msgid "Git directory not found:" msgstr "Директорията на Git не е открита:" -msgid "Cannot move to top of working directory:" -msgstr "Не може да се премине към родителската директория." +msgid "No working directory" +msgstr "Работната директория липсва" msgid "Cannot use bare repository:" msgstr "Голо хранилище не може да се използва:" -msgid "No working directory" -msgstr "Работната директория липсва" - msgid "Refreshing file status..." msgstr "Обновяване на състоянието на файла…" @@ -305,12 +308,21 @@ msgstr "употреба:" msgid "Usage" msgstr "Употреба" -msgid "Error" -msgstr "Грешка" +#, tcl-format +msgid "fatal: no such file '%s' in worktree" +msgstr "фатална грешка: в работното дърво липсва файл „%s“" #, tcl-format -msgid "fatal: cannot stat path %s: No such file or directory" -msgstr "ФАТАЛНА ГРЕШКА: пътят „%s“ липсва: такъв файл или директория няма" +msgid "fatal: '%s' is not a valid rev'" +msgstr "фатална грешка: „%s“ не е версия" + +#, tcl-format +msgid "'%s' is not a directory in rev '%s'" +msgstr "„%s“ не е директория във версия „%s“" + +#, tcl-format +msgid "'%s' is not a filename in rev '%s'" +msgstr "„%s“ не е име на файл във версия „%s“" msgid "Current Branch:" msgstr "Текущ клон:" @@ -461,6 +473,9 @@ msgstr "Анотиране на родителското подаване" msgid "Reading %s..." msgstr "Чете се „%s“…" +msgid "Error" +msgstr "Грешка" + msgid "Loading copy/move tracking annotations..." msgstr "Зареждане на анотациите за проследяване на копирането/преместването…" From 33ceb741218f8d499051a97b988787e4be140565 Mon Sep 17 00:00:00 2001 From: Harald Nordgren Date: Sat, 20 Jun 2026 22:46:10 +0000 Subject: [PATCH 2/4] git-gui: drop msgfmt --statistics output The catalog rules ran msgfmt with --statistics, whose output goes to stderr and so survive "make -s". The statistics are not needed, as in 2f12b31b746c (Makefile: don't invoke msgfmt with --statistics, 2021-12-17). Remove it so a quiet build stays quiet. Signed-off-by: Harald Nordgren [j6t: adjust commit message] Signed-off-by: Johannes Sixt --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d33204e875..48d848a59d 100644 --- a/Makefile +++ b/Makefile @@ -155,7 +155,7 @@ $(PO_TEMPLATE): $(SCRIPT_SH) $(ALL_LIBFILES) update-po:: $(PO_TEMPLATE) $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; ) $(ALL_MSGFILES): %.msg : %.po - $(QUIET_MSGFMT0)$(MSGFMT) --statistics --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< $(QUIET_MSGFMT1) + $(QUIET_MSGFMT0)$(MSGFMT) --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< $(QUIET_MSGFMT1) lib/tclIndex: $(ALL_LIBFILES) generate-tclindex.sh GIT-GUI-BUILD-OPTIONS $(QUIET_INDEX)$(SHELL_PATH) generate-tclindex.sh . ./GIT-GUI-BUILD-OPTIONS $(ALL_LIBFILES) From ed5ccdaca021ececf32da68ef46bcd687e00dafe Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Sun, 21 Jun 2026 11:55:14 +0200 Subject: [PATCH 3/4] git-gui: reduce complexity of the quiet msgfmt rule In non-verbose builds (without V=1) the rule to compile *.po files with msgfmt captures the output in a shell variable and then strips down the text produced by --statistics to fit on a 80 column line. The previous commit removed --statistics output of the msgfmt invocation, so that we don't get to see anything beyond "MSGFMT po/xx.msg" anymore. Make the rule as minimal as the other "quiet" rules. Signed-off-by: Johannes Sixt --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 48d848a59d..2e1711adc5 100644 --- a/Makefile +++ b/Makefile @@ -69,8 +69,7 @@ ifndef V QUIET = @ QUIET_GEN = $(QUIET)echo ' ' GEN '$@' && QUIET_INDEX = $(QUIET)echo ' ' INDEX $(dir $@) && - QUIET_MSGFMT0 = $(QUIET)printf ' MSGFMT %12s ' $@ && v=` - QUIET_MSGFMT1 = 2>&1` && echo "$$v" | sed -e 's/fuzzy translations/fuzzy/' | sed -e 's/ messages*//g' + QUIET_MSGFMT = $(QUIET)echo ' ' MSGFMT '$@' && INSTALL_D0 = dir= INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir" @@ -155,7 +154,7 @@ $(PO_TEMPLATE): $(SCRIPT_SH) $(ALL_LIBFILES) update-po:: $(PO_TEMPLATE) $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; ) $(ALL_MSGFILES): %.msg : %.po - $(QUIET_MSGFMT0)$(MSGFMT) --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< $(QUIET_MSGFMT1) + $(QUIET_MSGFMT)$(MSGFMT) --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< lib/tclIndex: $(ALL_LIBFILES) generate-tclindex.sh GIT-GUI-BUILD-OPTIONS $(QUIET_INDEX)$(SHELL_PATH) generate-tclindex.sh . ./GIT-GUI-BUILD-OPTIONS $(ALL_LIBFILES) From b4d47b7c106a6627b7a6fa87bb68def2465dc5c9 Mon Sep 17 00:00:00 2001 From: Alexander Shopov Date: Fri, 19 Jun 2026 17:12:57 +0200 Subject: [PATCH 4/4] git-gui: allow larger width for the commit message field Users may like to make the main window very wide. In this case, a rather small size of the commit message field leaves a wide unused space at the bottom-right. Allow settting the field width to values much larger than 99 characters. In fact, users can set it to extreme values to fill the entire space regardless of window width: the widget geometry will be negotiated to be limited to the available space despite the large requested width. Signed-off-by: Alexander Shopov --- lib/option.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/option.tcl b/lib/option.tcl index 487d70691d..43f79ff812 100644 --- a/lib/option.tcl +++ b/lib/option.tcl @@ -155,7 +155,7 @@ proc do_options {} { {i-0..300 gui.blamehistoryctx {mc "Blame History Context Radius (days)"}} {i-1..99 gui.diffcontext {mc "Number of Diff Context Lines"}} {t gui.diffopts {mc "Additional Diff Parameters"}} - {i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}} + {i-0..9999 gui.commitmsgwidth {mc "Commit Message Text Width"}} {t gui.newbranchtemplate {mc "New Branch Name Template"}} {c gui.encoding {mc "Default File Contents Encoding"}} {b gui.warndetachedcommit {mc "Warn before committing to a detached head"}}