Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

l10n: bg.po: Updated Bulgarian translation (5579t) #752

Merged
merged 1 commit into from
Feb 18, 2024
Merged

l10n: bg.po: Updated Bulgarian translation (5579t) #752

merged 1 commit into from
Feb 18, 2024

Conversation

alshopov
Copy link

Thanks for taking the time to contribute to Git! Please be advised that the
Git community does not use github.com for their contributions. Instead, we use
a mailing list (git@vger.kernel.org) for code submissions, code reviews, and
bug reports. Nevertheless, you can use GitGitGadget (https://gitgitgadget.github.io/)
to conveniently send your Pull Requests commits to our mailing list.

Please read the "guidelines for contributing" linked above!

@github-actions GitHub Actions
Copy link

Errors and warnings found by git-po-helper in workflow #556:

------------------------------------------------------------------------------
INFO [po/bg.po@0d0c0df]	5579 translated messages. 
------------------------------------------------------------------------------
WARNING [po/bg.po@0d0c0df]	mismatched patterns: refs/heads, refs/heads/ 
WARNING [po/bg.po@0d0c0df]	>> msgid: HEAD (%s) points outside of refs/heads/ 
WARNING [po/bg.po@0d0c0df]	>> msgstr: „HEAD“ (%s) сочи извън директорията „refs/heads“ 
WARNING [po/bg.po@0d0c0df]                           
WARNING [po/bg.po@0d0c0df]	mismatched patterns: --rebase-merges 
WARNING [po/bg.po@0d0c0df]	>> msgid: Unknown --rebase-merges mode: %s 
WARNING [po/bg.po@0d0c0df]	>> msgstr: Неправилен режим за „--rebase-merges“: %s 
WARNING [po/bg.po@0d0c0df]                           
WARNING [po/bg.po@0d0c0df]	mismatched patterns: --ancestry-path 
WARNING [po/bg.po@0d0c0df]	>> msgid: could not get commit for --ancestry-path argument %s 
WARNING [po/bg.po@0d0c0df]	>> msgstr: подаването „%s“ към опцията „--ancestry-path“ не може да бъде получено 
WARNING [po/bg.po@0d0c0df]                           
WARNING [po/bg.po@0d0c0df]	mismatched patterns: --bare 
WARNING [po/bg.po@0d0c0df]	>> msgid: create a mirror repository (implies --bare) 
WARNING [po/bg.po@0d0c0df]	>> msgstr: създаване на хранилище-огледало (включва опцията „--bare“ за голо хранилище) 
WARNING [po/bg.po@0d0c0df]                           
WARNING [po/bg.po@0d0c0df]	mismatched patterns: --pretty=, --pretty=short 
WARNING [po/bg.po@0d0c0df]	>> msgid: git log --pretty=short | git shortlog [<options>] 
WARNING [po/bg.po@0d0c0df]	>> msgstr: git log --pretty=short|git shortlog [ОПЦИЯ…] 
WARNING [po/bg.po@0d0c0df]                           
WARNING [po/bg.po@0d0c0df]	mismatched patterns: --force 
WARNING [po/bg.po@0d0c0df]	>> msgid: helper %s does not support '--force' 
WARNING [po/bg.po@0d0c0df]	>> msgstr: насрещната помощна програма „%s“ не поддържа опцията „--force“ 
WARNING [po/bg.po@0d0c0df]                           
WARNING [po/bg.po@0d0c0df]	mismatched patterns: --dirstat=, --dirstat=files 
WARNING [po/bg.po@0d0c0df]	>> msgid: synonym for --dirstat=files,param1,param2... 
WARNING [po/bg.po@0d0c0df]	>> msgstr: псевдоним на „--dirstat=ФАЙЛ…,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“ 
WARNING [po/bg.po@0d0c0df]                           
WARNING [po/bg.po@0d0c0df]	mismatched patterns: --mirror 
WARNING [po/bg.po@0d0c0df]	>> msgid: unknown --mirror argument: %s 
WARNING [po/bg.po@0d0c0df]	>> msgstr: неправилна стойност за „--mirror“: %s 
WARNING [po/bg.po@0d0c0df]                           
INFO checking commits: 1 passed.                  
------------------------------------------------------------------------------
INFO downloading pot file from https://github.com/git-l10n/pot-changes/raw/pot/master/po/git.pot 
------------------------------------------------------------------------------
ERROR [po/bg.po@0d0c0df]	57 new string(s) in 'po/git.pot', but not in your 'po/XX.po' 
ERROR [po/bg.po@0d0c0df]                           
ERROR [po/bg.po@0d0c0df]	  > po/git.pot:1660: this message is used but not defined in /tmp/2114438557--bg.po 
ERROR [po/bg.po@0d0c0df]	  > po/git.pot:3234: this message is used but not defined in /tmp/2114438557--bg.po 
ERROR [po/bg.po@0d0c0df]	  > po/git.pot:3239: this message is used but not defined in /tmp/2114438557--bg.po 
ERROR [po/bg.po@0d0c0df]	  > ...                   
ERROR [po/bg.po@0d0c0df]                           
ERROR [po/bg.po@0d0c0df]	27 obsolete string(s) in your 'po/XX.po', which must be removed 
ERROR [po/bg.po@0d0c0df]                           
ERROR [po/bg.po@0d0c0df]	  > po/XX.po:3080: warning: this message is not used 
ERROR [po/bg.po@0d0c0df]	  > po/XX.po:4142: warning: this message is not used 
ERROR [po/bg.po@0d0c0df]	  > po/XX.po:4396: warning: this message is not used 
ERROR [po/bg.po@0d0c0df]	  > ...                   
ERROR [po/bg.po@0d0c0df]                           
ERROR [po/bg.po@0d0c0df]	You can download the latest "po/git.pot" file from: 
ERROR [po/bg.po@0d0c0df]                           
ERROR [po/bg.po@0d0c0df]		https://github.com/git-l10n/pot-changes/raw/pot/master/po/git.pot 
ERROR [po/bg.po@0d0c0df]                           
ERROR [po/bg.po@0d0c0df]	Please rebase your branch to the latest upstream branch, 
ERROR [po/bg.po@0d0c0df]	run "git-po-helper update po/XX.po" to update your po file, 
ERROR [po/bg.po@0d0c0df]	and translate the new strings in it. 
ERROR [po/bg.po@0d0c0df]                           

ERROR: fail to execute "git-po-helper check-commits"

@alshopov
Copy link
Author

Fixes coming...

@github-actions GitHub Actions
Copy link

Warnings found by git-po-helper in workflow #559:

------------------------------------------------------------------------------
INFO [po/bg.po@680d800]	5609 translated messages. 
------------------------------------------------------------------------------
WARNING [po/bg.po@680d800]	mismatched patterns: --pretty=, --pretty=short 
WARNING [po/bg.po@680d800]	>> msgid: git log --pretty=short | git shortlog [<options>] 
WARNING [po/bg.po@680d800]	>> msgstr: git log --pretty=short|git shortlog [ОПЦИЯ…] 
WARNING [po/bg.po@680d800]                           
WARNING [po/bg.po@680d800]	mismatched patterns: --dirstat=, --dirstat=files 
WARNING [po/bg.po@680d800]	>> msgid: synonym for --dirstat=files,param1,param2... 
WARNING [po/bg.po@680d800]	>> msgstr: псевдоним на „--dirstat=ФАЙЛ…,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“ 
WARNING [po/bg.po@680d800]                           
INFO checking commits: 1 passed.                  
------------------------------------------------------------------------------
INFO downloading pot file from https://github.com/git-l10n/pot-changes/raw/pot/master/po/git.pot

@github-actions GitHub Actions
Copy link

Warnings found by git-po-helper in workflow #560:

------------------------------------------------------------------------------
INFO [po/bg.po@3a81bd4]	5609 translated messages. 
------------------------------------------------------------------------------
WARNING [po/bg.po@3a81bd4]	mismatched patterns: --dirstat=, --dirstat=files 
WARNING [po/bg.po@3a81bd4]	>> msgid: synonym for --dirstat=files,param1,param2... 
WARNING [po/bg.po@3a81bd4]	>> msgstr: псевдоним на „--dirstat=ФАЙЛ…,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“ 
WARNING [po/bg.po@3a81bd4]                           
INFO checking commits: 1 passed.                  
------------------------------------------------------------------------------
INFO downloading pot file from https://github.com/git-l10n/pot-changes/raw/pot/master/po/git.pot

@alshopov
Copy link
Author

TBH I am not sure what is the exact problem with that message, suggestions welcome

@jiangxin
Copy link
Member

jiangxin commented Feb 13, 2024 •
edited
Loading

TBH I am not sure what is the exact problem with that message, suggestions welcome

The first word for --dirstat cannot be translated. E.g.:

git diff <commit1> <commit2> --dirstat=files

According to the following code

calling git diff --dirstat-by-file[=<param1,param2>...] is the same as calling:

git diff --dirstat=files,param1,param2...

From the code of diff_opt_dirstat() as below:

We can see the first parameter for long option --dirstat-by-file is "files"
which cannot be translated. But other parameters such as param1 and param2
should be given in <place-holder> format.

You can make change of the source code of Git, and send patch to upstream:

--- a/diff.c
+++ b/diff.c
@@ -5598,7 +5598,7 @@ struct option *add_diff_options(const struct option *opts,
                               PARSE_OPT_NONEG | PARSE_OPT_NOARG,
                               diff_opt_dirstat),
                OPT_CALLBACK_F(0, "dirstat-by-file", options, N_("<param1,param2>..."),
-                              N_("synonym for --dirstat=files,param1,param2..."),
+                              N_("synonym for --dirstat=files,<param1>,<param2>..."),
                               PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
                               diff_opt_dirstat),
                OPT_BIT_F(0, "check", &options->output_format,

@jiangxin
Copy link
Member

Even when you updated bg.po as below,

msgstr: псевдоним на „--dirstat=files,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“

will report the same error message:

------------------------------------------------------------------------------
ERROR [po/bg.po]        mismatched patterns: --dirstat=, --dirstat=files 
ERROR [po/bg.po]        >> msgid: synonym for --dirstat=files,param1,param2... 
ERROR [po/bg.po]        >> msgstr: псевдоним на „--dirstat=files,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“ 
ERROR [po/bg.po]                                   
------------------------------------------------------------------------------

This is because the smudge entries defined below:

I will try to fix the smudge table for bg in git-po-helper.

@jiangxin
Copy link
Member

A new translatable message has been introduced in Git upstream, please update your translations.

@github-actions GitHub Actions
Copy link

Errors and warnings found by git-po-helper in workflow #560:

------------------------------------------------------------------------------
INFO [po/bg.po@3a81bd4]	5609 translated messages. 
------------------------------------------------------------------------------
WARNING [po/bg.po@3a81bd4]	mismatched patterns: --dirstat=<...>,, --dirstat=files,param1,param2... 
WARNING [po/bg.po@3a81bd4]	>> msgid: synonym for --dirstat=files,param1,param2... 
WARNING [po/bg.po@3a81bd4]	>> msgstr: псевдоним на „--dirstat=ФАЙЛ…,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“ 
WARNING [po/bg.po@3a81bd4]                           
INFO checking commits: 1 passed.                  
------------------------------------------------------------------------------
INFO downloading pot file from https://github.com/git-l10n/pot-changes/raw/pot/master/po/git.pot 
------------------------------------------------------------------------------
ERROR [po/bg.po@3a81bd4]	1 new string(s) in 'po/git.pot', but not in your 'po/XX.po' 
ERROR [po/bg.po@3a81bd4]                           
ERROR [po/bg.po@3a81bd4]	  > po/git.pot:7984: this message is used but not defined in /tmp/653197854--bg.po 
ERROR [po/bg.po@3a81bd4]                           
ERROR [po/bg.po@3a81bd4]	You can download the latest "po/git.pot" file from: 
ERROR [po/bg.po@3a81bd4]                           
ERROR [po/bg.po@3a81bd4]		https://github.com/git-l10n/pot-changes/raw/pot/master/po/git.pot 
ERROR [po/bg.po@3a81bd4]                           
ERROR [po/bg.po@3a81bd4]	Please rebase your branch to the latest upstream branch, 
ERROR [po/bg.po@3a81bd4]	run "git-po-helper update po/XX.po" to update your po file, 
ERROR [po/bg.po@3a81bd4]	and translate the new strings in it. 
ERROR [po/bg.po@3a81bd4]                           

ERROR: fail to execute "git-po-helper check-commits"

@jiangxin
Copy link
Member

Commit "diff: mark param1 and param2 as placeholders" has been merged, and two translatable messages have been changed. Let's start the 3rd (and perhaps final) round of l10n.

@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 16, 2024 •
edited
Loading

Warnings found by git-po-helper in workflow #602:

------------------------------------------------------------------------------
INFO [po/bg.po@330e419]	5610 translated messages. 
------------------------------------------------------------------------------
WARNING [po/bg.po@330e419]	mismatched patterns: --dirstat=files,<...>,<...>,..., --dirstat=files,<...>,<...>... 
WARNING [po/bg.po@330e419]	>> msgid: synonym for --dirstat=files,<param1>,<param2>... 
WARNING [po/bg.po@330e419]	>> msgstr: псевдоним на „--dirstat=files,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“ 
WARNING [po/bg.po@330e419]                           
INFO checking commits: 1 passed.                  
------------------------------------------------------------------------------
INFO downloading pot file from https://github.com/git-l10n/pot-changes/raw/pot/master/po/git.pot

@alshopov
l10n: bg.po: Updated Bulgarian translation (5610t)
330e419 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
@jiangxin jiangxin merged commit ce2f6a0 into git-l10n:master Feb 18, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@alshopov @jiangxin