diff --git a/po/documentation.de.po b/po/documentation.de.po index 8a52c80bcdc67e1820e3493d9bc7a773c748aba6..5f590cb3917e099d2b78dd9ec046d458ccd3f056 100644 --- a/po/documentation.de.po +++ b/po/documentation.de.po @@ -33348,10 +33348,9 @@ msgstr "COMMANDS" #. type: Labeled list #: en/git-notes.txt:56 en/git-worktree.txt:81 -#, fuzzy, no-wrap, priority:240 -#| msgid "--list" +#, ignore-same, no-wrap, priority:240 msgid "list" -msgstr "--list" +msgstr "list" #. type: Plain text #: en/git-notes.txt:61 @@ -33461,9 +33460,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:112 en/git-worktree.txt:105 -#, fuzzy, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "remove" -msgstr "--remove" +msgstr "remove" #. type: Plain text #: en/git-notes.txt:117 @@ -33473,10 +33472,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:118 en/git-worktree.txt:101 -#, fuzzy, no-wrap, priority:240 -#| msgid "'prune'" +#, ignore-same, no-wrap, priority:240 msgid "prune" -msgstr "'prune'" +msgstr "prune" #. type: Plain text #: en/git-notes.txt:120 @@ -55761,9 +55759,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:88 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "lock" -msgstr "" +msgstr "lock" #. type: Plain text #: en/git-worktree.txt:95 @@ -55773,10 +55771,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:96 -#, fuzzy, no-wrap, priority:240 -#| msgid "--move" +#, ignore-same, no-wrap, priority:240 msgid "move" -msgstr "--move" +msgstr "move" #. type: Plain text #: en/git-worktree.txt:100 @@ -55798,9 +55795,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:112 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "unlock" -msgstr "" +msgstr "unlock" #. type: Plain text #: en/git-worktree.txt:115 diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po index 636897de4c837049d52bba6fb5d835c80f1bc255..d8e4c91da0b3ebc26f2d9f2cf903283b3b900157 100644 --- a/po/documentation.es_MX.po +++ b/po/documentation.es_MX.po @@ -32627,9 +32627,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:56 en/git-worktree.txt:81 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "list" -msgstr "" +msgstr "list" #. type: Plain text #: en/git-notes.txt:61 @@ -32735,9 +32735,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:112 en/git-worktree.txt:105 -#, fuzzy, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "remove" -msgstr "--remove" +msgstr "remove" #. type: Plain text #: en/git-notes.txt:117 @@ -32747,9 +32747,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:118 en/git-worktree.txt:101 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "prune" -msgstr "" +msgstr "prune" #. type: Plain text #: en/git-notes.txt:120 @@ -54735,9 +54735,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:88 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "lock" -msgstr "" +msgstr "lock" #. type: Plain text #: en/git-worktree.txt:95 @@ -54747,9 +54747,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:96 -#, fuzzy, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "move" -msgstr "modo" +msgstr "move" #. type: Plain text #: en/git-worktree.txt:100 @@ -54771,9 +54771,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:112 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "unlock" -msgstr "" +msgstr "unlock" #. type: Plain text #: en/git-worktree.txt:115 diff --git a/po/documentation.fr.po b/po/documentation.fr.po index 4ce1a965dd72fd4c97466d0e86c0ec830f48728d..5fa969e19bb21a29cc86688954d4cd3ad7c332cc 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -32944,9 +32944,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:56 en/git-worktree.txt:81 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "list" -msgstr "" +msgstr "list" #. type: Plain text #: en/git-notes.txt:61 @@ -33052,9 +33052,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:112 en/git-worktree.txt:105 -#, fuzzy, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "remove" -msgstr "--remove" +msgstr "remove" #. type: Plain text #: en/git-notes.txt:117 @@ -33064,9 +33064,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:118 en/git-worktree.txt:101 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "prune" -msgstr "" +msgstr "prune" #. type: Plain text #: en/git-notes.txt:120 @@ -55341,9 +55341,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:88 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "lock" -msgstr "" +msgstr "lock" #. type: Plain text #: en/git-worktree.txt:95 @@ -55353,7 +55353,7 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:96 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "move" msgstr "move" @@ -55377,9 +55377,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:112 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "unlock" -msgstr "" +msgstr "unlock" #. type: Plain text #: en/git-worktree.txt:115 diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po index fe4e5935f210e2ef936e646fa18ad8965c0f651a..a00c18341807bcc602910ba58ac9ed321bf45b72 100644 --- a/po/documentation.nb_NO.po +++ b/po/documentation.nb_NO.po @@ -32579,9 +32579,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:56 en/git-worktree.txt:81 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "list" -msgstr "" +msgstr "list" #. type: Plain text #: en/git-notes.txt:61 @@ -32687,9 +32687,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:112 en/git-worktree.txt:105 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "remove" -msgstr "" +msgstr "remove" #. type: Plain text #: en/git-notes.txt:117 @@ -32699,9 +32699,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:118 en/git-worktree.txt:101 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "prune" -msgstr "" +msgstr "prune" #. type: Plain text #: en/git-notes.txt:120 @@ -54681,9 +54681,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:88 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "lock" -msgstr "" +msgstr "lock" #. type: Plain text #: en/git-worktree.txt:95 @@ -54693,9 +54693,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:96 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "move" -msgstr "" +msgstr "move" #. type: Plain text #: en/git-worktree.txt:100 @@ -54717,9 +54717,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:112 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "unlock" -msgstr "" +msgstr "unlock" #. type: Plain text #: en/git-worktree.txt:115 diff --git a/po/documentation.pot b/po/documentation.pot index 83baecd474624eca6e5f4924db71be3202c126d7..18ab5aab93ad0454f60d1cff0444699013ecf3c8 100644 --- a/po/documentation.pot +++ b/po/documentation.pot @@ -32578,9 +32578,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:56 en/git-worktree.txt:81 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "list" -msgstr "" +msgstr "list" #. type: Plain text #: en/git-notes.txt:61 @@ -32686,9 +32686,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:112 en/git-worktree.txt:105 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "remove" -msgstr "" +msgstr "remove" #. type: Plain text #: en/git-notes.txt:117 @@ -32698,9 +32698,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:118 en/git-worktree.txt:101 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "prune" -msgstr "" +msgstr "prune" #. type: Plain text #: en/git-notes.txt:120 @@ -54672,9 +54672,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:88 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "lock" -msgstr "" +msgstr "lock" #. type: Plain text #: en/git-worktree.txt:95 @@ -54684,9 +54684,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:96 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "move" -msgstr "" +msgstr "move" #. type: Plain text #: en/git-worktree.txt:100 @@ -54708,9 +54708,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:112 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "unlock" -msgstr "" +msgstr "unlock" #. type: Plain text #: en/git-worktree.txt:115 diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po index 64ed669c4782bdaf235219d635991955f872fea3..3da61213744de70cd5d4de5b3e1bdc749fb16a20 100644 --- a/po/documentation.pt_BR.po +++ b/po/documentation.pt_BR.po @@ -32950,9 +32950,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:56 en/git-worktree.txt:81 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "list" -msgstr "" +msgstr "list" #. type: Plain text #: en/git-notes.txt:61 @@ -33058,9 +33058,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:112 en/git-worktree.txt:105 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "remove" -msgstr "" +msgstr "remove" #. type: Plain text #: en/git-notes.txt:117 @@ -33070,9 +33070,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:118 en/git-worktree.txt:101 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "prune" -msgstr "" +msgstr "prune" #. type: Plain text #: en/git-notes.txt:120 @@ -55119,9 +55119,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:88 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "lock" -msgstr "" +msgstr "lock" #. type: Plain text #: en/git-worktree.txt:95 @@ -55131,9 +55131,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:96 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "move" -msgstr "" +msgstr "move" #. type: Plain text #: en/git-worktree.txt:100 @@ -55155,9 +55155,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:112 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "unlock" -msgstr "" +msgstr "unlock" #. type: Plain text #: en/git-worktree.txt:115 diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po index cd51b79e7f7aa574f5508966fdeccaf3554387a5..900f75fdf5316bb1a16f227d3a70ba1d65d5bc51 100644 --- a/po/documentation.pt_PT.po +++ b/po/documentation.pt_PT.po @@ -32577,9 +32577,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:56 en/git-worktree.txt:81 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "list" -msgstr "" +msgstr "list" #. type: Plain text #: en/git-notes.txt:61 @@ -32685,9 +32685,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:112 en/git-worktree.txt:105 -#, fuzzy, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "remove" -msgstr "--remove" +msgstr "remove" #. type: Plain text #: en/git-notes.txt:117 @@ -32697,9 +32697,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:118 en/git-worktree.txt:101 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "prune" -msgstr "" +msgstr "prune" #. type: Plain text #: en/git-notes.txt:120 @@ -54671,9 +54671,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:88 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "lock" -msgstr "" +msgstr "lock" #. type: Plain text #: en/git-worktree.txt:95 @@ -54683,9 +54683,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:96 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "move" -msgstr "" +msgstr "move" #. type: Plain text #: en/git-worktree.txt:100 @@ -54707,9 +54707,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:112 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "unlock" -msgstr "" +msgstr "unlock" #. type: Plain text #: en/git-worktree.txt:115 diff --git a/po/documentation.ru.po b/po/documentation.ru.po index 8c01469c825aa610e24d301ecf6afb384cc15eea..72496b00493a8950db77ed79adab9b1fb8c143f8 100644 --- a/po/documentation.ru.po +++ b/po/documentation.ru.po @@ -32592,9 +32592,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:56 en/git-worktree.txt:81 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "list" -msgstr "" +msgstr "list" #. type: Plain text #: en/git-notes.txt:61 @@ -32700,9 +32700,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:112 en/git-worktree.txt:105 -#, fuzzy, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "remove" -msgstr "--remove" +msgstr "remove" #. type: Plain text #: en/git-notes.txt:117 @@ -32712,9 +32712,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:118 en/git-worktree.txt:101 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "prune" -msgstr "" +msgstr "prune" #. type: Plain text #: en/git-notes.txt:120 @@ -54700,9 +54700,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:88 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "lock" -msgstr "" +msgstr "lock" #. type: Plain text #: en/git-worktree.txt:95 @@ -54712,9 +54712,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:96 -#, fuzzy, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "move" -msgstr "режим" +msgstr "move" #. type: Plain text #: en/git-worktree.txt:100 @@ -54736,9 +54736,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:112 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "unlock" -msgstr "" +msgstr "unlock" #. type: Plain text #: en/git-worktree.txt:115 diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po index aa40f5497157327c4765fabeb76bb05128df8710..734175250c8f9bfeb1f4e961b60decf1b5ee1464 100644 --- a/po/documentation.zh_HANT.po +++ b/po/documentation.zh_HANT.po @@ -31956,9 +31956,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:56 en/git-worktree.txt:81 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "list" -msgstr "" +msgstr "list" #. type: Plain text #: en/git-notes.txt:61 @@ -32064,9 +32064,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:112 en/git-worktree.txt:105 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "remove" -msgstr "" +msgstr "remove" #. type: Plain text #: en/git-notes.txt:117 @@ -32076,9 +32076,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:118 en/git-worktree.txt:101 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "prune" -msgstr "" +msgstr "prune" #. type: Plain text #: en/git-notes.txt:120 @@ -53378,9 +53378,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:88 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "lock" -msgstr "" +msgstr "lock" #. type: Plain text #: en/git-worktree.txt:95 @@ -53390,9 +53390,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:96 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "move" -msgstr "" +msgstr "move" #. type: Plain text #: en/git-worktree.txt:100 @@ -53414,9 +53414,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:112 -#, no-wrap, priority:240 +#, ignore-same, no-wrap, priority:240 msgid "unlock" -msgstr "" +msgstr "unlock" #. type: Plain text #: en/git-worktree.txt:115 diff --git a/scripts/pre-translate-po b/scripts/pre-translate-po index ac347c88e1b45956f5137a4e04df165f895febde..83fdf778b77b8af77e3b4f54993b0a61487594ee 100755 --- a/scripts/pre-translate-po +++ b/scripts/pre-translate-po @@ -8,7 +8,7 @@ def main (f, d=None): po = polib.pofile(f, wrapwidth=0) option_re = re.compile(r'-[-a-z0-9[\]]+') linkgit_re = re.compile(r'((linkgit:)?(git[-a-z0-9[\]]+|mail)(\[[157]\]|\([157]\))(,|;)?(\n| )?)+') - quoted_re = re.compile(r'(`[a-zA-Z-_]+`(, )?)+|\'(oneline|short|medium|full(er)?|email|raw|(un)?set|unspecified)\'|(user|transfer|submodule|stash|status|splitIndex|showbranch|sendemail|repack|remote|receive|push|merge(tool)?|mailinfo|log|interactive|instaweb|i18n|help|gui|gitweb|fastimport|format|fetch|diff(tool)?|credential|commit|column|core|branch|apply|color|git-p4)\.[a-zA-Z_.]+|araxis|bc3?|codecompare|deltawalker|guiffy|meld|diff(use|merge)|(exam|g?vim|t?k|open|xx)?diff[23]?|(ec?|p4|s|tortoise|win)merge|update|create|delete|verify|option|resolve|recursive|octopus|ours|subtree|theirs|patience|diff-algorithm=\[[a-z\|]+\]|ignore-(space-change|all-space|(cr|space)-at-eol)|(no-)?renormalize|no-renames|no|default|plain|blocks|(dimmed-)?zebra|allow-indentation-change|color|porcelain|none') + quoted_re = re.compile(r'(`[a-zA-Z-_]+`(, )?)+|\'(oneline|short|medium|full(er)?|email|raw|(un)?set|unspecified)\'|(user|transfer|submodule|stash|status|splitIndex|showbranch|sendemail|repack|remote|receive|push|merge(tool)?|mailinfo|log|interactive|instaweb|i18n|help|gui|gitweb|fastimport|format|fetch|diff(tool)?|credential|commit|column|core|branch|apply|color|git-p4)\.[a-zA-Z_.]+|araxis|bc3?|codecompare|deltawalker|guiffy|meld|diff(use|merge)|(exam|g?vim|t?k|open|xx)?diff[23]?|(ec?|p4|s|tortoise|win)merge|update|create|delete|verify|option|resolve|recursive|octopus|ours|subtree|theirs|patience|diff-algorithm=\[[a-z\|]+\]|ignore-(space-change|all-space|(cr|space)-at-eol)|(no-)?renormalize|no-renames|no|default|plain|blocks|(dimmed-)?zebra|allow-indentation-change|color|porcelain|none|list|(un)?lock|(re)?move|prune') env_var_re = re.compile(r'`?GIT_[A-Z_\d]+`?') if not d is None: po_file=polib.pofile(d)