Skip to content

Commit 44de152

Browse files
committed
Merge branch 'master' of https://github.com/j6t/git-gui
* 'master' of https://github.com/j6t/git-gui: git-gui: allow larger width for the commit message field git-gui: reduce complexity of the quiet msgfmt rule git-gui: drop msgfmt --statistics output git-gui i18n: Update Bulgarian translation (562t)
2 parents 946e693 + 5dcb978 commit 44de152

3 files changed

Lines changed: 29 additions & 15 deletions

File tree

git-gui/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ ifndef V
6969
QUIET = @
7070
QUIET_GEN = $(QUIET)echo ' ' GEN '$@' &&
7171
QUIET_INDEX = $(QUIET)echo ' ' INDEX $(dir $@) &&
72-
QUIET_MSGFMT0 = $(QUIET)printf ' MSGFMT %12s ' $@ && v=`
73-
QUIET_MSGFMT1 = 2>&1` && echo "$$v" | sed -e 's/fuzzy translations/fuzzy/' | sed -e 's/ messages*//g'
72+
QUIET_MSGFMT = $(QUIET)echo ' ' MSGFMT '$@' &&
7473

7574
INSTALL_D0 = dir=
7675
INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir"
@@ -155,7 +154,7 @@ $(PO_TEMPLATE): $(SCRIPT_SH) $(ALL_LIBFILES)
155154
update-po:: $(PO_TEMPLATE)
156155
$(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )
157156
$(ALL_MSGFILES): %.msg : %.po
158-
$(QUIET_MSGFMT0)$(MSGFMT) --statistics --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< $(QUIET_MSGFMT1)
157+
$(QUIET_MSGFMT)$(MSGFMT) --tcl -l $(basename $(notdir $<)) -d $(dir $@) $<
159158

160159
lib/tclIndex: $(ALL_LIBFILES) generate-tclindex.sh GIT-GUI-BUILD-OPTIONS
161160
$(QUIET_INDEX)$(SHELL_PATH) generate-tclindex.sh . ./GIT-GUI-BUILD-OPTIONS $(ALL_LIBFILES)

git-gui/lib/option.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ proc do_options {} {
155155
{i-0..300 gui.blamehistoryctx {mc "Blame History Context Radius (days)"}}
156156
{i-1..99 gui.diffcontext {mc "Number of Diff Context Lines"}}
157157
{t gui.diffopts {mc "Additional Diff Parameters"}}
158-
{i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}}
158+
{i-0..9999 gui.commitmsgwidth {mc "Commit Message Text Width"}}
159159
{t gui.newbranchtemplate {mc "New Branch Name Template"}}
160160
{c gui.encoding {mc "Default File Contents Encoding"}}
161161
{b gui.warndetachedcommit {mc "Warn before committing to a detached head"}}

git-gui/po/bg.po

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: git-gui master\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2025-07-22 17:37+0200\n"
12-
"PO-Revision-Date: 2026-01-19 10:12+0100\n"
11+
"POT-Creation-Date: 2026-06-02 19:13+0200\n"
12+
"PO-Revision-Date: 2026-06-14 22:57+0200\n"
1313
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
1414
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
1515
"Language: bg\n"
@@ -43,18 +43,21 @@ msgstr "Прекалено ниска версия на git, необходим
4343
msgid "git returned:"
4444
msgstr "git върна:"
4545

46+
msgid "Invalid configuration:"
47+
msgstr "Неправилна настройка:"
48+
49+
msgid "Unusable repo/worktree:"
50+
msgstr "Неизползваемо хранилище/раб. дърво:"
51+
4652
msgid "Git directory not found:"
4753
msgstr "Директорията на Git не е открита:"
4854

49-
msgid "Cannot move to top of working directory:"
50-
msgstr "Не може да се премине към родителската директория."
55+
msgid "No working directory"
56+
msgstr "Работната директория липсва"
5157

5258
msgid "Cannot use bare repository:"
5359
msgstr "Голо хранилище не може да се използва:"
5460

55-
msgid "No working directory"
56-
msgstr "Работната директория липсва"
57-
5861
msgid "Refreshing file status..."
5962
msgstr "Обновяване на състоянието на файла…"
6063

@@ -305,12 +308,21 @@ msgstr "употреба:"
305308
msgid "Usage"
306309
msgstr "Употреба"
307310

308-
msgid "Error"
309-
msgstr "Грешка"
311+
#, tcl-format
312+
msgid "fatal: no such file '%s' in worktree"
313+
msgstr "фатална грешка: в работното дърво липсва файл „%s“"
314+
315+
#, tcl-format
316+
msgid "fatal: '%s' is not a valid rev'"
317+
msgstr "фатална грешка: „%s“ не е версия"
318+
319+
#, tcl-format
320+
msgid "'%s' is not a directory in rev '%s'"
321+
msgstr "„%s“ не е директория във версия „%s“"
310322

311323
#, tcl-format
312-
msgid "fatal: cannot stat path %s: No such file or directory"
313-
msgstr "ФАТАЛНА ГРЕШКА: пътят „%s“ липсва: такъв файл или директория няма"
324+
msgid "'%s' is not a filename in rev '%s'"
325+
msgstr "„%s“ не е име на файл във версия „%s“"
314326

315327
msgid "Current Branch:"
316328
msgstr "Текущ клон:"
@@ -461,6 +473,9 @@ msgstr "Анотиране на родителското подаване"
461473
msgid "Reading %s..."
462474
msgstr "Чете се „%s“…"
463475

476+
msgid "Error"
477+
msgstr "Грешка"
478+
464479
msgid "Loading copy/move tracking annotations..."
465480
msgstr "Зареждане на анотациите за проследяване на копирането/преместването…"
466481

0 commit comments

Comments
 (0)