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.

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

l10n: bg.po: Updated Bulgarian translation (5652t) #769

Merged
merged 1 commit into from
Apr 29, 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 ([email protected]) 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.

For a single-commit pull request, please leave the pull request description
empty
: your commit message itself should describe your changes.

Please read the "guidelines for contributing" linked above!

Copy link

github-actions bot commented Apr 21, 2024

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

------------------------------------------------------------------------------
INFO [po/bg.po@d35a5cf]	5655 translated messages. 
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@d35a5cf]	1 new string(s) in 'po/git.pot', but not in your 'po/XX.po' 
ERROR [po/bg.po@d35a5cf]                           
ERROR [po/bg.po@d35a5cf]	  > po/git.pot:21588: this message is used but not defined in /tmp/3802109704--bg.po 
ERROR [po/bg.po@d35a5cf]                           
ERROR [po/bg.po@d35a5cf]	4 obsolete string(s) in your 'po/XX.po', which must be removed 
ERROR [po/bg.po@d35a5cf]                           
ERROR [po/bg.po@d35a5cf]	  > po/XX.po:1403: warning: this message is not used 
ERROR [po/bg.po@d35a5cf]	  > po/XX.po:19249: warning: this message is not used 
ERROR [po/bg.po@d35a5cf]	  > po/XX.po:19253: warning: this message is not used 
ERROR [po/bg.po@d35a5cf]	  > ...                   
ERROR [po/bg.po@d35a5cf]                           
ERROR [po/bg.po@d35a5cf]	You can download the latest "po/git.pot" file from: 
ERROR [po/bg.po@d35a5cf]                           
ERROR [po/bg.po@d35a5cf]		https://github.com/git-l10n/pot-changes/raw/pot/master/po/git.pot 
ERROR [po/bg.po@d35a5cf]                           
ERROR [po/bg.po@d35a5cf]	Please rebase your branch to the latest upstream branch, 
ERROR [po/bg.po@d35a5cf]	run "git-po-helper update po/XX.po" to update your po file, 
ERROR [po/bg.po@d35a5cf]	and translate the new strings in it. 
ERROR [po/bg.po@d35a5cf]                           

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

@alshopov
Copy link
Author

Still checking the mismatched patterns - these seem false positives
The 3 obsolete entries are from real messages that I intend to declare for translation

@jiangxin
Copy link
Member

jiangxin commented Apr 24, 2024

Still checking the mismatched patterns - these seem false positives

I will improve the helper to ignore such false positives. Thank you.

@jiangxin
Copy link
Member

I found some changes in your po file as below:

-msgid "helper %s does not support 'force'"
+msgid "helper %s does not support '--force'"
 msgstr "насрещната помощна програма „%s“ не поддържа опцията „--force“"

Before introducing such changes, there are false positives reported. In order to suppress such false positives, I made some changes in "git-po-helper" to replace arguments like "--force" to "force". See:

		/*
		 * In bg translations, add additional "--" characters before command option,
		 * but the original msgid does not have.
		 */
		{
			Pattern: "неправилен параметър към опцията „--update“",
			Replace: "bad value for update parameter",
		},
		{
			Pattern: "включва опцията „--bare“ за голо хранилище",
			Replace: "implies bare",
		},
		{
			Pattern: "„--hard“/„--mixed“/„--soft“",
			Replace: "--{hard,mixed,soft}",
		},
		{
			Pattern: "„%s“ към опцията „--ancestry-path",
			Replace: "ancestry-path argument %s",
		},
		{
			Pattern: "Неправилен режим за „--rebase-merges“: %s",
			Replace: "Unknown rebase-merges mode: %s",
		},
		{
			Pattern: "не поддържа опцията „--force“",
			Replace: "does not support 'force'",
		},
		{
			Pattern: "неправилна стойност за „--mirror“: %s",
			Replace: "unknown mirror argument: %s",
		},

But since you have contributed some fixups to upstream like:

commit 3a12749b50eb012b2828856fdf864fab67269cfd
Author: Alexander Shopov <[email protected]>
Date:   2024-02-16 11:15:34 +0100

    transport-helper.c: trivial fix of error message
    
    Mark --force as option rather than variable names
    
    Signed-off-by: Alexander Shopov <[email protected]>
    Signed-off-by: Junio C Hamano <[email protected]>

diff --git a/transport-helper.c b/transport-helper.c
index e34a8f47cf..7014b9ad70 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -1072,7 +1072,7 @@ static int push_refs_with_export(struct transport *transport,
        set_common_push_options(transport, data->name, flags);
        if (flags & TRANSPORT_PUSH_FORCE) {
                if (set_helper_option(transport, "force", "true") != 0)
-                       warning(_("helper %s does not support 'force'"), data->name);
+                       warning(_("helper %s does not support '--force'"), data->name);
        }
 
        helper = get_helper(transport);

, we need to remove the above dirty hack in git-po-helper.

@jiangxin
Copy link
Member

, we need to remove the above dirty hack in git-po-helper.

New dirty hacks on bg language in git-po-helper: git-l10n/git-po-helper@b0fff07

@jiangxin
Copy link
Member

We have new translatable messages from upstream v2.45.0-rc1, you can update your translations.

@jiangxin jiangxin merged commit 2cf6314 into git-l10n:master Apr 29, 2024
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants