From fd9332a19e951975b9b4a69885ea5c3bf9d8fa6f Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Fri, 5 Jan 2024 00:55:53 -0800 Subject: [PATCH] i18n: update translations for the upcoming release via "garden i18n" Signed-off-by: David Aguilar --- cola/i18n/cs.po | 2086 +++++++++++++++++++++++--------------------- cola/i18n/de.po | 2086 +++++++++++++++++++++++--------------------- cola/i18n/es.po | 2086 +++++++++++++++++++++++--------------------- cola/i18n/fr.po | 2086 +++++++++++++++++++++++--------------------- cola/i18n/git-cola.pot | 2076 +++++++++++++++++++++++--------------------- cola/i18n/hu.po | 2086 +++++++++++++++++++++++--------------------- cola/i18n/id_ID.po | 2086 +++++++++++++++++++++++--------------------- cola/i18n/it.po | 2084 +++++++++++++++++++++++--------------------- cola/i18n/ja.po | 2086 +++++++++++++++++++++++--------------------- cola/i18n/pl.po | 2263 +++++++++++++++++++++++++----------------------- cola/i18n/pt_BR.po | 2086 +++++++++++++++++++++++--------------------- cola/i18n/ru.po | 2086 +++++++++++++++++++++++--------------------- cola/i18n/sv.po | 2081 +++++++++++++++++++++++--------------------- cola/i18n/tr_TR.po | 2079 +++++++++++++++++++++++--------------------- cola/i18n/uk.po | 2086 +++++++++++++++++++++++--------------------- cola/i18n/zh_CN.po | 2086 +++++++++++++++++++++++--------------------- cola/i18n/zh_TW.po | 2086 +++++++++++++++++++++++--------------------- 17 files changed, 18942 insertions(+), 16673 deletions(-) diff --git a/cola/i18n/cs.po b/cola/i18n/cs.po index e8bcac81..2b1e6424 100644 --- a/cola/i18n/cs.po +++ b/cola/i18n/cs.po @@ -18,7 +18,7 @@ msgstr "" "X-Generator: Poedit 2.0.4\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: cola/widgets/patch.py:86 +#: cola/widgets/diff.py:1680 msgid "" "\n" "

\n" @@ -34,7 +34,7 @@ msgstr "" "

\n" " " -#: cola/widgets/about.py:455 +#: cola/widgets/about.py:438 #, python-format msgid "" "\n" @@ -87,7 +87,7 @@ msgstr "" "\n" " " -#: cola/widgets/about.py:180 +#: cola/widgets/about.py:182 #, python-format msgid "" "\n" @@ -116,7 +116,7 @@ msgstr "" " \n" " " -#: cola/widgets/about.py:387 +#: cola/widgets/about.py:370 #, python-format msgid "" "\n" @@ -131,7 +131,7 @@ msgstr "" "
\n" " " -#: cola/widgets/status.py:1310 +#: cola/widgets/status.py:1311 #, python-format msgid "" "\n" @@ -156,7 +156,7 @@ msgstr "" " %(basename)s = název souboru bez přípony\n" " %(ext)s = přípona souboru\n" -#: cola/sequenceeditor.py:700 +#: cola/sequenceeditor.py:695 msgid "" "\n" "Commands\n" @@ -195,7 +195,7 @@ msgid "" "ctrl+d = launch difftool\n" msgstr "" -#: cola/widgets/finder.py:65 +#: cola/widgets/finder.py:64 msgid "" "\n" "Keyboard Shortcuts\n" @@ -211,45 +211,71 @@ msgid "" "and the results.\n" msgstr "" -#: cola/widgets/dag.py:894 +#: cola/widgets/prefs.py:133 +msgid "" +"\n" +"This option determines how the supplied commit message should be\n" +"cleaned up before committing.\n" +"\n" +"The can be strip, whitespace, verbatim, scissors or default.\n" +"\n" +"strip\n" +" Strip leading and trailing empty lines, trailing whitespace,\n" +" commentary and collapse consecutive empty lines.\n" +"\n" +"whitespace\n" +" Same as strip except #commentary is not removed.\n" +"\n" +"verbatim\n" +" Do not change the message at all.\n" +"\n" +"scissors\n" +" Same as whitespace except that everything from (and including) the line\n" +" found below is truncated, if the message is to be edited.\n" +" \"#\" can be customized with core.commentChar.\n" +"\n" +" # ------------------------ >8 ------------------------" +msgstr "" + +#: cola/widgets/dag.py:960 msgid " - DAG" msgstr " – DAG" -#: cola/widgets/recent.py:54 +#: cola/widgets/recent.py:52 msgid " commits ago" msgstr " zápisů před" -#: cola/cmds.py:1197 +#: cola/cmds.py:1198 #, python-format msgid "\"%(branch)s\" has been deleted from \"%(remote)s\"." msgstr "„%(branch)s“ byla smazána z „%(remote)s“." -#: cola/widgets/createbranch.py:316 +#: cola/widgets/createbranch.py:314 #, python-format msgid "\"%(command)s\" returned exit status \"%(status)d\"" msgstr "„%(command)s“ vrátil návratový kód „%(status)d“" -#: cola/interaction.py:39 +#: cola/interaction.py:38 #, python-format msgid "\"%(command)s\" returned exit status %(status)d" msgstr "„%(command)s“ vrátil návratový kód %(status)d" -#: cola/guicmds.py:157 +#: cola/guicmds.py:156 #, python-format msgid "\"%s\" already exists" msgstr "„%s“ už existuje" -#: cola/widgets/clone.py:206 +#: cola/widgets/clone.py:204 #, python-format msgid "\"%s\" already exists, cola will create a new directory" msgstr "„%s“ už existuje, cola vytvoří novou složku" -#: cola/cmds.py:2349 +#: cola/cmds.py:2300 #, python-format msgid "\"%s\" requires a selected file." msgstr "„%s“ vyžaduje označený soubor." -#: cola/cmds.py:2087 +#: cola/cmds.py:2038 msgid "" "\"git rebase --update-refs\" automatically force-updates any\n" "branches that point to commits that are being rebased.\n" @@ -259,7 +285,11 @@ msgid "" "Using this feature is helpful for \"stacked\" branch workflows." msgstr "" -#: cola/sequenceeditor.py:321 +#: cola/models/stash.py:145 +msgid "\"git stash drop\" did not return a ref to rename." +msgstr "" + +#: cola/sequenceeditor.py:318 msgid "#" msgstr "č." @@ -268,37 +298,37 @@ msgstr "č." msgid "%(project)s: %(branch)s - Browse" msgstr "%(project)s: %(branch)s – procházet" -#: cola/widgets/dag.py:887 +#: cola/widgets/dag.py:953 #, python-format msgid "%(project)s: %(ref)s - DAG" msgstr "%(project)s: %(ref)s – DAG" -#: cola/models/browse.py:315 +#: cola/models/browse.py:314 #, python-format msgid "%d days ago" msgstr "Před %d dny" -#: cola/models/browse.py:314 +#: cola/models/browse.py:313 #, python-format msgid "%d hours ago" msgstr "Před %d hodinami" -#: cola/models/browse.py:307 cola/models/browse.py:311 +#: cola/models/browse.py:306 cola/models/browse.py:310 #, python-format msgid "%d minutes ago" msgstr "Před %d minutami" -#: cola/cmds.py:376 +#: cola/cmds.py:377 #, python-format msgid "%d patch(es) applied." msgstr "%d záplaty aplikovány." -#: cola/widgets/createbranch.py:281 +#: cola/widgets/createbranch.py:279 #, python-format msgid "%d skipped" msgstr "%d přeskočeno" -#: cola/cmds.py:2580 +#: cola/cmds.py:2522 #, python-format msgid "" "%s appears to contain merge conflicts.\n" @@ -311,36 +341,36 @@ msgstr "" "Tento soubor byste nejspíš měli přeskočit.\n" "Odložit ho i tak?" -#: cola/widgets/startup.py:263 +#: cola/widgets/startup.py:262 #, python-format msgid "%s could not be opened. Remove from bookmarks?" msgstr "" -#: cola/app.py:498 cola/widgets/bookmarks.py:482 +#: cola/app.py:501 cola/widgets/bookmarks.py:481 #, python-format msgid "%s is not a Git repository." msgstr "%s není Git repozitář." -#: cola/cmds.py:1015 +#: cola/cmds.py:1016 #, python-format msgid "%s will be removed from your bookmarks." msgstr "%s bude odstraněn ze záložek." -#: cola/cmds.py:1028 +#: cola/cmds.py:1029 #, python-format msgid "%s will be removed from your recent repositories." msgstr "%s bude odstraněn z nedávných repozitářů." -#: cola/cmds.py:1711 +#: cola/cmds.py:1663 #, python-format msgid "%s: No such file or directory." msgstr "%s: Žádný takový soubor nebo složka." -#: cola/widgets/main.py:734 +#: cola/widgets/main.py:747 msgid "&Edit" msgstr "&Upravit" -#: cola/widgets/main.py:676 +#: cola/widgets/main.py:689 msgid "&File" msgstr "&Soubor" @@ -348,124 +378,119 @@ msgstr "&Soubor" msgid "(Amending)" msgstr "(Pozměnit)" -#: cola/widgets/compare.py:36 +#: cola/widgets/compare.py:35 msgid "*** Branch Point ***" msgstr "" -#: cola/widgets/compare.py:37 +#: cola/widgets/compare.py:36 msgid "*** Sandbox ***" msgstr "*** pískoviště ***" -#: cola/widgets/diff.py:788 +#: cola/widgets/diff.py:816 msgid "100%" msgstr "100%" -#: cola/widgets/diff.py:789 +#: cola/widgets/diff.py:817 msgid "200%" msgstr "200%" -#: cola/widgets/diff.py:786 +#: cola/widgets/diff.py:814 msgid "25%" msgstr "25%" -#: cola/widgets/diff.py:790 +#: cola/widgets/diff.py:818 msgid "400%" msgstr "400%" -#: cola/widgets/diff.py:787 +#: cola/widgets/diff.py:815 msgid "50%" msgstr "50%" -#: cola/widgets/diff.py:791 +#: cola/widgets/diff.py:819 msgid "800%" msgstr "800%" -#: cola/widgets/finder.py:119 +#: cola/widgets/finder.py:118 msgid " ..." msgstr "…" -#: cola/cmds.py:1734 +#: cola/cmds.py:1686 msgid "" "A commit template has not been configured.\n" "Use \"git config\" to define \"commit.template\"\n" "so that it points to a commit template." msgstr "" -#: cola/cmds.py:1784 +#: cola/cmds.py:1735 #, python-format msgid "A hook must be provided at \"%s\"" msgstr "" -#: cola/widgets/stash.py:236 -#, python-format -msgid "A stash named \"%s\" already exists" -msgstr "Odklad s názvem \"%s\" již existuje" - -#: cola/widgets/cfgactions.py:82 cola/widgets/main.py:622 +#: cola/widgets/cfgactions.py:81 cola/widgets/main.py:635 msgid "Abort" msgstr "Zrušit" -#: cola/widgets/cfgactions.py:149 cola/widgets/cfgactions.py:155 +#: cola/widgets/cfgactions.py:148 cola/widgets/cfgactions.py:154 msgid "Abort Action" msgstr "Zrušit akci" -#: cola/cmds.py:132 +#: cola/cmds.py:131 msgid "Abort Applying Patch" msgstr "" -#: cola/cmds.py:126 +#: cola/cmds.py:125 msgid "Abort Applying Patch..." msgstr "" -#: cola/widgets/main.py:245 +#: cola/widgets/main.py:244 msgid "Abort Applying Patches..." msgstr "" -#: cola/cmds.py:162 +#: cola/cmds.py:161 msgid "Abort Cherry-Pick" msgstr "" -#: cola/cmds.py:156 cola/widgets/main.py:334 +#: cola/cmds.py:155 cola/widgets/main.py:329 msgid "Abort Cherry-Pick..." msgstr "" -#: cola/cmds.py:193 +#: cola/cmds.py:192 msgid "Abort Merge" msgstr "Zrušit sloučení" -#: cola/cmds.py:186 cola/widgets/main.py:368 +#: cola/cmds.py:185 cola/widgets/main.py:363 msgid "Abort Merge..." msgstr "Zrušit sloučení (merge)…" -#: cola/widgets/cfgactions.py:154 +#: cola/widgets/cfgactions.py:153 msgid "Abort the action?" msgstr "Zrušit akci?" -#: cola/widgets/main.py:250 +#: cola/widgets/main.py:245 msgid "Abort the current \"git am\" patch session" msgstr "" -#: cola/cmds.py:159 +#: cola/cmds.py:158 msgid "" "Aborting a cherry-pick can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:129 +#: cola/cmds.py:128 msgid "" "Aborting a patch can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:127 +#: cola/cmds.py:126 msgid "Aborting applying the current patch?" msgstr "" -#: cola/cmds.py:157 +#: cola/cmds.py:156 msgid "Aborting the current cherry-pick?" msgstr "" -#: cola/cmds.py:189 +#: cola/cmds.py:188 msgid "" "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." @@ -473,23 +498,23 @@ msgstr "" "Zrušení současného sloučení způsobí, že *VŠECHNY* nezapsané změny budou ztraceny.\n" "Obnovení nezapsaných změn není možné." -#: cola/cmds.py:187 +#: cola/cmds.py:186 msgid "Aborting the current merge?" msgstr "Zrušit stávající sloučení?" -#: cola/widgets/about.py:91 cola/widgets/main.py:517 +#: cola/widgets/about.py:89 cola/widgets/main.py:530 msgid "About" msgstr "O aplikaci" -#: cola/widgets/about.py:67 +#: cola/widgets/about.py:65 msgid "About git-cola" msgstr "O aplikaci git-cola" -#: cola/widgets/bookmarks.py:217 cola/widgets/startup.py:340 +#: cola/widgets/bookmarks.py:216 cola/widgets/startup.py:339 msgid "Accept" msgstr "Přijmout" -#: cola/sequenceeditor.py:159 +#: cola/sequenceeditor.py:157 msgid "" "Accept changes and rebase\n" "Shortcut: Ctrl+Enter" @@ -497,50 +522,50 @@ msgstr "" "Přijmout změny a přeskládat\n" "Klávesová zkratka: Ctrl+Enter" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Action Name" msgstr "Název akce" -#: cola/sequenceeditor.py:528 cola/widgets/bookmarks.py:321 -#: cola/widgets/branch.py:217 cola/widgets/browse.py:374 -#: cola/widgets/commitmsg.py:99 cola/widgets/dag.py:315 -#: cola/widgets/filelist.py:110 cola/widgets/main.py:95 -#: cola/widgets/main.py:757 cola/widgets/startup.py:436 +#: cola/sequenceeditor.py:524 cola/widgets/bookmarks.py:320 +#: cola/widgets/branch.py:221 cola/widgets/browse.py:375 +#: cola/widgets/commitmsg.py:105 cola/widgets/dag.py:314 +#: cola/widgets/filelist.py:107 cola/widgets/main.py:93 +#: cola/widgets/main.py:770 cola/widgets/startup.py:435 msgid "Actions" msgstr "Akce" -#: cola/widgets/commitmsg.py:101 +#: cola/widgets/commitmsg.py:107 msgid "Actions..." msgstr "Akce…" -#: cola/widgets/bookmarks.py:71 cola/widgets/gitignore.py:64 -#: cola/widgets/patch.py:103 cola/widgets/patch.py:117 -#: cola/widgets/status.py:1381 +#: cola/widgets/bookmarks.py:70 cola/widgets/diff.py:1697 +#: cola/widgets/diff.py:1711 cola/widgets/gitignore.py:63 +#: cola/widgets/status.py:1382 msgid "Add" msgstr "Přidat" -#: cola/widgets/bookmarks.py:470 +#: cola/widgets/bookmarks.py:469 msgid "Add Favorite" msgstr "Přidat oblíbený" -#: cola/widgets/editremotes.py:374 +#: cola/widgets/editremotes.py:373 msgid "Add Remote" msgstr "Přidat vzdálený" -#: cola/widgets/toolbar.py:315 +#: cola/widgets/toolbar.py:320 msgid "Add Separator" msgstr "Přidat oddělovač" -#: cola/cmds.py:3030 cola/widgets/submodules.py:42 -#: cola/widgets/submodules.py:111 +#: cola/cmds.py:2976 cola/widgets/submodules.py:41 +#: cola/widgets/submodules.py:110 msgid "Add Submodule" msgstr "" -#: cola/cmds.py:3027 cola/widgets/main.py:381 +#: cola/cmds.py:2973 cola/widgets/main.py:376 msgid "Add Submodule..." msgstr "" -#: cola/widgets/editremotes.py:62 +#: cola/widgets/editremotes.py:61 msgid "" "Add and remove remote repositories using the \n" "Add(+) and Delete(-) buttons on the left-hand side.\n" @@ -554,98 +579,98 @@ msgstr "" "Vzdálené mohou být přejmenovány tak, že se jeden vybere\n" "ze seznamu a stiskne se \"enter\", nebo dvojklikem." -#: cola/widgets/editremotes.py:81 +#: cola/widgets/editremotes.py:80 msgid "Add new remote git repository" msgstr "Přidat nový vzdálený git repozitář" -#: cola/widgets/patch.py:103 +#: cola/widgets/diff.py:1697 msgid "Add patches (+)" msgstr "Přidat záplaty (+)" -#: cola/widgets/editremotes.py:433 +#: cola/widgets/editremotes.py:431 msgid "Add remote" msgstr "Přidat vzdálený" -#: cola/cmds.py:3028 +#: cola/cmds.py:2974 msgid "Add this submodule?" msgstr "" -#: cola/widgets/gitignore.py:54 +#: cola/widgets/gitignore.py:53 msgid "Add to .gitignore" msgstr "Přidat do .gitignore" -#: cola/widgets/status.py:286 +#: cola/widgets/status.py:287 msgid "Add to Git Annex" msgstr "Přidat do Git Annex" -#: cola/widgets/status.py:290 +#: cola/widgets/status.py:291 msgid "Add to Git LFS" msgstr "Přidat do Git LFS" -#: cola/widgets/gitignore.py:28 +#: cola/widgets/gitignore.py:27 msgid "Add to exclusions" msgstr "" -#: cola/widgets/gitignore.py:55 +#: cola/widgets/gitignore.py:54 msgid "Add to local .git/info/exclude" msgstr "" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Additions" msgstr "Přidáno" -#: cola/widgets/archive.py:134 +#: cola/widgets/archive.py:132 msgid "Advanced" msgstr "Pokročilé" -#: cola/widgets/main.py:522 +#: cola/widgets/main.py:535 msgid "Against Commit... (Diff Mode)" msgstr "" -#: cola/models/browse.py:33 +#: cola/models/browse.py:32 msgid "Age" msgstr "Stáří" -#: cola/widgets/prefs.py:403 +#: cola/widgets/prefs.py:441 msgid "All Repositories" msgstr "Všechny repozitáře" -#: cola/cmds.py:3110 +#: cola/cmds.py:3056 #, python-format msgid "" "All submodules will be updated using\n" "\"%s\"" msgstr "" -#: cola/widgets/remote.py:195 +#: cola/widgets/remote.py:199 msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care" msgstr "Povolit aktualizace Ne rychle vpřed. Použití „vynutit“ může způsobit, že vzdálený repositář ztratí zápisy; používejte obezřetně" -#: cola/widgets/merge.py:61 +#: cola/widgets/merge.py:59 msgid "Always create a merge commit when enabled, even when the merge is a fast-forward update" msgstr "Vždy vytvořit zápis sloučení, je-li povoleno, a to i v případě, že sloučení je aktualizace Rychle vpřed" -#: cola/cmds.py:221 +#: cola/cmds.py:220 msgid "Amend" msgstr "Pozměnit" -#: cola/widgets/commitmsg.py:463 +#: cola/widgets/commitmsg.py:471 msgid "Amend Commit" msgstr "Pozměnit zápis" -#: cola/widgets/commitmsg.py:110 cola/widgets/main.py:194 +#: cola/widgets/commitmsg.py:116 cola/widgets/main.py:193 msgid "Amend Last Commit" msgstr "Pozměnit poslední zápis" -#: cola/widgets/commitmsg.py:462 +#: cola/widgets/commitmsg.py:470 msgid "Amend the published commit?" msgstr "Pozměnit uveřejněný zápis?" -#: cola/widgets/main.py:1157 +#: cola/widgets/main.py:1170 msgid "Amending" msgstr "Pozměnit" -#: cola/widgets/cfgactions.py:151 +#: cola/widgets/cfgactions.py:150 msgid "" "An action is still running.\n" "Terminating it could result in data loss." @@ -653,7 +678,7 @@ msgstr "" "Akce stále probíhá.\n" "Její ukončení by mohlo vést ke ztrátě dat." -#: cola/cmds.py:2804 +#: cola/cmds.py:2750 msgid "" "An unsigned, lightweight tag will be created instead.\n" "Create an unsigned tag?" @@ -661,56 +686,56 @@ msgstr "" "Místo toho bude vytvořena nepodepsaná prostá značka.\n" "Vytvořit nepodepsanou značku?" -#: cola/widgets/prefs.py:406 +#: cola/widgets/prefs.py:444 msgid "Appearance" msgstr "" -#: cola/widgets/diff.py:1230 +#: cola/widgets/diff.py:1304 msgid "Append Patch" msgstr "" -#: cola/widgets/diff.py:1299 +#: cola/widgets/diff.py:1373 msgid "Append Patch..." msgstr "" -#: cola/widgets/patch.py:112 cola/widgets/stash.py:48 cola/widgets/stash.py:107 -#: cola/widgets/toolbar.py:323 +#: cola/widgets/diff.py:1706 cola/widgets/stash.py:50 cola/widgets/stash.py:110 +#: cola/widgets/toolbar.py:328 msgid "Apply" msgstr "Aplikovat" -#: cola/widgets/patch.py:75 +#: cola/widgets/diff.py:1669 msgid "Apply Patches" msgstr "Aplikovat záplaty" -#: cola/widgets/main.py:239 +#: cola/widgets/main.py:238 msgid "Apply Patches..." msgstr "Aplikovat záplaty…" -#: cola/widgets/stash.py:64 +#: cola/widgets/stash.py:66 msgid "Apply and drop the selected stash (git stash pop)" msgstr "Aplikovat a zahodit vybraný odklad (git stash pop)" -#: cola/widgets/stash.py:48 +#: cola/widgets/stash.py:50 msgid "Apply the selected stash" msgstr "Aplikovat vybraný odklad" -#: cola/widgets/main.py:1167 +#: cola/widgets/main.py:1180 msgid "Applying Patch" msgstr "" -#: cola/widgets/cfgactions.py:207 +#: cola/widgets/cfgactions.py:205 msgid "Arguments" msgstr "Argumenty" -#: cola/qtutils.py:850 +#: cola/qtutils.py:887 msgid "Attach" msgstr "Připnout" -#: cola/models/browse.py:33 cola/models/browse.py:72 cola/widgets/dag.py:506 +#: cola/models/browse.py:32 cola/models/browse.py:71 cola/widgets/dag.py:572 msgid "Author" msgstr "Autor" -#: cola/widgets/about.py:93 +#: cola/widgets/about.py:91 msgid "Authors" msgstr "Autoři" @@ -718,43 +743,43 @@ msgstr "Autoři" msgid "Auto" msgstr "" -#: cola/widgets/commitmsg.py:137 cola/widgets/prefs.py:259 +#: cola/widgets/commitmsg.py:143 cola/widgets/prefs.py:280 msgid "Auto-Wrap Lines" msgstr "Automaticky zalamovat řádky" -#: cola/widgets/prefs.py:184 +#: cola/widgets/prefs.py:206 msgid "Autocomplete Paths" msgstr "" -#: cola/widgets/prefs.py:176 +#: cola/widgets/prefs.py:198 msgid "Automatically Load Commit Message Template" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Basic Regexp" msgstr "Základní regul. výraz" -#: cola/widgets/prefs.py:255 +#: cola/widgets/prefs.py:276 msgid "Blame Viewer" msgstr "" -#: cola/widgets/browse.py:205 +#: cola/widgets/browse.py:206 msgid "Blame selected paths" msgstr "" -#: cola/cmds.py:545 cola/widgets/status.py:282 +#: cola/cmds.py:546 cola/widgets/status.py:283 msgid "Blame..." msgstr "Blame…" -#: cola/widgets/prefs.py:347 +#: cola/widgets/prefs.py:367 msgid "Bold on dark headers instead of italic" msgstr "Hlavičky tučným písmem na tmavém pozadí místo kurzívy" -#: cola/widgets/main.py:806 cola/widgets/submodules.py:119 +#: cola/widgets/main.py:819 cola/widgets/submodules.py:118 msgid "Branch" msgstr "Větev" -#: cola/widgets/remote.py:600 +#: cola/widgets/remote.py:635 #, python-format msgid "" "Branch \"%(branch)s\" does not exist in \"%(remote)s\".\n" @@ -763,84 +788,84 @@ msgstr "" "Větev \"%(branch)s\" neexistuje v \"%(remote)s\".\n" "Bude uveřejněna nová vzdálená větev." -#: cola/widgets/createbranch.py:258 +#: cola/widgets/createbranch.py:256 #, python-format msgid "Branch \"%s\" already exists." msgstr "Větev „%s“ už existuje." -#: cola/widgets/compare.py:44 +#: cola/widgets/compare.py:43 msgid "Branch Diff Viewer" msgstr "Diff prohlížeč větví" -#: cola/widgets/createbranch.py:259 cola/widgets/createbranch.py:271 +#: cola/widgets/createbranch.py:257 cola/widgets/createbranch.py:269 msgid "Branch Exists" msgstr "Větev existuje" -#: cola/widgets/createbranch.py:98 +#: cola/widgets/createbranch.py:96 msgid "Branch Name" msgstr "Název větve" -#: cola/widgets/submodules.py:89 +#: cola/widgets/submodules.py:88 msgid "Branch name" msgstr "" -#: cola/widgets/browse.py:89 cola/widgets/main.py:1097 +#: cola/widgets/browse.py:89 cola/widgets/main.py:1110 #, python-format msgid "Branch: %s" msgstr "Větev: %s" -#: cola/widgets/branch.py:85 cola/widgets/main.py:131 +#: cola/widgets/branch.py:87 cola/widgets/main.py:129 msgid "Branches" msgstr "Větve" -#: cola/widgets/main.py:538 +#: cola/widgets/main.py:551 msgid "Branches..." msgstr "Větve…" -#: cola/widgets/about.py:414 cola/widgets/about.py:417 -#: cola/widgets/about.py:437 +#: cola/widgets/about.py:397 cola/widgets/about.py:400 +#: cola/widgets/about.py:420 msgid "Brazilian translation" msgstr "Brazilský překlad" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse" msgstr "Procházet" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse Commits..." msgstr "Procházet zápisy…" -#: cola/widgets/main.py:499 +#: cola/widgets/main.py:512 msgid "Browse Current Branch..." msgstr "Procházet stávající větev…" -#: cola/widgets/main.py:505 +#: cola/widgets/main.py:518 msgid "Browse Other Branch..." msgstr "Procházet jinou větev…" -#: cola/widgets/editremotes.py:437 cola/widgets/search.py:46 -#: cola/widgets/startup.py:65 cola/widgets/startup.py:285 +#: cola/widgets/editremotes.py:435 cola/widgets/search.py:45 +#: cola/widgets/startup.py:64 cola/widgets/startup.py:284 msgid "Browse..." msgstr "Procházet…" -#: cola/widgets/main.py:89 +#: cola/widgets/main.py:87 msgid "Browser" msgstr "Prohlížeč" -#: cola/widgets/browse.py:589 +#: cola/widgets/browse.py:590 #, python-format msgid "Browsing %s" msgstr "Prochází se %s" -#: cola/widgets/commitmsg.py:118 +#: cola/widgets/commitmsg.py:124 msgid "Bypass Commit Hooks" msgstr "Přemostit háčky nahrání" -#: cola/sequenceeditor.py:175 cola/widgets/standard.py:991 +#: cola/sequenceeditor.py:173 cola/widgets/standard.py:1058 msgid "Cancel" msgstr "Storno" -#: cola/sequenceeditor.py:176 +#: cola/sequenceeditor.py:174 msgid "" "Cancel rebase\n" "Shortcut: Ctrl+Q" @@ -848,188 +873,200 @@ msgstr "" "Zrušit přeskládání\n" "Zkratka: Ctrl+Q" -#: cola/cmds.py:254 +#: cola/cmds.py:253 msgid "Cannot Amend" msgstr "Není možné amend" -#: cola/cmds.py:560 +#: cola/cmds.py:561 #, python-format msgid "Cannot exec \"%s\": please configure a blame viewer" msgstr "Nedaří se spustit „%s" -#: cola/cmds.py:3146 +#: cola/cmds.py:3092 #, python-format msgid "Cannot exec \"%s\": please configure a history browser" msgstr "Nelze spustit \"%s\": prosím nakonfigurujte prohlížeč historie" -#: cola/cmds.py:1583 +#: cola/cmds.py:1571 #, python-format msgid "Cannot exec \"%s\": please configure your editor" msgstr "Nelze spustit \"%s\": prosím nakonfigurujte editor" -#: cola/models/browse.py:336 +#: cola/models/browse.py:335 msgid "Changed Upstream" msgstr "Změněno v upstreamu" -#: cola/widgets/prefs.py:186 +#: cola/widgets/prefs.py:208 msgid "Check Published Commits when Amending" msgstr "" -#: cola/widgets/commitmsg.py:130 +#: cola/widgets/commitmsg.py:136 msgid "Check Spelling" msgstr "Kontrolovat pravopis" -#: cola/widgets/prefs.py:265 +#: cola/widgets/prefs.py:286 msgid "Check spelling" msgstr "Kontrolovat pravopis" -#: cola/widgets/prefs.py:163 +#: cola/widgets/prefs.py:186 msgid "Check whether a commit has been published when amending" msgstr "" -#: cola/guicmds.py:62 cola/widgets/branch.py:222 +#: cola/guicmds.py:61 cola/widgets/branch.py:233 msgid "Checkout" msgstr "Přepnout" -#: cola/widgets/createbranch.py:130 +#: cola/widgets/createbranch.py:128 msgid "Checkout After Creation" msgstr "Přepnout po vytvoření" -#: cola/guicmds.py:62 cola/widgets/dag.py:410 +#: cola/guicmds.py:61 cola/widgets/dag.py:409 msgid "Checkout Branch" msgstr "Přepnout větev" -#: cola/widgets/dag.py:414 +#: cola/widgets/dag.py:413 msgid "Checkout Detached HEAD" msgstr "Přepnout odpojené hlavní" -#: cola/cmds.py:480 cola/cmds.py:518 +#: cola/cmds.py:481 cola/cmds.py:519 msgid "Checkout Files" msgstr "" -#: cola/widgets/branch.py:226 +#: cola/widgets/branch.py:237 msgid "Checkout as new branch" msgstr "Přepnout jako novou větev" -#: cola/cmds.py:507 +#: cola/cmds.py:508 msgid "Checkout files from our branch (HEAD)" msgstr "" -#: cola/cmds.py:511 +#: cola/cmds.py:512 msgid "Checkout files from our branch?" msgstr "" -#: cola/cmds.py:469 +#: cola/cmds.py:470 msgid "Checkout files from their branch (MERGE_HEAD)" msgstr "" -#: cola/cmds.py:473 +#: cola/cmds.py:474 msgid "Checkout files from their branch?" msgstr "" -#: cola/widgets/main.py:576 +#: cola/widgets/main.py:589 msgid "Checkout..." msgstr "Přepnout…" -#: cola/widgets/dag.py:387 cola/widgets/search.py:79 +#: cola/widgets/dag.py:386 cola/widgets/search.py:78 msgid "Cherry Pick" msgstr "Sloučit selektivně" -#: cola/guicmds.py:73 +#: cola/guicmds.py:72 msgid "Cherry-Pick Commit" msgstr "Sloučit konkrétní nahrání" -#: cola/widgets/main.py:328 +#: cola/widgets/main.py:323 msgid "Cherry-Pick..." msgstr "Selektivně sloučit…" -#: cola/cmds.py:584 +#: cola/cmds.py:585 msgid "Cherry-pick failed" msgstr "" -#: cola/widgets/main.py:1161 +#: cola/widgets/main.py:1174 msgid "Cherry-picking" msgstr "" -#: cola/widgets/diff.py:1247 +#: cola/widgets/diff.py:1321 msgid "Choose Patch..." msgstr "" -#: cola/widgets/search.py:319 +#: cola/widgets/search.py:318 msgid "Choose Paths" msgstr "Zvolit umístění" -#: cola/widgets/grep.py:116 +#: cola/widgets/grep.py:114 msgid "Choose the \"git grep\" regular expression mode" msgstr "Zvolte režim regulárního výrazu „git grep“" -#: cola/widgets/bookmarks.py:229 cola/widgets/startup.py:352 +#: cola/widgets/bookmarks.py:228 cola/widgets/startup.py:351 msgid "Clear Default Repository" msgstr "Zrušit výchozí repozitář" -#: cola/widgets/commitmsg.py:305 +#: cola/widgets/commitmsg.py:313 msgid "Clear commit message" msgstr "Vyčistit zprává nahrání" -#: cola/widgets/commitmsg.py:302 +#: cola/widgets/commitmsg.py:310 msgid "Clear commit message?" msgstr "Vyčistit zprávu nahrání?" -#: cola/widgets/commitmsg.py:62 +#: cola/widgets/commitmsg.py:63 msgid "Clear..." msgstr "Vyčístit…" -#: cola/widgets/clone.py:126 +#: cola/widgets/clone.py:124 msgid "Clone" msgstr "Klonovat" -#: cola/widgets/clone.py:62 cola/widgets/clone.py:104 +#: cola/widgets/clone.py:61 cola/widgets/clone.py:102 msgid "Clone Repository" msgstr "Klonovat repozitář" -#: cola/widgets/main.py:465 cola/widgets/startup.py:58 +#: cola/widgets/main.py:478 cola/widgets/startup.py:57 msgid "Clone..." msgstr "Klonovat…" -#: cola/widgets/clone.py:62 +#: cola/widgets/clone.py:61 #, python-format msgid "Cloning repository at %s" msgstr "Klonuje se repozitář na %s" -#: cola/qtutils.py:757 cola/qtutils.py:807 cola/widgets/about.py:508 -#: cola/widgets/remote.py:328 cola/widgets/text.py:1094 +#: cola/qtutils.py:788 cola/qtutils.py:838 cola/widgets/about.py:491 +#: cola/widgets/remote.py:362 cola/widgets/text.py:1090 msgid "Close" msgstr "Zavřít" -#: cola/widgets/text.py:402 +#: cola/widgets/remote.py:222 +msgid "Close dialog when completed" +msgstr "" + +#: cola/widgets/remote.py:221 +msgid "Close on completion" +msgstr "" + +#: cola/widgets/text.py:399 msgid "Close the find bar" msgstr "" -#: cola/qtutils.py:623 +#: cola/qtutils.py:651 msgid "Close..." msgstr "Zavřít…" -#: cola/widgets/recent.py:71 +#: cola/widgets/recent.py:69 msgid "Collapse all" msgstr "Sbalit vše" -#: cola/sequenceeditor.py:323 +#: cola/sequenceeditor.py:320 msgid "Command" msgstr "Příkaz" -#: cola/widgets/main.py:163 cola/widgets/merge.py:74 +#: cola/widgets/main.py:161 cola/widgets/merge.py:72 msgid "Commit" msgstr "Zapsat" -#: cola/cmds.py:837 +#: cola/widgets/prefs.py:192 +msgid "Commit Message Cleanup" +msgstr "" + +#: cola/widgets/commitmsg.py:495 msgid "Commit failed" msgstr "Zapsání se nezdařilo" -#: cola/widgets/commitmsg.py:61 +#: cola/widgets/commitmsg.py:62 msgid "Commit staged changes" msgstr "Zapsat připravené změny" -#: cola/widgets/commitmsg.py:93 +#: cola/widgets/commitmsg.py:94 msgid "" "Commit staged changes\n" "Shortcut: Ctrl+Enter" @@ -1037,361 +1074,365 @@ msgstr "" "Zapsat (commit) připravené změny\n" "Klávesová zkratka: Ctrl+Enter" -#: cola/widgets/commitmsg.py:564 +#: cola/widgets/commitmsg.py:590 msgid "Commit summary" msgstr "Souhrn zápisu" -#: cola/widgets/main.py:259 +#: cola/widgets/main.py:253 msgid "Commit the current state and continue applying patches" msgstr "" -#: cola/widgets/merge.py:70 +#: cola/widgets/merge.py:68 msgid "Commit the merge if there are no conflicts. Uncheck to leave the merge uncommitted" msgstr "Zapsat sloučení, pokud nejsou žádné konflikty. Je-li odškrtnuto, sloučení zůstane nezapsáno" -#: cola/widgets/commitmsg.py:58 cola/widgets/commitmsg.py:95 -#: cola/widgets/main.py:778 cola/widgets/main.py:779 +#: cola/widgets/commitmsg.py:59 cola/widgets/commitmsg.py:96 +#: cola/widgets/main.py:791 cola/widgets/main.py:792 msgid "Commit@@verb" msgstr "Zapsat" -#: cola/difftool.py:78 cola/widgets/compare.py:70 +#: cola/widgets/dag.py:487 +msgid "Commits authored by me" +msgstr "" + +#: cola/difftool.py:97 cola/widgets/compare.py:69 msgid "Compare" msgstr "Porovnat" -#: cola/difftool.py:83 +#: cola/difftool.py:102 msgid "Compare All" msgstr "Porovnat vše" -#: cola/widgets/toolbar.py:269 cola/widgets/toolbar.py:306 +#: cola/widgets/toolbar.py:274 cola/widgets/toolbar.py:311 msgid "Configure Toolbar" msgstr "Upravit nástrojovou lištu" -#: cola/widgets/remote.py:214 +#: cola/widgets/remote.py:218 msgid "Configure the remote branch as the the new upstream" msgstr "Nastavit vzdálenou větev jako nový upstream" -#: cola/widgets/main.py:170 +#: cola/widgets/main.py:168 msgid "Console" msgstr "Konzole" -#: cola/interaction.py:111 cola/widgets/main.py:610 +#: cola/interaction.py:109 cola/widgets/main.py:623 msgid "Continue" msgstr "Pokračovat" -#: cola/widgets/main.py:255 +#: cola/widgets/main.py:252 msgid "Continue Applying Patches" msgstr "" -#: cola/widgets/bookmarks.py:248 cola/widgets/main.py:742 -#: cola/widgets/startup.py:371 +#: cola/widgets/bookmarks.py:247 cola/widgets/main.py:755 +#: cola/widgets/startup.py:370 msgid "Copy" msgstr "Kopírovat" -#: cola/widgets/status.py:268 +#: cola/widgets/status.py:269 msgid "Copy Basename to Clipboard" msgstr "Kopírovat název souboru do schránky" -#: cola/widgets/diff.py:208 +#: cola/widgets/diff.py:209 msgid "Copy Diff" msgstr "" -#: cola/widgets/status.py:745 +#: cola/widgets/status.py:746 msgid "Copy Leading Path to Clipboard" msgstr "Zkopírovat popis umístění do schránky" -#: cola/widgets/status.py:251 +#: cola/widgets/status.py:252 msgid "Copy Path to Clipboard" msgstr "Zkopírovat popis umístění do schránky" -#: cola/widgets/status.py:259 +#: cola/widgets/status.py:260 msgid "Copy Relative Path to Clipboard" msgstr "Zkopírovat relativní popis umístění do schránky" -#: cola/sequenceeditor.py:334 cola/widgets/dag.py:474 +#: cola/sequenceeditor.py:330 cola/widgets/dag.py:473 msgid "Copy SHA-1" msgstr "Kopírovat SHA-1" -#: cola/widgets/status.py:737 +#: cola/widgets/status.py:738 msgid "Copy..." msgstr "Kopírovat…" -#: cola/app.py:490 +#: cola/app.py:493 #, python-format msgid "Could not open %s." msgstr "" -#: cola/widgets/clone.py:191 cola/widgets/clone.py:193 +#: cola/widgets/clone.py:189 cola/widgets/clone.py:191 #, python-format msgid "Could not parse Git URL: \"%s\"" msgstr "Nedaří se zpracovat Git URL: „%s“" -#: cola/app.py:500 +#: cola/app.py:503 msgid "Create" msgstr "" -#: cola/widgets/createbranch.py:86 cola/widgets/createbranch.py:135 -#: cola/widgets/createbranch.py:301 cola/widgets/dag.py:369 +#: cola/widgets/createbranch.py:84 cola/widgets/createbranch.py:133 +#: cola/widgets/createbranch.py:299 cola/widgets/dag.py:368 msgid "Create Branch" msgstr "Vytvořit větev" -#: cola/widgets/dag.py:373 +#: cola/widgets/dag.py:372 msgid "Create Patch" msgstr "Vytvořit záplatu" -#: cola/widgets/remote.py:606 +#: cola/widgets/remote.py:641 msgid "Create Remote Branch" msgstr "Vytvořit vzdálenou větev" -#: cola/widgets/commitmsg.py:124 cola/widgets/merge.py:78 +#: cola/widgets/commitmsg.py:130 cola/widgets/merge.py:76 msgid "Create Signed Commit" msgstr "Vytvořit podepsaný zápis" -#: cola/widgets/createtag.py:55 cola/widgets/createtag.py:91 -#: cola/widgets/dag.py:377 +#: cola/widgets/createtag.py:53 cola/widgets/createtag.py:89 +#: cola/widgets/dag.py:376 msgid "Create Tag" msgstr "Vytvořit štítek" -#: cola/widgets/main.py:544 +#: cola/widgets/main.py:557 msgid "Create Tag..." msgstr "Vytvořit štítek…" -#: cola/cmds.py:2807 +#: cola/cmds.py:2753 msgid "Create Unsigned Tag" msgstr "Vytvořit nepodepsanou značku" -#: cola/widgets/remote.py:188 +#: cola/widgets/remote.py:192 msgid "Create a merge commit even when the merge resolves as a fast-forward" msgstr "Vytvořit zápis sloučení i v případě, že je sloučení vyřešeno jako Rychle vpřed" -#: cola/widgets/remote.py:605 +#: cola/widgets/remote.py:640 msgid "Create a new remote branch?" msgstr "Vytvořit novou vzdálenou větev?" -#: cola/app.py:499 +#: cola/app.py:502 msgid "Create a new repository at that location?" msgstr "" -#: cola/widgets/submodules.py:100 +#: cola/widgets/submodules.py:99 msgid "Create a shallow clone with history truncated to the specified number of revisions. 0 performs a full clone." msgstr "" -#: cola/widgets/main.py:551 +#: cola/widgets/main.py:564 msgid "Create..." msgstr "Vytvořit…" -#: cola/cmds.py:2843 +#: cola/cmds.py:2789 #, python-format msgid "Created a new tag named \"%s\"" msgstr "Vytvořena nová značka názvaná „%s“" -#: cola/widgets/prefs.py:266 +#: cola/widgets/prefs.py:287 msgid "Ctrl+MouseWheel to Zoom" msgstr "" -#: cola/widgets/prefs.py:404 +#: cola/widgets/prefs.py:442 msgid "Current Repository" msgstr "Stávající repozitář" -#: cola/widgets/status.py:1371 +#: cola/widgets/status.py:1372 msgid "Custom Copy Actions" msgstr "Vlastní akce kopírování" -#: cola/widgets/status.py:273 +#: cola/widgets/status.py:274 msgid "Customize..." msgstr "Přizpůsobit…" -#: cola/widgets/main.py:740 +#: cola/widgets/main.py:753 msgid "Cut" msgstr "Vyjmout" -#: cola/widgets/about.py:411 cola/widgets/about.py:442 +#: cola/widgets/about.py:394 cola/widgets/about.py:425 msgid "Czech translation" msgstr "Český překlad" -#: cola/widgets/main.py:592 +#: cola/widgets/main.py:605 msgid "DAG..." msgstr "DAG…" -#: cola/icons.py:55 +#: cola/icons.py:54 msgid "Dark Theme" msgstr "" -#: cola/widgets/dag.py:506 +#: cola/widgets/dag.py:572 msgid "Date, Time" msgstr "Datum, čas" -#: cola/icons.py:54 cola/themes.py:637 +#: cola/icons.py:53 cola/themes.py:643 msgid "Default" msgstr "" -#: cola/widgets/prefs.py:126 +#: cola/widgets/prefs.py:124 msgid "" "Default directory when exporting patches.\n" "Relative paths are relative to the current repository.\n" "Absolute path are used as-is." msgstr "" -#: cola/cmds.py:925 cola/guicmds.py:26 cola/guicmds.py:35 -#: cola/widgets/bookmarks.py:75 cola/widgets/bookmarks.py:251 -#: cola/widgets/main.py:746 cola/widgets/startup.py:373 +#: cola/cmds.py:923 cola/guicmds.py:25 cola/guicmds.py:34 +#: cola/widgets/bookmarks.py:74 cola/widgets/bookmarks.py:250 +#: cola/widgets/main.py:759 cola/widgets/startup.py:372 msgid "Delete" msgstr "Odstranit" -#: cola/cmds.py:1088 +#: cola/cmds.py:1089 #, python-format msgid "Delete %d file(s)?" msgstr "Smazat %d soubory?" -#: cola/cmds.py:1016 +#: cola/cmds.py:1017 msgid "Delete Bookmark" msgstr "Odstranit záložku" -#: cola/cmds.py:1014 +#: cola/cmds.py:1015 msgid "Delete Bookmark?" msgstr "Odstranit záložku?" -#: cola/cmds.py:1114 cola/cmds.py:1117 cola/guicmds.py:26 -#: cola/widgets/branch.py:268 +#: cola/cmds.py:1115 cola/cmds.py:1118 cola/guicmds.py:25 +#: cola/widgets/branch.py:277 msgid "Delete Branch" msgstr "Smazat větev" -#: cola/cmds.py:1089 +#: cola/cmds.py:1090 msgid "Delete Files" msgstr "Smazat soubory" -#: cola/widgets/status.py:311 +#: cola/widgets/status.py:312 msgid "Delete Files..." msgstr "Smazat soubory…" -#: cola/cmds.py:1085 +#: cola/cmds.py:1086 msgid "Delete Files?" msgstr "Smazat soubory?" -#: cola/cmds.py:922 +#: cola/cmds.py:920 msgid "Delete Remote" msgstr "Odstranit vzdálený" -#: cola/guicmds.py:35 cola/widgets/branch.py:270 +#: cola/guicmds.py:34 cola/widgets/branch.py:279 msgid "Delete Remote Branch" msgstr "Smazat vzdálenou větev" -#: cola/widgets/main.py:564 +#: cola/widgets/main.py:577 msgid "Delete Remote Branch..." msgstr "Smazat vzdálenou větev…" -#: cola/widgets/toolbar.py:271 +#: cola/widgets/toolbar.py:276 msgid "Delete Toolbar" msgstr "Odstranit nástrojovou lištu" -#: cola/cmds.py:1115 +#: cola/cmds.py:1116 #, python-format msgid "Delete branch \"%s\"?" msgstr "" -#: cola/widgets/editremotes.py:88 +#: cola/widgets/editremotes.py:87 msgid "Delete remote" msgstr "Odstranit vzdálený" -#: cola/cmds.py:924 +#: cola/cmds.py:922 #, python-format msgid "Delete remote \"%s\"" msgstr "Odstranit vzdálený „%s“" -#: cola/cmds.py:923 +#: cola/cmds.py:921 msgid "Delete remote?" msgstr "Odstranit vzdálený?" -#: cola/widgets/main.py:558 +#: cola/widgets/main.py:571 msgid "Delete..." msgstr "Smazat…" -#: cola/cmds.py:1067 +#: cola/cmds.py:1068 #, python-format msgid "Deleting \"%s\" failed" msgstr "Odstraňování „%s“ se nezdařilo" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Deletions" msgstr "Odstraněno" -#: cola/widgets/submodules.py:120 +#: cola/widgets/submodules.py:119 msgid "Depth" msgstr "" -#: cola/qtutils.py:811 cola/qtutils.py:852 +#: cola/qtutils.py:842 cola/qtutils.py:889 msgid "Detach" msgstr "Odpojit" -#: cola/widgets/prefs.py:181 +#: cola/widgets/prefs.py:203 msgid "Detect Conflict Markers" msgstr "Zjistit značky konfliktů" -#: cola/widgets/prefs.py:151 +#: cola/widgets/prefs.py:174 msgid "Detect conflict markers in unmerged files" msgstr "Zjistit značky konfliktů v nesloučených souborech" -#: cola/widgets/about.py:271 cola/widgets/about.py:274 -#: cola/widgets/about.py:277 cola/widgets/about.py:278 -#: cola/widgets/about.py:279 cola/widgets/about.py:280 -#: cola/widgets/about.py:281 cola/widgets/about.py:282 -#: cola/widgets/about.py:283 cola/widgets/about.py:284 -#: cola/widgets/about.py:285 cola/widgets/about.py:286 -#: cola/widgets/about.py:287 cola/widgets/about.py:288 -#: cola/widgets/about.py:289 cola/widgets/about.py:290 -#: cola/widgets/about.py:291 cola/widgets/about.py:292 -#: cola/widgets/about.py:293 cola/widgets/about.py:294 -#: cola/widgets/about.py:295 cola/widgets/about.py:296 -#: cola/widgets/about.py:297 cola/widgets/about.py:298 -#: cola/widgets/about.py:299 cola/widgets/about.py:300 -#: cola/widgets/about.py:301 cola/widgets/about.py:302 -#: cola/widgets/about.py:303 cola/widgets/about.py:304 -#: cola/widgets/about.py:305 cola/widgets/about.py:306 -#: cola/widgets/about.py:307 cola/widgets/about.py:308 -#: cola/widgets/about.py:309 cola/widgets/about.py:310 -#: cola/widgets/about.py:311 cola/widgets/about.py:312 -#: cola/widgets/about.py:313 cola/widgets/about.py:314 -#: cola/widgets/about.py:315 cola/widgets/about.py:316 -#: cola/widgets/about.py:317 cola/widgets/about.py:318 -#: cola/widgets/about.py:319 cola/widgets/about.py:320 -#: cola/widgets/about.py:321 cola/widgets/about.py:322 -#: cola/widgets/about.py:323 cola/widgets/about.py:324 -#: cola/widgets/about.py:325 cola/widgets/about.py:326 -#: cola/widgets/about.py:327 cola/widgets/about.py:328 -#: cola/widgets/about.py:329 cola/widgets/about.py:330 -#: cola/widgets/about.py:331 cola/widgets/about.py:332 -#: cola/widgets/about.py:333 cola/widgets/about.py:334 -#: cola/widgets/about.py:335 cola/widgets/about.py:336 -#: cola/widgets/about.py:337 cola/widgets/about.py:338 -#: cola/widgets/about.py:339 cola/widgets/about.py:340 -#: cola/widgets/about.py:341 cola/widgets/about.py:342 -#: cola/widgets/about.py:343 cola/widgets/about.py:344 -#: cola/widgets/about.py:345 cola/widgets/about.py:346 -#: cola/widgets/about.py:347 cola/widgets/about.py:348 -#: cola/widgets/about.py:349 cola/widgets/about.py:350 -#: cola/widgets/about.py:351 cola/widgets/about.py:352 -#: cola/widgets/about.py:353 cola/widgets/about.py:354 -#: cola/widgets/about.py:355 cola/widgets/about.py:356 -#: cola/widgets/about.py:357 cola/widgets/about.py:358 -#: cola/widgets/about.py:359 cola/widgets/about.py:360 -#: cola/widgets/about.py:361 cola/widgets/about.py:362 -#: cola/widgets/about.py:363 cola/widgets/about.py:364 -#: cola/widgets/about.py:365 cola/widgets/about.py:366 -#: cola/widgets/about.py:367 cola/widgets/about.py:368 -#: cola/widgets/about.py:369 cola/widgets/about.py:370 -#: cola/widgets/about.py:371 cola/widgets/about.py:372 -#: cola/widgets/about.py:373 cola/widgets/about.py:374 -#: cola/widgets/about.py:375 cola/widgets/about.py:376 -#: cola/widgets/about.py:377 cola/widgets/about.py:378 -#: cola/widgets/about.py:379 cola/widgets/about.py:380 +#: cola/widgets/about.py:254 cola/widgets/about.py:257 +#: cola/widgets/about.py:260 cola/widgets/about.py:261 +#: cola/widgets/about.py:262 cola/widgets/about.py:263 +#: cola/widgets/about.py:264 cola/widgets/about.py:265 +#: cola/widgets/about.py:266 cola/widgets/about.py:267 +#: cola/widgets/about.py:268 cola/widgets/about.py:269 +#: cola/widgets/about.py:270 cola/widgets/about.py:271 +#: cola/widgets/about.py:272 cola/widgets/about.py:273 +#: cola/widgets/about.py:274 cola/widgets/about.py:275 +#: cola/widgets/about.py:276 cola/widgets/about.py:277 +#: cola/widgets/about.py:278 cola/widgets/about.py:279 +#: cola/widgets/about.py:280 cola/widgets/about.py:281 +#: cola/widgets/about.py:282 cola/widgets/about.py:283 +#: cola/widgets/about.py:284 cola/widgets/about.py:285 +#: cola/widgets/about.py:286 cola/widgets/about.py:287 +#: cola/widgets/about.py:288 cola/widgets/about.py:289 +#: cola/widgets/about.py:290 cola/widgets/about.py:291 +#: cola/widgets/about.py:292 cola/widgets/about.py:293 +#: cola/widgets/about.py:294 cola/widgets/about.py:295 +#: cola/widgets/about.py:296 cola/widgets/about.py:297 +#: cola/widgets/about.py:298 cola/widgets/about.py:299 +#: cola/widgets/about.py:300 cola/widgets/about.py:301 +#: cola/widgets/about.py:302 cola/widgets/about.py:303 +#: cola/widgets/about.py:304 cola/widgets/about.py:305 +#: cola/widgets/about.py:306 cola/widgets/about.py:307 +#: cola/widgets/about.py:308 cola/widgets/about.py:309 +#: cola/widgets/about.py:310 cola/widgets/about.py:311 +#: cola/widgets/about.py:312 cola/widgets/about.py:313 +#: cola/widgets/about.py:314 cola/widgets/about.py:315 +#: cola/widgets/about.py:316 cola/widgets/about.py:317 +#: cola/widgets/about.py:318 cola/widgets/about.py:319 +#: cola/widgets/about.py:320 cola/widgets/about.py:321 +#: cola/widgets/about.py:322 cola/widgets/about.py:323 +#: cola/widgets/about.py:324 cola/widgets/about.py:325 +#: cola/widgets/about.py:326 cola/widgets/about.py:327 +#: cola/widgets/about.py:328 cola/widgets/about.py:329 +#: cola/widgets/about.py:330 cola/widgets/about.py:331 +#: cola/widgets/about.py:332 cola/widgets/about.py:333 +#: cola/widgets/about.py:334 cola/widgets/about.py:335 +#: cola/widgets/about.py:336 cola/widgets/about.py:337 +#: cola/widgets/about.py:338 cola/widgets/about.py:339 +#: cola/widgets/about.py:340 cola/widgets/about.py:341 +#: cola/widgets/about.py:342 cola/widgets/about.py:343 +#: cola/widgets/about.py:344 cola/widgets/about.py:345 +#: cola/widgets/about.py:346 cola/widgets/about.py:347 +#: cola/widgets/about.py:348 cola/widgets/about.py:349 +#: cola/widgets/about.py:350 cola/widgets/about.py:351 +#: cola/widgets/about.py:352 cola/widgets/about.py:353 +#: cola/widgets/about.py:354 cola/widgets/about.py:355 +#: cola/widgets/about.py:356 cola/widgets/about.py:357 +#: cola/widgets/about.py:358 cola/widgets/about.py:359 +#: cola/widgets/about.py:360 cola/widgets/about.py:361 +#: cola/widgets/about.py:362 cola/widgets/about.py:363 msgid "Developer" msgstr "Vývojář" -#: cola/guicmds.py:185 cola/widgets/dag.py:764 cola/widgets/diff.py:781 -#: cola/widgets/main.py:177 cola/widgets/main.py:797 +#: cola/guicmds.py:184 cola/widgets/dag.py:830 cola/widgets/diff.py:809 +#: cola/widgets/main.py:175 cola/widgets/main.py:810 msgid "Diff" msgstr "Diff" -#: cola/guicmds.py:185 +#: cola/guicmds.py:184 msgid "Diff Against Commit" msgstr "" @@ -1399,35 +1440,35 @@ msgstr "" msgid "Diff Against Predecessor..." msgstr "Rozdíl oproti předchůdci…" -#: cola/widgets/main.py:1159 +#: cola/widgets/main.py:1172 msgid "Diff Mode" msgstr "" -#: cola/widgets/diff.py:772 cola/widgets/diff.py:796 +#: cola/widgets/diff.py:800 cola/widgets/diff.py:824 msgid "Diff Options" msgstr "Volby Diff" -#: cola/widgets/prefs.py:256 +#: cola/widgets/prefs.py:277 msgid "Diff Tool" msgstr "Nástroj Diff" -#: cola/widgets/dag.py:364 +#: cola/widgets/dag.py:363 msgid "Diff selected -> this" msgstr "Diff vybraný -> tento" -#: cola/widgets/dag.py:358 +#: cola/widgets/dag.py:357 msgid "Diff this -> selected" msgstr "Diff tento -> vybraný" -#: cola/widgets/main.py:218 +#: cola/widgets/main.py:217 msgid "Diffstat" msgstr "" -#: cola/cmds.py:3262 +#: cola/difftool.py:324 msgid "Difftool" msgstr "" -#: cola/widgets/clone.py:207 +#: cola/widgets/clone.py:205 msgid "Directory Exists" msgstr "Složka existuje" @@ -1435,84 +1476,88 @@ msgstr "Složka existuje" msgid "Disable" msgstr "" -#: cola/widgets/prefs.py:180 +#: cola/widgets/prefs.py:202 msgid "Display Untracked Files" msgstr "Zobrazit nesledované soubory" -#: cola/cmds.py:2094 +#: cola/widgets/remote.py:176 +msgid "Display remote messages in a separate dialog" +msgstr "" + +#: cola/cmds.py:2045 msgid "Do not update stacked branches" msgstr "" -#: cola/widgets/main.py:471 +#: cola/widgets/main.py:484 msgid "Documentation" msgstr "Dokumentace" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop" msgstr "Zahodit" -#: cola/widgets/stash.py:258 +#: cola/widgets/stash.py:276 msgid "Drop Stash" msgstr "Zahodit odklad" -#: cola/widgets/stash.py:255 +#: cola/widgets/stash.py:273 msgid "Drop Stash?" msgstr "Zahodit odklad?" -#: cola/widgets/stash.py:257 +#: cola/widgets/stash.py:275 #, python-format msgid "Drop the \"%s\" stash?" msgstr "Zahodit odklad „%s“?" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop the selected stash" msgstr "Zahodit vybraný odklad" -#: cola/qtutils.py:764 cola/sequenceeditor.py:357 cola/widgets/grep.py:102 +#: cola/qtutils.py:795 cola/sequenceeditor.py:353 cola/widgets/grep.py:100 msgid "Edit" msgstr "Upravit" -#: cola/widgets/diff.py:1019 +#: cola/widgets/diff.py:1058 msgid "Edit Diff Hunk to Revert..." msgstr "" -#: cola/widgets/diff.py:1017 +#: cola/widgets/diff.py:1056 msgid "Edit Diff Hunk to Stage..." msgstr "" -#: cola/widgets/diff.py:1062 +#: cola/widgets/diff.py:1124 msgid "Edit Diff Hunk to Unstage..." msgstr "" -#: cola/cmds.py:2166 +#: cola/cmds.py:2117 msgid "Edit Rebase" msgstr "Upravit přeskládání" -#: cola/widgets/editremotes.py:36 +#: cola/widgets/editremotes.py:35 msgid "Edit Remotes" msgstr "Upravit vzdálené" -#: cola/widgets/main.py:298 +#: cola/widgets/main.py:293 msgid "Edit Remotes..." msgstr "Upravit vzdálené…" -#: cola/widgets/diff.py:1014 +#: cola/widgets/diff.py:1053 msgid "Edit Selected Lines to Revert..." msgstr "" -#: cola/widgets/diff.py:1012 +#: cola/widgets/diff.py:1051 msgid "Edit Selected Lines to Stage..." msgstr "" -#: cola/widgets/diff.py:1059 +#: cola/widgets/diff.py:1122 msgid "Edit Selected Lines to Unstage..." msgstr "" -#: cola/widgets/editremotes.py:44 +#: cola/widgets/editremotes.py:43 msgid "Edit remotes by selecting them from the list" msgstr "Upravit vzdálené jejich výběrem ze seznamu" -#: cola/widgets/browse.py:197 cola/widgets/common.py:39 +#: cola/widgets/browse.py:198 cola/widgets/common.py:38 msgid "Edit selected paths" msgstr "Upravit označená umístění" @@ -1528,11 +1573,11 @@ msgstr "" msgid "Edit the following patch, which will then be applied to the worktree to revert the changes:" msgstr "" -#: cola/widgets/main.py:604 +#: cola/widgets/main.py:617 msgid "Edit..." msgstr "Upravit…" -#: cola/widgets/prefs.py:253 +#: cola/widgets/prefs.py:274 msgid "Editor" msgstr "Editor" @@ -1541,153 +1586,158 @@ msgstr "Editor" msgid "Editor returned %s exit code. Not applying patch." msgstr "" -#: cola/widgets/prefs.py:167 +#: cola/widgets/prefs.py:190 msgid "Email Address" msgstr "E-mailová adresa" -#: cola/widgets/about.py:258 cola/widgets/about.py:401 +#: cola/widgets/about.py:241 cola/widgets/about.py:384 msgid "Email contributor" msgstr "Napsat přispěvateli e-mail" -#: cola/widgets/prefs.py:182 +#: cola/widgets/prefs.py:204 msgid "Enable Gravatar Icons" msgstr "" -#: cola/widgets/prefs.py:160 +#: cola/widgets/prefs.py:183 msgid "Enable path autocompletion in tools" msgstr "" -#: cola/widgets/diff.py:768 +#: cola/widgets/diff.py:796 msgid "Enable word wrapping" msgstr "" -#: cola/sequenceeditor.py:322 +#: cola/sequenceeditor.py:319 msgid "Enabled" msgstr "Povoleno" -#: cola/guicmds.py:333 cola/widgets/branch.py:445 +#: cola/guicmds.py:332 cola/widgets/branch.py:478 msgid "Enter New Branch Name" msgstr "Zadat nový název větve" -#: cola/guicmds.py:147 +#: cola/guicmds.py:146 msgid "Enter a name for the new bare repo" msgstr "Zadejte název pro nový holý repozitář" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Enter a name for the stash" msgstr "Zadat název odkladu" -#: cola/cmds.py:146 cola/cmds.py:176 cola/cmds.py:207 cola/cmds.py:283 -#: cola/cmds.py:292 cola/cmds.py:307 cola/cmds.py:317 cola/cmds.py:460 -#: cola/cmds.py:496 cola/cmds.py:534 cola/cmds.py:633 cola/cmds.py:751 -#: cola/cmds.py:1067 cola/cmds.py:1164 cola/cmds.py:2005 cola/cmds.py:2394 -#: cola/cmds.py:2637 cola/cmds.py:2643 cola/cmds.py:2651 cola/cmds.py:2872 -#: cola/cmds.py:2890 cola/cmds.py:3180 cola/gitcmds.py:984 cola/guicmds.py:157 -#: cola/models/stash.py:70 cola/models/stash.py:87 cola/models/stash.py:108 -#: cola/widgets/bookmarks.py:482 cola/widgets/branch.py:777 +#: cola/widgets/stash.py:216 +msgid "Enter a new name for the stash" +msgstr "" + +#: cola/cmds.py:145 cola/cmds.py:175 cola/cmds.py:206 cola/cmds.py:284 +#: cola/cmds.py:293 cola/cmds.py:308 cola/cmds.py:318 cola/cmds.py:461 +#: cola/cmds.py:497 cola/cmds.py:535 cola/cmds.py:635 cola/cmds.py:753 +#: cola/cmds.py:1068 cola/cmds.py:1165 cola/cmds.py:1956 cola/cmds.py:2345 +#: cola/cmds.py:2579 cola/cmds.py:2585 cola/cmds.py:2593 cola/cmds.py:2818 +#: cola/cmds.py:2836 cola/cmds.py:3125 cola/gitcmds.py:994 cola/guicmds.py:156 +#: cola/models/stash.py:70 cola/models/stash.py:90 cola/models/stash.py:112 +#: cola/models/stash.py:138 cola/widgets/bookmarks.py:481 +#: cola/widgets/branch.py:829 msgid "Error" msgstr "Chyba" -#: cola/widgets/clone.py:191 +#: cola/widgets/clone.py:189 msgid "Error Cloning" msgstr "Chyba při klonování" -#: cola/widgets/createbranch.py:314 +#: cola/widgets/createbranch.py:312 msgid "Error Creating Branch" msgstr "Chyba při vytváření větve" -#: cola/app.py:502 cola/guicmds.py:101 +#: cola/app.py:505 cola/guicmds.py:100 msgid "Error Creating Repository" msgstr "Chyba při vytváření repozitáře" -#: cola/cmds.py:1202 +#: cola/cmds.py:1206 msgid "Error Deleting Remote Branch" msgstr "Chyba při odstraňování vzdálené větve" -#: cola/cmds.py:1585 +#: cola/cmds.py:1573 msgid "Error Editing File" msgstr "Chyba při úpravě souboru" -#: cola/cmds.py:559 +#: cola/cmds.py:560 msgid "Error Launching Blame Viewer" msgstr "Chyba při spouštění blame prohlížeče" -#: cola/cmds.py:3145 +#: cola/cmds.py:3091 msgid "Error Launching History Browser" msgstr "Chyba při spouštění prohlížeče historie" -#: cola/app.py:489 +#: cola/app.py:492 msgid "Error Opening Repository" msgstr "" -#: cola/widgets/browse.py:566 +#: cola/models/stash.py:144 +msgid "Error Renaming Stash" +msgstr "" + +#: cola/widgets/browse.py:567 msgid "Error Saving File" msgstr "" -#: cola/cmds.py:914 +#: cola/cmds.py:912 #, python-format msgid "Error creating remote \"%s\"" msgstr "Chyba při vytváření vzdálené \"%s\"" -#: cola/models/stash.py:197 +#: cola/models/stash.py:233 msgid "Error creating stash" msgstr "Chyba při vytváření stash" -#: cola/cmds.py:1126 +#: cola/cmds.py:1127 #, python-format msgid "Error deleting branch \"%s\"" msgstr "" -#: cola/cmds.py:932 +#: cola/cmds.py:930 #, python-format msgid "Error deleting remote \"%s\"" msgstr "Chyba při odstraňování vzdálené \"%s\"" -#: cola/cmds.py:956 +#: cola/cmds.py:955 #, python-format msgid "Error renaming \"%(name)s\" to \"%(new_name)s\"" msgstr "Chyba při přejmenovávání „%(name)s“ na „%(new_name)s“" -#: cola/cmds.py:1771 +#: cola/cmds.py:1722 msgid "Error running prepare-commitmsg hook" msgstr "Chyba spouštění háčku prepare-commitmsg" -#: cola/cmds.py:3043 cola/cmds.py:3089 +#: cola/cmds.py:2989 cola/cmds.py:3035 #, python-format msgid "Error updating submodule %s" msgstr "" -#: cola/cmds.py:3125 +#: cola/cmds.py:3071 msgid "Error updating submodules" msgstr "" -#: cola/widgets/diff.py:1326 +#: cola/widgets/diff.py:1400 msgid "Error writing patch" msgstr "" -#: cola/cmds.py:1710 +#: cola/cmds.py:1662 msgid "Error: Cannot find commit template" msgstr "Chyba: nedaří se nalézt šablonu nahrání" -#: cola/widgets/stash.py:235 -msgid "Error: Stash exists" -msgstr "Chyba: Odklad existuje" - -#: cola/cmds.py:1732 +#: cola/cmds.py:1684 msgid "Error: Unconfigured commit template" msgstr "Chyba: Nenastavená šablona nahrání" -#: cola/widgets/clone.py:53 +#: cola/widgets/clone.py:52 #, python-format msgid "Error: could not clone \"%s\"" msgstr "Chyba: „%s“ nemohl být klonován" -#: cola/cmds.py:2835 +#: cola/cmds.py:2781 #, python-format msgid "Error: could not create tag \"%s\"" msgstr "Chyba: značka „%s“ nemohla být vytvořena" -#: cola/widgets/branch.py:421 +#: cola/widgets/branch.py:433 #, python-format msgid "Executing action %s" msgstr "Spouští se akce %s" @@ -1696,408 +1746,420 @@ msgstr "Spouští se akce %s" msgid "Exit \"Diff\" mode" msgstr "" -#: cola/widgets/action.py:67 +#: cola/widgets/action.py:81 msgid "Exit Diff" msgstr "" -#: cola/widgets/main.py:528 +#: cola/widgets/main.py:541 msgid "Exit Diff Mode" msgstr "" -#: cola/widgets/action.py:68 +#: cola/widgets/action.py:81 msgid "Exit Diff mode" msgstr "" -#: cola/widgets/recent.py:67 +#: cola/widgets/recent.py:65 msgid "Expand all" msgstr "Rozbalit vše" -#: cola/widgets/diff.py:1223 +#: cola/widgets/diff.py:1297 msgid "Export Patch" msgstr "" -#: cola/guicmds.py:168 cola/widgets/search.py:75 +#: cola/guicmds.py:167 cola/widgets/search.py:74 msgid "Export Patches" msgstr "Exportovat záplaty" -#: cola/widgets/main.py:273 +#: cola/widgets/main.py:268 msgid "Export Patches..." msgstr "Exportovat záplaty…" -#: cola/widgets/main.py:533 +#: cola/widgets/main.py:546 msgid "Expression..." msgstr "Výraz…" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Extended Regexp" msgstr "" -#: cola/widgets/commitmsg.py:612 +#: cola/widgets/commitmsg.py:638 msgid "Extended description..." msgstr "Podrobný popis…" -#: cola/cmds.py:387 +#: cola/cmds.py:388 msgid "Failed to commit and continue applying patches" msgstr "" -#: cola/cmds.py:403 +#: cola/cmds.py:404 msgid "Failed to continue applying patches after skipping the current patch" msgstr "" -#: cola/widgets/createbranch.py:124 +#: cola/widgets/createbranch.py:122 msgid "Fast Forward Only" msgstr "Pouze rychle vpřed" -#: cola/widgets/remote.py:177 +#: cola/widgets/remote.py:181 msgid "Fast-forward only" msgstr "Pouze rychle vpřed" -#: cola/widgets/bookmarks.py:91 +#: cola/widgets/bookmarks.py:90 msgid "Favorite repositories" msgstr "Oblíbené repozitáře" -#: cola/widgets/main.py:111 +#: cola/widgets/main.py:109 msgid "Favorites" msgstr "Oblíbené" -#: cola/widgets/remote.py:673 +#: cola/widgets/remote.py:735 msgid "Fetch" msgstr "Vyzvednout" -#: cola/widgets/createbranch.py:127 +#: cola/widgets/createbranch.py:125 msgid "Fetch Tracking Branch" msgstr "Vyzvednout sledovanou větev" -#: cola/widgets/action.py:63 cola/widgets/main.py:387 +#: cola/widgets/action.py:67 cola/widgets/main.py:384 +msgid "Fetch from one or more remotes using \"git fetch\"" +msgstr "" + +#: cola/widgets/action.py:65 cola/widgets/main.py:383 msgid "Fetch..." msgstr "Vyzvednout (fetch)…" -#: cola/widgets/main.py:588 +#: cola/widgets/main.py:601 msgid "File Browser..." msgstr "Prohlížeč souborů…" -#: cola/widgets/compare.py:75 +#: cola/widgets/compare.py:74 msgid "File Differences" msgstr "Rozdíly souboru" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 msgid "File Saved" msgstr "Soubor uložen" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 #, python-format msgid "File saved to \"%s\"" msgstr "Soubor uložen jako „%s“" -#: cola/fsmonitor.py:517 +#: cola/fsmonitor.py:528 msgid "File system change monitoring: disabled because \"cola.inotify\" is false.\n" msgstr "Monitorování změn na souborovém systému: vypnuto protože „cola.inotify“ je nastaveno na false.\n" -#: cola/fsmonitor.py:534 +#: cola/fsmonitor.py:545 msgid "File system change monitoring: disabled because libc does not support the inotify system calls.\n" msgstr "Monitorování změn na souborovém systému: vypnuto protože libc nepodporuje systémová volání inotify.\n" -#: cola/fsmonitor.py:528 +#: cola/fsmonitor.py:539 msgid "File system change monitoring: disabled because pywin32 is not installed.\n" msgstr "Monitorování změn na souborovém systému: vypnuto protože není nainstalováno pywin32.\n" -#: cola/fsmonitor.py:181 +#: cola/fsmonitor.py:184 msgid "" "File system change monitoring: disabled because the limit on the total number of inotify watches was reached. You may be able to increase the limit on the number of watches by running:\n" "\n" " echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n" msgstr "" -#: cola/fsmonitor.py:142 +#: cola/fsmonitor.py:145 msgid "File system change monitoring: enabled.\n" msgstr "Monitorování změn na souborovém systému: zapnuto.\n" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Filename" msgstr "Název souboru" -#: cola/widgets/dag.py:755 +#: cola/widgets/dag.py:821 msgid "Files" msgstr "Soubory" -#: cola/widgets/branch.py:785 +#: cola/widgets/branch.py:837 msgid "Filter branches..." msgstr "Filtrovat větve…" -#: cola/widgets/status.py:1333 +#: cola/widgets/status.py:1334 msgid "Filter paths..." msgstr "Filtrovat umístění…" -#: cola/widgets/finder.py:113 cola/widgets/main.py:312 +#: cola/widgets/finder.py:112 cola/widgets/main.py:307 msgid "Find Files" msgstr "Hledat soubory" -#: cola/widgets/text.py:388 +#: cola/widgets/text.py:385 msgid "Find in diff" msgstr "" -#: cola/widgets/text.py:425 +#: cola/widgets/text.py:422 msgid "Find next item" msgstr "" -#: cola/widgets/text.py:431 +#: cola/widgets/text.py:428 msgid "Find previous item" msgstr "" -#: cola/widgets/text.py:395 +#: cola/widgets/text.py:392 msgid "Find the next occurrence of the phrase" msgstr "" -#: cola/widgets/text.py:391 +#: cola/widgets/text.py:388 msgid "Find the previous occurrence of the phrase" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Fixed String" msgstr "Pevný řetězec" -#: cola/widgets/prefs.py:251 +#: cola/widgets/prefs.py:270 msgid "Fixed-Width Font" msgstr "Písmo s pevnou šířkou" -#: cola/sequenceeditor.py:362 +#: cola/sequenceeditor.py:358 msgid "Fixup" msgstr "Opravit" -#: cola/widgets/commitmsg.py:148 +#: cola/widgets/commitmsg.py:154 msgid "Fixup Previous Commit" msgstr "Opravit předchozí zápis" -#: cola/themes.py:672 +#: cola/themes.py:684 msgid "Flat dark blue" msgstr "" -#: cola/themes.py:693 +#: cola/themes.py:705 msgid "Flat dark green" msgstr "" -#: cola/themes.py:686 +#: cola/themes.py:698 msgid "Flat dark grey" msgstr "" -#: cola/themes.py:679 +#: cola/themes.py:691 msgid "Flat dark red" msgstr "" -#: cola/themes.py:644 +#: cola/themes.py:656 msgid "Flat light blue" msgstr "" -#: cola/themes.py:665 +#: cola/themes.py:677 msgid "Flat light green" msgstr "" -#: cola/themes.py:658 +#: cola/themes.py:670 msgid "Flat light grey" msgstr "" -#: cola/themes.py:651 +#: cola/themes.py:663 msgid "Flat light red" msgstr "" -#: cola/widgets/startup.py:73 +#: cola/widgets/startup.py:72 msgid "Folder" msgstr "" -#: cola/widgets/toolbar.py:177 +#: cola/widgets/toolbar.py:181 msgid "Follow System Style" msgstr "" -#: cola/widgets/prefs.py:252 +#: cola/widgets/prefs.py:271 msgid "Font Size" msgstr "Velikost písma" -#: cola/widgets/remote.py:193 +#: cola/widgets/remote.py:197 msgid "Force" msgstr "Vynutit" -#: cola/widgets/remote.py:617 +#: cola/widgets/remote.py:652 msgid "Force Fetch" msgstr "Vynutit vyzvednutí" -#: cola/widgets/remote.py:614 +#: cola/widgets/remote.py:649 msgid "Force Fetch?" msgstr "Vynutit vyzvednutí?" -#: cola/widgets/remote.py:625 +#: cola/widgets/remote.py:660 msgid "Force Push" msgstr "Vynutit odeslání" -#: cola/widgets/remote.py:619 +#: cola/widgets/remote.py:654 msgid "Force Push?" msgstr "Vynutit odeslání?" -#: cola/widgets/remote.py:616 +#: cola/widgets/remote.py:651 #, python-format msgid "Force fetching from %s?" msgstr "Vynutit vyzvednutí z %s?" -#: cola/widgets/remote.py:624 +#: cola/widgets/remote.py:659 #, python-format msgid "Force push to %s?" msgstr "Vynutit odeslání do %s?" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Format String" msgstr "Formátovací řetězec" -#: cola/widgets/about.py:430 cola/widgets/about.py:431 +#: cola/widgets/about.py:413 cola/widgets/about.py:414 msgid "French translation" msgstr "Francouzský překlad" -#: cola/widgets/merge.py:80 +#: cola/widgets/merge.py:78 msgid "GPG-sign the merge commit" msgstr "GPG podepsaný zápis sloučení" -#: cola/widgets/prefs.py:344 +#: cola/widgets/prefs.py:364 msgid "GUI theme" msgstr "" -#: cola/widgets/editremotes.py:318 +#: cola/widgets/editremotes.py:317 #, python-format msgid "Gathering info for \"%s\"..." msgstr "Shromažďování informací pro „%s“…" -#: cola/widgets/about.py:420 cola/widgets/about.py:428 -#: cola/widgets/about.py:429 +#: cola/widgets/about.py:403 cola/widgets/about.py:411 +#: cola/widgets/about.py:412 msgid "German translation" msgstr "Německý překlad" -#: cola/widgets/main.py:511 +#: cola/widgets/main.py:524 msgid "Get Commit Message Template" msgstr "Získat šablonu zprávy zápisu" -#: cola/widgets/dag.py:520 +#: cola/widgets/dag.py:586 msgid "Go Down" msgstr "Jít níže" -#: cola/widgets/dag.py:516 +#: cola/widgets/dag.py:582 msgid "Go Up" msgstr "Jít výše" -#: cola/widgets/dag.py:467 cola/widgets/filelist.py:42 +#: cola/widgets/dag.py:466 cola/widgets/filelist.py:39 msgid "Grab File..." msgstr "Získat soubor…" -#: cola/widgets/dag.py:782 +#: cola/widgets/dag.py:848 msgid "Graph" msgstr "Graf" -#: cola/widgets/main.py:358 +#: cola/widgets/main.py:353 msgid "Grep" msgstr "Grep" -#: cola/widgets/remote.py:662 +#: cola/widgets/remote.py:707 msgid "Have you rebased/pulled lately?" msgstr "Nepřeskládali/nestáhli jste v poslední době?" -#: cola/sequenceeditor.py:110 cola/sequenceeditor.py:171 -#: cola/widgets/finder.py:138 cola/widgets/main.py:854 +#: cola/sequenceeditor.py:108 cola/sequenceeditor.py:169 +#: cola/widgets/finder.py:137 cola/widgets/main.py:867 msgid "Help" msgstr "Nápověda" -#: cola/widgets/status.py:1322 +#: cola/widgets/status.py:1323 msgid "Help - Custom Copy Actions" msgstr "Nápověda – uživatelské akce kopírování" -#: cola/widgets/finder.py:79 +#: cola/widgets/finder.py:78 msgid "Help - Find Files" msgstr "Nápověda – najít soubory" -#: cola/sequenceeditor.py:737 +#: cola/sequenceeditor.py:732 msgid "Help - git-cola-sequence-editor" msgstr "Nápověda – git-cola-sequence-editor" -#: cola/widgets/prefs.py:346 +#: cola/widgets/prefs.py:366 msgid "High DPI" msgstr "" -#: cola/gitcmds.py:876 +#: cola/gitcmds.py:886 msgid "Hint: The \"Actions > Abort Cherry-Pick\" menu action can be used to cancel the current cherry-pick." msgstr "" -#: cola/widgets/prefs.py:254 +#: cola/widgets/prefs.py:275 msgid "History Browser" msgstr "Prohlížeč historie" -#: cola/widgets/about.py:427 cola/widgets/about.py:441 +#: cola/widgets/about.py:410 cola/widgets/about.py:424 msgid "Hungarian translation" msgstr "Maďarský překlad" -#: cola/widgets/toolbar.py:178 +#: cola/widgets/toolbar.py:182 msgid "Icon Only" msgstr "" -#: cola/widgets/prefs.py:345 +#: cola/widgets/prefs.py:365 msgid "Icon theme" msgstr "" -#: cola/widgets/diff.py:758 +#: cola/widgets/diff.py:787 msgid "Ignore all whitespace" msgstr "Ignorovat všechny mezery" -#: cola/widgets/diff.py:755 +#: cola/widgets/diff.py:785 msgid "Ignore changes in amount of whitespace" msgstr "Ignorovat změny v počtu mezer" -#: cola/widgets/diff.py:751 +#: cola/widgets/diff.py:782 msgid "Ignore changes in whitespace at EOL" msgstr "Ignorovat změny v mezerách na konci řádků" -#: cola/widgets/gitignore.py:46 +#: cola/widgets/gitignore.py:45 msgid "Ignore custom pattern" msgstr "Ignorovat dle šablony" -#: cola/widgets/gitignore.py:44 +#: cola/widgets/gitignore.py:43 msgid "Ignore exact filename" msgstr "Ignorovat přesný název souboru" -#: cola/widgets/gitignore.py:32 +#: cola/widgets/gitignore.py:31 msgid "Ignore filename or pattern" msgstr "Ignorovat název souboru nebo šablonu" -#: cola/widgets/status.py:933 +#: cola/widgets/dag.py:498 +msgid "Ignore merge commits" +msgstr "" + +#: cola/widgets/status.py:934 msgid "Ignore..." msgstr "" -#: cola/widgets/remote.py:203 +#: cola/widgets/remote.py:207 msgid "Include tags " msgstr "Zahrnout značky " -#: cola/widgets/prefs.py:349 +#: cola/widgets/prefs.py:369 msgid "Indent Status paths" msgstr "" -#: cola/widgets/about.py:419 cola/widgets/about.py:426 +#: cola/widgets/about.py:402 cola/widgets/about.py:409 msgid "Indonesian translation" msgstr "Indonéský překlad" -#: cola/widgets/main.py:643 +#: cola/widgets/main.py:656 msgid "Initialize Git Annex" msgstr "Inicializovat Git Annex" -#: cola/widgets/main.py:647 +#: cola/widgets/main.py:660 msgid "Initialize Git LFS" msgstr "Inicializovat Git LFS" -#: cola/widgets/clone.py:116 +#: cola/widgets/clone.py:114 msgid "Inititalize submodules" msgstr "Inicializovat dílčí moduly" -#: cola/widgets/prefs.py:260 +#: cola/widgets/prefs.py:281 msgid "Insert spaces instead of tabs" msgstr "Vkládat mezery místo tabelátorů" -#: cola/cmds.py:2130 +#: cola/widgets/action.py:73 cola/widgets/main.py:402 +msgid "Integrate changes using \"git pull\"" +msgstr "" + +#: cola/cmds.py:2081 msgid "Interactive Rebase" msgstr "Interaktivní přeskládání" -#: cola/cmds.py:2364 +#: cola/cmds.py:2315 msgid "Invalid Revision" msgstr "Neplatná revize" @@ -2105,40 +2167,40 @@ msgstr "Neplatná revize" msgid "It is not necessary to update the hunk header lines as they will be regenerated automatically." msgstr "" -#: cola/widgets/about.py:421 cola/widgets/about.py:424 +#: cola/widgets/about.py:404 cola/widgets/about.py:407 msgid "Japanese translation" msgstr "" -#: cola/widgets/prefs.py:262 +#: cola/widgets/prefs.py:283 msgid "Keep *.orig Merge Backups" msgstr "Ponechat *.orig zálohy začlenění" -#: cola/widgets/stash.py:71 +#: cola/widgets/stash.py:73 msgid "Keep Index" msgstr "Zachovat index" -#: cola/widgets/main.py:477 +#: cola/widgets/main.py:490 msgid "Keyboard Shortcuts" msgstr "Klávesové zkratky" -#: cola/cmds.py:1608 cola/sequenceeditor.py:165 cola/sequenceeditor.py:338 -#: cola/widgets/dag.py:395 cola/widgets/filelist.py:34 +#: cola/difftool.py:27 cola/sequenceeditor.py:163 cola/sequenceeditor.py:334 +#: cola/widgets/dag.py:394 cola/widgets/filelist.py:31 msgid "Launch Diff Tool" msgstr "Spustit nástroj Diff" -#: cola/widgets/dag.py:402 +#: cola/widgets/dag.py:401 msgid "Launch Directory Diff Tool" msgstr "Spustit nástroj pro porovnání rozdílů mezi složkami" -#: cola/cmds.py:1541 cola/cmds.py:1679 cola/widgets/filelist.py:38 +#: cola/cmds.py:1529 cola/cmds.py:1631 cola/widgets/filelist.py:35 msgid "Launch Editor" msgstr "Spustit editor" -#: cola/cmds.py:1644 +#: cola/cmds.py:1596 msgid "Launch Terminal" msgstr "Spustit terminál" -#: cola/sequenceeditor.py:166 +#: cola/sequenceeditor.py:164 msgid "" "Launch external diff tool\n" "Shortcut: Ctrl+D" @@ -2146,8 +2208,8 @@ msgstr "" "Spustit externí diff nástroj\n" "Zkratka: Ctrl+D" -#: cola/widgets/diff.py:1005 cola/widgets/diff.py:1051 -#: cola/widgets/status.py:852 cola/widgets/status.py:948 +#: cola/widgets/diff.py:1044 cola/widgets/diff.py:1106 +#: cola/widgets/status.py:853 cola/widgets/status.py:949 msgid "Launch git-cola" msgstr "Spustit git-cola" @@ -2159,7 +2221,7 @@ msgstr "Spustit git-difftool proti předchozím verzím" msgid "Launch git-difftool on the current path" msgstr "Spustit git-difftool na stávajícím umístění" -#: cola/icons.py:56 +#: cola/icons.py:55 msgid "Light Theme" msgstr "" @@ -2168,167 +2230,183 @@ msgstr "" msgid "Lines starting with '%s' will be ignored." msgstr "" -#: cola/widgets/startup.py:74 +#: cola/widgets/startup.py:73 msgid "List" msgstr "" -#: cola/guicmds.py:267 +#: cola/guicmds.py:266 msgid "Load Commit Message" msgstr "Nahrát zprávu zápisu" -#: cola/widgets/main.py:339 +#: cola/widgets/main.py:334 msgid "Load Commit Message..." msgstr "Načíst zprávu zápisu…" -#: cola/widgets/commitmsg.py:144 +#: cola/widgets/commitmsg.py:150 msgid "Load Previous Commit Message" msgstr "Načíst zprávu předchozího zápisu" -#: cola/widgets/diff.py:264 +#: cola/widgets/diff.py:265 msgid "Loading..." msgstr "Načítání…" -#: cola/widgets/branch.py:169 cola/widgets/branch.py:240 -#: cola/widgets/branch.py:281 cola/widgets/compare.py:38 -#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/branch.py:173 cola/widgets/branch.py:250 +#: cola/widgets/branch.py:290 cola/widgets/compare.py:37 +#: cola/widgets/compare.py:52 cola/widgets/compare.py:57 msgid "Local" msgstr "Místní" -#: cola/widgets/cfgactions.py:227 cola/widgets/merge.py:46 -#: cola/widgets/remote.py:138 +#: cola/widgets/cfgactions.py:225 cola/widgets/merge.py:44 +#: cola/widgets/remote.py:136 msgid "Local Branch" msgstr "Místní větev" -#: cola/widgets/createbranch.py:114 +#: cola/widgets/createbranch.py:112 msgid "Local branch" msgstr "Místní větev" -#: cola/widgets/dag.py:788 cola/widgets/main.py:651 +#: cola/widgets/dag.py:854 cola/widgets/main.py:664 msgid "Lock Layout" msgstr "Zamknout rozvržení" -#: cola/widgets/dag.py:750 +#: cola/widgets/dag.py:816 msgid "Log" msgstr "Záznam událostí" -#: cola/widgets/prefs.py:170 +#: cola/widgets/prefs.py:191 msgid "Log Date Format" msgstr "" -#: cola/widgets/about.py:268 +#: cola/themes.py:769 +msgid "MacOS Aqua dark" +msgstr "" + +#: cola/themes.py:765 +msgid "MacOS Aqua light" +msgstr "" + +#: cola/themes.py:781 +msgid "MacOS Vibrant dark" +msgstr "" + +#: cola/themes.py:775 +msgid "MacOS Vibrant light" +msgstr "" + +#: cola/widgets/about.py:251 msgid "Maintainer (since 2007) and developer" msgstr "Správce (od roku 2007) a vývojář" -#: cola/widgets/text.py:398 +#: cola/widgets/text.py:395 msgid "Match Case" msgstr "" -#: cola/widgets/merge.py:88 +#: cola/widgets/merge.py:86 msgid "Merge" msgstr "Sloučit" -#: cola/widgets/merge.py:162 +#: cola/widgets/merge.py:160 #, python-format msgid "Merge \"%(revision)s\" into \"%(branch)s\"" msgstr "Začlenit „%(revision)s“ do „%(branch)s“" -#: cola/widgets/prefs.py:257 +#: cola/widgets/prefs.py:278 msgid "Merge Tool" msgstr "Nástroj sloučení" -#: cola/widgets/prefs.py:171 +#: cola/widgets/prefs.py:193 msgid "Merge Verbosity" msgstr "Výřečnost při sloučení" -#: cola/cmds.py:1829 +#: cola/cmds.py:1780 msgid "Merge failed. Conflict resolution is required." msgstr "Sloučení se nezdařilo. Je třeba rozhodnout o konfliktech." -#: cola/widgets/merge.py:167 +#: cola/widgets/merge.py:165 #, python-format msgid "Merge into \"%s\"" msgstr "Začlenit do „%s“" -#: cola/widgets/branch.py:231 +#: cola/widgets/branch.py:242 msgid "Merge into current branch" msgstr "Začlenit do současné větve" -#: cola/widgets/main.py:363 +#: cola/widgets/main.py:358 msgid "Merge..." msgstr "Sloučit (merge)…" -#: cola/widgets/main.py:1163 +#: cola/widgets/main.py:1176 msgid "Merging" msgstr "Slučování" -#: cola/models/browse.py:33 cola/widgets/createtag.py:78 +#: cola/models/browse.py:32 cola/widgets/createtag.py:76 msgid "Message" msgstr "Zpráva" -#: cola/widgets/commitmsg.py:417 +#: cola/widgets/commitmsg.py:425 msgid "Missing Commit Message" msgstr "Chybí zpráva příspěvku" -#: cola/widgets/createbranch.py:252 +#: cola/widgets/createbranch.py:250 msgid "Missing Data" msgstr "Chybí data" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Missing Name" msgstr "Chybí název" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Missing Revision" msgstr "Chybějící revize" -#: cola/cmds.py:2801 +#: cola/cmds.py:2747 msgid "Missing Tag Message" msgstr "Zpráva značky chybí" -#: cola/models/browse.py:332 cola/widgets/status.py:158 -#: cola/widgets/status.py:631 +#: cola/models/browse.py:331 cola/widgets/status.py:158 +#: cola/widgets/status.py:632 msgid "Modified" msgstr "Změněno" -#: cola/widgets/commitmsg.py:506 +#: cola/widgets/commitmsg.py:532 msgid "More..." msgstr "Více…" -#: cola/widgets/standard.py:243 cola/widgets/status.py:233 +#: cola/widgets/standard.py:242 cola/widgets/status.py:234 msgid "Move Down" msgstr "Posunout dolů" -#: cola/widgets/standard.py:235 cola/widgets/status.py:225 +#: cola/widgets/standard.py:234 cola/widgets/status.py:226 msgid "Move Up" msgstr "Posunout nahoru" -#: cola/widgets/status.py:300 +#: cola/widgets/status.py:301 msgid "Move files to trash" msgstr "Přesunout soubory do koše" -#: cola/models/browse.py:33 cola/widgets/bookmarks.py:467 -#: cola/widgets/createtag.py:61 cola/widgets/editremotes.py:450 -#: cola/widgets/status.py:1452 cola/widgets/toolbar.py:312 +#: cola/models/browse.py:32 cola/widgets/bookmarks.py:466 +#: cola/widgets/createtag.py:59 cola/widgets/editremotes.py:448 +#: cola/widgets/status.py:1453 cola/widgets/toolbar.py:317 msgid "Name" msgstr "Název" -#: cola/widgets/editremotes.py:434 +#: cola/widgets/editremotes.py:432 msgid "Name for the new remote" msgstr "Název nového vzdáleného" -#: cola/guicmds.py:148 cola/widgets/main.py:285 +#: cola/guicmds.py:147 cola/widgets/main.py:280 msgid "New Bare Repository..." msgstr "Nový holý repozitář…" -#: cola/guicmds.py:87 cola/widgets/main.py:280 +#: cola/guicmds.py:86 cola/widgets/main.py:275 msgid "New Repository..." msgstr "Nový repozitář…" -#: cola/widgets/main.py:983 +#: cola/widgets/main.py:996 msgid "New Toolbar" msgstr "Přidat nástrojovou lištu" -#: cola/widgets/startup.py:53 +#: cola/widgets/startup.py:52 msgid "New..." msgstr "Nový…" @@ -2336,15 +2414,19 @@ msgstr "Nový…" msgid "Next File" msgstr "Následující soubor" -#: cola/widgets/createbranch.py:123 cola/widgets/standard.py:1065 +#: cola/widgets/createbranch.py:121 cola/widgets/standard.py:1183 msgid "No" msgstr "Ne" -#: cola/widgets/merge.py:217 cola/widgets/merge.py:227 +#: cola/widgets/merge.py:215 cola/widgets/merge.py:225 msgid "No Revision Specified" msgstr "Nezadána žádná revize" -#: cola/widgets/commitmsg.py:427 +#: cola/widgets/stash.py:225 +msgid "No change made" +msgstr "" + +#: cola/widgets/commitmsg.py:435 msgid "" "No changes to commit.\n" "\n" @@ -2354,27 +2436,27 @@ msgstr "" "\n" "Je potřeba připravit k zapsání alespoň jeden soubor předtím, než ho bude možné zapsat." -#: cola/widgets/selectcommits.py:118 +#: cola/widgets/selectcommits.py:117 msgid "No commits exist in this branch." msgstr "V této větvi nejsou žádné zápisy." -#: cola/widgets/merge.py:65 +#: cola/widgets/merge.py:63 msgid "No fast forward" msgstr "Ne rychle vpřed" -#: cola/widgets/remote.py:186 +#: cola/widgets/remote.py:190 msgid "No fast-forward" msgstr "Ne rychle vpřed" -#: cola/widgets/remote.py:577 +#: cola/widgets/remote.py:612 msgid "No repository selected." msgstr "Nevybrán žádný repozitář." -#: cola/widgets/remote.py:615 +#: cola/widgets/remote.py:650 msgid "Non-fast-forward fetch overwrites local history!" msgstr "Vyzvednutí Ne rychle vpřed přepíše místní historii!" -#: cola/widgets/remote.py:621 +#: cola/widgets/remote.py:656 msgid "" "Non-fast-forward push overwrites published history!\n" "(Did you pull first?)" @@ -2382,7 +2464,7 @@ msgstr "" "Odeslání Ne rychle vpřed přepíše uveřejněnou historii!\n" "(Dali jste nejdříve stáhnout?)" -#: cola/widgets/commitmsg.py:444 +#: cola/widgets/commitmsg.py:452 msgid "Nothing to commit" msgstr "Není co odeslat" @@ -2390,79 +2472,79 @@ msgstr "Není co odeslat" msgid "Nothing to do" msgstr "Není co udělat" -#: cola/widgets/prefs.py:172 +#: cola/widgets/prefs.py:194 msgid "Number of Diff Context Lines" msgstr "Počet kontextový řádků Diff" -#: cola/widgets/bookmarks.py:79 cola/widgets/bookmarks.py:213 -#: cola/widgets/startup.py:336 +#: cola/widgets/bookmarks.py:78 cola/widgets/bookmarks.py:212 +#: cola/widgets/startup.py:335 msgid "Open" msgstr "Otevřít" -#: cola/widgets/text.py:230 +#: cola/widgets/text.py:228 #, python-format msgid "Open \"%s\"" msgstr "" -#: cola/cmds.py:1857 +#: cola/cmds.py:1808 msgid "Open Directory" msgstr "" -#: cola/guicmds.py:205 cola/guicmds.py:214 cola/widgets/editremotes.py:473 -#: cola/widgets/startup.py:55 cola/widgets/startup.py:215 +#: cola/guicmds.py:204 cola/guicmds.py:213 cola/widgets/editremotes.py:471 +#: cola/widgets/startup.py:54 cola/widgets/startup.py:214 msgid "Open Git Repository" msgstr "Otevřít Git repozitář" -#: cola/widgets/submodules.py:49 +#: cola/widgets/submodules.py:48 msgid "Open Parent" msgstr "" -#: cola/cmds.py:1877 +#: cola/cmds.py:1828 msgid "Open Parent Directory" msgstr "Otevřít nadřazenou složku" -#: cola/widgets/main.py:679 +#: cola/widgets/main.py:692 msgid "Open Recent" msgstr "Otevřít nedávné" -#: cola/cmds.py:1840 +#: cola/cmds.py:1791 msgid "Open Using Default Application" msgstr "Otevřít ve výchozí aplikaci" -#: cola/cmds.py:1890 +#: cola/cmds.py:1841 msgid "Open Worktree" msgstr "" -#: cola/widgets/bookmarks.py:221 cola/widgets/startup.py:344 +#: cola/widgets/bookmarks.py:220 cola/widgets/startup.py:343 msgid "Open in New Window" msgstr "Otevřít v novém okně" -#: cola/widgets/main.py:408 +#: cola/widgets/main.py:415 msgid "Open in New Window..." msgstr "Otevřít v novém okně…" -#: cola/widgets/main.py:402 +#: cola/widgets/main.py:409 msgid "Open..." msgstr "Otevřít…" -#: cola/widgets/branch.py:345 +#: cola/widgets/branch.py:354 msgid "Other branches" msgstr "Další větve" -#: cola/widgets/archive.py:210 +#: cola/widgets/archive.py:208 msgid "Overwrite" msgstr "Přepsat" -#: cola/widgets/archive.py:209 +#: cola/widgets/archive.py:207 #, python-format msgid "Overwrite \"%s\"?" msgstr "Přepsat „%s“?" -#: cola/widgets/archive.py:207 +#: cola/widgets/archive.py:205 msgid "Overwrite File?" msgstr "Přepsat soubor?" -#: cola/widgets/grep.py:144 +#: cola/widgets/grep.py:142 msgid "" "Parse arguments using a shell.\n" "Queries with spaces will require \"double quotes\"." @@ -2470,63 +2552,67 @@ msgstr "" "Zpracovat argumenty pomocí shellu.\n" "Dotazy s mezerami vyžadují \"dvojité uvozovky\"." -#: cola/models/browse.py:330 +#: cola/models/browse.py:329 msgid "Partially Staged" msgstr "Částečně staged" -#: cola/widgets/main.py:744 +#: cola/widgets/main.py:757 msgid "Paste" msgstr "Vložit" -#: cola/cmds.py:363 +#: cola/cmds.py:364 msgid "Patch failed to apply" msgstr "" -#: cola/cmds.py:375 +#: cola/cmds.py:376 msgid "Patch(es) Applied" msgstr "Záplaty aplikovány" -#: cola/widgets/diff.py:1219 cola/widgets/main.py:695 +#: cola/widgets/diff.py:1293 cola/widgets/main.py:708 msgid "Patches" msgstr "" -#: cola/widgets/prefs.py:173 +#: cola/widgets/prefs.py:195 msgid "Patches Directory" msgstr "" -#: cola/widgets/bookmarks.py:468 cola/widgets/submodules.py:118 +#: cola/widgets/bookmarks.py:467 cola/widgets/submodules.py:117 msgid "Path" msgstr "Cesta" -#: cola/widgets/clone.py:112 +#: cola/widgets/clone.py:110 msgid "Path or URL to clone (Env. $VARS okay)" msgstr "Cesta nebo URL, která se má klonovat (Env. $VARS okay)" -#: cola/sequenceeditor.py:346 +#: cola/sequenceeditor.py:342 msgid "Pick" msgstr "Vybrat" -#: cola/widgets/diff.py:781 +#: cola/widgets/dag.py:490 +msgid "Pickaxe search for changes containing text" +msgstr "" + +#: cola/widgets/diff.py:809 msgid "Pixel XOR" msgstr "Pixel XOR" -#: cola/widgets/createbranch.py:253 +#: cola/widgets/createbranch.py:251 msgid "Please provide both a branch name and revision expression." msgstr "Zadejte jak název větve, tak výraz revize." -#: cola/cmds.py:2348 +#: cola/cmds.py:2299 msgid "Please select a file" msgstr "Vyberte soubor" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Please specify a name for the new tag." msgstr "Zadejte název nové značky." -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Please specify a revision to tag." msgstr "Zadejte štítek revize." -#: cola/widgets/commitmsg.py:410 +#: cola/widgets/commitmsg.py:418 msgid "" "Please supply a commit message.\n" "\n" @@ -2537,31 +2623,31 @@ msgid "" "- Remaining lines: Describe why this change is good.\n" msgstr "" -#: cola/cmds.py:653 +#: cola/cmds.py:655 msgid "Point the current branch head to a new commit?" msgstr "Umístit současnou hlavu větve na nový zápis?" -#: cola/widgets/about.py:416 +#: cola/widgets/about.py:399 msgid "Polish translation" msgstr "Polský překlad" -#: cola/widgets/stash.py:63 cola/widgets/stash.py:111 cola/widgets/stash.py:115 +#: cola/widgets/stash.py:65 cola/widgets/stash.py:114 cola/widgets/stash.py:118 msgid "Pop" msgstr "Pop" -#: cola/widgets/main.py:293 cola/widgets/prefs.py:395 +#: cola/widgets/main.py:288 cola/widgets/prefs.py:433 msgid "Preferences" msgstr "Předvolby" -#: cola/widgets/archive.py:129 +#: cola/widgets/archive.py:127 msgid "Prefix" msgstr "Předpona" -#: cola/widgets/main.py:345 +#: cola/widgets/main.py:340 msgid "Prepare Commit Message" msgstr "Připravit zprávu zápisu" -#: cola/widgets/prefs.py:157 +#: cola/widgets/prefs.py:180 msgid "Prevent \"Stage\" from staging all files when nothing is selected" msgstr "Zabránit „Stage“ ze staging všech souborů když není nic vybráno" @@ -2569,216 +2655,228 @@ msgstr "Zabránit „Stage“ ze staging všech souborů když není nic vybrán msgid "Previous File" msgstr "Předchozí soubor" -#: cola/widgets/remote.py:171 +#: cola/widgets/remote.py:169 msgid "Prompt on creation" msgstr "Dotázat se při vytvoření" -#: cola/widgets/remote.py:172 +#: cola/widgets/remote.py:170 msgid "Prompt when pushing creates new remote branches" msgstr "Dotázat se když nahrání vytváří nové vzdálené větve" -#: cola/widgets/remote.py:208 +#: cola/widgets/remote.py:212 msgid "Prune " msgstr "Prune" -#: cola/widgets/bookmarks.py:255 cola/widgets/startup.py:376 +#: cola/widgets/bookmarks.py:254 cola/widgets/startup.py:375 msgid "Prune Missing Entries" msgstr "" -#: cola/widgets/branch.py:247 cola/widgets/remote.py:728 +#: cola/widgets/branch.py:256 cola/widgets/remote.py:783 msgid "Pull" msgstr "Stáhnout si" -#: cola/widgets/action.py:65 cola/widgets/main.py:397 +#: cola/widgets/action.py:73 cola/widgets/main.py:401 msgid "Pull..." msgstr "Stáhnout si (pull)…" -#: cola/widgets/branch.py:253 cola/widgets/remote.py:593 -#: cola/widgets/remote.py:698 +#: cola/widgets/branch.py:262 cola/widgets/remote.py:628 +#: cola/widgets/remote.py:758 msgid "Push" msgstr "Odeslat" -#: cola/widgets/action.py:64 cola/widgets/main.py:392 +#: cola/widgets/action.py:70 cola/widgets/main.py:393 +msgid "Push to one or more remotes using \"git push\"" +msgstr "" + +#: cola/widgets/action.py:70 cola/widgets/main.py:392 msgid "Push..." msgstr "Odeslat (push)…" -#: cola/guicmds.py:252 +#: cola/guicmds.py:251 msgid "Quick Open Repository" msgstr "" -#: cola/widgets/main.py:660 +#: cola/widgets/main.py:673 msgid "Quick Open..." msgstr "" -#: cola/widgets/main.py:355 +#: cola/widgets/main.py:350 msgid "Quit" msgstr "Ukončit" -#: cola/cmds.py:2144 cola/cmds.py:2180 cola/cmds.py:2181 cola/cmds.py:2194 -#: cola/cmds.py:2195 cola/sequenceeditor.py:158 cola/sequenceeditor.py:199 -#: cola/widgets/main.py:822 cola/widgets/remote.py:211 +#: cola/cmds.py:2095 cola/cmds.py:2131 cola/cmds.py:2132 cola/cmds.py:2145 +#: cola/cmds.py:2146 cola/sequenceeditor.py:156 cola/sequenceeditor.py:197 +#: cola/widgets/main.py:835 cola/widgets/remote.py:215 msgid "Rebase" msgstr "Přeskládat" -#: cola/cmds.py:2143 +#: cola/cmds.py:2094 #, python-format msgid "Rebase onto %s" msgstr "Přeskládat do %s" -#: cola/cmds.py:2156 +#: cola/cmds.py:2107 msgid "Rebase stopped" msgstr "Přeskládání zastaveno" -#: cola/widgets/remote.py:210 +#: cola/widgets/remote.py:214 msgid "Rebase the current branch instead of merging" msgstr "Místo sloučení přeskládat současnou větev" -#: cola/widgets/dag.py:419 +#: cola/widgets/dag.py:418 msgid "Rebase to this commit" msgstr "" -#: cola/widgets/main.py:1165 +#: cola/widgets/main.py:1178 msgid "Rebasing" msgstr "Přeskládání" -#: cola/widgets/main.py:120 +#: cola/widgets/main.py:118 msgid "Recent" msgstr "Nedávné" -#: cola/widgets/bookmarks.py:93 +#: cola/widgets/bookmarks.py:92 msgid "Recent repositories" msgstr "Nedávné repozitáře" -#: cola/widgets/prefs.py:258 +#: cola/widgets/prefs.py:279 msgid "Recent repository count" msgstr "Počet nedávných repozitářů" -#: cola/widgets/recent.py:46 +#: cola/widgets/recent.py:44 msgid "Recently Modified Files" msgstr "Nedávno změněné soubory" -#: cola/widgets/main.py:320 +#: cola/widgets/main.py:315 msgid "Recently Modified Files..." msgstr "Nedávno změněné soubory…" -#: cola/widgets/stash.py:256 +#: cola/widgets/stash.py:274 msgid "Recovering a dropped stash is not possible." msgstr "Obnova zahozeného odkladu není možná." -#: cola/widgets/createbranch.py:283 +#: cola/widgets/createbranch.py:281 msgid "Recovering lost commits may not be easy." msgstr "Obnova ztracených příspěvků nemusí být snadná." -#: cola/widgets/main.py:737 +#: cola/widgets/main.py:750 msgid "Redo" msgstr "Znovu" -#: cola/widgets/clone.py:121 +#: cola/widgets/clone.py:119 msgid "Reduce commit history to minimum" msgstr "Omezit historii zápisů na minimum" -#: cola/widgets/submodules.py:121 +#: cola/widgets/submodules.py:120 msgid "Reference Repository" msgstr "" -#: cola/widgets/submodules.py:105 +#: cola/widgets/submodules.py:104 msgid "Reference URL" msgstr "" -#: cola/widgets/submodules.py:106 +#: cola/widgets/submodules.py:105 msgid "Reference repository to use when cloning (optional)" msgstr "" -#: cola/cmds.py:2222 cola/qtutils.py:770 cola/widgets/action.py:62 -#: cola/widgets/dag.py:792 cola/widgets/editremotes.py:85 -#: cola/widgets/grep.py:105 cola/widgets/recent.py:116 -#: cola/widgets/submodules.py:45 +#: cola/cmds.py:2173 cola/qtutils.py:801 cola/widgets/action.py:63 +#: cola/widgets/dag.py:858 cola/widgets/editremotes.py:84 +#: cola/widgets/grep.py:103 cola/widgets/recent.py:114 +#: cola/widgets/submodules.py:44 msgid "Refresh" msgstr "Načíst znovu" -#: cola/widgets/remote.py:179 +#: cola/widgets/remote.py:183 msgid "Refuse to merge unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward" msgstr "Odmítnout sloučení, jestliže současná HLAVA není již aktualizovaná, nebo sloučení, které nemůže být vyřešeno jako Rychle vpřed" -#: cola/widgets/branch.py:173 cola/widgets/branch.py:225 -#: cola/widgets/branch.py:269 cola/widgets/branch.py:470 -#: cola/widgets/compare.py:54 cola/widgets/compare.py:59 -#: cola/widgets/remote.py:147 +#: cola/widgets/branch.py:177 cola/widgets/branch.py:236 +#: cola/widgets/branch.py:278 cola/widgets/branch.py:513 +#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/remote.py:145 msgid "Remote" msgstr "Vzdálená" -#: cola/widgets/remote.py:162 +#: cola/widgets/remote.py:160 msgid "Remote Branch" msgstr "Vzdálená větev" -#: cola/cmds.py:1196 +#: cola/cmds.py:1197 msgid "Remote Branch Deleted" msgstr "Vzdálená větev smazána" -#: cola/widgets/editremotes.py:49 +#: cola/widgets/log.py:99 +msgid "Remote Messages" +msgstr "" + +#: cola/widgets/editremotes.py:48 msgid "Remote git repositories - double-click to rename" msgstr "Vzdálené git repozitáře – přejmenujete dvojklikem" -#: cola/cmds.py:1029 cola/widgets/patch.py:107 cola/widgets/patch.py:122 -#: cola/widgets/startup.py:265 cola/widgets/status.py:1382 +#: cola/cmds.py:1030 cola/widgets/diff.py:1701 cola/widgets/diff.py:1716 +#: cola/widgets/startup.py:264 cola/widgets/status.py:1383 msgid "Remove" msgstr "Odstranit" -#: cola/cmds.py:1027 +#: cola/cmds.py:1028 #, python-format msgid "Remove %s from the recent list?" msgstr "Odstranit %s ze seznamu nedávných?" -#: cola/widgets/toolbar.py:316 +#: cola/widgets/toolbar.py:321 msgid "Remove Element" msgstr "Odebrat prvek" -#: cola/widgets/remote.py:206 +#: cola/widgets/remote.py:210 msgid "Remove remote-tracking branches that no longer exist on the remote" msgstr "Odstranit odkazy na vzdálené větve, které již neexistují ve vzdáleném" -#: cola/widgets/patch.py:109 +#: cola/widgets/diff.py:1703 msgid "Remove selected (Delete)" msgstr "Odstranit vybrané (Smazat)" -#: cola/widgets/bookmarks.py:258 cola/widgets/startup.py:379 +#: cola/widgets/bookmarks.py:257 cola/widgets/startup.py:378 msgid "Remove stale entries for repositories that no longer exist" msgstr "" -#: cola/guicmds.py:333 cola/widgets/browse.py:159 +#: cola/guicmds.py:332 cola/widgets/browse.py:159 cola/widgets/stash.py:44 msgid "Rename" msgstr "Přejmenovat" -#: cola/cmds.py:1153 +#: cola/cmds.py:1154 #, python-format msgid "Rename \"%s\"" msgstr "Přejmenovat „%s“" -#: cola/widgets/branch.py:259 +#: cola/widgets/branch.py:268 msgid "Rename Branch" msgstr "Přejmenovat větev" -#: cola/widgets/main.py:570 +#: cola/widgets/main.py:583 msgid "Rename Branch..." msgstr "Přejmenovat větev…" -#: cola/guicmds.py:330 +#: cola/guicmds.py:329 msgid "Rename Existing Branch" msgstr "Přejmenovat stávající větev" -#: cola/cmds.py:944 +#: cola/cmds.py:942 msgid "Rename Remote" msgstr "Přejmenovat vzdálenou" -#: cola/widgets/bookmarks.py:233 cola/widgets/startup.py:356 +#: cola/widgets/bookmarks.py:232 cola/widgets/startup.py:355 msgid "Rename Repository" msgstr "Přejmenovat repozitář" -#: cola/widgets/branch.py:445 +#: cola/widgets/stash.py:218 +msgid "Rename Stash" +msgstr "" + +#: cola/widgets/branch.py:478 msgid "Rename branch" msgstr "Přejmenovat větev" -#: cola/cmds.py:945 +#: cola/cmds.py:943 #, python-format msgid "Rename remote \"%(current)s\" to \"%(new)s\"?" msgstr "Přejmenovat vzdálenou „%(current)s“ na „%(new)s“?" @@ -2787,179 +2885,183 @@ msgstr "Přejmenovat vzdálenou „%(current)s“ na „%(new)s“?" msgid "Rename selected paths" msgstr "Přejmenovat vybraná umístění" -#: cola/app.py:497 cola/widgets/startup.py:262 +#: cola/widgets/stash.py:45 +msgid "Rename the selected stash" +msgstr "" + +#: cola/app.py:500 cola/widgets/startup.py:261 msgid "Repository Not Found" msgstr "" -#: cola/widgets/browse.py:87 cola/widgets/main.py:1095 +#: cola/widgets/browse.py:87 cola/widgets/main.py:1108 #, python-format msgid "Repository: %s" msgstr "Repozitář: %s" -#: cola/guicmds.py:351 cola/widgets/createbranch.py:125 cola/widgets/dag.py:331 -#: cola/widgets/editremotes.py:58 cola/widgets/main.py:832 +#: cola/guicmds.py:350 cola/widgets/createbranch.py:123 cola/widgets/dag.py:330 +#: cola/widgets/editremotes.py:57 cola/widgets/main.py:845 msgid "Reset" msgstr "Resetovat" -#: cola/widgets/createbranch.py:286 +#: cola/widgets/createbranch.py:284 #, python-format msgid "Reset \"%(branch)s\" to \"%(revision)s\"?" msgstr "Resetovat \"%(branch)s\" do \"%(revision)s\"?" -#: cola/guicmds.py:359 +#: cola/guicmds.py:358 msgid "Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/cmds.py:655 cola/cmds.py:706 cola/guicmds.py:342 -#: cola/widgets/createbranch.py:295 +#: cola/cmds.py:657 cola/cmds.py:708 cola/guicmds.py:341 +#: cola/widgets/createbranch.py:293 msgid "Reset Branch" msgstr "Resetovat větev" -#: cola/cmds.py:703 cola/guicmds.py:341 cola/widgets/dag.py:425 -#: cola/widgets/main.py:419 +#: cola/cmds.py:705 cola/guicmds.py:340 cola/widgets/dag.py:424 +#: cola/widgets/main.py:431 msgid "Reset Branch (Soft)" msgstr "" -#: cola/cmds.py:652 cola/guicmds.py:350 cola/widgets/dag.py:431 -#: cola/widgets/main.py:426 +#: cola/cmds.py:654 cola/guicmds.py:349 cola/widgets/dag.py:430 +#: cola/widgets/main.py:439 msgid "Reset Branch and Stage (Mixed)" msgstr "" -#: cola/widgets/createbranch.py:292 +#: cola/widgets/createbranch.py:290 msgid "Reset Branch?" msgstr "Resetovat větev?" -#: cola/widgets/main.py:655 +#: cola/widgets/main.py:668 msgid "Reset Layout" msgstr "" -#: cola/cmds.py:687 +#: cola/cmds.py:689 msgid "Reset Worktree and Reset All?" msgstr "" -#: cola/cmds.py:672 cola/cmds.py:689 cola/cmds.py:723 cola/guicmds.py:360 -#: cola/guicmds.py:373 cola/guicmds.py:382 +#: cola/cmds.py:674 cola/cmds.py:691 cola/cmds.py:725 cola/guicmds.py:359 +#: cola/guicmds.py:372 cola/guicmds.py:381 msgid "Reset and Restore" msgstr "" -#: cola/cmds.py:704 +#: cola/cmds.py:706 msgid "Reset branch?" msgstr "" -#: cola/widgets/createbranch.py:266 +#: cola/widgets/createbranch.py:264 #, python-format msgid "Resetting \"%(branch)s\" to \"%(revision)s\" will lose commits." msgstr "Resetováním „%(branch)s“ do „%(revision)s“ se ztratí zápisy." -#: cola/widgets/prefs.py:264 +#: cola/widgets/prefs.py:285 msgid "Resize File Browser columns" msgstr "" -#: cola/widgets/prefs.py:374 +#: cola/widgets/prefs.py:412 msgid "Restart the application after changing appearance settings." msgstr "" -#: cola/cmds.py:757 cola/cmds.py:760 cola/guicmds.py:390 cola/guicmds.py:391 -#: cola/widgets/dag.py:461 cola/widgets/main.py:457 +#: cola/cmds.py:759 cola/cmds.py:762 cola/guicmds.py:389 cola/guicmds.py:390 +#: cola/widgets/dag.py:460 cola/widgets/main.py:471 msgid "Restore Worktree" msgstr "" -#: cola/cmds.py:720 cola/guicmds.py:381 cola/widgets/dag.py:454 -#: cola/widgets/main.py:450 +#: cola/cmds.py:722 cola/guicmds.py:380 cola/widgets/dag.py:453 +#: cola/widgets/main.py:463 msgid "Restore Worktree and Reset All (Hard)" msgstr "" -#: cola/cmds.py:669 cola/widgets/main.py:434 +#: cola/cmds.py:671 cola/widgets/main.py:447 msgid "Restore Worktree and Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/widgets/dag.py:438 +#: cola/widgets/dag.py:437 msgid "Restore Worktree and Reset All (Keep Unstaged Edits)" msgstr "" -#: cola/cmds.py:686 cola/guicmds.py:372 cola/widgets/dag.py:446 -#: cola/widgets/main.py:442 +#: cola/cmds.py:688 cola/guicmds.py:371 cola/widgets/dag.py:445 +#: cola/widgets/main.py:455 msgid "Restore Worktree and Reset All (Merge)" msgstr "" -#: cola/cmds.py:721 +#: cola/cmds.py:723 msgid "Restore Worktree and Reset All?" msgstr "" -#: cola/cmds.py:758 +#: cola/cmds.py:760 #, python-format msgid "Restore Worktree to %s?" msgstr "" -#: cola/cmds.py:670 +#: cola/cmds.py:672 msgid "Restore worktree, reset, and preserve unstaged edits?" msgstr "" -#: cola/widgets/dag.py:390 +#: cola/widgets/dag.py:389 msgid "Revert" msgstr "Vrátit" -#: cola/widgets/diff.py:1153 +#: cola/widgets/diff.py:1227 msgid "Revert Diff Hunk" msgstr "Vrátit komplex rozdílů" -#: cola/widgets/diff.py:1018 +#: cola/widgets/diff.py:1057 msgid "Revert Diff Hunk..." msgstr "Vrátit komplex rozdílů…" -#: cola/widgets/diff.py:1152 +#: cola/widgets/diff.py:1226 msgid "Revert Diff Hunk?" msgstr "Vrátit komplex rozdílů?" -#: cola/widgets/diff.py:1150 +#: cola/widgets/diff.py:1224 msgid "Revert Selected Lines" msgstr "Vrátit vybrané řádky" -#: cola/widgets/diff.py:1013 +#: cola/widgets/diff.py:1052 msgid "Revert Selected Lines..." msgstr "Vrátit vybrané řádky…" -#: cola/widgets/diff.py:1149 +#: cola/widgets/diff.py:1223 msgid "Revert Selected Lines?" msgstr "Vrátit vybrané řádky?" -#: cola/cmds.py:2311 +#: cola/cmds.py:2262 msgid "Revert Uncommitted Changes" msgstr "Vrátit nezapsané změny" -#: cola/cmds.py:2305 +#: cola/cmds.py:2256 msgid "Revert Uncommitted Changes?" msgstr "Vrátit nezapsané změny?" -#: cola/cmds.py:2298 +#: cola/cmds.py:2249 msgid "Revert Uncommitted Edits..." msgstr "Vrátit nezapsané úpravy…" -#: cola/cmds.py:2289 +#: cola/cmds.py:2240 msgid "Revert Unstaged Changes" msgstr "Vrátit nepřipravené změny" -#: cola/cmds.py:2283 +#: cola/cmds.py:2234 msgid "Revert Unstaged Changes?" msgstr "Vrátit nepřipravené změny?" -#: cola/cmds.py:2275 +#: cola/cmds.py:2226 msgid "Revert Unstaged Edits..." msgstr "Vrátit nepřipravené úpravy…" -#: cola/cmds.py:598 +#: cola/cmds.py:599 msgid "Revert failed" msgstr "" -#: cola/cmds.py:2310 cola/widgets/diff.py:1161 +#: cola/cmds.py:2261 cola/widgets/diff.py:1235 msgid "Revert the uncommitted changes?" msgstr "Vrátit nezapsané změny?" -#: cola/cmds.py:2288 +#: cola/cmds.py:2239 msgid "Revert the unstaged changes?" msgstr "Vrátit nepřipravené změny?" -#: cola/widgets/browse.py:189 +#: cola/widgets/browse.py:190 msgid "Revert uncommitted changes to selected paths" msgstr "Vrátit nenahrané změny v označených umístěních" @@ -2967,294 +3069,302 @@ msgstr "Vrátit nenahrané změny v označených umístěních" msgid "Revert unstaged changes to selected paths" msgstr "Vrátit unstaged změny v značených umístěních" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Review" msgstr "Revidovat" -#: cola/widgets/main.py:583 +#: cola/widgets/main.py:596 msgid "Review..." msgstr "Revidovat…" -#: cola/widgets/cfgactions.py:233 cola/widgets/createtag.py:84 +#: cola/widgets/cfgactions.py:231 cola/widgets/createtag.py:82 msgid "Revision" msgstr "Revize" -#: cola/widgets/selectcommits.py:62 +#: cola/widgets/selectcommits.py:61 msgid "Revision Expression:" msgstr "Číslo revize:" -#: cola/widgets/merge.py:39 cola/widgets/merge.py:42 +#: cola/widgets/merge.py:37 cola/widgets/merge.py:40 msgid "Revision to Merge" msgstr "Revize ke sloučení" -#: cola/sequenceeditor.py:351 +#: cola/sequenceeditor.py:347 msgid "Reword" msgstr "" -#: cola/cmds.py:776 cola/widgets/commitmsg.py:456 +#: cola/cmds.py:778 cola/widgets/commitmsg.py:464 msgid "Rewrite Published Commit?" msgstr "Přepsat uveřejněný zápis?" -#: cola/widgets/log.py:31 +#: cola/widgets/log.py:31 cola/widgets/log.py:133 msgid "Right-click links to open:" msgstr "" -#: cola/interaction.py:127 cola/widgets/cfgactions.py:245 +#: cola/interaction.py:125 cola/widgets/cfgactions.py:243 msgid "Run" msgstr "Spustit" -#: cola/cmds.py:2341 +#: cola/cmds.py:2292 #, python-format msgid "Run \"%s\"?" msgstr "Spustit „%s“?" -#: cola/interaction.py:124 +#: cola/interaction.py:122 #, python-format msgid "Run %s?" msgstr "Spustit %s?" -#: cola/interaction.py:125 +#: cola/interaction.py:123 #, python-format msgid "Run the \"%s\" command?" msgstr "Spustit příkaz „%s“?" -#: cola/cmds.py:2380 +#: cola/cmds.py:2331 #, python-format msgid "Running command: %s" msgstr "Spuštěný příkaz: %s" -#: cola/widgets/about.py:422 +#: cola/widgets/about.py:405 msgid "Russian translation" msgstr "Ruský překlad" -#: cola/sequenceeditor.py:324 +#: cola/sequenceeditor.py:321 msgid "SHA-1" msgstr "SHA-1" -#: cola/widgets/prefs.py:183 +#: cola/widgets/prefs.py:205 msgid "Safe Mode" msgstr "Bezpečný režim" -#: cola/cmds.py:2167 cola/widgets/archive.py:126 cola/widgets/browse.py:609 -#: cola/widgets/editremotes.py:54 cola/widgets/stash.py:52 -#: cola/widgets/status.py:1388 +#: cola/cmds.py:2118 cola/widgets/archive.py:124 cola/widgets/browse.py:610 +#: cola/widgets/editremotes.py:53 cola/widgets/stash.py:54 +#: cola/widgets/status.py:1389 msgid "Save" msgstr "Uložit" -#: cola/widgets/archive.py:113 +#: cola/widgets/archive.py:111 msgid "Save Archive" msgstr "Uložit Archiv" -#: cola/widgets/dag.py:382 cola/widgets/main.py:351 +#: cola/widgets/dag.py:381 cola/widgets/main.py:346 msgid "Save As Tarball/Zip..." msgstr "Uložit jako Tarball/Zip…" -#: cola/widgets/prefs.py:263 +#: cola/widgets/prefs.py:284 msgid "Save GUI Settings" msgstr "Uložit nastavení graf. rozhraní" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Save Stash" msgstr "Uložit odklad" -#: cola/widgets/stash.py:53 +#: cola/widgets/stash.py:55 msgid "Save modified state to new stash" msgstr "Uložit modifikovaný stav jako nový odklad" -#: cola/widgets/browse.py:570 +#: cola/widgets/browse.py:571 #, python-format msgid "Saved \"%(filename)s\" from \"%(ref)s\" to \"%(destination)s\"" msgstr "Uloženo „%(filename)s“ z „%(ref)s“ do „%(destination)s“" -#: cola/widgets/bookmarks.py:83 cola/widgets/grep.py:98 -#: cola/widgets/search.py:42 cola/widgets/search.py:62 +#: cola/widgets/bookmarks.py:82 cola/widgets/grep.py:96 +#: cola/widgets/search.py:41 cola/widgets/search.py:61 msgid "Search" msgstr "Hledat" -#: cola/widgets/search.py:226 +#: cola/widgets/search.py:225 msgid "Search Authors" msgstr "Hledat autory" -#: cola/widgets/search.py:224 +#: cola/widgets/search.py:223 msgid "Search Commit Messages" msgstr "Hledat zprávy zápisů" -#: cola/widgets/search.py:227 +#: cola/widgets/search.py:226 msgid "Search Committers" msgstr "Hledat tvůrce zápisů" -#: cola/widgets/search.py:228 +#: cola/widgets/search.py:227 msgid "Search Date Range" msgstr "Hledat datový rozsah" -#: cola/widgets/search.py:225 +#: cola/widgets/search.py:224 msgid "Search Diffs" msgstr "Hledat rozdíly" -#: cola/widgets/search.py:222 +#: cola/widgets/search.py:221 msgid "Search by Expression" msgstr "Hledat dle výrazu" -#: cola/widgets/search.py:223 +#: cola/widgets/search.py:222 msgid "Search by Path" msgstr "Hledat dle cesty" -#: cola/widgets/grep.py:124 +#: cola/widgets/dag.py:494 +msgid "Search commit messages" +msgstr "" + +#: cola/widgets/grep.py:122 msgid "Search for a fixed string" msgstr "Hledat pevný řetězec" -#: cola/widgets/diff.py:519 cola/widgets/diff.py:1514 +#: cola/widgets/diff.py:526 cola/widgets/diff.py:1576 msgid "Search in Diff" msgstr "" -#: cola/guicmds.py:253 cola/widgets/bookmarks.py:62 +#: cola/guicmds.py:252 cola/widgets/bookmarks.py:61 msgid "Search repositories by name..." msgstr "" -#: cola/widgets/grep.py:122 +#: cola/widgets/grep.py:120 msgid "Search using a POSIX basic regular expression" msgstr "Hledat s použitím základních POSIX regulárních výrazů" -#: cola/widgets/grep.py:123 +#: cola/widgets/grep.py:121 msgid "Search using a POSIX extended regular expression" msgstr "Hledat s použitím rozšířených POSIX regulárních výrazů" -#: cola/widgets/main.py:493 +#: cola/widgets/main.py:506 msgid "Search..." msgstr "Hledat…" -#: cola/widgets/selectcommits.py:67 +#: cola/widgets/selectcommits.py:66 msgid "Search:" msgstr "" -#: cola/guicmds.py:330 cola/widgets/selectcommits.py:74 +#: cola/guicmds.py:329 cola/widgets/selectcommits.py:73 msgid "Select" msgstr "Vybrat" -#: cola/widgets/main.py:750 +#: cola/widgets/main.py:763 msgid "Select All" msgstr "Vybrat vše" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Select Branch to Review" msgstr "Vybrat větev k revizi" -#: cola/widgets/dag.py:1610 +#: cola/widgets/dag.py:1667 msgid "Select Child" msgstr "Vybrat podřízený" -#: cola/widgets/commitmsg.py:512 +#: cola/widgets/commitmsg.py:538 msgid "Select Commit" msgstr "Vybrat zápis" -#: cola/guicmds.py:137 +#: cola/guicmds.py:136 msgid "Select Directory..." msgstr "Vybrat složku…" -#: cola/cmds.py:2129 +#: cola/cmds.py:2080 msgid "Select New Upstream" msgstr "Vybrat nový upstream" -#: cola/widgets/dag.py:1614 +#: cola/widgets/dag.py:1671 msgid "Select Newest Child" msgstr "Vybrat nejnovější podřízený" -#: cola/widgets/dag.py:1604 +#: cola/widgets/dag.py:1661 msgid "Select Oldest Parent" msgstr "Vybrat nejstarší nadřazený" -#: cola/widgets/dag.py:1599 +#: cola/widgets/dag.py:1656 msgid "Select Parent" msgstr "Vybrat nadřazený" -#: cola/widgets/browse.py:525 +#: cola/widgets/browse.py:526 msgid "Select Previous Version" msgstr "Vybrat předchozí verzi" -#: cola/widgets/clone.py:197 +#: cola/widgets/clone.py:195 msgid "Select a parent directory for the new clone" msgstr "Vybrat nadřazenou složku pro nový klon" -#: cola/widgets/standard.py:756 cola/widgets/standard.py:779 +#: cola/widgets/standard.py:826 cola/widgets/standard.py:848 msgid "Select directory" msgstr "" -#: cola/widgets/selectcommits.py:162 +#: cola/widgets/selectcommits.py:161 msgid "Select output dir" msgstr "Vybrat výstupní složku" -#: cola/widgets/selectcommits.py:183 +#: cola/widgets/selectcommits.py:182 msgid "Select output directory" msgstr "Vybrat výstupní složku" -#: cola/widgets/patch.py:175 +#: cola/widgets/diff.py:1769 msgid "Select patch file(s)..." msgstr "Vybrat soubory se záplatami (patch)…" -#: cola/widgets/editremotes.py:437 +#: cola/widgets/editremotes.py:435 msgid "Select repository" msgstr "Vybrat repozitář" -#: cola/widgets/bookmarks.py:225 cola/widgets/startup.py:348 +#: cola/widgets/bookmarks.py:224 cola/widgets/startup.py:347 msgid "Set Default Repository" msgstr "Nastavit výchozí repozitář" -#: cola/widgets/branch.py:282 +#: cola/widgets/branch.py:291 msgid "Set Upstream Branch" msgstr "Nastavit upstream větev" -#: cola/widgets/branch.py:72 +#: cola/widgets/branch.py:74 msgid "" "Set the sort order for branches and tags.\n" "Toggle between date-based and version-name-based sorting." msgstr "" -#: cola/widgets/remote.py:213 +#: cola/widgets/remote.py:217 msgid "Set upstream" msgstr "Nastavit upstream" -#: cola/widgets/prefs.py:405 +#: cola/widgets/prefs.py:443 msgid "Settings" msgstr "Nastavení" -#: cola/widgets/grep.py:142 +#: cola/widgets/grep.py:140 msgid "Shell arguments" msgstr "Shell argumenty" -#: cola/sequenceeditor.py:375 +#: cola/sequenceeditor.py:371 msgid "Shift Down" msgstr "Posunout dolů" -#: cola/sequenceeditor.py:379 +#: cola/sequenceeditor.py:375 msgid "Shift Up" msgstr "Posunout nahoru" -#: cola/widgets/about.py:499 +#: cola/widgets/about.py:482 msgid "Shortcuts" msgstr "Klávesové zkratky" -#: cola/widgets/prefs.py:179 +#: cola/widgets/prefs.py:201 msgid "Show Diffstat After Merge" msgstr "Zobrazit Diffstat po sloučení" -#: cola/widgets/prefs.py:178 +#: cola/widgets/prefs.py:200 msgid "Show Full Paths in the Window Title" msgstr "V nadpisu okna zobrazovat úplné popisy umístění" -#: cola/sequenceeditor.py:106 cola/widgets/finder.py:187 -#: cola/widgets/status.py:1384 +#: cola/sequenceeditor.py:104 cola/widgets/finder.py:186 +#: cola/widgets/status.py:1385 msgid "Show Help" msgstr "Zobrazit nápovědu" -#: cola/widgets/filelist.py:30 +#: cola/widgets/filelist.py:27 msgid "Show History" msgstr "Zobrazit historii" -#: cola/widgets/prefs.py:348 +#: cola/widgets/prefs.py:368 msgid "Show file counts in Status titles" msgstr "" -#: cola/sequenceeditor.py:171 cola/widgets/finder.py:138 +#: cola/widgets/diff.py:794 +msgid "Show filenames" +msgstr "" + +#: cola/sequenceeditor.py:169 cola/widgets/finder.py:137 msgid "" "Show help\n" "Shortcut: ?" @@ -3262,137 +3372,145 @@ msgstr "" "Zobrazit nápovědu\n" "Zkratka: ?" -#: cola/widgets/diff.py:765 +#: cola/widgets/diff.py:792 msgid "Show line numbers" msgstr "Zobrazit čísla řádků" -#: cola/widgets/diff.py:761 +#: cola/widgets/remote.py:175 +msgid "Show remote messages" +msgstr "" + +#: cola/widgets/diff.py:789 msgid "Show whole surrounding functions of changes" msgstr "Zobrazit celé obklopující funkce změn" -#: cola/widgets/recent.py:58 +#: cola/widgets/recent.py:56 msgid "Showing changes since" msgstr "Zobrazit změny před" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "Side by side" msgstr "Vedle sebe" -#: cola/cmds.py:2512 +#: cola/cmds.py:2463 msgid "Sign Off" msgstr "Podepsat" -#: cola/widgets/createtag.py:71 +#: cola/widgets/createtag.py:69 msgid "Sign Tag" msgstr "Podepsat značku" -#: cola/widgets/commitmsg.py:55 +#: cola/widgets/commitmsg.py:56 msgid "Sign off on this commit" msgstr "Podepsat na tomto nahrání" -#: cola/widgets/about.py:412 cola/widgets/about.py:425 +#: cola/widgets/about.py:395 cola/widgets/about.py:408 msgid "Simplified Chinese translation" msgstr "Překlad do zjednodušené čínštiny" -#: cola/cmds.py:2587 +#: cola/cmds.py:2529 msgid "Skip" msgstr "Přeskočit" -#: cola/widgets/main.py:264 cola/widgets/main.py:617 +#: cola/widgets/main.py:260 cola/widgets/main.py:630 msgid "Skip Current Patch" msgstr "Přeskočit současnou záplatu" -#: cola/widgets/main.py:267 +#: cola/widgets/main.py:261 msgid "Skip applying the current patch and continue applying patches" msgstr "" -#: cola/widgets/prefs.py:261 +#: cola/widgets/prefs.py:282 msgid "Sort bookmarks alphabetically" msgstr "Záložky řadit abecedně" -#: cola/widgets/about.py:413 cola/widgets/about.py:436 -#: cola/widgets/about.py:440 +#: cola/widgets/about.py:396 cola/widgets/about.py:419 +#: cola/widgets/about.py:423 msgid "Spanish translation" msgstr "Španělský překlad" -#: cola/widgets/createtag.py:88 +#: cola/widgets/createtag.py:86 msgid "Specifies the SHA-1 to tag" msgstr "Určuje SHA-1 štítku" -#: cola/widgets/createtag.py:81 +#: cola/widgets/createtag.py:79 msgid "Specifies the tag message" msgstr "Určuje zprávu značky" -#: cola/widgets/createtag.py:65 +#: cola/widgets/createtag.py:63 msgid "Specifies the tag name" msgstr "Určuje název značky" -#: cola/widgets/spellcheck.py:46 +#: cola/widgets/spellcheck.py:45 msgid "Spelling Suggestions" msgstr "Doporučení pravopisu" -#: cola/sequenceeditor.py:369 cola/widgets/merge.py:58 +#: cola/sequenceeditor.py:365 cola/widgets/merge.py:56 msgid "Squash" msgstr "" -#: cola/widgets/merge.py:57 +#: cola/widgets/merge.py:55 msgid "Squash the merged commits into a single commit" msgstr "Squash sloučené nahrání do jediného nahrání" -#: cola/cmds.py:2598 cola/widgets/action.py:60 cola/widgets/diff.py:982 +#: cola/cmds.py:2540 cola/widgets/action.py:58 cola/widgets/diff.py:1168 msgid "Stage" msgstr "Připravit k zapsání" -#: cola/cmds.py:2753 +#: cola/cmds.py:2699 msgid "Stage / Unstage" msgstr "Připravit k zapsání / zrušit přípravu" -#: cola/cmds.py:2735 +#: cola/cmds.py:2681 msgid "Stage / Unstage All" msgstr "" -#: cola/widgets/diff.py:1016 +#: cola/widgets/diff.py:1055 msgid "Stage Diff Hunk" msgstr "Připravit k zapsání komplex rozdílů" -#: cola/cmds.py:2691 +#: cola/cmds.py:2633 msgid "Stage Modified" msgstr "Změněné připravit k zapsání" -#: cola/cmds.py:2724 +#: cola/cmds.py:2670 msgid "Stage Modified and Untracked" msgstr "" -#: cola/widgets/status.py:872 cola/widgets/status.py:894 -#: cola/widgets/status.py:962 +#: cola/widgets/status.py:873 cola/widgets/status.py:895 +#: cola/widgets/status.py:963 msgid "Stage Selected" msgstr "Vybrané připravit k zapsání" -#: cola/widgets/diff.py:1011 +#: cola/widgets/diff.py:1050 msgid "Stage Selected Lines" msgstr "Připravit k zapsání vybrané řádky" -#: cola/cmds.py:2702 +#: cola/cmds.py:2644 msgid "Stage Unmerged" msgstr "Nesloučené připravit k zapsání" -#: cola/cmds.py:2713 +#: cola/cmds.py:2655 msgid "Stage Untracked" msgstr "Nesledované připravit k zapsání" -#: cola/widgets/commitmsg.py:438 +#: cola/widgets/commitmsg.py:446 msgid "Stage and Commit" msgstr "Připravit k zapsání a zapsat" -#: cola/widgets/commitmsg.py:435 +#: cola/widgets/commitmsg.py:443 msgid "Stage and commit?" msgstr "Připravit k zapsání a zapsat?" -#: cola/cmds.py:2586 +#: cola/widgets/action.py:58 +msgid "Stage changes using \"git add\"" +msgstr "" + +#: cola/cmds.py:2528 msgid "Stage conflicts" msgstr "Konflikty přípravy k zapsání" -#: cola/cmds.py:2577 +#: cola/cmds.py:2519 msgid "Stage conflicts?" msgstr "Konflikty přípravy k zapsání?" @@ -3400,45 +3518,45 @@ msgstr "Konflikty přípravy k zapsání?" msgid "Stage/unstage selected paths for commit" msgstr "Připravit / zrušit přípravu označených umístění pro nahrání" -#: cola/models/browse.py:334 cola/widgets/status.py:156 -#: cola/widgets/status.py:620 +#: cola/models/browse.py:333 cola/widgets/status.py:156 +#: cola/widgets/status.py:621 msgid "Staged" msgstr "Připraveno k zapsání" -#: cola/cmds.py:2605 +#: cola/cmds.py:2547 #, python-format msgid "Staging: %s" msgstr "Připravuje s k zápisu: %s" -#: cola/widgets/main.py:597 +#: cola/widgets/main.py:610 msgid "Start Interactive Rebase..." msgstr "Zahájit interaktivní přeskládání (rebase)…" -#: cola/widgets/createbranch.py:107 +#: cola/widgets/createbranch.py:105 msgid "Starting Revision" msgstr "Počáteční revize" -#: cola/widgets/stash.py:40 +#: cola/widgets/stash.py:36 msgid "Stash" msgstr "Odložit" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash Index" msgstr "Odložit index" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash staged changes only" msgstr "Odložit pouze připravené změny" -#: cola/widgets/stash.py:73 +#: cola/widgets/stash.py:75 msgid "Stash unstaged changes only, keeping staged changes" msgstr "Odložit pouze nepřipravené změny, zachovat připravené změny" -#: cola/widgets/action.py:66 cola/widgets/main.py:414 +#: cola/widgets/action.py:76 cola/widgets/main.py:422 msgid "Stash..." msgstr "Odložit (stash)…" -#: cola/models/browse.py:33 cola/widgets/main.py:102 +#: cola/models/browse.py:32 cola/widgets/main.py:100 msgid "Status" msgstr "Stav" @@ -3446,151 +3564,159 @@ msgstr "Stav" msgid "Stop tracking paths" msgstr "Zastavit sledující umístění" -#: cola/widgets/submodules.py:82 +#: cola/widgets/submodules.py:81 msgid "Submodule URL (can be relative, ex: ../repo.git)" msgstr "" -#: cola/widgets/submodules.py:90 +#: cola/widgets/submodules.py:89 msgid "Submodule branch to track (optional)" msgstr "" -#: cola/widgets/submodules.py:86 +#: cola/widgets/submodules.py:85 msgid "Submodule path within the current repository (optional)" msgstr "" -#: cola/widgets/main.py:143 cola/widgets/submodules.py:32 +#: cola/widgets/main.py:141 cola/widgets/submodules.py:31 msgid "Submodules" msgstr "" -#: cola/widgets/prefs.py:174 +#: cola/widgets/prefs.py:196 msgid "Summarize Merge Commits" msgstr "Shrnout nahrání sloučení" -#: cola/sequenceeditor.py:325 cola/widgets/dag.py:506 +#: cola/sequenceeditor.py:322 cola/widgets/dag.py:572 msgid "Summary" msgstr "Shrnutí" -#: cola/widgets/prefs.py:168 +#: cola/widgets/prefs.py:273 msgid "Tab Width" msgstr "Šířka tabelátoru" -#: cola/widgets/cfgactions.py:229 cola/widgets/createbranch.py:116 -#: cola/widgets/merge.py:48 +#: cola/widgets/cfgactions.py:227 cola/widgets/createbranch.py:114 +#: cola/widgets/merge.py:46 msgid "Tag" msgstr "Značka" -#: cola/cmds.py:2842 +#: cola/cmds.py:2788 msgid "Tag Created" msgstr "Značka vytvořena" -#: cola/widgets/createtag.py:80 +#: cola/widgets/createtag.py:78 msgid "Tag message..." msgstr "Zpráva značky…" -#: cola/cmds.py:2802 +#: cola/cmds.py:2748 msgid "Tag-signing was requested but the tag message is empty." msgstr "Byl požadován podpis značky, ale zpráva značky je prázdná." -#: cola/widgets/branch.py:179 cola/widgets/branch.py:238 +#: cola/widgets/branch.py:183 cola/widgets/branch.py:248 msgid "Tags" msgstr "Značky" -#: cola/widgets/toolbar.py:180 +#: cola/widgets/action.py:78 cola/widgets/main.py:423 +msgid "Temporarily stash away uncommitted changes using \"git stash\"" +msgstr "" + +#: cola/widgets/toolbar.py:184 msgid "Text Beside Icon" msgstr "" -#: cola/widgets/toolbar.py:179 +#: cola/widgets/toolbar.py:183 msgid "Text Only" msgstr "" -#: cola/widgets/toolbar.py:181 +#: cola/widgets/toolbar.py:185 msgid "Text Under Icon" msgstr "" -#: cola/widgets/prefs.py:169 +#: cola/widgets/prefs.py:272 msgid "Text Width" msgstr "Šířka textu" -#: cola/cmds.py:1116 +#: cola/cmds.py:1117 msgid "The branch will be no longer available." msgstr "Větev nebude již k dispozici." -#: cola/cmds.py:648 +#: cola/cmds.py:650 #, python-format msgid "The branch will be reset using \"git reset --mixed %s\"" msgstr "Větev bude resetována za použití \"git reset --mixed %s\"" -#: cola/cmds.py:699 cola/cmds.py:790 +#: cola/cmds.py:701 cola/cmds.py:792 #, python-format msgid "The branch will be reset using \"git reset --soft %s\"" msgstr "Větev bude resetována za použití \"git reset --soft %s\"" -#: cola/widgets/commitmsg.py:303 +#: cola/widgets/commitmsg.py:311 msgid "The commit message will be cleared." msgstr "Zpráva o nahrání bude vyčištěna." -#: cola/widgets/prefs.py:146 +#: cola/widgets/prefs.py:169 msgid "" "The date-time format used when displaying dates in Git DAG.\n" "This value is passed to git log --date=" msgstr "" -#: cola/widgets/archive.py:208 +#: cola/widgets/archive.py:206 #, python-format msgid "The file \"%s\" exists and will be overwritten." msgstr "Soubor \"%s\" existuje a bude přepsán." -#: cola/cmds.py:1086 +#: cola/cmds.py:1087 msgid "The following files will be deleted:" msgstr "Následující soubory budou smazány:" -#: cola/widgets/status.py:1646 +#: cola/widgets/status.py:1647 msgid "The number of leading paths to strip" msgstr "" -#: cola/cmds.py:716 +#: cola/cmds.py:718 #, python-format msgid "The repository will be reset using \"git reset --hard %s\"" msgstr "" -#: cola/cmds.py:665 +#: cola/cmds.py:667 #, python-format msgid "The repository will be reset using \"git reset --keep %s\"" msgstr "" -#: cola/cmds.py:682 +#: cola/cmds.py:684 #, python-format msgid "The repository will be reset using \"git reset --merge %s\"" msgstr "" -#: cola/cmds.py:2365 +#: cola/cmds.py:2316 msgid "The revision expression cannot be empty." msgstr "Výraz revize nemůže zůstat nevyplněný." -#: cola/cmds.py:3029 +#: cola/widgets/stash.py:225 +msgid "The stash has not been renamed" +msgstr "" + +#: cola/cmds.py:2975 #, python-format msgid "" "The submodule will be added using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:3074 +#: cola/cmds.py:3020 #, python-format msgid "" "The submodule will be updated using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:736 +#: cola/cmds.py:738 #, python-format msgid "The worktree will be restored using \"git read-tree --reset -u %s\"" msgstr "" -#: cola/widgets/commitmsg.py:304 +#: cola/widgets/commitmsg.py:312 msgid "This cannot be undone. Clear commit message?" msgstr "Tuto akci nelze vzít zpět. Vyčistit zprávu k nahrání?" -#: cola/cmds.py:778 cola/widgets/commitmsg.py:458 +#: cola/cmds.py:780 cola/widgets/commitmsg.py:466 msgid "" "This commit has already been published.\n" "This operation will rewrite published history.\n" @@ -3600,7 +3726,7 @@ msgstr "" "Tato činnost přepíše uveřejněnou historii.\n" "Pravděpodobně to nechcete udělat." -#: cola/widgets/diff.py:1158 +#: cola/widgets/diff.py:1232 msgid "" "This operation drops uncommitted changes.\n" "These changes cannot be recovered." @@ -3608,7 +3734,7 @@ msgstr "" "Tato akce zahodí nezapsané změny.\n" "Tyto změny nemohou být obnoveny." -#: cola/cmds.py:2307 +#: cola/cmds.py:2258 msgid "" "This operation removes uncommitted edits from selected files.\n" "These changes cannot be recovered." @@ -3616,7 +3742,7 @@ msgstr "" "Tato akce zahodí nezapsané změny.\n" "Tyto změny nemohou být obnoveny." -#: cola/cmds.py:2285 +#: cola/cmds.py:2236 msgid "" "This operation removes unstaged edits from selected files.\n" "These changes cannot be recovered." @@ -3624,40 +3750,40 @@ msgstr "" "Tato akce zahodí nepřipravené změny.\n" "Tyto změny nemohou být obnoveny." -#: cola/cmds.py:475 +#: cola/cmds.py:476 msgid "" "This operation will replace the selected unmerged files with content from the branch being merged using \"git checkout --theirs\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:513 +#: cola/cmds.py:514 msgid "" "This operation will replace the selected unmerged files with content from your current branch using \"git checkout --ours\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/widgets/main.py:1109 +#: cola/widgets/main.py:1122 msgid "" "This repository has unresolved conflicts after applying a patch.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1102 +#: cola/widgets/main.py:1115 msgid "" "This repository is currently being rebased.\n" "Resolve conflicts, commit changes, and run:\n" " Rebase > Continue" msgstr "" -#: cola/widgets/main.py:1115 +#: cola/widgets/main.py:1128 msgid "" "This repository is in the middle of a cherry-pick.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1121 +#: cola/widgets/main.py:1134 msgid "" "This repository is in the middle of a merge.\n" "Resolve conflicts and commit changes." @@ -3675,15 +3801,15 @@ msgstr "" msgid "To avoid applying removal lines ('-'), change them to context lines (' ')." msgstr "" -#: cola/sequenceeditor.py:342 +#: cola/sequenceeditor.py:338 msgid "Toggle Enabled" msgstr "" -#: cola/widgets/diff.py:776 +#: cola/widgets/diff.py:804 msgid "Toggle image diff" msgstr "" -#: cola/widgets/branch.py:63 +#: cola/widgets/branch.py:65 msgid "Toggle the branches filter" msgstr "Zobrazit/skrýt filtr větví" @@ -3691,51 +3817,51 @@ msgstr "Zobrazit/skrýt filtr větví" msgid "Toggle the paths filter" msgstr "Zobrazit/skrýt filtr cest" -#: cola/widgets/toolbar.py:317 +#: cola/widgets/toolbar.py:322 msgid "Toolbar Style:" msgstr "" -#: cola/widgets/cfgactions.py:228 cola/widgets/merge.py:47 +#: cola/widgets/cfgactions.py:226 cola/widgets/merge.py:45 msgid "Tracking Branch" msgstr "Sledovaná větev" -#: cola/widgets/createbranch.py:115 +#: cola/widgets/createbranch.py:113 msgid "Tracking branch" msgstr "Sledovaná větev" -#: cola/widgets/about.py:408 cola/widgets/about.py:434 -#: cola/widgets/about.py:445 +#: cola/widgets/about.py:391 cola/widgets/about.py:417 +#: cola/widgets/about.py:428 msgid "Traditional Chinese (Taiwan) translation" msgstr "Překlad do tradiční čínštiny (taiwanštiny)" -#: cola/widgets/about.py:439 +#: cola/widgets/about.py:422 msgid "Translation" msgstr "" -#: cola/widgets/about.py:94 +#: cola/widgets/about.py:92 msgid "Translators" msgstr "Překladatelé" -#: cola/widgets/about.py:418 cola/widgets/about.py:423 -#: cola/widgets/about.py:438 +#: cola/widgets/about.py:401 cola/widgets/about.py:406 +#: cola/widgets/about.py:421 msgid "Turkish translation" msgstr "Turecký překlad" -#: cola/widgets/clone.py:109 cola/widgets/editremotes.py:451 -#: cola/widgets/submodules.py:117 +#: cola/widgets/clone.py:107 cola/widgets/editremotes.py:449 +#: cola/widgets/submodules.py:116 msgid "URL" msgstr "URL" -#: cola/widgets/remote.py:463 +#: cola/widgets/remote.py:497 #, python-format msgid "URL: %s" msgstr "URL: %s" -#: cola/widgets/about.py:415 +#: cola/widgets/about.py:398 msgid "Ukranian translation" msgstr "Ukrajinský překlad" -#: cola/cmds.py:2122 +#: cola/cmds.py:2073 msgid "Unable to rebase" msgstr "Nelze přeskládat" @@ -3744,53 +3870,58 @@ msgstr "Nelze přeskládat" msgid "Unable to set URL for \"%(name)s\" to \"%(url)s\"" msgstr "Nedaří se nastavit URL pro „%(name)s“ na „%(url)s“" -#: cola/widgets/diff.py:1327 +#: cola/widgets/diff.py:1401 #, python-format msgid "Unable to write patch to \"%s\". Check permissions?" msgstr "" -#: cola/widgets/main.py:735 +#: cola/widgets/main.py:748 msgid "Undo" msgstr "Zpět" -#: cola/cmds.py:783 cola/cmds.py:788 cola/cmds.py:791 cola/widgets/main.py:208 +#: cola/cmds.py:785 cola/cmds.py:790 cola/cmds.py:793 cola/widgets/main.py:207 msgid "Undo Last Commit" msgstr "" -#: cola/cmds.py:789 +#: cola/cmds.py:791 msgid "Undo last commit?" msgstr "" -#: cola/cmds.py:782 +#: cola/cmds.py:784 msgid "Undo the published commit?" msgstr "" -#: cola/models/browse.py:328 cola/widgets/status.py:157 -#: cola/widgets/status.py:640 +#: cola/models/browse.py:327 cola/widgets/status.py:157 +#: cola/widgets/status.py:641 msgid "Unmerged" msgstr "Nesloučeno" -#: cola/cmds.py:2855 cola/widgets/action.py:61 cola/widgets/diff.py:985 +#: cola/cmds.py:2801 cola/widgets/action.py:61 cola/widgets/diff.py:1165 +#: cola/widgets/main.py:212 msgid "Unstage" msgstr "Zrušit přípravu" -#: cola/widgets/main.py:203 cola/widgets/status.py:790 +#: cola/widgets/main.py:202 cola/widgets/status.py:791 msgid "Unstage All" msgstr "Zrušit veškerou přípravu" -#: cola/widgets/diff.py:1061 +#: cola/widgets/diff.py:1017 msgid "Unstage Diff Hunk" msgstr "Zrušit přípravu komplexu rozdílů" -#: cola/widgets/status.py:823 cola/widgets/status.py:858 +#: cola/widgets/status.py:824 cola/widgets/status.py:859 msgid "Unstage Selected" msgstr "Zrušit přípravu vybraných" -#: cola/widgets/diff.py:1058 +#: cola/widgets/diff.py:1015 msgid "Unstage Selected Lines" msgstr "Zrušit přípravu vybraných řádků" -#: cola/cmds.py:2867 +#: cola/widgets/action.py:61 +msgid "Unstage changes using \"git reset\"" +msgstr "" + +#: cola/cmds.py:2813 #, python-format msgid "Unstaging: %s" msgstr "Ruší se příprava: %s" @@ -3799,85 +3930,84 @@ msgstr "Ruší se příprava: %s" msgid "Untrack Selected" msgstr "Přestat sledovat vybrané" -#: cola/widgets/status.py:159 cola/widgets/status.py:646 +#: cola/widgets/status.py:159 cola/widgets/status.py:647 msgid "Untracked" msgstr "Nesledováno" -#: cola/cmds.py:1141 cola/cmds.py:2923 +#: cola/cmds.py:1142 cola/cmds.py:2869 #, python-format msgid "Untracking: %s" msgstr "Přestává se sledovat: %s" -#: cola/widgets/main.py:374 +#: cola/widgets/main.py:369 msgid "Update All Submodules..." msgstr "" -#: cola/widgets/createbranch.py:121 +#: cola/widgets/createbranch.py:119 msgid "Update Existing Branch:" msgstr "Aktualizovat stávající větev:" -#: cola/cmds.py:3075 +#: cola/cmds.py:3021 msgid "Update Submodule" msgstr "" -#: cola/cmds.py:3072 +#: cola/cmds.py:3018 msgid "Update Submodule..." msgstr "" -#: cola/cmds.py:3111 +#: cola/cmds.py:3057 msgid "Update Submodules" msgstr "" -#: cola/cmds.py:3109 +#: cola/cmds.py:3055 msgid "Update all submodules?" msgstr "" -#: cola/cmds.py:2093 +#: cola/cmds.py:2044 msgid "Update stacked branches" msgstr "" -#: cola/cmds.py:2085 cola/cmds.py:2092 +#: cola/cmds.py:2036 cola/cmds.py:2043 msgid "Update stacked branches when rebasing?" msgstr "" -#: cola/cmds.py:3108 +#: cola/cmds.py:3054 msgid "Update submodules..." msgstr "" -#: cola/widgets/status.py:953 +#: cola/widgets/status.py:954 msgid "Update this submodule" msgstr "" -#: cola/cmds.py:3073 +#: cola/cmds.py:3019 msgid "Update this submodule?" msgstr "" -#: cola/widgets/branch.py:421 cola/widgets/createbranch.py:302 -#: cola/widgets/remote.py:135 +#: cola/widgets/branch.py:433 cola/widgets/createbranch.py:300 msgid "Updating" msgstr "Aktualizuje se" -#: cola/widgets/prefs.py:350 +#: cola/widgets/prefs.py:370 msgid "Use a block cursor in diff editors" msgstr "" -#: cola/widgets/prefs.py:154 +#: cola/widgets/prefs.py:177 msgid "Use gravatar.com to lookup icons for author emails" msgstr "" -#: cola/widgets/prefs.py:166 +#: cola/widgets/prefs.py:189 msgid "User Name" msgstr "Uživatelské jméno" -#: cola/widgets/about.py:92 +#: cola/widgets/about.py:90 msgid "Version" msgstr "Verze" -#: cola/widgets/dag.py:800 cola/widgets/main.py:845 cola/widgets/main.py:966 +#: cola/widgets/dag.py:866 cola/widgets/main.py:858 cola/widgets/main.py:979 msgid "View" msgstr "Zobrazit" -#: cola/widgets/browse.py:137 cola/widgets/status.py:278 +#: cola/widgets/browse.py:137 cola/widgets/status.py:279 msgid "View History..." msgstr "Prohlížet historii…" @@ -3885,39 +4015,39 @@ msgstr "Prohlížet historii…" msgid "View history for selected paths" msgstr "Zobrazit historii vybraných umístění" -#: cola/widgets/merge.py:54 +#: cola/widgets/branch.py:224 cola/widgets/merge.py:52 msgid "Visualize" msgstr "Vizualizovat" -#: cola/widgets/main.py:488 +#: cola/widgets/main.py:501 msgid "Visualize All Branches..." msgstr "Vizualizovat všechny větve…" -#: cola/widgets/main.py:482 +#: cola/widgets/main.py:495 msgid "Visualize Current Branch..." msgstr "Vizualizovat stávající větev…" -#: cola/widgets/createtag.py:73 +#: cola/widgets/createtag.py:71 msgid "Whether to sign the tag (git tag -s)" msgstr "" -#: cola/widgets/text.py:399 +#: cola/widgets/text.py:396 msgid "Whole Words" msgstr "" -#: cola/widgets/commitmsg.py:432 +#: cola/widgets/commitmsg.py:440 msgid "Would you like to stage and commit all modified files?" msgstr "Chcete připravit k zapsání a zapsat všechny změněné soubory?" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "XOR" msgstr "" -#: cola/widgets/standard.py:1064 +#: cola/widgets/standard.py:1182 msgid "Yes" msgstr "Ano" -#: cola/cmds.py:256 +#: cola/cmds.py:255 msgid "" "You are in the middle of a merge.\n" "Cannot amend while merging." @@ -3925,36 +4055,36 @@ msgstr "" "Jste vprostřed slučování.\n" "Nelze amend při slučováné." -#: cola/cmds.py:2123 +#: cola/cmds.py:2074 msgid "You cannot rebase with uncommitted changes." msgstr "Nelze přeskládat s nezapsanými změnami." -#: cola/widgets/merge.py:227 +#: cola/widgets/merge.py:225 msgid "You must specify a revision to merge." msgstr "Pro sloučení je třeba určit revizi." -#: cola/widgets/merge.py:217 +#: cola/widgets/merge.py:215 msgid "You must specify a revision to view." msgstr "Je třeba určit kterou revizi zobrazit." -#: cola/widgets/dag.py:710 cola/widgets/dag.py:1588 +#: cola/widgets/dag.py:776 cola/widgets/dag.py:1645 msgid "Zoom In" msgstr "Přiblížit" -#: cola/widgets/dag.py:706 cola/widgets/dag.py:1594 +#: cola/widgets/dag.py:772 cola/widgets/dag.py:1651 msgid "Zoom Out" msgstr "Oddálit" -#: cola/widgets/dag.py:524 cola/widgets/dag.py:714 cola/widgets/dag.py:1596 -#: cola/widgets/diff.py:785 +#: cola/widgets/dag.py:590 cola/widgets/dag.py:780 cola/widgets/dag.py:1653 +#: cola/widgets/diff.py:813 msgid "Zoom to Fit" msgstr "Přizpůsobit velikosti okna" -#: cola/widgets/grep.py:112 +#: cola/widgets/grep.py:110 msgid "command-line arguments" msgstr "argumenty příkazového řádku" -#: cola/widgets/main.py:932 cola/widgets/main.py:938 +#: cola/widgets/main.py:945 cola/widgets/main.py:951 msgid "error: unable to execute git" msgstr "chyba: nedaří se spustit git" @@ -3963,45 +4093,41 @@ msgstr "chyba: nedaří se spustit git" msgid "exit code %s" msgstr "návratový kód %s" -#: cola/app.py:301 +#: cola/app.py:304 #, python-format msgid "fatal: \"%s\" is not a directory. Please specify a correct --repo ." msgstr "" -#: cola/widgets/main.py:928 +#: cola/widgets/main.py:941 #, python-format msgid "git cola version %s" msgstr "git cola verze %s" -#: cola/widgets/startup.py:35 +#: cola/widgets/startup.py:34 msgid "git-cola" msgstr "git-cola" -#: cola/difftool.py:63 +#: cola/difftool.py:82 msgid "git-cola diff" msgstr "git-cola diff" -#: cola/widgets/submodules.py:81 +#: cola/widgets/submodules.py:80 msgid "git://git.example.com/repo.git" msgstr "" -#: cola/widgets/grep.py:132 +#: cola/widgets/grep.py:130 msgid "grep result..." msgstr "výsledek z grep…" -#: cola/widgets/about.py:486 +#: cola/widgets/about.py:469 msgid "hotkeys.html" msgstr "hotkeys.html" -#: cola/widgets/submodules.py:85 +#: cola/widgets/submodules.py:84 msgid "path/to/submodule" msgstr "" -#: cola/cmds.py:2537 -msgid "unknown" -msgstr "neznámé" - -#: cola/widgets/createtag.py:63 +#: cola/widgets/createtag.py:61 msgid "vX.Y.Z" msgstr "vX.Y.Z" @@ -4010,20 +4136,31 @@ msgid "x 1" msgstr "" #: cola/hidpi.py:44 -msgid "x 1.5" +msgid "x 1.25" msgstr "" #: cola/hidpi.py:45 +msgid "x 1.5" +msgstr "" + +#: cola/hidpi.py:46 msgid "x 2" msgstr "" -#: cola/widgets/search.py:53 cola/widgets/search.py:58 +#: cola/widgets/search.py:52 cola/widgets/search.py:57 msgid "yyyy-MM-dd" msgstr "rrrr-mm-dd" +#, python-format +#~ msgid "A stash named \"%s\" already exists" +#~ msgstr "Odklad s názvem \"%s\" již existuje" + #~ msgid "Delete selected branch?" #~ msgstr "Smazat vybranou větev?" +#~ msgid "Error: Stash exists" +#~ msgstr "Chyba: Odklad existuje" + #~ msgid "Hide Details.." #~ msgstr "Skrýt podrobnosti…" @@ -4086,3 +4223,6 @@ msgstr "rrrr-mm-dd" #~ msgid "The worktree will be reset using \"git reset --keep %s\"" #~ msgstr "Větev bude resetována za použití \"git reset --keep %s\"" + +#~ msgid "unknown" +#~ msgstr "neznámé" diff --git a/cola/i18n/de.po b/cola/i18n/de.po index c1c9e9b5..ce71bb7b 100644 --- a/cola/i18n/de.po +++ b/cola/i18n/de.po @@ -24,7 +24,7 @@ msgstr "" "X-Poedit-Basepath: ../cola\n" "X-Poedit-SearchPath-0: .\n" -#: cola/widgets/patch.py:86 +#: cola/widgets/diff.py:1680 msgid "" "\n" "

\n" @@ -40,7 +40,7 @@ msgstr "" "

\n" " " -#: cola/widgets/about.py:455 +#: cola/widgets/about.py:438 #, python-format msgid "" "\n" @@ -95,7 +95,7 @@ msgstr "" "\n" " " -#: cola/widgets/about.py:180 +#: cola/widgets/about.py:182 #, python-format msgid "" "\n" @@ -124,7 +124,7 @@ msgstr "" " \n" " " -#: cola/widgets/about.py:387 +#: cola/widgets/about.py:370 #, python-format msgid "" "\n" @@ -139,7 +139,7 @@ msgstr "" "
\n" " " -#: cola/widgets/status.py:1310 +#: cola/widgets/status.py:1311 #, python-format msgid "" "\n" @@ -164,7 +164,7 @@ msgstr "" " %(basename)s = Dateiname ohne Erweiterung\n" " %(ext)s = Erweiterung\n" -#: cola/sequenceeditor.py:700 +#: cola/sequenceeditor.py:695 msgid "" "\n" "Commands\n" @@ -203,7 +203,7 @@ msgid "" "ctrl+d = launch difftool\n" msgstr "" -#: cola/widgets/finder.py:65 +#: cola/widgets/finder.py:64 msgid "" "\n" "Keyboard Shortcuts\n" @@ -231,45 +231,71 @@ msgstr "" "Die Pfeile hoch und runter ändern den Fokus zwischen dem\n" "Texteingabefeld und den Ergebnissen.\n" -#: cola/widgets/dag.py:894 +#: cola/widgets/prefs.py:133 +msgid "" +"\n" +"This option determines how the supplied commit message should be\n" +"cleaned up before committing.\n" +"\n" +"The can be strip, whitespace, verbatim, scissors or default.\n" +"\n" +"strip\n" +" Strip leading and trailing empty lines, trailing whitespace,\n" +" commentary and collapse consecutive empty lines.\n" +"\n" +"whitespace\n" +" Same as strip except #commentary is not removed.\n" +"\n" +"verbatim\n" +" Do not change the message at all.\n" +"\n" +"scissors\n" +" Same as whitespace except that everything from (and including) the line\n" +" found below is truncated, if the message is to be edited.\n" +" \"#\" can be customized with core.commentChar.\n" +"\n" +" # ------------------------ >8 ------------------------" +msgstr "" + +#: cola/widgets/dag.py:960 msgid " - DAG" msgstr " - Verlauf" -#: cola/widgets/recent.py:54 +#: cola/widgets/recent.py:52 msgid " commits ago" msgstr " Versionen davor" -#: cola/cmds.py:1197 +#: cola/cmds.py:1198 #, python-format msgid "\"%(branch)s\" has been deleted from \"%(remote)s\"." msgstr "\"%(branch)s\" wurde von \"%(remote)s\" gelöscht." -#: cola/widgets/createbranch.py:316 +#: cola/widgets/createbranch.py:314 #, python-format msgid "\"%(command)s\" returned exit status \"%(status)d\"" msgstr "\"%(command)s\" wurde beendet mit Status \"%(status)d\"" -#: cola/interaction.py:39 +#: cola/interaction.py:38 #, python-format msgid "\"%(command)s\" returned exit status %(status)d" msgstr "\"%(command)s\" wurde mit Code %(status)d beendet" -#: cola/guicmds.py:157 +#: cola/guicmds.py:156 #, python-format msgid "\"%s\" already exists" msgstr "\"%s\" existiert bereits" -#: cola/widgets/clone.py:206 +#: cola/widgets/clone.py:204 #, python-format msgid "\"%s\" already exists, cola will create a new directory" msgstr "\"%s\" existiert bereits, cola wird ein neues Verzeichnis anlegen" -#: cola/cmds.py:2349 +#: cola/cmds.py:2300 #, python-format msgid "\"%s\" requires a selected file." msgstr "\"%s\" erwartet, dass eine Datei ausgewählt wird." -#: cola/cmds.py:2087 +#: cola/cmds.py:2038 msgid "" "\"git rebase --update-refs\" automatically force-updates any\n" "branches that point to commits that are being rebased.\n" @@ -279,7 +305,11 @@ msgid "" "Using this feature is helpful for \"stacked\" branch workflows." msgstr "" -#: cola/sequenceeditor.py:321 +#: cola/models/stash.py:145 +msgid "\"git stash drop\" did not return a ref to rename." +msgstr "" + +#: cola/sequenceeditor.py:318 msgid "#" msgstr "#" @@ -288,37 +318,37 @@ msgstr "#" msgid "%(project)s: %(branch)s - Browse" msgstr "%(project)s: %(branch)s - Durchsuchen" -#: cola/widgets/dag.py:887 +#: cola/widgets/dag.py:953 #, python-format msgid "%(project)s: %(ref)s - DAG" msgstr "%(project)s: %(ref)s - DAG" -#: cola/models/browse.py:315 +#: cola/models/browse.py:314 #, python-format msgid "%d days ago" msgstr "vor %d Tagen" -#: cola/models/browse.py:314 +#: cola/models/browse.py:313 #, python-format msgid "%d hours ago" msgstr "vor %d Stunden" -#: cola/models/browse.py:307 cola/models/browse.py:311 +#: cola/models/browse.py:306 cola/models/browse.py:310 #, python-format msgid "%d minutes ago" msgstr "vor %d Minuten" -#: cola/cmds.py:376 +#: cola/cmds.py:377 #, python-format msgid "%d patch(es) applied." msgstr "%d Patch(es) angewendet." -#: cola/widgets/createbranch.py:281 +#: cola/widgets/createbranch.py:279 #, python-format msgid "%d skipped" msgstr "%d übersprungen" -#: cola/cmds.py:2580 +#: cola/cmds.py:2522 #, python-format msgid "" "%s appears to contain merge conflicts.\n" @@ -331,36 +361,36 @@ msgstr "" "Sie sollten diese Datei ggf. überspringen.\n" "Trotzdem vormerken?" -#: cola/widgets/startup.py:263 +#: cola/widgets/startup.py:262 #, python-format msgid "%s could not be opened. Remove from bookmarks?" msgstr "" -#: cola/app.py:498 cola/widgets/bookmarks.py:482 +#: cola/app.py:501 cola/widgets/bookmarks.py:481 #, python-format msgid "%s is not a Git repository." msgstr "%s ist kein Git-Repository." -#: cola/cmds.py:1015 +#: cola/cmds.py:1016 #, python-format msgid "%s will be removed from your bookmarks." msgstr "%s wird von den Favoriten entfernt." -#: cola/cmds.py:1028 +#: cola/cmds.py:1029 #, python-format msgid "%s will be removed from your recent repositories." msgstr "%s wird von den kürzlich verwendeten Repositories entfernt." -#: cola/cmds.py:1711 +#: cola/cmds.py:1663 #, python-format msgid "%s: No such file or directory." msgstr "%s: Datei oder Verzeichnis nicht gefunden." -#: cola/widgets/main.py:734 +#: cola/widgets/main.py:747 msgid "&Edit" msgstr "Bearbeiten" -#: cola/widgets/main.py:676 +#: cola/widgets/main.py:689 msgid "&File" msgstr "&Datei" @@ -368,43 +398,43 @@ msgstr "&Datei" msgid "(Amending)" msgstr "(Nachbesserung)" -#: cola/widgets/compare.py:36 +#: cola/widgets/compare.py:35 msgid "*** Branch Point ***" msgstr "*** Branch-Punkt ***" -#: cola/widgets/compare.py:37 +#: cola/widgets/compare.py:36 msgid "*** Sandbox ***" msgstr "*** Arbeitsbereich ***" -#: cola/widgets/diff.py:788 +#: cola/widgets/diff.py:816 msgid "100%" msgstr "100%" -#: cola/widgets/diff.py:789 +#: cola/widgets/diff.py:817 msgid "200%" msgstr "200%" -#: cola/widgets/diff.py:786 +#: cola/widgets/diff.py:814 msgid "25%" msgstr "25%" -#: cola/widgets/diff.py:790 +#: cola/widgets/diff.py:818 msgid "400%" msgstr "400%" -#: cola/widgets/diff.py:787 +#: cola/widgets/diff.py:815 msgid "50%" msgstr "50%" -#: cola/widgets/diff.py:791 +#: cola/widgets/diff.py:819 msgid "800%" msgstr "800%" -#: cola/widgets/finder.py:119 +#: cola/widgets/finder.py:118 msgid " ..." msgstr " ..." -#: cola/cmds.py:1734 +#: cola/cmds.py:1686 msgid "" "A commit template has not been configured.\n" "Use \"git config\" to define \"commit.template\"\n" @@ -414,81 +444,76 @@ msgstr "" "Verwenden Sie \"git config\" um \"commit.template\" so zu definieren,\n" "dass es auf eine Commit-Vorlage zeigt." -#: cola/cmds.py:1784 +#: cola/cmds.py:1735 #, python-format msgid "A hook must be provided at \"%s\"" msgstr "Ein Hook muss bereitgestellt sein für \"%s\"" -#: cola/widgets/stash.py:236 -#, python-format -msgid "A stash named \"%s\" already exists" -msgstr "Eine Ablage mit dem Namen \"%s\" existiert bereits" - -#: cola/widgets/cfgactions.py:82 cola/widgets/main.py:622 +#: cola/widgets/cfgactions.py:81 cola/widgets/main.py:635 msgid "Abort" msgstr "Abbrechen" -#: cola/widgets/cfgactions.py:149 cola/widgets/cfgactions.py:155 +#: cola/widgets/cfgactions.py:148 cola/widgets/cfgactions.py:154 msgid "Abort Action" msgstr "Befehl abbrechen" -#: cola/cmds.py:132 +#: cola/cmds.py:131 msgid "Abort Applying Patch" msgstr "" -#: cola/cmds.py:126 +#: cola/cmds.py:125 msgid "Abort Applying Patch..." msgstr "" -#: cola/widgets/main.py:245 +#: cola/widgets/main.py:244 msgid "Abort Applying Patches..." msgstr "" -#: cola/cmds.py:162 +#: cola/cmds.py:161 msgid "Abort Cherry-Pick" msgstr "" -#: cola/cmds.py:156 cola/widgets/main.py:334 +#: cola/cmds.py:155 cola/widgets/main.py:329 msgid "Abort Cherry-Pick..." msgstr "" -#: cola/cmds.py:193 +#: cola/cmds.py:192 msgid "Abort Merge" msgstr "Zusammenführung abbrechen" -#: cola/cmds.py:186 cola/widgets/main.py:368 +#: cola/cmds.py:185 cola/widgets/main.py:363 msgid "Abort Merge..." msgstr "Zusammenführung abbrechen..." -#: cola/widgets/cfgactions.py:154 +#: cola/widgets/cfgactions.py:153 msgid "Abort the action?" msgstr "Möchten Sie den Befehl abbrechen?" -#: cola/widgets/main.py:250 +#: cola/widgets/main.py:245 msgid "Abort the current \"git am\" patch session" msgstr "" -#: cola/cmds.py:159 +#: cola/cmds.py:158 msgid "" "Aborting a cherry-pick can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:129 +#: cola/cmds.py:128 msgid "" "Aborting a patch can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:127 +#: cola/cmds.py:126 msgid "Aborting applying the current patch?" msgstr "" -#: cola/cmds.py:157 +#: cola/cmds.py:156 msgid "Aborting the current cherry-pick?" msgstr "" -#: cola/cmds.py:189 +#: cola/cmds.py:188 msgid "" "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." @@ -496,23 +521,23 @@ msgstr "" "Abbrechen der gegenwärtigen Zusammenführung bedeutet den Verlust *ALLER* nicht vorgemerkten Änderungen.\n" "Eine Wiederherstellung nicht vorgemerkter Änderungen ist nicht möglich." -#: cola/cmds.py:187 +#: cola/cmds.py:186 msgid "Aborting the current merge?" msgstr "Möchten Sie die Zusammenführung abbrechen?" -#: cola/widgets/about.py:91 cola/widgets/main.py:517 +#: cola/widgets/about.py:89 cola/widgets/main.py:530 msgid "About" msgstr "Über git-cola" -#: cola/widgets/about.py:67 +#: cola/widgets/about.py:65 msgid "About git-cola" msgstr "Über git-cola" -#: cola/widgets/bookmarks.py:217 cola/widgets/startup.py:340 +#: cola/widgets/bookmarks.py:216 cola/widgets/startup.py:339 msgid "Accept" msgstr "Akzeptieren" -#: cola/sequenceeditor.py:159 +#: cola/sequenceeditor.py:157 msgid "" "Accept changes and rebase\n" "Shortcut: Ctrl+Enter" @@ -520,50 +545,50 @@ msgstr "" "Änderungen akzeptieren und Rebase starten\n" "Tastenkürzel: Strg+Enter" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Action Name" msgstr "Befehlsname" -#: cola/sequenceeditor.py:528 cola/widgets/bookmarks.py:321 -#: cola/widgets/branch.py:217 cola/widgets/browse.py:374 -#: cola/widgets/commitmsg.py:99 cola/widgets/dag.py:315 -#: cola/widgets/filelist.py:110 cola/widgets/main.py:95 -#: cola/widgets/main.py:757 cola/widgets/startup.py:436 +#: cola/sequenceeditor.py:524 cola/widgets/bookmarks.py:320 +#: cola/widgets/branch.py:221 cola/widgets/browse.py:375 +#: cola/widgets/commitmsg.py:105 cola/widgets/dag.py:314 +#: cola/widgets/filelist.py:107 cola/widgets/main.py:93 +#: cola/widgets/main.py:770 cola/widgets/startup.py:435 msgid "Actions" msgstr "Befehle" -#: cola/widgets/commitmsg.py:101 +#: cola/widgets/commitmsg.py:107 msgid "Actions..." msgstr "Befehle..." -#: cola/widgets/bookmarks.py:71 cola/widgets/gitignore.py:64 -#: cola/widgets/patch.py:103 cola/widgets/patch.py:117 -#: cola/widgets/status.py:1381 +#: cola/widgets/bookmarks.py:70 cola/widgets/diff.py:1697 +#: cola/widgets/diff.py:1711 cola/widgets/gitignore.py:63 +#: cola/widgets/status.py:1382 msgid "Add" msgstr "Hinzufügen" -#: cola/widgets/bookmarks.py:470 +#: cola/widgets/bookmarks.py:469 msgid "Add Favorite" msgstr "Favorit hinzufügen" -#: cola/widgets/editremotes.py:374 +#: cola/widgets/editremotes.py:373 msgid "Add Remote" msgstr "Hinzufügen" -#: cola/widgets/toolbar.py:315 +#: cola/widgets/toolbar.py:320 msgid "Add Separator" msgstr "Trenner hinzufügen" -#: cola/cmds.py:3030 cola/widgets/submodules.py:42 -#: cola/widgets/submodules.py:111 +#: cola/cmds.py:2976 cola/widgets/submodules.py:41 +#: cola/widgets/submodules.py:110 msgid "Add Submodule" msgstr "" -#: cola/cmds.py:3027 cola/widgets/main.py:381 +#: cola/cmds.py:2973 cola/widgets/main.py:376 msgid "Add Submodule..." msgstr "" -#: cola/widgets/editremotes.py:62 +#: cola/widgets/editremotes.py:61 msgid "" "Add and remove remote repositories using the \n" "Add(+) and Delete(-) buttons on the left-hand side.\n" @@ -577,98 +602,98 @@ msgstr "" "Externe Referenzen können umbenannt werden, indem Sie sie auswählen\n" "und \"Eingabe\" drücken, oder darauf doppelt klicken." -#: cola/widgets/editremotes.py:81 +#: cola/widgets/editremotes.py:80 msgid "Add new remote git repository" msgstr "Externes Git-Repository hinzufügen" -#: cola/widgets/patch.py:103 +#: cola/widgets/diff.py:1697 msgid "Add patches (+)" msgstr "Patches hinzufügen (+)" -#: cola/widgets/editremotes.py:433 +#: cola/widgets/editremotes.py:431 msgid "Add remote" msgstr "Externe Referenz hinzufügen" -#: cola/cmds.py:3028 +#: cola/cmds.py:2974 msgid "Add this submodule?" msgstr "" -#: cola/widgets/gitignore.py:54 +#: cola/widgets/gitignore.py:53 msgid "Add to .gitignore" msgstr "Zu .gitignore hinzufügen" -#: cola/widgets/status.py:286 +#: cola/widgets/status.py:287 msgid "Add to Git Annex" msgstr "Zu Git Annex hinzufügen" -#: cola/widgets/status.py:290 +#: cola/widgets/status.py:291 msgid "Add to Git LFS" msgstr "Zu Git LFS hinzufügen" -#: cola/widgets/gitignore.py:28 +#: cola/widgets/gitignore.py:27 msgid "Add to exclusions" msgstr "" -#: cola/widgets/gitignore.py:55 +#: cola/widgets/gitignore.py:54 msgid "Add to local .git/info/exclude" msgstr "" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Additions" msgstr "Hinzufügungen" -#: cola/widgets/archive.py:134 +#: cola/widgets/archive.py:132 msgid "Advanced" msgstr "Erweitert" -#: cola/widgets/main.py:522 +#: cola/widgets/main.py:535 msgid "Against Commit... (Diff Mode)" msgstr "" -#: cola/models/browse.py:33 +#: cola/models/browse.py:32 msgid "Age" msgstr "Alter" -#: cola/widgets/prefs.py:403 +#: cola/widgets/prefs.py:441 msgid "All Repositories" msgstr "Alle Repositories" -#: cola/cmds.py:3110 +#: cola/cmds.py:3056 #, python-format msgid "" "All submodules will be updated using\n" "\"%s\"" msgstr "" -#: cola/widgets/remote.py:195 +#: cola/widgets/remote.py:199 msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care" msgstr "Aktualisierungen ohne schnelles Vorspulen erlauben. Die Nutzung von \"force\" kann dazu führen, dass im externen Repository Commits verloren gehen; seien Sie vorsichtig" -#: cola/widgets/merge.py:61 +#: cola/widgets/merge.py:59 msgid "Always create a merge commit when enabled, even when the merge is a fast-forward update" msgstr "Immer einen Merge-Commit erzeugen, selbst wenn schnelles Vorspulen möglich ist" -#: cola/cmds.py:221 +#: cola/cmds.py:220 msgid "Amend" msgstr "Ergänzen" -#: cola/widgets/commitmsg.py:463 +#: cola/widgets/commitmsg.py:471 msgid "Amend Commit" msgstr "Letzten Commit nachbessern" -#: cola/widgets/commitmsg.py:110 cola/widgets/main.py:194 +#: cola/widgets/commitmsg.py:116 cola/widgets/main.py:193 msgid "Amend Last Commit" msgstr "Letzten Commit nachbessern" -#: cola/widgets/commitmsg.py:462 +#: cola/widgets/commitmsg.py:470 msgid "Amend the published commit?" msgstr "Möchten Sie die veröffentlichten Commit nachbessern?" -#: cola/widgets/main.py:1157 +#: cola/widgets/main.py:1170 msgid "Amending" msgstr "Am Nachbessern" -#: cola/widgets/cfgactions.py:151 +#: cola/widgets/cfgactions.py:150 msgid "" "An action is still running.\n" "Terminating it could result in data loss." @@ -676,7 +701,7 @@ msgstr "" "Zurzeit wird noch ein Befehl ausgeführt.\n" "Wenn Sie ihn abbrechen, könnten Daten verloren gehen." -#: cola/cmds.py:2804 +#: cola/cmds.py:2750 msgid "" "An unsigned, lightweight tag will be created instead.\n" "Create an unsigned tag?" @@ -684,56 +709,56 @@ msgstr "" "Stattdessen wird ein einfacher, unsignierter Tag erstellt.\n" "Unsignierten Tag erstellen?" -#: cola/widgets/prefs.py:406 +#: cola/widgets/prefs.py:444 msgid "Appearance" msgstr "" -#: cola/widgets/diff.py:1230 +#: cola/widgets/diff.py:1304 msgid "Append Patch" msgstr "" -#: cola/widgets/diff.py:1299 +#: cola/widgets/diff.py:1373 msgid "Append Patch..." msgstr "" -#: cola/widgets/patch.py:112 cola/widgets/stash.py:48 cola/widgets/stash.py:107 -#: cola/widgets/toolbar.py:323 +#: cola/widgets/diff.py:1706 cola/widgets/stash.py:50 cola/widgets/stash.py:110 +#: cola/widgets/toolbar.py:328 msgid "Apply" msgstr "Anwenden" -#: cola/widgets/patch.py:75 +#: cola/widgets/diff.py:1669 msgid "Apply Patches" msgstr "Patches anwenden" -#: cola/widgets/main.py:239 +#: cola/widgets/main.py:238 msgid "Apply Patches..." msgstr "Patches anwenden..." -#: cola/widgets/stash.py:64 +#: cola/widgets/stash.py:66 msgid "Apply and drop the selected stash (git stash pop)" msgstr "Die ausgewählte Ablage in den Arbeitsbereich zurück übernehmen" -#: cola/widgets/stash.py:48 +#: cola/widgets/stash.py:50 msgid "Apply the selected stash" msgstr "Die ausgewählte Ablage in den Arbeitsbereich zurück übernehmen" -#: cola/widgets/main.py:1167 +#: cola/widgets/main.py:1180 msgid "Applying Patch" msgstr "" -#: cola/widgets/cfgactions.py:207 +#: cola/widgets/cfgactions.py:205 msgid "Arguments" msgstr "Argumente" -#: cola/qtutils.py:850 +#: cola/qtutils.py:887 msgid "Attach" msgstr "Anhängen" -#: cola/models/browse.py:33 cola/models/browse.py:72 cola/widgets/dag.py:506 +#: cola/models/browse.py:32 cola/models/browse.py:71 cola/widgets/dag.py:572 msgid "Author" msgstr "Autor" -#: cola/widgets/about.py:93 +#: cola/widgets/about.py:91 msgid "Authors" msgstr "Autoren" @@ -741,43 +766,43 @@ msgstr "Autoren" msgid "Auto" msgstr "" -#: cola/widgets/commitmsg.py:137 cola/widgets/prefs.py:259 +#: cola/widgets/commitmsg.py:143 cola/widgets/prefs.py:280 msgid "Auto-Wrap Lines" msgstr "Zeilen automatisch umbrechen" -#: cola/widgets/prefs.py:184 +#: cola/widgets/prefs.py:206 msgid "Autocomplete Paths" msgstr "" -#: cola/widgets/prefs.py:176 +#: cola/widgets/prefs.py:198 msgid "Automatically Load Commit Message Template" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Basic Regexp" msgstr "Einfacher regulärer Ausdruck" -#: cola/widgets/prefs.py:255 +#: cola/widgets/prefs.py:276 msgid "Blame Viewer" msgstr "Verantwortlichkeitsbetrachter" -#: cola/widgets/browse.py:205 +#: cola/widgets/browse.py:206 msgid "Blame selected paths" msgstr "" -#: cola/cmds.py:545 cola/widgets/status.py:282 +#: cola/cmds.py:546 cola/widgets/status.py:283 msgid "Blame..." msgstr "Verantwortlichkeit..." -#: cola/widgets/prefs.py:347 +#: cola/widgets/prefs.py:367 msgid "Bold on dark headers instead of italic" msgstr "Fettschrift mit dunklem Hintergrund verwenden anstelle von schräg geschriebenen Überschriften" -#: cola/widgets/main.py:806 cola/widgets/submodules.py:119 +#: cola/widgets/main.py:819 cola/widgets/submodules.py:118 msgid "Branch" msgstr "Branch" -#: cola/widgets/remote.py:600 +#: cola/widgets/remote.py:635 #, python-format msgid "" "Branch \"%(branch)s\" does not exist in \"%(remote)s\".\n" @@ -786,84 +811,84 @@ msgstr "" "Der Branch \"%(branch)s\" existiert nicht in \"%(remote)s\".\n" "Ein neuer externer Branch wird veröffentlicht." -#: cola/widgets/createbranch.py:258 +#: cola/widgets/createbranch.py:256 #, python-format msgid "Branch \"%s\" already exists." msgstr "Der Branch \"%s\" existiert bereits." -#: cola/widgets/compare.py:44 +#: cola/widgets/compare.py:43 msgid "Branch Diff Viewer" msgstr "Branch-Diff-Betrachter" -#: cola/widgets/createbranch.py:259 cola/widgets/createbranch.py:271 +#: cola/widgets/createbranch.py:257 cola/widgets/createbranch.py:269 msgid "Branch Exists" msgstr "Branch existiert" -#: cola/widgets/createbranch.py:98 +#: cola/widgets/createbranch.py:96 msgid "Branch Name" msgstr "Branch-Name" -#: cola/widgets/submodules.py:89 +#: cola/widgets/submodules.py:88 msgid "Branch name" msgstr "" -#: cola/widgets/browse.py:89 cola/widgets/main.py:1097 +#: cola/widgets/browse.py:89 cola/widgets/main.py:1110 #, python-format msgid "Branch: %s" msgstr "Branch: %s" -#: cola/widgets/branch.py:85 cola/widgets/main.py:131 +#: cola/widgets/branch.py:87 cola/widgets/main.py:129 msgid "Branches" msgstr "Branches" -#: cola/widgets/main.py:538 +#: cola/widgets/main.py:551 msgid "Branches..." msgstr "Branches..." -#: cola/widgets/about.py:414 cola/widgets/about.py:417 -#: cola/widgets/about.py:437 +#: cola/widgets/about.py:397 cola/widgets/about.py:400 +#: cola/widgets/about.py:420 msgid "Brazilian translation" msgstr "Brasilianische Übersetzung" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse" msgstr "Ansehen" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse Commits..." msgstr "Commits durchsuchen..." -#: cola/widgets/main.py:499 +#: cola/widgets/main.py:512 msgid "Browse Current Branch..." msgstr "Gegenwärtigen Branch durchsuchen..." -#: cola/widgets/main.py:505 +#: cola/widgets/main.py:518 msgid "Browse Other Branch..." msgstr "Anderen Branch durchsuchen..." -#: cola/widgets/editremotes.py:437 cola/widgets/search.py:46 -#: cola/widgets/startup.py:65 cola/widgets/startup.py:285 +#: cola/widgets/editremotes.py:435 cola/widgets/search.py:45 +#: cola/widgets/startup.py:64 cola/widgets/startup.py:284 msgid "Browse..." msgstr "..." -#: cola/widgets/main.py:89 +#: cola/widgets/main.py:87 msgid "Browser" msgstr "Verzeichnisstruktur" -#: cola/widgets/browse.py:589 +#: cola/widgets/browse.py:590 #, python-format msgid "Browsing %s" msgstr "Durchsuche %s" -#: cola/widgets/commitmsg.py:118 +#: cola/widgets/commitmsg.py:124 msgid "Bypass Commit Hooks" msgstr "Commit-Hooks übergehen" -#: cola/sequenceeditor.py:175 cola/widgets/standard.py:991 +#: cola/sequenceeditor.py:173 cola/widgets/standard.py:1058 msgid "Cancel" msgstr "Abbrechen" -#: cola/sequenceeditor.py:176 +#: cola/sequenceeditor.py:174 msgid "" "Cancel rebase\n" "Shortcut: Ctrl+Q" @@ -871,188 +896,200 @@ msgstr "" "Rebase abbrechen\n" "Tastenkürzel: Strg+Q" -#: cola/cmds.py:254 +#: cola/cmds.py:253 msgid "Cannot Amend" msgstr "Fehler beim Ergänzen" -#: cola/cmds.py:560 +#: cola/cmds.py:561 #, python-format msgid "Cannot exec \"%s\": please configure a blame viewer" msgstr "Kann \"%s\" nicht ausführen: Bitte Verantwortlichkeiten-Betrachter konfigurieren" -#: cola/cmds.py:3146 +#: cola/cmds.py:3092 #, python-format msgid "Cannot exec \"%s\": please configure a history browser" msgstr "Kann \"%s\" nicht ausführen: Bitte Verlaufsbetrachter konfigurieren" -#: cola/cmds.py:1583 +#: cola/cmds.py:1571 #, python-format msgid "Cannot exec \"%s\": please configure your editor" msgstr "\"%s\" nach nicht ausgeführt werden: Bitte einen Editor konfigurieren" -#: cola/models/browse.py:336 +#: cola/models/browse.py:335 msgid "Changed Upstream" msgstr "In Upstream geändert" -#: cola/widgets/prefs.py:186 +#: cola/widgets/prefs.py:208 msgid "Check Published Commits when Amending" msgstr "" -#: cola/widgets/commitmsg.py:130 +#: cola/widgets/commitmsg.py:136 msgid "Check Spelling" msgstr "Rechtschreibung prüfen" -#: cola/widgets/prefs.py:265 +#: cola/widgets/prefs.py:286 msgid "Check spelling" msgstr "Rechtschreibung prüfen" -#: cola/widgets/prefs.py:163 +#: cola/widgets/prefs.py:186 msgid "Check whether a commit has been published when amending" msgstr "" -#: cola/guicmds.py:62 cola/widgets/branch.py:222 +#: cola/guicmds.py:61 cola/widgets/branch.py:233 msgid "Checkout" msgstr "Umstellen" -#: cola/widgets/createbranch.py:130 +#: cola/widgets/createbranch.py:128 msgid "Checkout After Creation" msgstr "Umschalten nach Erstellung" -#: cola/guicmds.py:62 cola/widgets/dag.py:410 +#: cola/guicmds.py:61 cola/widgets/dag.py:409 msgid "Checkout Branch" msgstr "Zu Branch wechseln" -#: cola/widgets/dag.py:414 +#: cola/widgets/dag.py:413 msgid "Checkout Detached HEAD" msgstr "Wechseln zu losgelöstem HEAD" -#: cola/cmds.py:480 cola/cmds.py:518 +#: cola/cmds.py:481 cola/cmds.py:519 msgid "Checkout Files" msgstr "" -#: cola/widgets/branch.py:226 +#: cola/widgets/branch.py:237 msgid "Checkout as new branch" msgstr "Als neuen Branch erstellen und wechseln" -#: cola/cmds.py:507 +#: cola/cmds.py:508 msgid "Checkout files from our branch (HEAD)" msgstr "" -#: cola/cmds.py:511 +#: cola/cmds.py:512 msgid "Checkout files from our branch?" msgstr "" -#: cola/cmds.py:469 +#: cola/cmds.py:470 msgid "Checkout files from their branch (MERGE_HEAD)" msgstr "" -#: cola/cmds.py:473 +#: cola/cmds.py:474 msgid "Checkout files from their branch?" msgstr "" -#: cola/widgets/main.py:576 +#: cola/widgets/main.py:589 msgid "Checkout..." msgstr "Wechseln..." -#: cola/widgets/dag.py:387 cola/widgets/search.py:79 +#: cola/widgets/dag.py:386 cola/widgets/search.py:78 msgid "Cherry Pick" msgstr "Einzelne Commits übernehmen" -#: cola/guicmds.py:73 +#: cola/guicmds.py:72 msgid "Cherry-Pick Commit" msgstr "Diesen Commit übernehmen" -#: cola/widgets/main.py:328 +#: cola/widgets/main.py:323 msgid "Cherry-Pick..." msgstr "Einzelnen Commit übernehmen..." -#: cola/cmds.py:584 +#: cola/cmds.py:585 msgid "Cherry-pick failed" msgstr "" -#: cola/widgets/main.py:1161 +#: cola/widgets/main.py:1174 msgid "Cherry-picking" msgstr "" -#: cola/widgets/diff.py:1247 +#: cola/widgets/diff.py:1321 msgid "Choose Patch..." msgstr "" -#: cola/widgets/search.py:319 +#: cola/widgets/search.py:318 msgid "Choose Paths" msgstr "Pfad wählen" -#: cola/widgets/grep.py:116 +#: cola/widgets/grep.py:114 msgid "Choose the \"git grep\" regular expression mode" msgstr "Modus für reguläre Ausdrücke für \"git grep\" wählen" -#: cola/widgets/bookmarks.py:229 cola/widgets/startup.py:352 +#: cola/widgets/bookmarks.py:228 cola/widgets/startup.py:351 msgid "Clear Default Repository" msgstr "Standard-Repository vergessen" -#: cola/widgets/commitmsg.py:305 +#: cola/widgets/commitmsg.py:313 msgid "Clear commit message" msgstr "Commit-Beschreibung leeren" -#: cola/widgets/commitmsg.py:302 +#: cola/widgets/commitmsg.py:310 msgid "Clear commit message?" msgstr "Commit-Beschreibung leeren?" -#: cola/widgets/commitmsg.py:62 +#: cola/widgets/commitmsg.py:63 msgid "Clear..." msgstr "Leeren..." -#: cola/widgets/clone.py:126 +#: cola/widgets/clone.py:124 msgid "Clone" msgstr "Klonen" -#: cola/widgets/clone.py:62 cola/widgets/clone.py:104 +#: cola/widgets/clone.py:61 cola/widgets/clone.py:102 msgid "Clone Repository" msgstr "Repository klonen" -#: cola/widgets/main.py:465 cola/widgets/startup.py:58 +#: cola/widgets/main.py:478 cola/widgets/startup.py:57 msgid "Clone..." msgstr "Klonen..." -#: cola/widgets/clone.py:62 +#: cola/widgets/clone.py:61 #, python-format msgid "Cloning repository at %s" msgstr "Klone Repository aus %s" -#: cola/qtutils.py:757 cola/qtutils.py:807 cola/widgets/about.py:508 -#: cola/widgets/remote.py:328 cola/widgets/text.py:1094 +#: cola/qtutils.py:788 cola/qtutils.py:838 cola/widgets/about.py:491 +#: cola/widgets/remote.py:362 cola/widgets/text.py:1090 msgid "Close" msgstr "Schließen" -#: cola/widgets/text.py:402 +#: cola/widgets/remote.py:222 +msgid "Close dialog when completed" +msgstr "" + +#: cola/widgets/remote.py:221 +msgid "Close on completion" +msgstr "" + +#: cola/widgets/text.py:399 msgid "Close the find bar" msgstr "" -#: cola/qtutils.py:623 +#: cola/qtutils.py:651 msgid "Close..." msgstr "Schließen..." -#: cola/widgets/recent.py:71 +#: cola/widgets/recent.py:69 msgid "Collapse all" msgstr "Alle zuklappen" -#: cola/sequenceeditor.py:323 +#: cola/sequenceeditor.py:320 msgid "Command" msgstr "Kommando" -#: cola/widgets/main.py:163 cola/widgets/merge.py:74 +#: cola/widgets/main.py:161 cola/widgets/merge.py:72 msgid "Commit" msgstr "Commit" -#: cola/cmds.py:837 +#: cola/widgets/prefs.py:192 +msgid "Commit Message Cleanup" +msgstr "" + +#: cola/widgets/commitmsg.py:495 msgid "Commit failed" msgstr "Commit fehlgeschlagen" -#: cola/widgets/commitmsg.py:61 +#: cola/widgets/commitmsg.py:62 msgid "Commit staged changes" msgstr "Vorgemerkte Änderungen aufnehmen" -#: cola/widgets/commitmsg.py:93 +#: cola/widgets/commitmsg.py:94 msgid "" "Commit staged changes\n" "Shortcut: Ctrl+Enter" @@ -1060,361 +1097,365 @@ msgstr "" "Vorgemerkte Änderungen aufnehmen\n" "Kürzel: Strg+Enter" -#: cola/widgets/commitmsg.py:564 +#: cola/widgets/commitmsg.py:590 msgid "Commit summary" msgstr "Commit-Zusammenfassung" -#: cola/widgets/main.py:259 +#: cola/widgets/main.py:253 msgid "Commit the current state and continue applying patches" msgstr "" -#: cola/widgets/merge.py:70 +#: cola/widgets/merge.py:68 msgid "Commit the merge if there are no conflicts. Uncheck to leave the merge uncommitted" msgstr "Merge eintragen, wenn es keine Konflikte gibt. Haken entfernen, um den Merge offen zu lassen" -#: cola/widgets/commitmsg.py:58 cola/widgets/commitmsg.py:95 -#: cola/widgets/main.py:778 cola/widgets/main.py:779 +#: cola/widgets/commitmsg.py:59 cola/widgets/commitmsg.py:96 +#: cola/widgets/main.py:791 cola/widgets/main.py:792 msgid "Commit@@verb" msgstr "Commit aufnehmen" -#: cola/difftool.py:78 cola/widgets/compare.py:70 +#: cola/widgets/dag.py:487 +msgid "Commits authored by me" +msgstr "" + +#: cola/difftool.py:97 cola/widgets/compare.py:69 msgid "Compare" msgstr "Vergleichen" -#: cola/difftool.py:83 +#: cola/difftool.py:102 msgid "Compare All" msgstr "Alle vergleichen" -#: cola/widgets/toolbar.py:269 cola/widgets/toolbar.py:306 +#: cola/widgets/toolbar.py:274 cola/widgets/toolbar.py:311 msgid "Configure Toolbar" msgstr "Werkzeugleiste konfigurieren" -#: cola/widgets/remote.py:214 +#: cola/widgets/remote.py:218 msgid "Configure the remote branch as the the new upstream" msgstr "Externen Branch als neuen Upstream konfigurieren" -#: cola/widgets/main.py:170 +#: cola/widgets/main.py:168 msgid "Console" msgstr "Meldungen" -#: cola/interaction.py:111 cola/widgets/main.py:610 +#: cola/interaction.py:109 cola/widgets/main.py:623 msgid "Continue" msgstr "Fortsetzen" -#: cola/widgets/main.py:255 +#: cola/widgets/main.py:252 msgid "Continue Applying Patches" msgstr "" -#: cola/widgets/bookmarks.py:248 cola/widgets/main.py:742 -#: cola/widgets/startup.py:371 +#: cola/widgets/bookmarks.py:247 cola/widgets/main.py:755 +#: cola/widgets/startup.py:370 msgid "Copy" msgstr "Kopieren" -#: cola/widgets/status.py:268 +#: cola/widgets/status.py:269 msgid "Copy Basename to Clipboard" msgstr "Dateiname in Zwischenablage kopieren" -#: cola/widgets/diff.py:208 +#: cola/widgets/diff.py:209 msgid "Copy Diff" msgstr "" -#: cola/widgets/status.py:745 +#: cola/widgets/status.py:746 msgid "Copy Leading Path to Clipboard" msgstr "Führenden Pfad in Zwischenablage kopieren" -#: cola/widgets/status.py:251 +#: cola/widgets/status.py:252 msgid "Copy Path to Clipboard" msgstr "Kopiere Pfad in Zwischenablage" -#: cola/widgets/status.py:259 +#: cola/widgets/status.py:260 msgid "Copy Relative Path to Clipboard" msgstr "Relativen Pfad in Zwischenablage kopieren" -#: cola/sequenceeditor.py:334 cola/widgets/dag.py:474 +#: cola/sequenceeditor.py:330 cola/widgets/dag.py:473 msgid "Copy SHA-1" msgstr "SHA-1 kopieren" -#: cola/widgets/status.py:737 +#: cola/widgets/status.py:738 msgid "Copy..." msgstr "Kopieren..." -#: cola/app.py:490 +#: cola/app.py:493 #, python-format msgid "Could not open %s." msgstr "" -#: cola/widgets/clone.py:191 cola/widgets/clone.py:193 +#: cola/widgets/clone.py:189 cola/widgets/clone.py:191 #, python-format msgid "Could not parse Git URL: \"%s\"" msgstr "URL konnte nicht ausgewertet werden: \"%s\"" -#: cola/app.py:500 +#: cola/app.py:503 msgid "Create" msgstr "" -#: cola/widgets/createbranch.py:86 cola/widgets/createbranch.py:135 -#: cola/widgets/createbranch.py:301 cola/widgets/dag.py:369 +#: cola/widgets/createbranch.py:84 cola/widgets/createbranch.py:133 +#: cola/widgets/createbranch.py:299 cola/widgets/dag.py:368 msgid "Create Branch" msgstr "Branch erstellen" -#: cola/widgets/dag.py:373 +#: cola/widgets/dag.py:372 msgid "Create Patch" msgstr "Patch erstellen" -#: cola/widgets/remote.py:606 +#: cola/widgets/remote.py:641 msgid "Create Remote Branch" msgstr "Externen Branch erstellen" -#: cola/widgets/commitmsg.py:124 cola/widgets/merge.py:78 +#: cola/widgets/commitmsg.py:130 cola/widgets/merge.py:76 msgid "Create Signed Commit" msgstr "Unterzeichneten Commit erstellen" -#: cola/widgets/createtag.py:55 cola/widgets/createtag.py:91 -#: cola/widgets/dag.py:377 +#: cola/widgets/createtag.py:53 cola/widgets/createtag.py:89 +#: cola/widgets/dag.py:376 msgid "Create Tag" msgstr "Tag erstellen" -#: cola/widgets/main.py:544 +#: cola/widgets/main.py:557 msgid "Create Tag..." msgstr "Tag erstellen..." -#: cola/cmds.py:2807 +#: cola/cmds.py:2753 msgid "Create Unsigned Tag" msgstr "Unsignierten Tag erstellen" -#: cola/widgets/remote.py:188 +#: cola/widgets/remote.py:192 msgid "Create a merge commit even when the merge resolves as a fast-forward" msgstr "Merge-Commit erstellen, selbst wenn der Merge mit schnellem Vorspulen auflösbar ist" -#: cola/widgets/remote.py:605 +#: cola/widgets/remote.py:640 msgid "Create a new remote branch?" msgstr "Neuen externen Branch erstellen?" -#: cola/app.py:499 +#: cola/app.py:502 msgid "Create a new repository at that location?" msgstr "" -#: cola/widgets/submodules.py:100 +#: cola/widgets/submodules.py:99 msgid "Create a shallow clone with history truncated to the specified number of revisions. 0 performs a full clone." msgstr "" -#: cola/widgets/main.py:551 +#: cola/widgets/main.py:564 msgid "Create..." msgstr "Neu..." -#: cola/cmds.py:2843 +#: cola/cmds.py:2789 #, python-format msgid "Created a new tag named \"%s\"" msgstr "Tag erstellt als \"%s\"" -#: cola/widgets/prefs.py:266 +#: cola/widgets/prefs.py:287 msgid "Ctrl+MouseWheel to Zoom" msgstr "" -#: cola/widgets/prefs.py:404 +#: cola/widgets/prefs.py:442 msgid "Current Repository" msgstr "Gegenwärtiges Repository" -#: cola/widgets/status.py:1371 +#: cola/widgets/status.py:1372 msgid "Custom Copy Actions" msgstr "Benutzerdefinierte Kopier-Befehle" -#: cola/widgets/status.py:273 +#: cola/widgets/status.py:274 msgid "Customize..." msgstr "Anpassen..." -#: cola/widgets/main.py:740 +#: cola/widgets/main.py:753 msgid "Cut" msgstr "Ausschneiden" -#: cola/widgets/about.py:411 cola/widgets/about.py:442 +#: cola/widgets/about.py:394 cola/widgets/about.py:425 msgid "Czech translation" msgstr "Tschechische Übersetzung" -#: cola/widgets/main.py:592 +#: cola/widgets/main.py:605 msgid "DAG..." msgstr "DAG..." -#: cola/icons.py:55 +#: cola/icons.py:54 msgid "Dark Theme" msgstr "" -#: cola/widgets/dag.py:506 +#: cola/widgets/dag.py:572 msgid "Date, Time" msgstr "Datum und Zeit" -#: cola/icons.py:54 cola/themes.py:637 +#: cola/icons.py:53 cola/themes.py:643 msgid "Default" msgstr "" -#: cola/widgets/prefs.py:126 +#: cola/widgets/prefs.py:124 msgid "" "Default directory when exporting patches.\n" "Relative paths are relative to the current repository.\n" "Absolute path are used as-is." msgstr "" -#: cola/cmds.py:925 cola/guicmds.py:26 cola/guicmds.py:35 -#: cola/widgets/bookmarks.py:75 cola/widgets/bookmarks.py:251 -#: cola/widgets/main.py:746 cola/widgets/startup.py:373 +#: cola/cmds.py:923 cola/guicmds.py:25 cola/guicmds.py:34 +#: cola/widgets/bookmarks.py:74 cola/widgets/bookmarks.py:250 +#: cola/widgets/main.py:759 cola/widgets/startup.py:372 msgid "Delete" msgstr "Löschen" -#: cola/cmds.py:1088 +#: cola/cmds.py:1089 #, python-format msgid "Delete %d file(s)?" msgstr "Wollen Sie %d Datei(en) löschen?" -#: cola/cmds.py:1016 +#: cola/cmds.py:1017 msgid "Delete Bookmark" msgstr "Favoriten löschen" -#: cola/cmds.py:1014 +#: cola/cmds.py:1015 msgid "Delete Bookmark?" msgstr "Favorit löschen?" -#: cola/cmds.py:1114 cola/cmds.py:1117 cola/guicmds.py:26 -#: cola/widgets/branch.py:268 +#: cola/cmds.py:1115 cola/cmds.py:1118 cola/guicmds.py:25 +#: cola/widgets/branch.py:277 msgid "Delete Branch" msgstr "Branch löschen" -#: cola/cmds.py:1089 +#: cola/cmds.py:1090 msgid "Delete Files" msgstr "Lösche Dateien" -#: cola/widgets/status.py:311 +#: cola/widgets/status.py:312 msgid "Delete Files..." msgstr "Lösche Datei(en)..." -#: cola/cmds.py:1085 +#: cola/cmds.py:1086 msgid "Delete Files?" msgstr "Datei(en) löschen?" -#: cola/cmds.py:922 +#: cola/cmds.py:920 msgid "Delete Remote" msgstr "Externe Referenz löschen" -#: cola/guicmds.py:35 cola/widgets/branch.py:270 +#: cola/guicmds.py:34 cola/widgets/branch.py:279 msgid "Delete Remote Branch" msgstr "Externen Branch löschen" -#: cola/widgets/main.py:564 +#: cola/widgets/main.py:577 msgid "Delete Remote Branch..." msgstr "Externen Branch löschen..." -#: cola/widgets/toolbar.py:271 +#: cola/widgets/toolbar.py:276 msgid "Delete Toolbar" msgstr "Werkzeugleiste löschen" -#: cola/cmds.py:1115 +#: cola/cmds.py:1116 #, python-format msgid "Delete branch \"%s\"?" msgstr "" -#: cola/widgets/editremotes.py:88 +#: cola/widgets/editremotes.py:87 msgid "Delete remote" msgstr "Externe Referenz löschen" -#: cola/cmds.py:924 +#: cola/cmds.py:922 #, python-format msgid "Delete remote \"%s\"" msgstr "Externe Referenz \"%s\" löschen" -#: cola/cmds.py:923 +#: cola/cmds.py:921 msgid "Delete remote?" msgstr "Externe Referenz löschen?" -#: cola/widgets/main.py:558 +#: cola/widgets/main.py:571 msgid "Delete..." msgstr "Löschen..." -#: cola/cmds.py:1067 +#: cola/cmds.py:1068 #, python-format msgid "Deleting \"%s\" failed" msgstr "Löschen von \"%s\" fehlgeschlagen" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Deletions" msgstr "Löschungen" -#: cola/widgets/submodules.py:120 +#: cola/widgets/submodules.py:119 msgid "Depth" msgstr "" -#: cola/qtutils.py:811 cola/qtutils.py:852 +#: cola/qtutils.py:842 cola/qtutils.py:889 msgid "Detach" msgstr "Loslösen" -#: cola/widgets/prefs.py:181 +#: cola/widgets/prefs.py:203 msgid "Detect Conflict Markers" msgstr "Konflikt-Markierungen erkennen" -#: cola/widgets/prefs.py:151 +#: cola/widgets/prefs.py:174 msgid "Detect conflict markers in unmerged files" msgstr "Konflikt-Markierungen in nicht zusammengeführten Dateien erkennen" -#: cola/widgets/about.py:271 cola/widgets/about.py:274 -#: cola/widgets/about.py:277 cola/widgets/about.py:278 -#: cola/widgets/about.py:279 cola/widgets/about.py:280 -#: cola/widgets/about.py:281 cola/widgets/about.py:282 -#: cola/widgets/about.py:283 cola/widgets/about.py:284 -#: cola/widgets/about.py:285 cola/widgets/about.py:286 -#: cola/widgets/about.py:287 cola/widgets/about.py:288 -#: cola/widgets/about.py:289 cola/widgets/about.py:290 -#: cola/widgets/about.py:291 cola/widgets/about.py:292 -#: cola/widgets/about.py:293 cola/widgets/about.py:294 -#: cola/widgets/about.py:295 cola/widgets/about.py:296 -#: cola/widgets/about.py:297 cola/widgets/about.py:298 -#: cola/widgets/about.py:299 cola/widgets/about.py:300 -#: cola/widgets/about.py:301 cola/widgets/about.py:302 -#: cola/widgets/about.py:303 cola/widgets/about.py:304 -#: cola/widgets/about.py:305 cola/widgets/about.py:306 -#: cola/widgets/about.py:307 cola/widgets/about.py:308 -#: cola/widgets/about.py:309 cola/widgets/about.py:310 -#: cola/widgets/about.py:311 cola/widgets/about.py:312 -#: cola/widgets/about.py:313 cola/widgets/about.py:314 -#: cola/widgets/about.py:315 cola/widgets/about.py:316 -#: cola/widgets/about.py:317 cola/widgets/about.py:318 -#: cola/widgets/about.py:319 cola/widgets/about.py:320 -#: cola/widgets/about.py:321 cola/widgets/about.py:322 -#: cola/widgets/about.py:323 cola/widgets/about.py:324 -#: cola/widgets/about.py:325 cola/widgets/about.py:326 -#: cola/widgets/about.py:327 cola/widgets/about.py:328 -#: cola/widgets/about.py:329 cola/widgets/about.py:330 -#: cola/widgets/about.py:331 cola/widgets/about.py:332 -#: cola/widgets/about.py:333 cola/widgets/about.py:334 -#: cola/widgets/about.py:335 cola/widgets/about.py:336 -#: cola/widgets/about.py:337 cola/widgets/about.py:338 -#: cola/widgets/about.py:339 cola/widgets/about.py:340 -#: cola/widgets/about.py:341 cola/widgets/about.py:342 -#: cola/widgets/about.py:343 cola/widgets/about.py:344 -#: cola/widgets/about.py:345 cola/widgets/about.py:346 -#: cola/widgets/about.py:347 cola/widgets/about.py:348 -#: cola/widgets/about.py:349 cola/widgets/about.py:350 -#: cola/widgets/about.py:351 cola/widgets/about.py:352 -#: cola/widgets/about.py:353 cola/widgets/about.py:354 -#: cola/widgets/about.py:355 cola/widgets/about.py:356 -#: cola/widgets/about.py:357 cola/widgets/about.py:358 -#: cola/widgets/about.py:359 cola/widgets/about.py:360 -#: cola/widgets/about.py:361 cola/widgets/about.py:362 -#: cola/widgets/about.py:363 cola/widgets/about.py:364 -#: cola/widgets/about.py:365 cola/widgets/about.py:366 -#: cola/widgets/about.py:367 cola/widgets/about.py:368 -#: cola/widgets/about.py:369 cola/widgets/about.py:370 -#: cola/widgets/about.py:371 cola/widgets/about.py:372 -#: cola/widgets/about.py:373 cola/widgets/about.py:374 -#: cola/widgets/about.py:375 cola/widgets/about.py:376 -#: cola/widgets/about.py:377 cola/widgets/about.py:378 -#: cola/widgets/about.py:379 cola/widgets/about.py:380 +#: cola/widgets/about.py:254 cola/widgets/about.py:257 +#: cola/widgets/about.py:260 cola/widgets/about.py:261 +#: cola/widgets/about.py:262 cola/widgets/about.py:263 +#: cola/widgets/about.py:264 cola/widgets/about.py:265 +#: cola/widgets/about.py:266 cola/widgets/about.py:267 +#: cola/widgets/about.py:268 cola/widgets/about.py:269 +#: cola/widgets/about.py:270 cola/widgets/about.py:271 +#: cola/widgets/about.py:272 cola/widgets/about.py:273 +#: cola/widgets/about.py:274 cola/widgets/about.py:275 +#: cola/widgets/about.py:276 cola/widgets/about.py:277 +#: cola/widgets/about.py:278 cola/widgets/about.py:279 +#: cola/widgets/about.py:280 cola/widgets/about.py:281 +#: cola/widgets/about.py:282 cola/widgets/about.py:283 +#: cola/widgets/about.py:284 cola/widgets/about.py:285 +#: cola/widgets/about.py:286 cola/widgets/about.py:287 +#: cola/widgets/about.py:288 cola/widgets/about.py:289 +#: cola/widgets/about.py:290 cola/widgets/about.py:291 +#: cola/widgets/about.py:292 cola/widgets/about.py:293 +#: cola/widgets/about.py:294 cola/widgets/about.py:295 +#: cola/widgets/about.py:296 cola/widgets/about.py:297 +#: cola/widgets/about.py:298 cola/widgets/about.py:299 +#: cola/widgets/about.py:300 cola/widgets/about.py:301 +#: cola/widgets/about.py:302 cola/widgets/about.py:303 +#: cola/widgets/about.py:304 cola/widgets/about.py:305 +#: cola/widgets/about.py:306 cola/widgets/about.py:307 +#: cola/widgets/about.py:308 cola/widgets/about.py:309 +#: cola/widgets/about.py:310 cola/widgets/about.py:311 +#: cola/widgets/about.py:312 cola/widgets/about.py:313 +#: cola/widgets/about.py:314 cola/widgets/about.py:315 +#: cola/widgets/about.py:316 cola/widgets/about.py:317 +#: cola/widgets/about.py:318 cola/widgets/about.py:319 +#: cola/widgets/about.py:320 cola/widgets/about.py:321 +#: cola/widgets/about.py:322 cola/widgets/about.py:323 +#: cola/widgets/about.py:324 cola/widgets/about.py:325 +#: cola/widgets/about.py:326 cola/widgets/about.py:327 +#: cola/widgets/about.py:328 cola/widgets/about.py:329 +#: cola/widgets/about.py:330 cola/widgets/about.py:331 +#: cola/widgets/about.py:332 cola/widgets/about.py:333 +#: cola/widgets/about.py:334 cola/widgets/about.py:335 +#: cola/widgets/about.py:336 cola/widgets/about.py:337 +#: cola/widgets/about.py:338 cola/widgets/about.py:339 +#: cola/widgets/about.py:340 cola/widgets/about.py:341 +#: cola/widgets/about.py:342 cola/widgets/about.py:343 +#: cola/widgets/about.py:344 cola/widgets/about.py:345 +#: cola/widgets/about.py:346 cola/widgets/about.py:347 +#: cola/widgets/about.py:348 cola/widgets/about.py:349 +#: cola/widgets/about.py:350 cola/widgets/about.py:351 +#: cola/widgets/about.py:352 cola/widgets/about.py:353 +#: cola/widgets/about.py:354 cola/widgets/about.py:355 +#: cola/widgets/about.py:356 cola/widgets/about.py:357 +#: cola/widgets/about.py:358 cola/widgets/about.py:359 +#: cola/widgets/about.py:360 cola/widgets/about.py:361 +#: cola/widgets/about.py:362 cola/widgets/about.py:363 msgid "Developer" msgstr "Entwickler" -#: cola/guicmds.py:185 cola/widgets/dag.py:764 cola/widgets/diff.py:781 -#: cola/widgets/main.py:177 cola/widgets/main.py:797 +#: cola/guicmds.py:184 cola/widgets/dag.py:830 cola/widgets/diff.py:809 +#: cola/widgets/main.py:175 cola/widgets/main.py:810 msgid "Diff" msgstr "Vergleich" -#: cola/guicmds.py:185 +#: cola/guicmds.py:184 msgid "Diff Against Commit" msgstr "" @@ -1422,35 +1463,35 @@ msgstr "" msgid "Diff Against Predecessor..." msgstr "Mit einem Vorgänger vergleichen..." -#: cola/widgets/main.py:1159 +#: cola/widgets/main.py:1172 msgid "Diff Mode" msgstr "" -#: cola/widgets/diff.py:772 cola/widgets/diff.py:796 +#: cola/widgets/diff.py:800 cola/widgets/diff.py:824 msgid "Diff Options" msgstr "Vergleichsoptionen" -#: cola/widgets/prefs.py:256 +#: cola/widgets/prefs.py:277 msgid "Diff Tool" msgstr "Werkzeug zum Dateivergleich" -#: cola/widgets/dag.py:364 +#: cola/widgets/dag.py:363 msgid "Diff selected -> this" msgstr "Auswahl mit diesem vergleichen" -#: cola/widgets/dag.py:358 +#: cola/widgets/dag.py:357 msgid "Diff this -> selected" msgstr "Mit Auswahl vergleichen" -#: cola/widgets/main.py:218 +#: cola/widgets/main.py:217 msgid "Diffstat" msgstr "Vergleichsstatistik" -#: cola/cmds.py:3262 +#: cola/difftool.py:324 msgid "Difftool" msgstr "Diff-Werkzeug" -#: cola/widgets/clone.py:207 +#: cola/widgets/clone.py:205 msgid "Directory Exists" msgstr "Verzeichnis existiert" @@ -1458,84 +1499,88 @@ msgstr "Verzeichnis existiert" msgid "Disable" msgstr "" -#: cola/widgets/prefs.py:180 +#: cola/widgets/prefs.py:202 msgid "Display Untracked Files" msgstr "Nicht verfolgte Dateien anzeigen" -#: cola/cmds.py:2094 +#: cola/widgets/remote.py:176 +msgid "Display remote messages in a separate dialog" +msgstr "" + +#: cola/cmds.py:2045 msgid "Do not update stacked branches" msgstr "" -#: cola/widgets/main.py:471 +#: cola/widgets/main.py:484 msgid "Documentation" msgstr "Online-Hilfe" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop" msgstr "Löschen" -#: cola/widgets/stash.py:258 +#: cola/widgets/stash.py:276 msgid "Drop Stash" msgstr "Ablage löschen" -#: cola/widgets/stash.py:255 +#: cola/widgets/stash.py:273 msgid "Drop Stash?" msgstr "Möchten Sie die Ablage löschen?" -#: cola/widgets/stash.py:257 +#: cola/widgets/stash.py:275 #, python-format msgid "Drop the \"%s\" stash?" msgstr "Möchten Sie die Ablage \"%s\" löschen?" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop the selected stash" msgstr "Die ausgewählte Ablage löschen" -#: cola/qtutils.py:764 cola/sequenceeditor.py:357 cola/widgets/grep.py:102 +#: cola/qtutils.py:795 cola/sequenceeditor.py:353 cola/widgets/grep.py:100 msgid "Edit" msgstr "Bearbeiten" -#: cola/widgets/diff.py:1019 +#: cola/widgets/diff.py:1058 msgid "Edit Diff Hunk to Revert..." msgstr "" -#: cola/widgets/diff.py:1017 +#: cola/widgets/diff.py:1056 msgid "Edit Diff Hunk to Stage..." msgstr "" -#: cola/widgets/diff.py:1062 +#: cola/widgets/diff.py:1124 msgid "Edit Diff Hunk to Unstage..." msgstr "" -#: cola/cmds.py:2166 +#: cola/cmds.py:2117 msgid "Edit Rebase" msgstr "Rebase bearbeiten" -#: cola/widgets/editremotes.py:36 +#: cola/widgets/editremotes.py:35 msgid "Edit Remotes" msgstr "Externe Referenzen bearbeiten" -#: cola/widgets/main.py:298 +#: cola/widgets/main.py:293 msgid "Edit Remotes..." msgstr "Externe Referenzen bearbeiten..." -#: cola/widgets/diff.py:1014 +#: cola/widgets/diff.py:1053 msgid "Edit Selected Lines to Revert..." msgstr "" -#: cola/widgets/diff.py:1012 +#: cola/widgets/diff.py:1051 msgid "Edit Selected Lines to Stage..." msgstr "" -#: cola/widgets/diff.py:1059 +#: cola/widgets/diff.py:1122 msgid "Edit Selected Lines to Unstage..." msgstr "" -#: cola/widgets/editremotes.py:44 +#: cola/widgets/editremotes.py:43 msgid "Edit remotes by selecting them from the list" msgstr "Bearbeiten Sie externe Referenzen, indem Sie sie in der Liste auswählen" -#: cola/widgets/browse.py:197 cola/widgets/common.py:39 +#: cola/widgets/browse.py:198 cola/widgets/common.py:38 msgid "Edit selected paths" msgstr "Ausgewählten Pfad bearbeiten" @@ -1551,11 +1596,11 @@ msgstr "" msgid "Edit the following patch, which will then be applied to the worktree to revert the changes:" msgstr "" -#: cola/widgets/main.py:604 +#: cola/widgets/main.py:617 msgid "Edit..." msgstr "Bearbeiten..." -#: cola/widgets/prefs.py:253 +#: cola/widgets/prefs.py:274 msgid "Editor" msgstr "Editor" @@ -1564,153 +1609,158 @@ msgstr "Editor" msgid "Editor returned %s exit code. Not applying patch." msgstr "" -#: cola/widgets/prefs.py:167 +#: cola/widgets/prefs.py:190 msgid "Email Address" msgstr "E-Mail-Adresse" -#: cola/widgets/about.py:258 cola/widgets/about.py:401 +#: cola/widgets/about.py:241 cola/widgets/about.py:384 msgid "Email contributor" msgstr "E-Mail an Beitragenden" -#: cola/widgets/prefs.py:182 +#: cola/widgets/prefs.py:204 msgid "Enable Gravatar Icons" msgstr "" -#: cola/widgets/prefs.py:160 +#: cola/widgets/prefs.py:183 msgid "Enable path autocompletion in tools" msgstr "" -#: cola/widgets/diff.py:768 +#: cola/widgets/diff.py:796 msgid "Enable word wrapping" msgstr "" -#: cola/sequenceeditor.py:322 +#: cola/sequenceeditor.py:319 msgid "Enabled" msgstr "Aktiviert" -#: cola/guicmds.py:333 cola/widgets/branch.py:445 +#: cola/guicmds.py:332 cola/widgets/branch.py:478 msgid "Enter New Branch Name" msgstr "Namen für neuen Branch vergeben" -#: cola/guicmds.py:147 +#: cola/guicmds.py:146 msgid "Enter a name for the new bare repo" msgstr "Namen für neues kahles Repository" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Enter a name for the stash" msgstr "Geben Sie einen Namen für die Ablage an" -#: cola/cmds.py:146 cola/cmds.py:176 cola/cmds.py:207 cola/cmds.py:283 -#: cola/cmds.py:292 cola/cmds.py:307 cola/cmds.py:317 cola/cmds.py:460 -#: cola/cmds.py:496 cola/cmds.py:534 cola/cmds.py:633 cola/cmds.py:751 -#: cola/cmds.py:1067 cola/cmds.py:1164 cola/cmds.py:2005 cola/cmds.py:2394 -#: cola/cmds.py:2637 cola/cmds.py:2643 cola/cmds.py:2651 cola/cmds.py:2872 -#: cola/cmds.py:2890 cola/cmds.py:3180 cola/gitcmds.py:984 cola/guicmds.py:157 -#: cola/models/stash.py:70 cola/models/stash.py:87 cola/models/stash.py:108 -#: cola/widgets/bookmarks.py:482 cola/widgets/branch.py:777 +#: cola/widgets/stash.py:216 +msgid "Enter a new name for the stash" +msgstr "" + +#: cola/cmds.py:145 cola/cmds.py:175 cola/cmds.py:206 cola/cmds.py:284 +#: cola/cmds.py:293 cola/cmds.py:308 cola/cmds.py:318 cola/cmds.py:461 +#: cola/cmds.py:497 cola/cmds.py:535 cola/cmds.py:635 cola/cmds.py:753 +#: cola/cmds.py:1068 cola/cmds.py:1165 cola/cmds.py:1956 cola/cmds.py:2345 +#: cola/cmds.py:2579 cola/cmds.py:2585 cola/cmds.py:2593 cola/cmds.py:2818 +#: cola/cmds.py:2836 cola/cmds.py:3125 cola/gitcmds.py:994 cola/guicmds.py:156 +#: cola/models/stash.py:70 cola/models/stash.py:90 cola/models/stash.py:112 +#: cola/models/stash.py:138 cola/widgets/bookmarks.py:481 +#: cola/widgets/branch.py:829 msgid "Error" msgstr "Fehler" -#: cola/widgets/clone.py:191 +#: cola/widgets/clone.py:189 msgid "Error Cloning" msgstr "Fehler beim Klonen" -#: cola/widgets/createbranch.py:314 +#: cola/widgets/createbranch.py:312 msgid "Error Creating Branch" msgstr "Fehler beim Erstellen des Branches" -#: cola/app.py:502 cola/guicmds.py:101 +#: cola/app.py:505 cola/guicmds.py:100 msgid "Error Creating Repository" msgstr "Fehler beim Anlegen des Repositories" -#: cola/cmds.py:1202 +#: cola/cmds.py:1206 msgid "Error Deleting Remote Branch" msgstr "Fehler beim Löschen des externen Branches" -#: cola/cmds.py:1585 +#: cola/cmds.py:1573 msgid "Error Editing File" msgstr "Fehler beim Bearbeiten der Datei" -#: cola/cmds.py:559 +#: cola/cmds.py:560 msgid "Error Launching Blame Viewer" msgstr "Fehler beim Starten der Verantwortlichkeitansicht" -#: cola/cmds.py:3145 +#: cola/cmds.py:3091 msgid "Error Launching History Browser" msgstr "Fehler beim Starten der Verlaufsansicht" -#: cola/app.py:489 +#: cola/app.py:492 msgid "Error Opening Repository" msgstr "" -#: cola/widgets/browse.py:566 +#: cola/models/stash.py:144 +msgid "Error Renaming Stash" +msgstr "" + +#: cola/widgets/browse.py:567 msgid "Error Saving File" msgstr "" -#: cola/cmds.py:914 +#: cola/cmds.py:912 #, python-format msgid "Error creating remote \"%s\"" msgstr "Fehler beim erstellen der externen Referenz \"%s\"" -#: cola/models/stash.py:197 +#: cola/models/stash.py:233 msgid "Error creating stash" msgstr "Fehler beim Erstellen der Ablage" -#: cola/cmds.py:1126 +#: cola/cmds.py:1127 #, python-format msgid "Error deleting branch \"%s\"" msgstr "" -#: cola/cmds.py:932 +#: cola/cmds.py:930 #, python-format msgid "Error deleting remote \"%s\"" msgstr "Fehler beim Löschen der externen Referenz \"%s\"" -#: cola/cmds.py:956 +#: cola/cmds.py:955 #, python-format msgid "Error renaming \"%(name)s\" to \"%(new_name)s\"" msgstr "Fehler beim Umbenennen von \"%(name)s\" in \"%(new_name)s\"" -#: cola/cmds.py:1771 +#: cola/cmds.py:1722 msgid "Error running prepare-commitmsg hook" msgstr "Fehler beim Aufrufen der Vor-Eintragen-Kontrolle" -#: cola/cmds.py:3043 cola/cmds.py:3089 +#: cola/cmds.py:2989 cola/cmds.py:3035 #, python-format msgid "Error updating submodule %s" msgstr "" -#: cola/cmds.py:3125 +#: cola/cmds.py:3071 msgid "Error updating submodules" msgstr "" -#: cola/widgets/diff.py:1326 +#: cola/widgets/diff.py:1400 msgid "Error writing patch" msgstr "" -#: cola/cmds.py:1710 +#: cola/cmds.py:1662 msgid "Error: Cannot find commit template" msgstr "Fehler: Commit-Vorlage nicht gefunden" -#: cola/widgets/stash.py:235 -msgid "Error: Stash exists" -msgstr "Fehler: Diese Ablage existiert bereits" - -#: cola/cmds.py:1732 +#: cola/cmds.py:1684 msgid "Error: Unconfigured commit template" msgstr "Fehler: Commit-Textvorlage nicht konfiguriert" -#: cola/widgets/clone.py:53 +#: cola/widgets/clone.py:52 #, python-format msgid "Error: could not clone \"%s\"" msgstr "Fehler: Konnte \"%s\" nicht klonen" -#: cola/cmds.py:2835 +#: cola/cmds.py:2781 #, python-format msgid "Error: could not create tag \"%s\"" msgstr "Fehler: Konnte Tag \"%s\" nicht erstellen" -#: cola/widgets/branch.py:421 +#: cola/widgets/branch.py:433 #, python-format msgid "Executing action %s" msgstr "Ausführen von Aktion %s" @@ -1719,112 +1769,116 @@ msgstr "Ausführen von Aktion %s" msgid "Exit \"Diff\" mode" msgstr "" -#: cola/widgets/action.py:67 +#: cola/widgets/action.py:81 msgid "Exit Diff" msgstr "" -#: cola/widgets/main.py:528 +#: cola/widgets/main.py:541 msgid "Exit Diff Mode" msgstr "" -#: cola/widgets/action.py:68 +#: cola/widgets/action.py:81 msgid "Exit Diff mode" msgstr "" -#: cola/widgets/recent.py:67 +#: cola/widgets/recent.py:65 msgid "Expand all" msgstr "Alles ausklappen" -#: cola/widgets/diff.py:1223 +#: cola/widgets/diff.py:1297 msgid "Export Patch" msgstr "" -#: cola/guicmds.py:168 cola/widgets/search.py:75 +#: cola/guicmds.py:167 cola/widgets/search.py:74 msgid "Export Patches" msgstr "Patches exportieren" -#: cola/widgets/main.py:273 +#: cola/widgets/main.py:268 msgid "Export Patches..." msgstr "Patches exportieren..." -#: cola/widgets/main.py:533 +#: cola/widgets/main.py:546 msgid "Expression..." msgstr "Mit Suchausdruck..." -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Extended Regexp" msgstr "Erweiterte reguläre Ausdrücke" -#: cola/widgets/commitmsg.py:612 +#: cola/widgets/commitmsg.py:638 msgid "Extended description..." msgstr "Ausführliche Beschreibung..." -#: cola/cmds.py:387 +#: cola/cmds.py:388 msgid "Failed to commit and continue applying patches" msgstr "" -#: cola/cmds.py:403 +#: cola/cmds.py:404 msgid "Failed to continue applying patches after skipping the current patch" msgstr "" -#: cola/widgets/createbranch.py:124 +#: cola/widgets/createbranch.py:122 msgid "Fast Forward Only" msgstr "Bei lokalen Änderungen abbrechen" -#: cola/widgets/remote.py:177 +#: cola/widgets/remote.py:181 msgid "Fast-forward only" msgstr "Nur schnelles Vorspulen" -#: cola/widgets/bookmarks.py:91 +#: cola/widgets/bookmarks.py:90 msgid "Favorite repositories" msgstr "Repository-Favoriten" -#: cola/widgets/main.py:111 +#: cola/widgets/main.py:109 msgid "Favorites" msgstr "Favoriten" -#: cola/widgets/remote.py:673 +#: cola/widgets/remote.py:735 msgid "Fetch" msgstr "Holen" -#: cola/widgets/createbranch.py:127 +#: cola/widgets/createbranch.py:125 msgid "Fetch Tracking Branch" msgstr "Verfolgten Branch holen" -#: cola/widgets/action.py:63 cola/widgets/main.py:387 +#: cola/widgets/action.py:67 cola/widgets/main.py:384 +msgid "Fetch from one or more remotes using \"git fetch\"" +msgstr "" + +#: cola/widgets/action.py:65 cola/widgets/main.py:383 msgid "Fetch..." msgstr "Holen..." -#: cola/widgets/main.py:588 +#: cola/widgets/main.py:601 msgid "File Browser..." msgstr "Dateien durchsuchen..." -#: cola/widgets/compare.py:75 +#: cola/widgets/compare.py:74 msgid "File Differences" msgstr "Dateiunterschiede" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 msgid "File Saved" msgstr "Datei gespeichert" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 #, python-format msgid "File saved to \"%s\"" msgstr "Datei gespeichert als \"%s\"" -#: cola/fsmonitor.py:517 +#: cola/fsmonitor.py:528 msgid "File system change monitoring: disabled because \"cola.inotify\" is false.\n" msgstr "Benachrichtigung über Änderungen im Dateisystem: deaktiviert, da \"cola.inotify\" auf falsche gesetzt ist.\n" -#: cola/fsmonitor.py:534 +#: cola/fsmonitor.py:545 msgid "File system change monitoring: disabled because libc does not support the inotify system calls.\n" msgstr "Überwachung von Dateisystemänderungen: deaktiviert, da libc die entsprechenden Systemaufrufe nicht unterstützt.\n" -#: cola/fsmonitor.py:528 +#: cola/fsmonitor.py:539 msgid "File system change monitoring: disabled because pywin32 is not installed.\n" msgstr "Überwachung von Dateisystemänderungen: deaktiviert, da pywin32 nicht installiert ist.\n" -#: cola/fsmonitor.py:181 +#: cola/fsmonitor.py:184 msgid "" "File system change monitoring: disabled because the limit on the total number of inotify watches was reached. You may be able to increase the limit on the number of watches by running:\n" "\n" @@ -1835,296 +1889,304 @@ msgstr "" " echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n" "\n" -#: cola/fsmonitor.py:142 +#: cola/fsmonitor.py:145 msgid "File system change monitoring: enabled.\n" msgstr "Benachrichtigungen über Änderungen im Dateisystem: aktiviert.\n" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Filename" msgstr "Dateiname" -#: cola/widgets/dag.py:755 +#: cola/widgets/dag.py:821 msgid "Files" msgstr "Dateien" -#: cola/widgets/branch.py:785 +#: cola/widgets/branch.py:837 msgid "Filter branches..." msgstr "Branches filtern..." -#: cola/widgets/status.py:1333 +#: cola/widgets/status.py:1334 msgid "Filter paths..." msgstr "Pfade filtern..." -#: cola/widgets/finder.py:113 cola/widgets/main.py:312 +#: cola/widgets/finder.py:112 cola/widgets/main.py:307 msgid "Find Files" msgstr "Dateien suchen" -#: cola/widgets/text.py:388 +#: cola/widgets/text.py:385 msgid "Find in diff" msgstr "" -#: cola/widgets/text.py:425 +#: cola/widgets/text.py:422 msgid "Find next item" msgstr "" -#: cola/widgets/text.py:431 +#: cola/widgets/text.py:428 msgid "Find previous item" msgstr "" -#: cola/widgets/text.py:395 +#: cola/widgets/text.py:392 msgid "Find the next occurrence of the phrase" msgstr "" -#: cola/widgets/text.py:391 +#: cola/widgets/text.py:388 msgid "Find the previous occurrence of the phrase" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Fixed String" msgstr "Feste Zeichenkette" -#: cola/widgets/prefs.py:251 +#: cola/widgets/prefs.py:270 msgid "Fixed-Width Font" msgstr "Schriftart" -#: cola/sequenceeditor.py:362 +#: cola/sequenceeditor.py:358 msgid "Fixup" msgstr "Nachbessern (fixup)" -#: cola/widgets/commitmsg.py:148 +#: cola/widgets/commitmsg.py:154 msgid "Fixup Previous Commit" msgstr "Vorherigen Commit nachbessern (fixup)" -#: cola/themes.py:672 +#: cola/themes.py:684 msgid "Flat dark blue" msgstr "" -#: cola/themes.py:693 +#: cola/themes.py:705 msgid "Flat dark green" msgstr "" -#: cola/themes.py:686 +#: cola/themes.py:698 msgid "Flat dark grey" msgstr "" -#: cola/themes.py:679 +#: cola/themes.py:691 msgid "Flat dark red" msgstr "" -#: cola/themes.py:644 +#: cola/themes.py:656 msgid "Flat light blue" msgstr "" -#: cola/themes.py:665 +#: cola/themes.py:677 msgid "Flat light green" msgstr "" -#: cola/themes.py:658 +#: cola/themes.py:670 msgid "Flat light grey" msgstr "" -#: cola/themes.py:651 +#: cola/themes.py:663 msgid "Flat light red" msgstr "" -#: cola/widgets/startup.py:73 +#: cola/widgets/startup.py:72 msgid "Folder" msgstr "" -#: cola/widgets/toolbar.py:177 +#: cola/widgets/toolbar.py:181 msgid "Follow System Style" msgstr "" -#: cola/widgets/prefs.py:252 +#: cola/widgets/prefs.py:271 msgid "Font Size" msgstr "Schriftgröße" -#: cola/widgets/remote.py:193 +#: cola/widgets/remote.py:197 msgid "Force" msgstr "Erzwingen" -#: cola/widgets/remote.py:617 +#: cola/widgets/remote.py:652 msgid "Force Fetch" msgstr "Abruf erzwingen" -#: cola/widgets/remote.py:614 +#: cola/widgets/remote.py:649 msgid "Force Fetch?" msgstr "Möchten Sie den Abruf erzwingen?" -#: cola/widgets/remote.py:625 +#: cola/widgets/remote.py:660 msgid "Force Push" msgstr "Veröffentlichung erzwingen" -#: cola/widgets/remote.py:619 +#: cola/widgets/remote.py:654 msgid "Force Push?" msgstr "Möchten Sie die Veröffentlichung erzwingen?" -#: cola/widgets/remote.py:616 +#: cola/widgets/remote.py:651 #, python-format msgid "Force fetching from %s?" msgstr "Möchten Sie den Abruf von \"%s\" erzwingen?" -#: cola/widgets/remote.py:624 +#: cola/widgets/remote.py:659 #, python-format msgid "Force push to %s?" msgstr "Möchten Sie die Veröffentlichung in \"%s\" erzwingen?" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Format String" msgstr "Format-String" -#: cola/widgets/about.py:430 cola/widgets/about.py:431 +#: cola/widgets/about.py:413 cola/widgets/about.py:414 msgid "French translation" msgstr "Französische Übersetzung" -#: cola/widgets/merge.py:80 +#: cola/widgets/merge.py:78 msgid "GPG-sign the merge commit" msgstr "GPG-signierter Merge-Commit" -#: cola/widgets/prefs.py:344 +#: cola/widgets/prefs.py:364 msgid "GUI theme" msgstr "" -#: cola/widgets/editremotes.py:318 +#: cola/widgets/editremotes.py:317 #, python-format msgid "Gathering info for \"%s\"..." msgstr "Frage Informationen zu »%s« ab..." -#: cola/widgets/about.py:420 cola/widgets/about.py:428 -#: cola/widgets/about.py:429 +#: cola/widgets/about.py:403 cola/widgets/about.py:411 +#: cola/widgets/about.py:412 msgid "German translation" msgstr "Deutsche Übersetzung" -#: cola/widgets/main.py:511 +#: cola/widgets/main.py:524 msgid "Get Commit Message Template" msgstr "Commit-Beschreibung aus Vorlage einfügen" -#: cola/widgets/dag.py:520 +#: cola/widgets/dag.py:586 msgid "Go Down" msgstr "Nach unten" -#: cola/widgets/dag.py:516 +#: cola/widgets/dag.py:582 msgid "Go Up" msgstr "Nach oben" -#: cola/widgets/dag.py:467 cola/widgets/filelist.py:42 +#: cola/widgets/dag.py:466 cola/widgets/filelist.py:39 msgid "Grab File..." msgstr "Datei extrahieren..." -#: cola/widgets/dag.py:782 +#: cola/widgets/dag.py:848 msgid "Graph" msgstr "Diagramm" -#: cola/widgets/main.py:358 +#: cola/widgets/main.py:353 msgid "Grep" msgstr "Grep" -#: cola/widgets/remote.py:662 +#: cola/widgets/remote.py:707 msgid "Have you rebased/pulled lately?" msgstr "Haben Sie kürzlich einen Rebase oder Pull durchgeführt?" -#: cola/sequenceeditor.py:110 cola/sequenceeditor.py:171 -#: cola/widgets/finder.py:138 cola/widgets/main.py:854 +#: cola/sequenceeditor.py:108 cola/sequenceeditor.py:169 +#: cola/widgets/finder.py:137 cola/widgets/main.py:867 msgid "Help" msgstr "Hilfe" -#: cola/widgets/status.py:1322 +#: cola/widgets/status.py:1323 msgid "Help - Custom Copy Actions" msgstr "Hilfe - Benutzerdefinierte Kopier-Befehle" -#: cola/widgets/finder.py:79 +#: cola/widgets/finder.py:78 msgid "Help - Find Files" msgstr "Hilfe - Dateien suchen" -#: cola/sequenceeditor.py:737 +#: cola/sequenceeditor.py:732 msgid "Help - git-cola-sequence-editor" msgstr "Hilfe - git-cola-sequence-editor" -#: cola/widgets/prefs.py:346 +#: cola/widgets/prefs.py:366 msgid "High DPI" msgstr "" -#: cola/gitcmds.py:876 +#: cola/gitcmds.py:886 msgid "Hint: The \"Actions > Abort Cherry-Pick\" menu action can be used to cancel the current cherry-pick." msgstr "" -#: cola/widgets/prefs.py:254 +#: cola/widgets/prefs.py:275 msgid "History Browser" msgstr "Werkzeug für die Verlaufsansicht" -#: cola/widgets/about.py:427 cola/widgets/about.py:441 +#: cola/widgets/about.py:410 cola/widgets/about.py:424 msgid "Hungarian translation" msgstr "Ungarische Übersetzung" -#: cola/widgets/toolbar.py:178 +#: cola/widgets/toolbar.py:182 msgid "Icon Only" msgstr "" -#: cola/widgets/prefs.py:345 +#: cola/widgets/prefs.py:365 msgid "Icon theme" msgstr "" -#: cola/widgets/diff.py:758 +#: cola/widgets/diff.py:787 msgid "Ignore all whitespace" msgstr "Alle Leerzeichen ignorieren" -#: cola/widgets/diff.py:755 +#: cola/widgets/diff.py:785 msgid "Ignore changes in amount of whitespace" msgstr "Anzahl von Leerzeichen ignorieren" -#: cola/widgets/diff.py:751 +#: cola/widgets/diff.py:782 msgid "Ignore changes in whitespace at EOL" msgstr "Leerzeichen am Zeilenende ignorieren" -#: cola/widgets/gitignore.py:46 +#: cola/widgets/gitignore.py:45 msgid "Ignore custom pattern" msgstr "Benutzerdefiniertes Muster ignorieren" -#: cola/widgets/gitignore.py:44 +#: cola/widgets/gitignore.py:43 msgid "Ignore exact filename" msgstr "Exakten Dateinamen ignorieren" -#: cola/widgets/gitignore.py:32 +#: cola/widgets/gitignore.py:31 msgid "Ignore filename or pattern" msgstr "Dateiname oder Muster ignorieren" -#: cola/widgets/status.py:933 +#: cola/widgets/dag.py:498 +msgid "Ignore merge commits" +msgstr "" + +#: cola/widgets/status.py:934 msgid "Ignore..." msgstr "" -#: cola/widgets/remote.py:203 +#: cola/widgets/remote.py:207 msgid "Include tags " msgstr "Übernehmen der Tags " -#: cola/widgets/prefs.py:349 +#: cola/widgets/prefs.py:369 msgid "Indent Status paths" msgstr "" -#: cola/widgets/about.py:419 cola/widgets/about.py:426 +#: cola/widgets/about.py:402 cola/widgets/about.py:409 msgid "Indonesian translation" msgstr "Indonesische Übersetzung" -#: cola/widgets/main.py:643 +#: cola/widgets/main.py:656 msgid "Initialize Git Annex" msgstr "Git Annex intialisieren" -#: cola/widgets/main.py:647 +#: cola/widgets/main.py:660 msgid "Initialize Git LFS" msgstr "Git LFS initialisieren" -#: cola/widgets/clone.py:116 +#: cola/widgets/clone.py:114 msgid "Inititalize submodules" msgstr "Submodule initialisieren" -#: cola/widgets/prefs.py:260 +#: cola/widgets/prefs.py:281 msgid "Insert spaces instead of tabs" msgstr "Leerzeichen statt Tabs einfügen" -#: cola/cmds.py:2130 +#: cola/widgets/action.py:73 cola/widgets/main.py:402 +msgid "Integrate changes using \"git pull\"" +msgstr "" + +#: cola/cmds.py:2081 msgid "Interactive Rebase" msgstr "Interaktiver Rebase" -#: cola/cmds.py:2364 +#: cola/cmds.py:2315 msgid "Invalid Revision" msgstr "Unzulässige Revision" @@ -2132,40 +2194,40 @@ msgstr "Unzulässige Revision" msgid "It is not necessary to update the hunk header lines as they will be regenerated automatically." msgstr "" -#: cola/widgets/about.py:421 cola/widgets/about.py:424 +#: cola/widgets/about.py:404 cola/widgets/about.py:407 msgid "Japanese translation" msgstr "" -#: cola/widgets/prefs.py:262 +#: cola/widgets/prefs.py:283 msgid "Keep *.orig Merge Backups" msgstr "Sicherheitskopie beim Zusammenführen anlegen (Datei.orig)" -#: cola/widgets/stash.py:71 +#: cola/widgets/stash.py:73 msgid "Keep Index" msgstr "Vormerkliste unverändert lassen" -#: cola/widgets/main.py:477 +#: cola/widgets/main.py:490 msgid "Keyboard Shortcuts" msgstr "Tastenkürzel" -#: cola/cmds.py:1608 cola/sequenceeditor.py:165 cola/sequenceeditor.py:338 -#: cola/widgets/dag.py:395 cola/widgets/filelist.py:34 +#: cola/difftool.py:27 cola/sequenceeditor.py:163 cola/sequenceeditor.py:334 +#: cola/widgets/dag.py:394 cola/widgets/filelist.py:31 msgid "Launch Diff Tool" msgstr "Mit direktem Vorgänger vergleichen" -#: cola/widgets/dag.py:402 +#: cola/widgets/dag.py:401 msgid "Launch Directory Diff Tool" msgstr "Werkzeug für Verzeichnis-Diff ausführen" -#: cola/cmds.py:1541 cola/cmds.py:1679 cola/widgets/filelist.py:38 +#: cola/cmds.py:1529 cola/cmds.py:1631 cola/widgets/filelist.py:35 msgid "Launch Editor" msgstr "Mit Editor bearbeiten" -#: cola/cmds.py:1644 +#: cola/cmds.py:1596 msgid "Launch Terminal" msgstr "Konsole starten" -#: cola/sequenceeditor.py:166 +#: cola/sequenceeditor.py:164 msgid "" "Launch external diff tool\n" "Shortcut: Ctrl+D" @@ -2173,8 +2235,8 @@ msgstr "" "Externen Diff-Betrachter starten\n" "Kürzel: Strg+D" -#: cola/widgets/diff.py:1005 cola/widgets/diff.py:1051 -#: cola/widgets/status.py:852 cola/widgets/status.py:948 +#: cola/widgets/diff.py:1044 cola/widgets/diff.py:1106 +#: cola/widgets/status.py:853 cola/widgets/status.py:949 msgid "Launch git-cola" msgstr "Starte git-cola" @@ -2186,7 +2248,7 @@ msgstr "Git-difftool gegen Vorversionen ausführen" msgid "Launch git-difftool on the current path" msgstr "Gegenwärtigen Pfad im Vergleichswerkzeug öffnen" -#: cola/icons.py:56 +#: cola/icons.py:55 msgid "Light Theme" msgstr "" @@ -2195,167 +2257,183 @@ msgstr "" msgid "Lines starting with '%s' will be ignored." msgstr "" -#: cola/widgets/startup.py:74 +#: cola/widgets/startup.py:73 msgid "List" msgstr "" -#: cola/guicmds.py:267 +#: cola/guicmds.py:266 msgid "Load Commit Message" msgstr "Commit-Beschreibung laden" -#: cola/widgets/main.py:339 +#: cola/widgets/main.py:334 msgid "Load Commit Message..." msgstr "Commit-Beschreibung laden..." -#: cola/widgets/commitmsg.py:144 +#: cola/widgets/commitmsg.py:150 msgid "Load Previous Commit Message" msgstr "Vorherige Commit-Beschreibung laden" -#: cola/widgets/diff.py:264 +#: cola/widgets/diff.py:265 msgid "Loading..." msgstr "Lade..." -#: cola/widgets/branch.py:169 cola/widgets/branch.py:240 -#: cola/widgets/branch.py:281 cola/widgets/compare.py:38 -#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/branch.py:173 cola/widgets/branch.py:250 +#: cola/widgets/branch.py:290 cola/widgets/compare.py:37 +#: cola/widgets/compare.py:52 cola/widgets/compare.py:57 msgid "Local" msgstr "Lokal" -#: cola/widgets/cfgactions.py:227 cola/widgets/merge.py:46 -#: cola/widgets/remote.py:138 +#: cola/widgets/cfgactions.py:225 cola/widgets/merge.py:44 +#: cola/widgets/remote.py:136 msgid "Local Branch" msgstr "Lokaler Branch" -#: cola/widgets/createbranch.py:114 +#: cola/widgets/createbranch.py:112 msgid "Local branch" msgstr "Lokalem Branch" -#: cola/widgets/dag.py:788 cola/widgets/main.py:651 +#: cola/widgets/dag.py:854 cola/widgets/main.py:664 msgid "Lock Layout" msgstr "Layout sperren" -#: cola/widgets/dag.py:750 +#: cola/widgets/dag.py:816 msgid "Log" msgstr "Log" -#: cola/widgets/prefs.py:170 +#: cola/widgets/prefs.py:191 msgid "Log Date Format" msgstr "" -#: cola/widgets/about.py:268 +#: cola/themes.py:769 +msgid "MacOS Aqua dark" +msgstr "" + +#: cola/themes.py:765 +msgid "MacOS Aqua light" +msgstr "" + +#: cola/themes.py:781 +msgid "MacOS Vibrant dark" +msgstr "" + +#: cola/themes.py:775 +msgid "MacOS Vibrant light" +msgstr "" + +#: cola/widgets/about.py:251 msgid "Maintainer (since 2007) and developer" msgstr "Pflege (seit 2007) und Entwicklung" -#: cola/widgets/text.py:398 +#: cola/widgets/text.py:395 msgid "Match Case" msgstr "" -#: cola/widgets/merge.py:88 +#: cola/widgets/merge.py:86 msgid "Merge" msgstr "Zusammenführen" -#: cola/widgets/merge.py:162 +#: cola/widgets/merge.py:160 #, python-format msgid "Merge \"%(revision)s\" into \"%(branch)s\"" msgstr "\"%(revision)s\" in \"%(branch)s\" zusammenführen" -#: cola/widgets/prefs.py:257 +#: cola/widgets/prefs.py:278 msgid "Merge Tool" msgstr "Werkzeug zum Zusammenführen" -#: cola/widgets/prefs.py:171 +#: cola/widgets/prefs.py:193 msgid "Merge Verbosity" msgstr "Ausführlichkeit der Meldungen beim Zusammenführen" -#: cola/cmds.py:1829 +#: cola/cmds.py:1780 msgid "Merge failed. Conflict resolution is required." msgstr "Zusammenführen fehlgeschlagen. Konfliktauflösung ist notwendig." -#: cola/widgets/merge.py:167 +#: cola/widgets/merge.py:165 #, python-format msgid "Merge into \"%s\"" msgstr "Zusammenführen in »%s«" -#: cola/widgets/branch.py:231 +#: cola/widgets/branch.py:242 msgid "Merge into current branch" msgstr "In gegenwärtigen Branch zusammenführen" -#: cola/widgets/main.py:363 +#: cola/widgets/main.py:358 msgid "Merge..." msgstr "Zusammenführen..." -#: cola/widgets/main.py:1163 +#: cola/widgets/main.py:1176 msgid "Merging" msgstr "Am Zusammenführen" -#: cola/models/browse.py:33 cola/widgets/createtag.py:78 +#: cola/models/browse.py:32 cola/widgets/createtag.py:76 msgid "Message" msgstr "Beschreibung" -#: cola/widgets/commitmsg.py:417 +#: cola/widgets/commitmsg.py:425 msgid "Missing Commit Message" msgstr "Die Commit-Beschreibung fehlt" -#: cola/widgets/createbranch.py:252 +#: cola/widgets/createbranch.py:250 msgid "Missing Data" msgstr "Fehlende Daten" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Missing Name" msgstr "Fehlender Name" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Missing Revision" msgstr "Revision fehlt" -#: cola/cmds.py:2801 +#: cola/cmds.py:2747 msgid "Missing Tag Message" msgstr "Tag-Beschreibung fehlt" -#: cola/models/browse.py:332 cola/widgets/status.py:158 -#: cola/widgets/status.py:631 +#: cola/models/browse.py:331 cola/widgets/status.py:158 +#: cola/widgets/status.py:632 msgid "Modified" msgstr "Geändert" -#: cola/widgets/commitmsg.py:506 +#: cola/widgets/commitmsg.py:532 msgid "More..." msgstr "Mehr..." -#: cola/widgets/standard.py:243 cola/widgets/status.py:233 +#: cola/widgets/standard.py:242 cola/widgets/status.py:234 msgid "Move Down" msgstr "Nach unten bewegen" -#: cola/widgets/standard.py:235 cola/widgets/status.py:225 +#: cola/widgets/standard.py:234 cola/widgets/status.py:226 msgid "Move Up" msgstr "Nach oben bewegen" -#: cola/widgets/status.py:300 +#: cola/widgets/status.py:301 msgid "Move files to trash" msgstr "Dateien in den Papierkorb schieben" -#: cola/models/browse.py:33 cola/widgets/bookmarks.py:467 -#: cola/widgets/createtag.py:61 cola/widgets/editremotes.py:450 -#: cola/widgets/status.py:1452 cola/widgets/toolbar.py:312 +#: cola/models/browse.py:32 cola/widgets/bookmarks.py:466 +#: cola/widgets/createtag.py:59 cola/widgets/editremotes.py:448 +#: cola/widgets/status.py:1453 cola/widgets/toolbar.py:317 msgid "Name" msgstr "Name" -#: cola/widgets/editremotes.py:434 +#: cola/widgets/editremotes.py:432 msgid "Name for the new remote" msgstr "Name der neuen externen Referenz" -#: cola/guicmds.py:148 cola/widgets/main.py:285 +#: cola/guicmds.py:147 cola/widgets/main.py:280 msgid "New Bare Repository..." msgstr "Neues kahles Repository..." -#: cola/guicmds.py:87 cola/widgets/main.py:280 +#: cola/guicmds.py:86 cola/widgets/main.py:275 msgid "New Repository..." msgstr "Neues Repository..." -#: cola/widgets/main.py:983 +#: cola/widgets/main.py:996 msgid "New Toolbar" msgstr "Werkzeugleiste hinzufügen" -#: cola/widgets/startup.py:53 +#: cola/widgets/startup.py:52 msgid "New..." msgstr "Neu..." @@ -2363,15 +2441,19 @@ msgstr "Neu..." msgid "Next File" msgstr "Nächste Datei" -#: cola/widgets/createbranch.py:123 cola/widgets/standard.py:1065 +#: cola/widgets/createbranch.py:121 cola/widgets/standard.py:1183 msgid "No" msgstr "Nein" -#: cola/widgets/merge.py:217 cola/widgets/merge.py:227 +#: cola/widgets/merge.py:215 cola/widgets/merge.py:225 msgid "No Revision Specified" msgstr "Keine Revision angegeben" -#: cola/widgets/commitmsg.py:427 +#: cola/widgets/stash.py:225 +msgid "No change made" +msgstr "" + +#: cola/widgets/commitmsg.py:435 msgid "" "No changes to commit.\n" "\n" @@ -2381,33 +2463,33 @@ msgstr "" "\n" "Merken Sie mindestens eine Datei für einen Commit vor." -#: cola/widgets/selectcommits.py:118 +#: cola/widgets/selectcommits.py:117 msgid "No commits exist in this branch." msgstr "In diesem Branch gibt es keine Commits." -#: cola/widgets/merge.py:65 +#: cola/widgets/merge.py:63 msgid "No fast forward" msgstr "Kein schnelles Vorspulen" -#: cola/widgets/remote.py:186 +#: cola/widgets/remote.py:190 msgid "No fast-forward" msgstr "Kein schnelles Vorspulen" -#: cola/widgets/remote.py:577 +#: cola/widgets/remote.py:612 msgid "No repository selected." msgstr "Kein Repository ausgewählt." -#: cola/widgets/remote.py:615 +#: cola/widgets/remote.py:650 msgid "Non-fast-forward fetch overwrites local history!" msgstr "Holen ohne schnelles Vorspulen überschreibt den lokalen Verlauf!" -#: cola/widgets/remote.py:621 +#: cola/widgets/remote.py:656 msgid "" "Non-fast-forward push overwrites published history!\n" "(Did you pull first?)" msgstr "Versenden ohne schnelles Vorspulen überschreibt den veröffentlichten Verlauf! (Haben Sie zuvor Änderungen geholt und zusammengeführt?)" -#: cola/widgets/commitmsg.py:444 +#: cola/widgets/commitmsg.py:452 msgid "Nothing to commit" msgstr "Nichts für einen Commit vorhanden" @@ -2415,79 +2497,79 @@ msgstr "Nichts für einen Commit vorhanden" msgid "Nothing to do" msgstr "Nichts zu tun" -#: cola/widgets/prefs.py:172 +#: cola/widgets/prefs.py:194 msgid "Number of Diff Context Lines" msgstr "Anzahl der Kontextzeilen beim Vergleich" -#: cola/widgets/bookmarks.py:79 cola/widgets/bookmarks.py:213 -#: cola/widgets/startup.py:336 +#: cola/widgets/bookmarks.py:78 cola/widgets/bookmarks.py:212 +#: cola/widgets/startup.py:335 msgid "Open" msgstr "Öffnen" -#: cola/widgets/text.py:230 +#: cola/widgets/text.py:228 #, python-format msgid "Open \"%s\"" msgstr "" -#: cola/cmds.py:1857 +#: cola/cmds.py:1808 msgid "Open Directory" msgstr "" -#: cola/guicmds.py:205 cola/guicmds.py:214 cola/widgets/editremotes.py:473 -#: cola/widgets/startup.py:55 cola/widgets/startup.py:215 +#: cola/guicmds.py:204 cola/guicmds.py:213 cola/widgets/editremotes.py:471 +#: cola/widgets/startup.py:54 cola/widgets/startup.py:214 msgid "Open Git Repository" msgstr "Git-Repository öffnen" -#: cola/widgets/submodules.py:49 +#: cola/widgets/submodules.py:48 msgid "Open Parent" msgstr "" -#: cola/cmds.py:1877 +#: cola/cmds.py:1828 msgid "Open Parent Directory" msgstr "Übergeordnetes Verzeichnis öffnen" -#: cola/widgets/main.py:679 +#: cola/widgets/main.py:692 msgid "Open Recent" msgstr "Zuletzt verwendet" -#: cola/cmds.py:1840 +#: cola/cmds.py:1791 msgid "Open Using Default Application" msgstr "Mit der Standardanwendung öffnen" -#: cola/cmds.py:1890 +#: cola/cmds.py:1841 msgid "Open Worktree" msgstr "" -#: cola/widgets/bookmarks.py:221 cola/widgets/startup.py:344 +#: cola/widgets/bookmarks.py:220 cola/widgets/startup.py:343 msgid "Open in New Window" msgstr "In neuem Fenster öffnen" -#: cola/widgets/main.py:408 +#: cola/widgets/main.py:415 msgid "Open in New Window..." msgstr "In neuem Fenster öffnen..." -#: cola/widgets/main.py:402 +#: cola/widgets/main.py:409 msgid "Open..." msgstr "Öffnen..." -#: cola/widgets/branch.py:345 +#: cola/widgets/branch.py:354 msgid "Other branches" msgstr "Andere Branches" -#: cola/widgets/archive.py:210 +#: cola/widgets/archive.py:208 msgid "Overwrite" msgstr "Überschreiben" -#: cola/widgets/archive.py:209 +#: cola/widgets/archive.py:207 #, python-format msgid "Overwrite \"%s\"?" msgstr "Möchten Sie die Datei\"%s\" überschreiben?" -#: cola/widgets/archive.py:207 +#: cola/widgets/archive.py:205 msgid "Overwrite File?" msgstr "Möchten Sie die Datei überschreiben?" -#: cola/widgets/grep.py:144 +#: cola/widgets/grep.py:142 msgid "" "Parse arguments using a shell.\n" "Queries with spaces will require \"double quotes\"." @@ -2495,63 +2577,67 @@ msgstr "" "Führt die Suche in einer Kommandozeile aus.\n" "Setzen Sie Texte mit Leerzeichen in \"Gänsefüßchen\"." -#: cola/models/browse.py:330 +#: cola/models/browse.py:329 msgid "Partially Staged" msgstr "Teilweise vorgemerkt" -#: cola/widgets/main.py:744 +#: cola/widgets/main.py:757 msgid "Paste" msgstr "Einfügen" -#: cola/cmds.py:363 +#: cola/cmds.py:364 msgid "Patch failed to apply" msgstr "" -#: cola/cmds.py:375 +#: cola/cmds.py:376 msgid "Patch(es) Applied" msgstr "Patch(es) angewendet" -#: cola/widgets/diff.py:1219 cola/widgets/main.py:695 +#: cola/widgets/diff.py:1293 cola/widgets/main.py:708 msgid "Patches" msgstr "" -#: cola/widgets/prefs.py:173 +#: cola/widgets/prefs.py:195 msgid "Patches Directory" msgstr "" -#: cola/widgets/bookmarks.py:468 cola/widgets/submodules.py:118 +#: cola/widgets/bookmarks.py:467 cola/widgets/submodules.py:117 msgid "Path" msgstr "Pfad" -#: cola/widgets/clone.py:112 +#: cola/widgets/clone.py:110 msgid "Path or URL to clone (Env. $VARS okay)" msgstr "Quell-Pfad oder -URL" -#: cola/sequenceeditor.py:346 +#: cola/sequenceeditor.py:342 msgid "Pick" msgstr "Übernehmen" -#: cola/widgets/diff.py:781 +#: cola/widgets/dag.py:490 +msgid "Pickaxe search for changes containing text" +msgstr "" + +#: cola/widgets/diff.py:809 msgid "Pixel XOR" msgstr "Pixel-XOR" -#: cola/widgets/createbranch.py:253 +#: cola/widgets/createbranch.py:251 msgid "Please provide both a branch name and revision expression." msgstr "Bitte geben Sie beides, einen Branch-Namen und Revisionsausdruck, an." -#: cola/cmds.py:2348 +#: cola/cmds.py:2299 msgid "Please select a file" msgstr "Bitte wählen Sie eine Datei" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Please specify a name for the new tag." msgstr "Bitte geben Sie einen Namen für den neuen Tag an." -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Please specify a revision to tag." msgstr "Bitte geben Sie eine Revision für den Tag an." -#: cola/widgets/commitmsg.py:410 +#: cola/widgets/commitmsg.py:418 msgid "" "Please supply a commit message.\n" "\n" @@ -2569,31 +2655,31 @@ msgstr "" "- Zweite Zeile: Leerzeile\n" "- Rest: Ausführliche Beschreibung, warum diese Änderung hilfreich ist\n" -#: cola/cmds.py:653 +#: cola/cmds.py:655 msgid "Point the current branch head to a new commit?" msgstr "Soll der Branch-Head auf einen neuen Commit zeigen?" -#: cola/widgets/about.py:416 +#: cola/widgets/about.py:399 msgid "Polish translation" msgstr "Polnische Übersetzung" -#: cola/widgets/stash.py:63 cola/widgets/stash.py:111 cola/widgets/stash.py:115 +#: cola/widgets/stash.py:65 cola/widgets/stash.py:114 cola/widgets/stash.py:118 msgid "Pop" msgstr "" -#: cola/widgets/main.py:293 cola/widgets/prefs.py:395 +#: cola/widgets/main.py:288 cola/widgets/prefs.py:433 msgid "Preferences" msgstr "Einstellungen" -#: cola/widgets/archive.py:129 +#: cola/widgets/archive.py:127 msgid "Prefix" msgstr "Verzeichnis" -#: cola/widgets/main.py:345 +#: cola/widgets/main.py:340 msgid "Prepare Commit Message" msgstr "Commit-Beschreibung vorbereiten" -#: cola/widgets/prefs.py:157 +#: cola/widgets/prefs.py:180 msgid "Prevent \"Stage\" from staging all files when nothing is selected" msgstr "Bei \"Vormerken\" verhindern, dass alle Dateien vorgemerkt werden, wenn nichts ausgewählt wurde" @@ -2601,216 +2687,228 @@ msgstr "Bei \"Vormerken\" verhindern, dass alle Dateien vorgemerkt werden, wenn msgid "Previous File" msgstr "Vorige Datei" -#: cola/widgets/remote.py:171 +#: cola/widgets/remote.py:169 msgid "Prompt on creation" msgstr "Beim Erstellen nachfragen" -#: cola/widgets/remote.py:172 +#: cola/widgets/remote.py:170 msgid "Prompt when pushing creates new remote branches" msgstr "Bestätigen, falls das Versenden neue Remote-Branches erzeugt" -#: cola/widgets/remote.py:208 +#: cola/widgets/remote.py:212 msgid "Prune " msgstr "Aufräumen von " -#: cola/widgets/bookmarks.py:255 cola/widgets/startup.py:376 +#: cola/widgets/bookmarks.py:254 cola/widgets/startup.py:375 msgid "Prune Missing Entries" msgstr "" -#: cola/widgets/branch.py:247 cola/widgets/remote.py:728 +#: cola/widgets/branch.py:256 cola/widgets/remote.py:783 msgid "Pull" msgstr "Pull" -#: cola/widgets/action.py:65 cola/widgets/main.py:397 +#: cola/widgets/action.py:73 cola/widgets/main.py:401 msgid "Pull..." msgstr "Pull..." -#: cola/widgets/branch.py:253 cola/widgets/remote.py:593 -#: cola/widgets/remote.py:698 +#: cola/widgets/branch.py:262 cola/widgets/remote.py:628 +#: cola/widgets/remote.py:758 msgid "Push" msgstr "Push" -#: cola/widgets/action.py:64 cola/widgets/main.py:392 +#: cola/widgets/action.py:70 cola/widgets/main.py:393 +msgid "Push to one or more remotes using \"git push\"" +msgstr "" + +#: cola/widgets/action.py:70 cola/widgets/main.py:392 msgid "Push..." msgstr "Push..." -#: cola/guicmds.py:252 +#: cola/guicmds.py:251 msgid "Quick Open Repository" msgstr "" -#: cola/widgets/main.py:660 +#: cola/widgets/main.py:673 msgid "Quick Open..." msgstr "" -#: cola/widgets/main.py:355 +#: cola/widgets/main.py:350 msgid "Quit" msgstr "Beenden" -#: cola/cmds.py:2144 cola/cmds.py:2180 cola/cmds.py:2181 cola/cmds.py:2194 -#: cola/cmds.py:2195 cola/sequenceeditor.py:158 cola/sequenceeditor.py:199 -#: cola/widgets/main.py:822 cola/widgets/remote.py:211 +#: cola/cmds.py:2095 cola/cmds.py:2131 cola/cmds.py:2132 cola/cmds.py:2145 +#: cola/cmds.py:2146 cola/sequenceeditor.py:156 cola/sequenceeditor.py:197 +#: cola/widgets/main.py:835 cola/widgets/remote.py:215 msgid "Rebase" msgstr "Rebase" -#: cola/cmds.py:2143 +#: cola/cmds.py:2094 #, python-format msgid "Rebase onto %s" msgstr "Rebase auf %s" -#: cola/cmds.py:2156 +#: cola/cmds.py:2107 msgid "Rebase stopped" msgstr "Rebase angehalten" -#: cola/widgets/remote.py:210 +#: cola/widgets/remote.py:214 msgid "Rebase the current branch instead of merging" msgstr "Rebase statt Merge für gegenwärtigen Branch durchführen" -#: cola/widgets/dag.py:419 +#: cola/widgets/dag.py:418 msgid "Rebase to this commit" msgstr "" -#: cola/widgets/main.py:1165 +#: cola/widgets/main.py:1178 msgid "Rebasing" msgstr "Rebase im Gange" -#: cola/widgets/main.py:120 +#: cola/widgets/main.py:118 msgid "Recent" msgstr "Kürzlich" -#: cola/widgets/bookmarks.py:93 +#: cola/widgets/bookmarks.py:92 msgid "Recent repositories" msgstr "Kürzlich verwendete Repositories" -#: cola/widgets/prefs.py:258 +#: cola/widgets/prefs.py:279 msgid "Recent repository count" msgstr "Anzahl zuletzt verwendeter Repositories" -#: cola/widgets/recent.py:46 +#: cola/widgets/recent.py:44 msgid "Recently Modified Files" msgstr "Kürzlich geänderte Dateien suchen" -#: cola/widgets/main.py:320 +#: cola/widgets/main.py:315 msgid "Recently Modified Files..." msgstr "Kürzlich geänderte Dateien suchen..." -#: cola/widgets/stash.py:256 +#: cola/widgets/stash.py:274 msgid "Recovering a dropped stash is not possible." msgstr "Eine gelöschte Ablage kann nicht wiederhergestellt werden." -#: cola/widgets/createbranch.py:283 +#: cola/widgets/createbranch.py:281 msgid "Recovering lost commits may not be easy." msgstr "Ein Wiederherstellen verlorener Commits könnte schwierig sein." -#: cola/widgets/main.py:737 +#: cola/widgets/main.py:750 msgid "Redo" msgstr "Wiederholen" -#: cola/widgets/clone.py:121 +#: cola/widgets/clone.py:119 msgid "Reduce commit history to minimum" msgstr "Commit-Verlauf auf ein Minimum reduzieren" -#: cola/widgets/submodules.py:121 +#: cola/widgets/submodules.py:120 msgid "Reference Repository" msgstr "" -#: cola/widgets/submodules.py:105 +#: cola/widgets/submodules.py:104 msgid "Reference URL" msgstr "" -#: cola/widgets/submodules.py:106 +#: cola/widgets/submodules.py:105 msgid "Reference repository to use when cloning (optional)" msgstr "" -#: cola/cmds.py:2222 cola/qtutils.py:770 cola/widgets/action.py:62 -#: cola/widgets/dag.py:792 cola/widgets/editremotes.py:85 -#: cola/widgets/grep.py:105 cola/widgets/recent.py:116 -#: cola/widgets/submodules.py:45 +#: cola/cmds.py:2173 cola/qtutils.py:801 cola/widgets/action.py:63 +#: cola/widgets/dag.py:858 cola/widgets/editremotes.py:84 +#: cola/widgets/grep.py:103 cola/widgets/recent.py:114 +#: cola/widgets/submodules.py:44 msgid "Refresh" msgstr "Ansicht aktualisieren" -#: cola/widgets/remote.py:179 +#: cola/widgets/remote.py:183 msgid "Refuse to merge unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward" msgstr "Merge verweigern, außer der gegenwärtige HEAD ist aktuell oder der Merge kann mit schnellem Vorspulen ausgelöst werden" -#: cola/widgets/branch.py:173 cola/widgets/branch.py:225 -#: cola/widgets/branch.py:269 cola/widgets/branch.py:470 -#: cola/widgets/compare.py:54 cola/widgets/compare.py:59 -#: cola/widgets/remote.py:147 +#: cola/widgets/branch.py:177 cola/widgets/branch.py:236 +#: cola/widgets/branch.py:278 cola/widgets/branch.py:513 +#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/remote.py:145 msgid "Remote" msgstr "Externe Referenz" -#: cola/widgets/remote.py:162 +#: cola/widgets/remote.py:160 msgid "Remote Branch" msgstr "Externer Branch" -#: cola/cmds.py:1196 +#: cola/cmds.py:1197 msgid "Remote Branch Deleted" msgstr "Externer Branch gelöscht" -#: cola/widgets/editremotes.py:49 +#: cola/widgets/log.py:99 +msgid "Remote Messages" +msgstr "" + +#: cola/widgets/editremotes.py:48 msgid "Remote git repositories - double-click to rename" msgstr "Externes Git-Repository - Doppelklick zum Umbenennen" -#: cola/cmds.py:1029 cola/widgets/patch.py:107 cola/widgets/patch.py:122 -#: cola/widgets/startup.py:265 cola/widgets/status.py:1382 +#: cola/cmds.py:1030 cola/widgets/diff.py:1701 cola/widgets/diff.py:1716 +#: cola/widgets/startup.py:264 cola/widgets/status.py:1383 msgid "Remove" msgstr "Entfernen" -#: cola/cmds.py:1027 +#: cola/cmds.py:1028 #, python-format msgid "Remove %s from the recent list?" msgstr "%s aus dem Verlauf entfernen?" -#: cola/widgets/toolbar.py:316 +#: cola/widgets/toolbar.py:321 msgid "Remove Element" msgstr "Element entfernen" -#: cola/widgets/remote.py:206 +#: cola/widgets/remote.py:210 msgid "Remove remote-tracking branches that no longer exist on the remote" msgstr "" -#: cola/widgets/patch.py:109 +#: cola/widgets/diff.py:1703 msgid "Remove selected (Delete)" msgstr "Auswahl entfernen (löschen)" -#: cola/widgets/bookmarks.py:258 cola/widgets/startup.py:379 +#: cola/widgets/bookmarks.py:257 cola/widgets/startup.py:378 msgid "Remove stale entries for repositories that no longer exist" msgstr "" -#: cola/guicmds.py:333 cola/widgets/browse.py:159 +#: cola/guicmds.py:332 cola/widgets/browse.py:159 cola/widgets/stash.py:44 msgid "Rename" msgstr "Umbenennen" -#: cola/cmds.py:1153 +#: cola/cmds.py:1154 #, python-format msgid "Rename \"%s\"" msgstr "\"%s\" umbenennen" -#: cola/widgets/branch.py:259 +#: cola/widgets/branch.py:268 msgid "Rename Branch" msgstr "Branch umbenennen" -#: cola/widgets/main.py:570 +#: cola/widgets/main.py:583 msgid "Rename Branch..." msgstr "Branch umbenennen..." -#: cola/guicmds.py:330 +#: cola/guicmds.py:329 msgid "Rename Existing Branch" msgstr "Existierenden Branch umbenennen" -#: cola/cmds.py:944 +#: cola/cmds.py:942 msgid "Rename Remote" msgstr "Externe Referenz umbenennen" -#: cola/widgets/bookmarks.py:233 cola/widgets/startup.py:356 +#: cola/widgets/bookmarks.py:232 cola/widgets/startup.py:355 msgid "Rename Repository" msgstr "Repository umbenennen" -#: cola/widgets/branch.py:445 +#: cola/widgets/stash.py:218 +msgid "Rename Stash" +msgstr "" + +#: cola/widgets/branch.py:478 msgid "Rename branch" msgstr "Branch umbenennen" -#: cola/cmds.py:945 +#: cola/cmds.py:943 #, python-format msgid "Rename remote \"%(current)s\" to \"%(new)s\"?" msgstr "Externe Referenz \"%(current)s\" umbenennen zu \"%(new)s\"?" @@ -2819,179 +2917,183 @@ msgstr "Externe Referenz \"%(current)s\" umbenennen zu \"%(new)s\"?" msgid "Rename selected paths" msgstr "Ausgewählten Pfad umbenennen" -#: cola/app.py:497 cola/widgets/startup.py:262 +#: cola/widgets/stash.py:45 +msgid "Rename the selected stash" +msgstr "" + +#: cola/app.py:500 cola/widgets/startup.py:261 msgid "Repository Not Found" msgstr "" -#: cola/widgets/browse.py:87 cola/widgets/main.py:1095 +#: cola/widgets/browse.py:87 cola/widgets/main.py:1108 #, python-format msgid "Repository: %s" msgstr "Repository: %s" -#: cola/guicmds.py:351 cola/widgets/createbranch.py:125 cola/widgets/dag.py:331 -#: cola/widgets/editremotes.py:58 cola/widgets/main.py:832 +#: cola/guicmds.py:350 cola/widgets/createbranch.py:123 cola/widgets/dag.py:330 +#: cola/widgets/editremotes.py:57 cola/widgets/main.py:845 msgid "Reset" msgstr "Zurücksetzen" -#: cola/widgets/createbranch.py:286 +#: cola/widgets/createbranch.py:284 #, python-format msgid "Reset \"%(branch)s\" to \"%(revision)s\"?" msgstr "Möchten Sie \"%(branch)s\" auf \"%(revision)s\" zurücksetzen?" -#: cola/guicmds.py:359 +#: cola/guicmds.py:358 msgid "Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/cmds.py:655 cola/cmds.py:706 cola/guicmds.py:342 -#: cola/widgets/createbranch.py:295 +#: cola/cmds.py:657 cola/cmds.py:708 cola/guicmds.py:341 +#: cola/widgets/createbranch.py:293 msgid "Reset Branch" msgstr "Branch zurücksetzen" -#: cola/cmds.py:703 cola/guicmds.py:341 cola/widgets/dag.py:425 -#: cola/widgets/main.py:419 +#: cola/cmds.py:705 cola/guicmds.py:340 cola/widgets/dag.py:424 +#: cola/widgets/main.py:431 msgid "Reset Branch (Soft)" msgstr "" -#: cola/cmds.py:652 cola/guicmds.py:350 cola/widgets/dag.py:431 -#: cola/widgets/main.py:426 +#: cola/cmds.py:654 cola/guicmds.py:349 cola/widgets/dag.py:430 +#: cola/widgets/main.py:439 msgid "Reset Branch and Stage (Mixed)" msgstr "" -#: cola/widgets/createbranch.py:292 +#: cola/widgets/createbranch.py:290 msgid "Reset Branch?" msgstr "Branch zurücksetzen?" -#: cola/widgets/main.py:655 +#: cola/widgets/main.py:668 msgid "Reset Layout" msgstr "" -#: cola/cmds.py:687 +#: cola/cmds.py:689 msgid "Reset Worktree and Reset All?" msgstr "" -#: cola/cmds.py:672 cola/cmds.py:689 cola/cmds.py:723 cola/guicmds.py:360 -#: cola/guicmds.py:373 cola/guicmds.py:382 +#: cola/cmds.py:674 cola/cmds.py:691 cola/cmds.py:725 cola/guicmds.py:359 +#: cola/guicmds.py:372 cola/guicmds.py:381 msgid "Reset and Restore" msgstr "" -#: cola/cmds.py:704 +#: cola/cmds.py:706 msgid "Reset branch?" msgstr "" -#: cola/widgets/createbranch.py:266 +#: cola/widgets/createbranch.py:264 #, python-format msgid "Resetting \"%(branch)s\" to \"%(revision)s\" will lose commits." msgstr "Das Zurücksetzen von \"%(branch)s\" nach \"%(revision)s\" verwirft Commits." -#: cola/widgets/prefs.py:264 +#: cola/widgets/prefs.py:285 msgid "Resize File Browser columns" msgstr "" -#: cola/widgets/prefs.py:374 +#: cola/widgets/prefs.py:412 msgid "Restart the application after changing appearance settings." msgstr "" -#: cola/cmds.py:757 cola/cmds.py:760 cola/guicmds.py:390 cola/guicmds.py:391 -#: cola/widgets/dag.py:461 cola/widgets/main.py:457 +#: cola/cmds.py:759 cola/cmds.py:762 cola/guicmds.py:389 cola/guicmds.py:390 +#: cola/widgets/dag.py:460 cola/widgets/main.py:471 msgid "Restore Worktree" msgstr "" -#: cola/cmds.py:720 cola/guicmds.py:381 cola/widgets/dag.py:454 -#: cola/widgets/main.py:450 +#: cola/cmds.py:722 cola/guicmds.py:380 cola/widgets/dag.py:453 +#: cola/widgets/main.py:463 msgid "Restore Worktree and Reset All (Hard)" msgstr "" -#: cola/cmds.py:669 cola/widgets/main.py:434 +#: cola/cmds.py:671 cola/widgets/main.py:447 msgid "Restore Worktree and Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/widgets/dag.py:438 +#: cola/widgets/dag.py:437 msgid "Restore Worktree and Reset All (Keep Unstaged Edits)" msgstr "" -#: cola/cmds.py:686 cola/guicmds.py:372 cola/widgets/dag.py:446 -#: cola/widgets/main.py:442 +#: cola/cmds.py:688 cola/guicmds.py:371 cola/widgets/dag.py:445 +#: cola/widgets/main.py:455 msgid "Restore Worktree and Reset All (Merge)" msgstr "" -#: cola/cmds.py:721 +#: cola/cmds.py:723 msgid "Restore Worktree and Reset All?" msgstr "" -#: cola/cmds.py:758 +#: cola/cmds.py:760 #, python-format msgid "Restore Worktree to %s?" msgstr "" -#: cola/cmds.py:670 +#: cola/cmds.py:672 msgid "Restore worktree, reset, and preserve unstaged edits?" msgstr "" -#: cola/widgets/dag.py:390 +#: cola/widgets/dag.py:389 msgid "Revert" msgstr "" -#: cola/widgets/diff.py:1153 +#: cola/widgets/diff.py:1227 msgid "Revert Diff Hunk" msgstr "Abschnitt verwerfen" -#: cola/widgets/diff.py:1018 +#: cola/widgets/diff.py:1057 msgid "Revert Diff Hunk..." msgstr "Abschnitt verwerfen..." -#: cola/widgets/diff.py:1152 +#: cola/widgets/diff.py:1226 msgid "Revert Diff Hunk?" msgstr "Möchten Sie den Abschnitt verwerfen?" -#: cola/widgets/diff.py:1150 +#: cola/widgets/diff.py:1224 msgid "Revert Selected Lines" msgstr "Änderungen an den ausgewählten Zeilen verwerfen" -#: cola/widgets/diff.py:1013 +#: cola/widgets/diff.py:1052 msgid "Revert Selected Lines..." msgstr "Ausgewählte Zeilen wiederherstellen..." -#: cola/widgets/diff.py:1149 +#: cola/widgets/diff.py:1223 msgid "Revert Selected Lines?" msgstr "Möchten Sie die Änderungen an den ausgewählten Zeilen verwerfen?" -#: cola/cmds.py:2311 +#: cola/cmds.py:2262 msgid "Revert Uncommitted Changes" msgstr "Nicht vorgemerkte Änderungen verwerfen" -#: cola/cmds.py:2305 +#: cola/cmds.py:2256 msgid "Revert Uncommitted Changes?" msgstr "Möchten Sie die Änderungen verwerfen?" -#: cola/cmds.py:2298 +#: cola/cmds.py:2249 msgid "Revert Uncommitted Edits..." msgstr "Nicht vorgemerkte Änderungen verwerfen..." -#: cola/cmds.py:2289 +#: cola/cmds.py:2240 msgid "Revert Unstaged Changes" msgstr "Nehme nicht vorgemerkte Änderungen zurück" -#: cola/cmds.py:2283 +#: cola/cmds.py:2234 msgid "Revert Unstaged Changes?" msgstr "Wollen sie die nicht vorgemerkten Änderungen zurücknehmen?" -#: cola/cmds.py:2275 +#: cola/cmds.py:2226 msgid "Revert Unstaged Edits..." msgstr "Nicht vorgemerkte Änderungen zurücknehmen..." -#: cola/cmds.py:598 +#: cola/cmds.py:599 msgid "Revert failed" msgstr "" -#: cola/cmds.py:2310 cola/widgets/diff.py:1161 +#: cola/cmds.py:2261 cola/widgets/diff.py:1235 msgid "Revert the uncommitted changes?" msgstr "Möchten Sie die nicht vorgemerkten Änderungen verwerfen?" -#: cola/cmds.py:2288 +#: cola/cmds.py:2239 msgid "Revert the unstaged changes?" msgstr "Möchten Sie die nicht vorgemerkten Änderungen zurücknehmen?" -#: cola/widgets/browse.py:189 +#: cola/widgets/browse.py:190 msgid "Revert uncommitted changes to selected paths" msgstr "Änderungen an ausgewählten Pfaden verwerfen" @@ -2999,294 +3101,302 @@ msgstr "Änderungen an ausgewählten Pfaden verwerfen" msgid "Revert unstaged changes to selected paths" msgstr "Änderungen an ausgewählten Pfaden verwerfen" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Review" msgstr "Vergleichen" -#: cola/widgets/main.py:583 +#: cola/widgets/main.py:596 msgid "Review..." msgstr "Review..." -#: cola/widgets/cfgactions.py:233 cola/widgets/createtag.py:84 +#: cola/widgets/cfgactions.py:231 cola/widgets/createtag.py:82 msgid "Revision" msgstr "Version" -#: cola/widgets/selectcommits.py:62 +#: cola/widgets/selectcommits.py:61 msgid "Revision Expression:" msgstr "Revisionsausdruck:" -#: cola/widgets/merge.py:39 cola/widgets/merge.py:42 +#: cola/widgets/merge.py:37 cola/widgets/merge.py:40 msgid "Revision to Merge" msgstr "Zusammenzuführende Revision" -#: cola/sequenceeditor.py:351 +#: cola/sequenceeditor.py:347 msgid "Reword" msgstr "Umformulieren" -#: cola/cmds.py:776 cola/widgets/commitmsg.py:456 +#: cola/cmds.py:778 cola/widgets/commitmsg.py:464 msgid "Rewrite Published Commit?" msgstr "Veröffentlichten Commit umschreiben?" -#: cola/widgets/log.py:31 +#: cola/widgets/log.py:31 cola/widgets/log.py:133 msgid "Right-click links to open:" msgstr "" -#: cola/interaction.py:127 cola/widgets/cfgactions.py:245 +#: cola/interaction.py:125 cola/widgets/cfgactions.py:243 msgid "Run" msgstr "Ausführen" -#: cola/cmds.py:2341 +#: cola/cmds.py:2292 #, python-format msgid "Run \"%s\"?" msgstr "Möchten Sie \"%s\" ausführen?" -#: cola/interaction.py:124 +#: cola/interaction.py:122 #, python-format msgid "Run %s?" msgstr "Möchten Sie \"%s\" ausführen?" -#: cola/interaction.py:125 +#: cola/interaction.py:123 #, python-format msgid "Run the \"%s\" command?" msgstr "Möchten Sie den Befehl \"%s\" ausführen?" -#: cola/cmds.py:2380 +#: cola/cmds.py:2331 #, python-format msgid "Running command: %s" msgstr "Führe Befehl \"%s\" aus" -#: cola/widgets/about.py:422 +#: cola/widgets/about.py:405 msgid "Russian translation" msgstr "Russische Übersetzung" -#: cola/sequenceeditor.py:324 +#: cola/sequenceeditor.py:321 msgid "SHA-1" msgstr "SHA-1" -#: cola/widgets/prefs.py:183 +#: cola/widgets/prefs.py:205 msgid "Safe Mode" msgstr "Abgesicherter Modus" -#: cola/cmds.py:2167 cola/widgets/archive.py:126 cola/widgets/browse.py:609 -#: cola/widgets/editremotes.py:54 cola/widgets/stash.py:52 -#: cola/widgets/status.py:1388 +#: cola/cmds.py:2118 cola/widgets/archive.py:124 cola/widgets/browse.py:610 +#: cola/widgets/editremotes.py:53 cola/widgets/stash.py:54 +#: cola/widgets/status.py:1389 msgid "Save" msgstr "Speichern" -#: cola/widgets/archive.py:113 +#: cola/widgets/archive.py:111 msgid "Save Archive" msgstr "Als TAR- oder ZIP-Archiv exportieren" -#: cola/widgets/dag.py:382 cola/widgets/main.py:351 +#: cola/widgets/dag.py:381 cola/widgets/main.py:346 msgid "Save As Tarball/Zip..." msgstr "Als TAR- oder ZIP-Archiv exportieren..." -#: cola/widgets/prefs.py:263 +#: cola/widgets/prefs.py:284 msgid "Save GUI Settings" msgstr "Einstellungen der Programmoberfläche sichern" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Save Stash" msgstr "Ablage speichern" -#: cola/widgets/stash.py:53 +#: cola/widgets/stash.py:55 msgid "Save modified state to new stash" msgstr "Änderungen in einer neuen Ablage speichern" -#: cola/widgets/browse.py:570 +#: cola/widgets/browse.py:571 #, python-format msgid "Saved \"%(filename)s\" from \"%(ref)s\" to \"%(destination)s\"" msgstr "\"%(filename)s\" von \"%(ref)s\" in \"%(destination)s\" gespeichert" -#: cola/widgets/bookmarks.py:83 cola/widgets/grep.py:98 -#: cola/widgets/search.py:42 cola/widgets/search.py:62 +#: cola/widgets/bookmarks.py:82 cola/widgets/grep.py:96 +#: cola/widgets/search.py:41 cola/widgets/search.py:61 msgid "Search" msgstr "Suchen" -#: cola/widgets/search.py:226 +#: cola/widgets/search.py:225 msgid "Search Authors" msgstr "Autor" -#: cola/widgets/search.py:224 +#: cola/widgets/search.py:223 msgid "Search Commit Messages" msgstr "Commit-Beschreibungen durchsuchen" -#: cola/widgets/search.py:227 +#: cola/widgets/search.py:226 msgid "Search Committers" msgstr "Eintragender" -#: cola/widgets/search.py:228 +#: cola/widgets/search.py:227 msgid "Search Date Range" msgstr "Datum von-bis" -#: cola/widgets/search.py:225 +#: cola/widgets/search.py:224 msgid "Search Diffs" msgstr "Dateiunterschiede durchsuchen" -#: cola/widgets/search.py:222 +#: cola/widgets/search.py:221 msgid "Search by Expression" msgstr "Regulärer Ausdruck" -#: cola/widgets/search.py:223 +#: cola/widgets/search.py:222 msgid "Search by Path" msgstr "Datei" -#: cola/widgets/grep.py:124 +#: cola/widgets/dag.py:494 +msgid "Search commit messages" +msgstr "" + +#: cola/widgets/grep.py:122 msgid "Search for a fixed string" msgstr "Nach einer festen Zeichenkette suchen" -#: cola/widgets/diff.py:519 cola/widgets/diff.py:1514 +#: cola/widgets/diff.py:526 cola/widgets/diff.py:1576 msgid "Search in Diff" msgstr "" -#: cola/guicmds.py:253 cola/widgets/bookmarks.py:62 +#: cola/guicmds.py:252 cola/widgets/bookmarks.py:61 msgid "Search repositories by name..." msgstr "" -#: cola/widgets/grep.py:122 +#: cola/widgets/grep.py:120 msgid "Search using a POSIX basic regular expression" msgstr "Suche mit einer einfachen POSIX Regular Expression durchführen" -#: cola/widgets/grep.py:123 +#: cola/widgets/grep.py:121 msgid "Search using a POSIX extended regular expression" msgstr "Suche mit einer erweiterten POSIX Regular Expression durchführen" -#: cola/widgets/main.py:493 +#: cola/widgets/main.py:506 msgid "Search..." msgstr "Suchen..." -#: cola/widgets/selectcommits.py:67 +#: cola/widgets/selectcommits.py:66 msgid "Search:" msgstr "" -#: cola/guicmds.py:330 cola/widgets/selectcommits.py:74 +#: cola/guicmds.py:329 cola/widgets/selectcommits.py:73 msgid "Select" msgstr "Auswählen" -#: cola/widgets/main.py:750 +#: cola/widgets/main.py:763 msgid "Select All" msgstr "Alle auswählen" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Select Branch to Review" msgstr "Branch für Review auswählen" -#: cola/widgets/dag.py:1610 +#: cola/widgets/dag.py:1667 msgid "Select Child" msgstr "Nachfolger auswählen" -#: cola/widgets/commitmsg.py:512 +#: cola/widgets/commitmsg.py:538 msgid "Select Commit" msgstr "Wählen Sie einen Commit aus" -#: cola/guicmds.py:137 +#: cola/guicmds.py:136 msgid "Select Directory..." msgstr "Verzeichnis wählen..." -#: cola/cmds.py:2129 +#: cola/cmds.py:2080 msgid "Select New Upstream" msgstr "Neuen Upstream auswählen" -#: cola/widgets/dag.py:1614 +#: cola/widgets/dag.py:1671 msgid "Select Newest Child" msgstr "Jüngsten Nachfolger auswählen" -#: cola/widgets/dag.py:1604 +#: cola/widgets/dag.py:1661 msgid "Select Oldest Parent" msgstr "Ältesten Vorgänger auswählen" -#: cola/widgets/dag.py:1599 +#: cola/widgets/dag.py:1656 msgid "Select Parent" msgstr "Vorgänger Auswählen" -#: cola/widgets/browse.py:525 +#: cola/widgets/browse.py:526 msgid "Select Previous Version" msgstr "Vorherige Version auswählen" -#: cola/widgets/clone.py:197 +#: cola/widgets/clone.py:195 msgid "Select a parent directory for the new clone" msgstr "Wählen Sie das übergeordnete Verzeichnis für den Klon" -#: cola/widgets/standard.py:756 cola/widgets/standard.py:779 +#: cola/widgets/standard.py:826 cola/widgets/standard.py:848 msgid "Select directory" msgstr "" -#: cola/widgets/selectcommits.py:162 +#: cola/widgets/selectcommits.py:161 msgid "Select output dir" msgstr "Ausgabe-Verzeichnis wählen" -#: cola/widgets/selectcommits.py:183 +#: cola/widgets/selectcommits.py:182 msgid "Select output directory" msgstr "Ausgabe-Verzeichnis wählen" -#: cola/widgets/patch.py:175 +#: cola/widgets/diff.py:1769 msgid "Select patch file(s)..." msgstr "Patch-Datei(en) wählen..." -#: cola/widgets/editremotes.py:437 +#: cola/widgets/editremotes.py:435 msgid "Select repository" msgstr "Repository wählen" -#: cola/widgets/bookmarks.py:225 cola/widgets/startup.py:348 +#: cola/widgets/bookmarks.py:224 cola/widgets/startup.py:347 msgid "Set Default Repository" msgstr "Standard-Repository auswählen" -#: cola/widgets/branch.py:282 +#: cola/widgets/branch.py:291 msgid "Set Upstream Branch" msgstr "Upstream-Branch setzen" -#: cola/widgets/branch.py:72 +#: cola/widgets/branch.py:74 msgid "" "Set the sort order for branches and tags.\n" "Toggle between date-based and version-name-based sorting." msgstr "" -#: cola/widgets/remote.py:213 +#: cola/widgets/remote.py:217 msgid "Set upstream" msgstr "Neuen Upstream setzen" -#: cola/widgets/prefs.py:405 +#: cola/widgets/prefs.py:443 msgid "Settings" msgstr "Allgemein" -#: cola/widgets/grep.py:142 +#: cola/widgets/grep.py:140 msgid "Shell arguments" msgstr "Als Kommandozeilenargumente" -#: cola/sequenceeditor.py:375 +#: cola/sequenceeditor.py:371 msgid "Shift Down" msgstr "Nach unten schieben" -#: cola/sequenceeditor.py:379 +#: cola/sequenceeditor.py:375 msgid "Shift Up" msgstr "Nach oben schieben" -#: cola/widgets/about.py:499 +#: cola/widgets/about.py:482 msgid "Shortcuts" msgstr "Tastenkürzel" -#: cola/widgets/prefs.py:179 +#: cola/widgets/prefs.py:201 msgid "Show Diffstat After Merge" msgstr "Vergleichsstatistik nach Zusammenführen anzeigen" -#: cola/widgets/prefs.py:178 +#: cola/widgets/prefs.py:200 msgid "Show Full Paths in the Window Title" msgstr "Vollständige Pfade in Fenstertiteln zeigen" -#: cola/sequenceeditor.py:106 cola/widgets/finder.py:187 -#: cola/widgets/status.py:1384 +#: cola/sequenceeditor.py:104 cola/widgets/finder.py:186 +#: cola/widgets/status.py:1385 msgid "Show Help" msgstr "Hilfe anzeigen" -#: cola/widgets/filelist.py:30 +#: cola/widgets/filelist.py:27 msgid "Show History" msgstr "Verlauf anzeigen" -#: cola/widgets/prefs.py:348 +#: cola/widgets/prefs.py:368 msgid "Show file counts in Status titles" msgstr "" -#: cola/sequenceeditor.py:171 cola/widgets/finder.py:138 +#: cola/widgets/diff.py:794 +msgid "Show filenames" +msgstr "" + +#: cola/sequenceeditor.py:169 cola/widgets/finder.py:137 msgid "" "Show help\n" "Shortcut: ?" @@ -3294,137 +3404,145 @@ msgstr "" "Hilfe anzeigen\n" "Kurzwahl: ?" -#: cola/widgets/diff.py:765 +#: cola/widgets/diff.py:792 msgid "Show line numbers" msgstr "Zeilennummern anzeigen" -#: cola/widgets/diff.py:761 +#: cola/widgets/remote.py:175 +msgid "Show remote messages" +msgstr "" + +#: cola/widgets/diff.py:789 msgid "Show whole surrounding functions of changes" msgstr "Gesamte übergeordnete Funktion anzeigen" -#: cola/widgets/recent.py:58 +#: cola/widgets/recent.py:56 msgid "Showing changes since" msgstr "Änderungen seit" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "Side by side" msgstr "Nebeneinander" -#: cola/cmds.py:2512 +#: cola/cmds.py:2463 msgid "Sign Off" msgstr "Abzeichnen" -#: cola/widgets/createtag.py:71 +#: cola/widgets/createtag.py:69 msgid "Sign Tag" msgstr "Tag unterzeichnen" -#: cola/widgets/commitmsg.py:55 +#: cola/widgets/commitmsg.py:56 msgid "Sign off on this commit" msgstr "Diesen Commit abzeichnen" -#: cola/widgets/about.py:412 cola/widgets/about.py:425 +#: cola/widgets/about.py:395 cola/widgets/about.py:408 msgid "Simplified Chinese translation" msgstr "Vereinfachte Chinesische Übersetzung" -#: cola/cmds.py:2587 +#: cola/cmds.py:2529 msgid "Skip" msgstr "Überspringen" -#: cola/widgets/main.py:264 cola/widgets/main.py:617 +#: cola/widgets/main.py:260 cola/widgets/main.py:630 msgid "Skip Current Patch" msgstr "Gegenwärtigen Patch überspringen" -#: cola/widgets/main.py:267 +#: cola/widgets/main.py:261 msgid "Skip applying the current patch and continue applying patches" msgstr "" -#: cola/widgets/prefs.py:261 +#: cola/widgets/prefs.py:282 msgid "Sort bookmarks alphabetically" msgstr "Lesezeichen alphabetisch sortieren" -#: cola/widgets/about.py:413 cola/widgets/about.py:436 -#: cola/widgets/about.py:440 +#: cola/widgets/about.py:396 cola/widgets/about.py:419 +#: cola/widgets/about.py:423 msgid "Spanish translation" msgstr "Spanische Übersetzung" -#: cola/widgets/createtag.py:88 +#: cola/widgets/createtag.py:86 msgid "Specifies the SHA-1 to tag" msgstr "Legt den zu taggenden SHA-1 fest" -#: cola/widgets/createtag.py:81 +#: cola/widgets/createtag.py:79 msgid "Specifies the tag message" msgstr "Legt die Tag-Beschreibung fest" -#: cola/widgets/createtag.py:65 +#: cola/widgets/createtag.py:63 msgid "Specifies the tag name" msgstr "Legt den Namen des Tags fest" -#: cola/widgets/spellcheck.py:46 +#: cola/widgets/spellcheck.py:45 msgid "Spelling Suggestions" msgstr "Rechtschreibvorschläge" -#: cola/sequenceeditor.py:369 cola/widgets/merge.py:58 +#: cola/sequenceeditor.py:365 cola/widgets/merge.py:56 msgid "Squash" msgstr "Verschmelzen" -#: cola/widgets/merge.py:57 +#: cola/widgets/merge.py:55 msgid "Squash the merged commits into a single commit" msgstr "Zusammengeführte Commits in einzelnen Commit vereinen" -#: cola/cmds.py:2598 cola/widgets/action.py:60 cola/widgets/diff.py:982 +#: cola/cmds.py:2540 cola/widgets/action.py:58 cola/widgets/diff.py:1168 msgid "Stage" msgstr "Änderung vormerken" -#: cola/cmds.py:2753 +#: cola/cmds.py:2699 msgid "Stage / Unstage" msgstr "Vormerken/Nicht vormerken" -#: cola/cmds.py:2735 +#: cola/cmds.py:2681 msgid "Stage / Unstage All" msgstr "" -#: cola/widgets/diff.py:1016 +#: cola/widgets/diff.py:1055 msgid "Stage Diff Hunk" msgstr "Änderungen am Abschnitt vormerken" -#: cola/cmds.py:2691 +#: cola/cmds.py:2633 msgid "Stage Modified" msgstr "Vermerke Änderung" -#: cola/cmds.py:2724 +#: cola/cmds.py:2670 msgid "Stage Modified and Untracked" msgstr "" -#: cola/widgets/status.py:872 cola/widgets/status.py:894 -#: cola/widgets/status.py:962 +#: cola/widgets/status.py:873 cola/widgets/status.py:895 +#: cola/widgets/status.py:963 msgid "Stage Selected" msgstr "Auswahl vormerken" -#: cola/widgets/diff.py:1011 +#: cola/widgets/diff.py:1050 msgid "Stage Selected Lines" msgstr "Änderungen an ausgewählten Zeilen vormerken" -#: cola/cmds.py:2702 +#: cola/cmds.py:2644 msgid "Stage Unmerged" msgstr "Nicht zusammengeführte Dateien vormerken" -#: cola/cmds.py:2713 +#: cola/cmds.py:2655 msgid "Stage Untracked" msgstr "Neue Dateien vormerken" -#: cola/widgets/commitmsg.py:438 +#: cola/widgets/commitmsg.py:446 msgid "Stage and Commit" msgstr "Vormerken und eintragen" -#: cola/widgets/commitmsg.py:435 +#: cola/widgets/commitmsg.py:443 msgid "Stage and commit?" msgstr "Vormerken und eintragen?" -#: cola/cmds.py:2586 +#: cola/widgets/action.py:58 +msgid "Stage changes using \"git add\"" +msgstr "" + +#: cola/cmds.py:2528 msgid "Stage conflicts" msgstr "Konflikte beim Vormerken" -#: cola/cmds.py:2577 +#: cola/cmds.py:2519 msgid "Stage conflicts?" msgstr "Konflikte vormerken?" @@ -3432,45 +3550,45 @@ msgstr "Konflikte vormerken?" msgid "Stage/unstage selected paths for commit" msgstr "Vormerken für Commit umschalten für ausgewählte Pfade" -#: cola/models/browse.py:334 cola/widgets/status.py:156 -#: cola/widgets/status.py:620 +#: cola/models/browse.py:333 cola/widgets/status.py:156 +#: cola/widgets/status.py:621 msgid "Staged" msgstr "Vorgemerkt" -#: cola/cmds.py:2605 +#: cola/cmds.py:2547 #, python-format msgid "Staging: %s" msgstr "Vermerken: %s" -#: cola/widgets/main.py:597 +#: cola/widgets/main.py:610 msgid "Start Interactive Rebase..." msgstr "Interaktiven Rebase starten..." -#: cola/widgets/createbranch.py:107 +#: cola/widgets/createbranch.py:105 msgid "Starting Revision" msgstr "Start-Revision" -#: cola/widgets/stash.py:40 +#: cola/widgets/stash.py:36 msgid "Stash" msgstr "Git-Zwischenablage" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash Index" msgstr "Inhalt der Zwischenablage" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash staged changes only" msgstr "Nur vorgemerkte Änderungen in die Zwischenablage" -#: cola/widgets/stash.py:73 +#: cola/widgets/stash.py:75 msgid "Stash unstaged changes only, keeping staged changes" msgstr "Nur nicht vorgemerkte Änderungen in die Zwischenablage, vorgemerkte Änderungen behalten" -#: cola/widgets/action.py:66 cola/widgets/main.py:414 +#: cola/widgets/action.py:76 cola/widgets/main.py:422 msgid "Stash..." msgstr "Git-Zwischenablage..." -#: cola/models/browse.py:33 cola/widgets/main.py:102 +#: cola/models/browse.py:32 cola/widgets/main.py:100 msgid "Status" msgstr "Zustand" @@ -3478,151 +3596,159 @@ msgstr "Zustand" msgid "Stop tracking paths" msgstr "Versionskontrolle für den ausgewählten Pfad beenden" -#: cola/widgets/submodules.py:82 +#: cola/widgets/submodules.py:81 msgid "Submodule URL (can be relative, ex: ../repo.git)" msgstr "" -#: cola/widgets/submodules.py:90 +#: cola/widgets/submodules.py:89 msgid "Submodule branch to track (optional)" msgstr "" -#: cola/widgets/submodules.py:86 +#: cola/widgets/submodules.py:85 msgid "Submodule path within the current repository (optional)" msgstr "" -#: cola/widgets/main.py:143 cola/widgets/submodules.py:32 +#: cola/widgets/main.py:141 cola/widgets/submodules.py:31 msgid "Submodules" msgstr "" -#: cola/widgets/prefs.py:174 +#: cola/widgets/prefs.py:196 msgid "Summarize Merge Commits" msgstr "Zusammenfassung beim Zusammenführen anzeigen" -#: cola/sequenceeditor.py:325 cola/widgets/dag.py:506 +#: cola/sequenceeditor.py:322 cola/widgets/dag.py:572 msgid "Summary" msgstr "Zusammenfassung" -#: cola/widgets/prefs.py:168 +#: cola/widgets/prefs.py:273 msgid "Tab Width" msgstr "Tabulatorweite" -#: cola/widgets/cfgactions.py:229 cola/widgets/createbranch.py:116 -#: cola/widgets/merge.py:48 +#: cola/widgets/cfgactions.py:227 cola/widgets/createbranch.py:114 +#: cola/widgets/merge.py:46 msgid "Tag" msgstr "Tag" -#: cola/cmds.py:2842 +#: cola/cmds.py:2788 msgid "Tag Created" msgstr "Tag erstellt" -#: cola/widgets/createtag.py:80 +#: cola/widgets/createtag.py:78 msgid "Tag message..." msgstr "Tag-Beschreibung..." -#: cola/cmds.py:2802 +#: cola/cmds.py:2748 msgid "Tag-signing was requested but the tag message is empty." msgstr "Eine Tag-Signatur wurde angefordert, aber die Tag-Beschreibung fehlt." -#: cola/widgets/branch.py:179 cola/widgets/branch.py:238 +#: cola/widgets/branch.py:183 cola/widgets/branch.py:248 msgid "Tags" msgstr "Tags" -#: cola/widgets/toolbar.py:180 +#: cola/widgets/action.py:78 cola/widgets/main.py:423 +msgid "Temporarily stash away uncommitted changes using \"git stash\"" +msgstr "" + +#: cola/widgets/toolbar.py:184 msgid "Text Beside Icon" msgstr "" -#: cola/widgets/toolbar.py:179 +#: cola/widgets/toolbar.py:183 msgid "Text Only" msgstr "" -#: cola/widgets/toolbar.py:181 +#: cola/widgets/toolbar.py:185 msgid "Text Under Icon" msgstr "" -#: cola/widgets/prefs.py:169 +#: cola/widgets/prefs.py:272 msgid "Text Width" msgstr "Textbreite" -#: cola/cmds.py:1116 +#: cola/cmds.py:1117 msgid "The branch will be no longer available." msgstr "Der Branch wird nicht mehr verfügbar sein." -#: cola/cmds.py:648 +#: cola/cmds.py:650 #, python-format msgid "The branch will be reset using \"git reset --mixed %s\"" msgstr "Der Branch wird zurückgesetzt mit \"git reset --mixed %s\"" -#: cola/cmds.py:699 cola/cmds.py:790 +#: cola/cmds.py:701 cola/cmds.py:792 #, python-format msgid "The branch will be reset using \"git reset --soft %s\"" msgstr "Der Branch wird zurückgesetzt mit \"git reset --soft %s\"" -#: cola/widgets/commitmsg.py:303 +#: cola/widgets/commitmsg.py:311 msgid "The commit message will be cleared." msgstr "Die Commit-Beschreibung wird geleert." -#: cola/widgets/prefs.py:146 +#: cola/widgets/prefs.py:169 msgid "" "The date-time format used when displaying dates in Git DAG.\n" "This value is passed to git log --date=" msgstr "" -#: cola/widgets/archive.py:208 +#: cola/widgets/archive.py:206 #, python-format msgid "The file \"%s\" exists and will be overwritten." msgstr "Die Datei \"%s\" existiert bereits und wird überschrieben." -#: cola/cmds.py:1086 +#: cola/cmds.py:1087 msgid "The following files will be deleted:" msgstr "Die folgenden Zeilen werden gleich gelöscht:" -#: cola/widgets/status.py:1646 +#: cola/widgets/status.py:1647 msgid "The number of leading paths to strip" msgstr "" -#: cola/cmds.py:716 +#: cola/cmds.py:718 #, python-format msgid "The repository will be reset using \"git reset --hard %s\"" msgstr "" -#: cola/cmds.py:665 +#: cola/cmds.py:667 #, python-format msgid "The repository will be reset using \"git reset --keep %s\"" msgstr "" -#: cola/cmds.py:682 +#: cola/cmds.py:684 #, python-format msgid "The repository will be reset using \"git reset --merge %s\"" msgstr "" -#: cola/cmds.py:2365 +#: cola/cmds.py:2316 msgid "The revision expression cannot be empty." msgstr "Der Ausdruck darf nicht leer sein." -#: cola/cmds.py:3029 +#: cola/widgets/stash.py:225 +msgid "The stash has not been renamed" +msgstr "" + +#: cola/cmds.py:2975 #, python-format msgid "" "The submodule will be added using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:3074 +#: cola/cmds.py:3020 #, python-format msgid "" "The submodule will be updated using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:736 +#: cola/cmds.py:738 #, python-format msgid "The worktree will be restored using \"git read-tree --reset -u %s\"" msgstr "" -#: cola/widgets/commitmsg.py:304 +#: cola/widgets/commitmsg.py:312 msgid "This cannot be undone. Clear commit message?" msgstr "Dies kann nicht rückgängig gemacht werden. Commit-Beschreibung leeren?" -#: cola/cmds.py:778 cola/widgets/commitmsg.py:458 +#: cola/cmds.py:780 cola/widgets/commitmsg.py:466 msgid "" "This commit has already been published.\n" "This operation will rewrite published history.\n" @@ -3632,7 +3758,7 @@ msgstr "" "Dieser Vorgang wird den veröffentlichten Verlauf umschreiben.\n" "Dies wollen Sie womöglich nicht tun." -#: cola/widgets/diff.py:1158 +#: cola/widgets/diff.py:1232 msgid "" "This operation drops uncommitted changes.\n" "These changes cannot be recovered." @@ -3640,7 +3766,7 @@ msgstr "" "Dieser Vorgang verwirft nicht vorgemerkte Änderungen.\n" "Diese Änderung kann nicht rückgängig gemacht werden." -#: cola/cmds.py:2307 +#: cola/cmds.py:2258 msgid "" "This operation removes uncommitted edits from selected files.\n" "These changes cannot be recovered." @@ -3648,7 +3774,7 @@ msgstr "" "Dieser Befehl verwirft nicht vorgemerkte Änderungen an den ausgewählten Dateien.\n" "Dieser Schritt kann nicht rückgängig gemacht werden." -#: cola/cmds.py:2285 +#: cola/cmds.py:2236 msgid "" "This operation removes unstaged edits from selected files.\n" "These changes cannot be recovered." @@ -3656,27 +3782,27 @@ msgstr "" "Damit verwerfen Sie nicht vorgemerkte Änderungen.\n" "Diese können nicht mehr wiederhergestellt werden." -#: cola/cmds.py:475 +#: cola/cmds.py:476 msgid "" "This operation will replace the selected unmerged files with content from the branch being merged using \"git checkout --theirs\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:513 +#: cola/cmds.py:514 msgid "" "This operation will replace the selected unmerged files with content from your current branch using \"git checkout --ours\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/widgets/main.py:1109 +#: cola/widgets/main.py:1122 msgid "" "This repository has unresolved conflicts after applying a patch.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1102 +#: cola/widgets/main.py:1115 msgid "" "This repository is currently being rebased.\n" "Resolve conflicts, commit changes, and run:\n" @@ -3686,13 +3812,13 @@ msgstr "" "Lösen Sie die Konflikte aus und committen Sie die Änderungen, dann nutzen Sie:\n" " Rebase > Fortsetzen" -#: cola/widgets/main.py:1115 +#: cola/widgets/main.py:1128 msgid "" "This repository is in the middle of a cherry-pick.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1121 +#: cola/widgets/main.py:1134 msgid "" "This repository is in the middle of a merge.\n" "Resolve conflicts and commit changes." @@ -3712,15 +3838,15 @@ msgstr "" msgid "To avoid applying removal lines ('-'), change them to context lines (' ')." msgstr "" -#: cola/sequenceeditor.py:342 +#: cola/sequenceeditor.py:338 msgid "Toggle Enabled" msgstr "Aktivierung umschalten" -#: cola/widgets/diff.py:776 +#: cola/widgets/diff.py:804 msgid "Toggle image diff" msgstr "" -#: cola/widgets/branch.py:63 +#: cola/widgets/branch.py:65 msgid "Toggle the branches filter" msgstr "Branch-Filter umschalten" @@ -3728,51 +3854,51 @@ msgstr "Branch-Filter umschalten" msgid "Toggle the paths filter" msgstr "Pfadfilter umschalten" -#: cola/widgets/toolbar.py:317 +#: cola/widgets/toolbar.py:322 msgid "Toolbar Style:" msgstr "" -#: cola/widgets/cfgactions.py:228 cola/widgets/merge.py:47 +#: cola/widgets/cfgactions.py:226 cola/widgets/merge.py:45 msgid "Tracking Branch" msgstr "Nachverfolgter Branch" -#: cola/widgets/createbranch.py:115 +#: cola/widgets/createbranch.py:113 msgid "Tracking branch" msgstr "Nachverfolgtem Branch" -#: cola/widgets/about.py:408 cola/widgets/about.py:434 -#: cola/widgets/about.py:445 +#: cola/widgets/about.py:391 cola/widgets/about.py:417 +#: cola/widgets/about.py:428 msgid "Traditional Chinese (Taiwan) translation" msgstr "Traditionell-Chinesische (Taiwan) Übersetzung" -#: cola/widgets/about.py:439 +#: cola/widgets/about.py:422 msgid "Translation" msgstr "" -#: cola/widgets/about.py:94 +#: cola/widgets/about.py:92 msgid "Translators" msgstr "Übersetzer" -#: cola/widgets/about.py:418 cola/widgets/about.py:423 -#: cola/widgets/about.py:438 +#: cola/widgets/about.py:401 cola/widgets/about.py:406 +#: cola/widgets/about.py:421 msgid "Turkish translation" msgstr "Türkische Übersetzung" -#: cola/widgets/clone.py:109 cola/widgets/editremotes.py:451 -#: cola/widgets/submodules.py:117 +#: cola/widgets/clone.py:107 cola/widgets/editremotes.py:449 +#: cola/widgets/submodules.py:116 msgid "URL" msgstr "URL" -#: cola/widgets/remote.py:463 +#: cola/widgets/remote.py:497 #, python-format msgid "URL: %s" msgstr "URL: %s" -#: cola/widgets/about.py:415 +#: cola/widgets/about.py:398 msgid "Ukranian translation" msgstr "Ukrainische Übersetzung" -#: cola/cmds.py:2122 +#: cola/cmds.py:2073 msgid "Unable to rebase" msgstr "Rebase nicht durchführbar" @@ -3781,53 +3907,58 @@ msgstr "Rebase nicht durchführbar" msgid "Unable to set URL for \"%(name)s\" to \"%(url)s\"" msgstr "Kann URL für \"%(name)s\" nicht auf \"%(url)s\" setzen" -#: cola/widgets/diff.py:1327 +#: cola/widgets/diff.py:1401 #, python-format msgid "Unable to write patch to \"%s\". Check permissions?" msgstr "" -#: cola/widgets/main.py:735 +#: cola/widgets/main.py:748 msgid "Undo" msgstr "Rückgängig" -#: cola/cmds.py:783 cola/cmds.py:788 cola/cmds.py:791 cola/widgets/main.py:208 +#: cola/cmds.py:785 cola/cmds.py:790 cola/cmds.py:793 cola/widgets/main.py:207 msgid "Undo Last Commit" msgstr "" -#: cola/cmds.py:789 +#: cola/cmds.py:791 msgid "Undo last commit?" msgstr "" -#: cola/cmds.py:782 +#: cola/cmds.py:784 msgid "Undo the published commit?" msgstr "" -#: cola/models/browse.py:328 cola/widgets/status.py:157 -#: cola/widgets/status.py:640 +#: cola/models/browse.py:327 cola/widgets/status.py:157 +#: cola/widgets/status.py:641 msgid "Unmerged" msgstr "Nicht zusammengeführt" -#: cola/cmds.py:2855 cola/widgets/action.py:61 cola/widgets/diff.py:985 +#: cola/cmds.py:2801 cola/widgets/action.py:61 cola/widgets/diff.py:1165 +#: cola/widgets/main.py:212 msgid "Unstage" msgstr "Änderung nicht vormerken" -#: cola/widgets/main.py:203 cola/widgets/status.py:790 +#: cola/widgets/main.py:202 cola/widgets/status.py:791 msgid "Unstage All" msgstr "Alle Vormerkungen aufheben" -#: cola/widgets/diff.py:1061 +#: cola/widgets/diff.py:1017 msgid "Unstage Diff Hunk" msgstr "Änderungen am Abschnitt nicht vormerken" -#: cola/widgets/status.py:823 cola/widgets/status.py:858 +#: cola/widgets/status.py:824 cola/widgets/status.py:859 msgid "Unstage Selected" msgstr "Vormerkung für Auswahl aufheben" -#: cola/widgets/diff.py:1058 +#: cola/widgets/diff.py:1015 msgid "Unstage Selected Lines" msgstr "Änderungen an ausgewählten Zeilen nicht mehr vormerken" -#: cola/cmds.py:2867 +#: cola/widgets/action.py:61 +msgid "Unstage changes using \"git reset\"" +msgstr "" + +#: cola/cmds.py:2813 #, python-format msgid "Unstaging: %s" msgstr "Entferne Datei »%s« aus Vormerkliste" @@ -3836,85 +3967,84 @@ msgstr "Entferne Datei »%s« aus Vormerkliste" msgid "Untrack Selected" msgstr "Auswahl von Versionskontrolle ausnehmen" -#: cola/widgets/status.py:159 cola/widgets/status.py:646 +#: cola/widgets/status.py:159 cola/widgets/status.py:647 msgid "Untracked" msgstr "Nicht unter Versionskontrolle" -#: cola/cmds.py:1141 cola/cmds.py:2923 +#: cola/cmds.py:1142 cola/cmds.py:2869 #, python-format msgid "Untracking: %s" msgstr "Nicht mehr verfolgen: %s" -#: cola/widgets/main.py:374 +#: cola/widgets/main.py:369 msgid "Update All Submodules..." msgstr "" -#: cola/widgets/createbranch.py:121 +#: cola/widgets/createbranch.py:119 msgid "Update Existing Branch:" msgstr "Existierenden Branch aktualisieren:" -#: cola/cmds.py:3075 +#: cola/cmds.py:3021 msgid "Update Submodule" msgstr "" -#: cola/cmds.py:3072 +#: cola/cmds.py:3018 msgid "Update Submodule..." msgstr "" -#: cola/cmds.py:3111 +#: cola/cmds.py:3057 msgid "Update Submodules" msgstr "" -#: cola/cmds.py:3109 +#: cola/cmds.py:3055 msgid "Update all submodules?" msgstr "" -#: cola/cmds.py:2093 +#: cola/cmds.py:2044 msgid "Update stacked branches" msgstr "" -#: cola/cmds.py:2085 cola/cmds.py:2092 +#: cola/cmds.py:2036 cola/cmds.py:2043 msgid "Update stacked branches when rebasing?" msgstr "" -#: cola/cmds.py:3108 +#: cola/cmds.py:3054 msgid "Update submodules..." msgstr "" -#: cola/widgets/status.py:953 +#: cola/widgets/status.py:954 msgid "Update this submodule" msgstr "" -#: cola/cmds.py:3073 +#: cola/cmds.py:3019 msgid "Update this submodule?" msgstr "" -#: cola/widgets/branch.py:421 cola/widgets/createbranch.py:302 -#: cola/widgets/remote.py:135 +#: cola/widgets/branch.py:433 cola/widgets/createbranch.py:300 msgid "Updating" msgstr "Aktualisierung" -#: cola/widgets/prefs.py:350 +#: cola/widgets/prefs.py:370 msgid "Use a block cursor in diff editors" msgstr "" -#: cola/widgets/prefs.py:154 +#: cola/widgets/prefs.py:177 msgid "Use gravatar.com to lookup icons for author emails" msgstr "" -#: cola/widgets/prefs.py:166 +#: cola/widgets/prefs.py:189 msgid "User Name" msgstr "Benutzername" -#: cola/widgets/about.py:92 +#: cola/widgets/about.py:90 msgid "Version" msgstr "Version" -#: cola/widgets/dag.py:800 cola/widgets/main.py:845 cola/widgets/main.py:966 +#: cola/widgets/dag.py:866 cola/widgets/main.py:858 cola/widgets/main.py:979 msgid "View" msgstr "Ansicht" -#: cola/widgets/browse.py:137 cola/widgets/status.py:278 +#: cola/widgets/browse.py:137 cola/widgets/status.py:279 msgid "View History..." msgstr "Verlauf anzeigen..." @@ -3922,74 +4052,74 @@ msgstr "Verlauf anzeigen..." msgid "View history for selected paths" msgstr "Verlauf für ausgewählte Pfade anzeigen" -#: cola/widgets/merge.py:54 +#: cola/widgets/branch.py:224 cola/widgets/merge.py:52 msgid "Visualize" msgstr "In Verlaufsansicht anzeigen" -#: cola/widgets/main.py:488 +#: cola/widgets/main.py:501 msgid "Visualize All Branches..." msgstr "Alle Branches visualisieren..." -#: cola/widgets/main.py:482 +#: cola/widgets/main.py:495 msgid "Visualize Current Branch..." msgstr "Gegenwärtigen Branch visualisieren..." -#: cola/widgets/createtag.py:73 +#: cola/widgets/createtag.py:71 msgid "Whether to sign the tag (git tag -s)" msgstr "Den Tag unterzeichnen (siehe git tag -s)" -#: cola/widgets/text.py:399 +#: cola/widgets/text.py:396 msgid "Whole Words" msgstr "" -#: cola/widgets/commitmsg.py:432 +#: cola/widgets/commitmsg.py:440 msgid "Would you like to stage and commit all modified files?" msgstr "Möchten Sie alle veränderten Dateien vormerken und aufnehmen?" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "XOR" msgstr "XOR" -#: cola/widgets/standard.py:1064 +#: cola/widgets/standard.py:1182 msgid "Yes" msgstr "" -#: cola/cmds.py:256 +#: cola/cmds.py:255 msgid "" "You are in the middle of a merge.\n" "Cannot amend while merging." msgstr "Es werden gerade Änderungen eingepflegt.Sie können deshalb im Moment keine Ergänzungen vornehmen." -#: cola/cmds.py:2123 +#: cola/cmds.py:2074 msgid "You cannot rebase with uncommitted changes." msgstr "Rebase nicht möglich mit ausstehenden Änderungen." -#: cola/widgets/merge.py:227 +#: cola/widgets/merge.py:225 msgid "You must specify a revision to merge." msgstr "Sie müssen eine Revision für die Zusammenführung angeben." -#: cola/widgets/merge.py:217 +#: cola/widgets/merge.py:215 msgid "You must specify a revision to view." msgstr "Sie müssen eine Revision zum Betrachten angeben." -#: cola/widgets/dag.py:710 cola/widgets/dag.py:1588 +#: cola/widgets/dag.py:776 cola/widgets/dag.py:1645 msgid "Zoom In" msgstr "Vergrößern" -#: cola/widgets/dag.py:706 cola/widgets/dag.py:1594 +#: cola/widgets/dag.py:772 cola/widgets/dag.py:1651 msgid "Zoom Out" msgstr "Verkleinern" -#: cola/widgets/dag.py:524 cola/widgets/dag.py:714 cola/widgets/dag.py:1596 -#: cola/widgets/diff.py:785 +#: cola/widgets/dag.py:590 cola/widgets/dag.py:780 cola/widgets/dag.py:1653 +#: cola/widgets/diff.py:813 msgid "Zoom to Fit" msgstr "In Ansicht einpassen" -#: cola/widgets/grep.py:112 +#: cola/widgets/grep.py:110 msgid "command-line arguments" msgstr "Kommandozeilenargumente" -#: cola/widgets/main.py:932 cola/widgets/main.py:938 +#: cola/widgets/main.py:945 cola/widgets/main.py:951 msgid "error: unable to execute git" msgstr "" @@ -3998,45 +4128,41 @@ msgstr "" msgid "exit code %s" msgstr "Ende-Code %s" -#: cola/app.py:301 +#: cola/app.py:304 #, python-format msgid "fatal: \"%s\" is not a directory. Please specify a correct --repo ." msgstr "fatal: \"%s\" ist kein Verzeichnis. Bitte gültiges Repository angeben mit --repo ." -#: cola/widgets/main.py:928 +#: cola/widgets/main.py:941 #, python-format msgid "git cola version %s" msgstr "git cola Version %s" -#: cola/widgets/startup.py:35 +#: cola/widgets/startup.py:34 msgid "git-cola" msgstr "git-cola" -#: cola/difftool.py:63 +#: cola/difftool.py:82 msgid "git-cola diff" msgstr "git-cola diff" -#: cola/widgets/submodules.py:81 +#: cola/widgets/submodules.py:80 msgid "git://git.example.com/repo.git" msgstr "" -#: cola/widgets/grep.py:132 +#: cola/widgets/grep.py:130 msgid "grep result..." msgstr "Ergebnis von grep..." -#: cola/widgets/about.py:486 +#: cola/widgets/about.py:469 msgid "hotkeys.html" msgstr "hotkeys_de.html" -#: cola/widgets/submodules.py:85 +#: cola/widgets/submodules.py:84 msgid "path/to/submodule" msgstr "" -#: cola/cmds.py:2537 -msgid "unknown" -msgstr "unbekannt" - -#: cola/widgets/createtag.py:63 +#: cola/widgets/createtag.py:61 msgid "vX.Y.Z" msgstr "vX.Y.Z" @@ -4045,14 +4171,18 @@ msgid "x 1" msgstr "" #: cola/hidpi.py:44 -msgid "x 1.5" +msgid "x 1.25" msgstr "" #: cola/hidpi.py:45 +msgid "x 1.5" +msgstr "" + +#: cola/hidpi.py:46 msgid "x 2" msgstr "" -#: cola/widgets/search.py:53 cola/widgets/search.py:58 +#: cola/widgets/search.py:52 cola/widgets/search.py:57 msgid "yyyy-MM-dd" msgstr "dd.MM.yyyy" @@ -4177,6 +4307,10 @@ msgstr "dd.MM.yyyy" #~ msgid "A branch is required for 'Merged Into'." #~ msgstr "Für »Zusammenführen mit« muss ein Zweig angegeben werden." +#, python-format +#~ msgid "A stash named \"%s\" already exists" +#~ msgstr "Eine Ablage mit dem Namen \"%s\" existiert bereits" + #~ msgid "Abort completed. Ready." #~ msgstr "Abbruch durchgeführt. Bereit." @@ -4421,6 +4555,9 @@ msgstr "dd.MM.yyyy" #~ msgid "Error: Command Failed" #~ msgstr "Fehler: Kommando fehlgeschlagen" +#~ msgid "Error: Stash exists" +#~ msgstr "Fehler: Diese Ablage existiert bereits" + #~ msgid "Errors: %s" #~ msgstr "Fehler: \"%s\"" @@ -5204,6 +5341,9 @@ msgstr "dd.MM.yyyy" #~ msgid "remote prune %s" #~ msgstr "Aufräumen von »%s«" +#~ msgid "unknown" +#~ msgstr "unbekannt" + #~ msgid "update-ref failed:" #~ msgstr "update-ref fehlgeschlagen:" diff --git a/cola/i18n/es.po b/cola/i18n/es.po index d06f73d9..2e5b281e 100644 --- a/cola/i18n/es.po +++ b/cola/i18n/es.po @@ -21,7 +21,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 22.04.2\n" -#: cola/widgets/patch.py:86 +#: cola/widgets/diff.py:1680 msgid "" "\n" "

\n" @@ -37,7 +37,7 @@ msgstr "" "

\n" " " -#: cola/widgets/about.py:455 +#: cola/widgets/about.py:438 #, python-format msgid "" "\n" @@ -90,7 +90,7 @@ msgstr "" "\n" " " -#: cola/widgets/about.py:180 +#: cola/widgets/about.py:182 #, python-format msgid "" "\n" @@ -119,7 +119,7 @@ msgstr "" " \n" " " -#: cola/widgets/about.py:387 +#: cola/widgets/about.py:370 #, python-format msgid "" "\n" @@ -134,7 +134,7 @@ msgstr "" "
\n" " " -#: cola/widgets/status.py:1310 +#: cola/widgets/status.py:1311 #, python-format msgid "" "\n" @@ -159,7 +159,7 @@ msgstr "" " %(basename)s = nombre base del archivo sin extensión\n" " %(ext)s = extensión del archivo\n" -#: cola/sequenceeditor.py:700 +#: cola/sequenceeditor.py:695 msgid "" "\n" "Commands\n" @@ -198,7 +198,7 @@ msgid "" "ctrl+d = launch difftool\n" msgstr "" -#: cola/widgets/finder.py:65 +#: cola/widgets/finder.py:64 msgid "" "\n" "Keyboard Shortcuts\n" @@ -226,45 +226,71 @@ msgstr "" "Las flechas hacia arriba y hacia abajo cambian el foco entre los campos para introducir texto\n" "y los resultados.\n" -#: cola/widgets/dag.py:894 +#: cola/widgets/prefs.py:133 +msgid "" +"\n" +"This option determines how the supplied commit message should be\n" +"cleaned up before committing.\n" +"\n" +"The can be strip, whitespace, verbatim, scissors or default.\n" +"\n" +"strip\n" +" Strip leading and trailing empty lines, trailing whitespace,\n" +" commentary and collapse consecutive empty lines.\n" +"\n" +"whitespace\n" +" Same as strip except #commentary is not removed.\n" +"\n" +"verbatim\n" +" Do not change the message at all.\n" +"\n" +"scissors\n" +" Same as whitespace except that everything from (and including) the line\n" +" found below is truncated, if the message is to be edited.\n" +" \"#\" can be customized with core.commentChar.\n" +"\n" +" # ------------------------ >8 ------------------------" +msgstr "" + +#: cola/widgets/dag.py:960 msgid " - DAG" msgstr " - DAG" -#: cola/widgets/recent.py:54 +#: cola/widgets/recent.py:52 msgid " commits ago" msgstr "commits atrás" -#: cola/cmds.py:1197 +#: cola/cmds.py:1198 #, python-format msgid "\"%(branch)s\" has been deleted from \"%(remote)s\"." msgstr "\"%(branch)s\" ha sido eliminado de \"%(remote)s\"." -#: cola/widgets/createbranch.py:316 +#: cola/widgets/createbranch.py:314 #, python-format msgid "\"%(command)s\" returned exit status \"%(status)d\"" msgstr "\"%(command)s\" devolvieron este estado de salida \"%(status)d\"" -#: cola/interaction.py:39 +#: cola/interaction.py:38 #, python-format msgid "\"%(command)s\" returned exit status %(status)d" msgstr "\"%(command)s\" devolvieron este estado de salida %(status)d" -#: cola/guicmds.py:157 +#: cola/guicmds.py:156 #, python-format msgid "\"%s\" already exists" msgstr "\"%s\" ya existe" -#: cola/widgets/clone.py:206 +#: cola/widgets/clone.py:204 #, python-format msgid "\"%s\" already exists, cola will create a new directory" msgstr "\"%s\" ya existe, cola creará una nueva carpeta" -#: cola/cmds.py:2349 +#: cola/cmds.py:2300 #, python-format msgid "\"%s\" requires a selected file." msgstr "\"%s\" requiere que seleccione un archivo." -#: cola/cmds.py:2087 +#: cola/cmds.py:2038 msgid "" "\"git rebase --update-refs\" automatically force-updates any\n" "branches that point to commits that are being rebased.\n" @@ -274,7 +300,11 @@ msgid "" "Using this feature is helpful for \"stacked\" branch workflows." msgstr "" -#: cola/sequenceeditor.py:321 +#: cola/models/stash.py:145 +msgid "\"git stash drop\" did not return a ref to rename." +msgstr "" + +#: cola/sequenceeditor.py:318 msgid "#" msgstr "#" @@ -283,37 +313,37 @@ msgstr "#" msgid "%(project)s: %(branch)s - Browse" msgstr "%(project)s: %(branch)s - Navegar" -#: cola/widgets/dag.py:887 +#: cola/widgets/dag.py:953 #, python-format msgid "%(project)s: %(ref)s - DAG" msgstr "%(project)s: %(ref)s - DAG" -#: cola/models/browse.py:315 +#: cola/models/browse.py:314 #, python-format msgid "%d days ago" msgstr "Hace %d días" -#: cola/models/browse.py:314 +#: cola/models/browse.py:313 #, python-format msgid "%d hours ago" msgstr "Hace %d horas" -#: cola/models/browse.py:307 cola/models/browse.py:311 +#: cola/models/browse.py:306 cola/models/browse.py:310 #, python-format msgid "%d minutes ago" msgstr "Hace %d minutos" -#: cola/cmds.py:376 +#: cola/cmds.py:377 #, python-format msgid "%d patch(es) applied." msgstr "%d parche(s) aplicado(s)." -#: cola/widgets/createbranch.py:281 +#: cola/widgets/createbranch.py:279 #, python-format msgid "%d skipped" msgstr "%d omitido" -#: cola/cmds.py:2580 +#: cola/cmds.py:2522 #, python-format msgid "" "%s appears to contain merge conflicts.\n" @@ -326,36 +356,36 @@ msgstr "" "Quizás debería omitir este archivo.\n" "¿Incluirlo en \"Stage\" de todas formas?" -#: cola/widgets/startup.py:263 +#: cola/widgets/startup.py:262 #, python-format msgid "%s could not be opened. Remove from bookmarks?" msgstr "" -#: cola/app.py:498 cola/widgets/bookmarks.py:482 +#: cola/app.py:501 cola/widgets/bookmarks.py:481 #, python-format msgid "%s is not a Git repository." msgstr "%s no es un repositorio Git." -#: cola/cmds.py:1015 +#: cola/cmds.py:1016 #, python-format msgid "%s will be removed from your bookmarks." msgstr "%s será eliminado de sus marcadores." -#: cola/cmds.py:1028 +#: cola/cmds.py:1029 #, python-format msgid "%s will be removed from your recent repositories." msgstr "%s será eliminado de tus repositorios recientes." -#: cola/cmds.py:1711 +#: cola/cmds.py:1663 #, python-format msgid "%s: No such file or directory." msgstr "%s: el archivo o carpeta no existe." -#: cola/widgets/main.py:734 +#: cola/widgets/main.py:747 msgid "&Edit" msgstr "&Editar" -#: cola/widgets/main.py:676 +#: cola/widgets/main.py:689 msgid "&File" msgstr "&Archivo" @@ -363,43 +393,43 @@ msgstr "&Archivo" msgid "(Amending)" msgstr "(Corrigiendo)" -#: cola/widgets/compare.py:36 +#: cola/widgets/compare.py:35 msgid "*** Branch Point ***" msgstr "*** Punto de la rama ***" -#: cola/widgets/compare.py:37 +#: cola/widgets/compare.py:36 msgid "*** Sandbox ***" msgstr "*** Sandbox ***" -#: cola/widgets/diff.py:788 +#: cola/widgets/diff.py:816 msgid "100%" msgstr "100%" -#: cola/widgets/diff.py:789 +#: cola/widgets/diff.py:817 msgid "200%" msgstr "200%" -#: cola/widgets/diff.py:786 +#: cola/widgets/diff.py:814 msgid "25%" msgstr "25%" -#: cola/widgets/diff.py:790 +#: cola/widgets/diff.py:818 msgid "400%" msgstr "400%" -#: cola/widgets/diff.py:787 +#: cola/widgets/diff.py:815 msgid "50%" msgstr "50%" -#: cola/widgets/diff.py:791 +#: cola/widgets/diff.py:819 msgid "800%" msgstr "800%" -#: cola/widgets/finder.py:119 +#: cola/widgets/finder.py:118 msgid " ..." msgstr " ..." -#: cola/cmds.py:1734 +#: cola/cmds.py:1686 msgid "" "A commit template has not been configured.\n" "Use \"git config\" to define \"commit.template\"\n" @@ -409,81 +439,76 @@ msgstr "" "Utilice \"git config\" y modifique \"commit.template\"\n" "para que apunte a una plantilla." -#: cola/cmds.py:1784 +#: cola/cmds.py:1735 #, python-format msgid "A hook must be provided at \"%s\"" msgstr "Un hook debe ser configurado en \"%s\"" -#: cola/widgets/stash.py:236 -#, python-format -msgid "A stash named \"%s\" already exists" -msgstr "Un \"stash\" llamado \"%s\" ya existe" - -#: cola/widgets/cfgactions.py:82 cola/widgets/main.py:622 +#: cola/widgets/cfgactions.py:81 cola/widgets/main.py:635 msgid "Abort" msgstr "Cancelar" -#: cola/widgets/cfgactions.py:149 cola/widgets/cfgactions.py:155 +#: cola/widgets/cfgactions.py:148 cola/widgets/cfgactions.py:154 msgid "Abort Action" msgstr "Cancelar acción" -#: cola/cmds.py:132 +#: cola/cmds.py:131 msgid "Abort Applying Patch" msgstr "" -#: cola/cmds.py:126 +#: cola/cmds.py:125 msgid "Abort Applying Patch..." msgstr "" -#: cola/widgets/main.py:245 +#: cola/widgets/main.py:244 msgid "Abort Applying Patches..." msgstr "" -#: cola/cmds.py:162 +#: cola/cmds.py:161 msgid "Abort Cherry-Pick" msgstr "" -#: cola/cmds.py:156 cola/widgets/main.py:334 +#: cola/cmds.py:155 cola/widgets/main.py:329 msgid "Abort Cherry-Pick..." msgstr "" -#: cola/cmds.py:193 +#: cola/cmds.py:192 msgid "Abort Merge" msgstr "Cancelar Merge" -#: cola/cmds.py:186 cola/widgets/main.py:368 +#: cola/cmds.py:185 cola/widgets/main.py:363 msgid "Abort Merge..." msgstr "Cancelar Merge..." -#: cola/widgets/cfgactions.py:154 +#: cola/widgets/cfgactions.py:153 msgid "Abort the action?" msgstr "¿Desea cancelar la acción?" -#: cola/widgets/main.py:250 +#: cola/widgets/main.py:245 msgid "Abort the current \"git am\" patch session" msgstr "" -#: cola/cmds.py:159 +#: cola/cmds.py:158 msgid "" "Aborting a cherry-pick can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:129 +#: cola/cmds.py:128 msgid "" "Aborting a patch can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:127 +#: cola/cmds.py:126 msgid "Aborting applying the current patch?" msgstr "" -#: cola/cmds.py:157 +#: cola/cmds.py:156 msgid "Aborting the current cherry-pick?" msgstr "" -#: cola/cmds.py:189 +#: cola/cmds.py:188 msgid "" "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." @@ -491,23 +516,23 @@ msgstr "" "Cancelar el \"merge\" actual causará que *TODOS* los cambios que no se haya hecho un commit se perderán.\n" "No es posible recuperar los cambios en los que no se haya hecho un commit." -#: cola/cmds.py:187 +#: cola/cmds.py:186 msgid "Aborting the current merge?" msgstr "¿Cancelar el merge actual?" -#: cola/widgets/about.py:91 cola/widgets/main.py:517 +#: cola/widgets/about.py:89 cola/widgets/main.py:530 msgid "About" msgstr "Acerca de" -#: cola/widgets/about.py:67 +#: cola/widgets/about.py:65 msgid "About git-cola" msgstr "Acerca de git-cola" -#: cola/widgets/bookmarks.py:217 cola/widgets/startup.py:340 +#: cola/widgets/bookmarks.py:216 cola/widgets/startup.py:339 msgid "Accept" msgstr "Aceptar" -#: cola/sequenceeditor.py:159 +#: cola/sequenceeditor.py:157 msgid "" "Accept changes and rebase\n" "Shortcut: Ctrl+Enter" @@ -515,50 +540,50 @@ msgstr "" "Aceptar cambios y rebase\n" "Atajo de teclado: Ctrl+Enter" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Action Name" msgstr "Nombre de acción" -#: cola/sequenceeditor.py:528 cola/widgets/bookmarks.py:321 -#: cola/widgets/branch.py:217 cola/widgets/browse.py:374 -#: cola/widgets/commitmsg.py:99 cola/widgets/dag.py:315 -#: cola/widgets/filelist.py:110 cola/widgets/main.py:95 -#: cola/widgets/main.py:757 cola/widgets/startup.py:436 +#: cola/sequenceeditor.py:524 cola/widgets/bookmarks.py:320 +#: cola/widgets/branch.py:221 cola/widgets/browse.py:375 +#: cola/widgets/commitmsg.py:105 cola/widgets/dag.py:314 +#: cola/widgets/filelist.py:107 cola/widgets/main.py:93 +#: cola/widgets/main.py:770 cola/widgets/startup.py:435 msgid "Actions" msgstr "Acciones" -#: cola/widgets/commitmsg.py:101 +#: cola/widgets/commitmsg.py:107 msgid "Actions..." msgstr "Acciones..." -#: cola/widgets/bookmarks.py:71 cola/widgets/gitignore.py:64 -#: cola/widgets/patch.py:103 cola/widgets/patch.py:117 -#: cola/widgets/status.py:1381 +#: cola/widgets/bookmarks.py:70 cola/widgets/diff.py:1697 +#: cola/widgets/diff.py:1711 cola/widgets/gitignore.py:63 +#: cola/widgets/status.py:1382 msgid "Add" msgstr "Añadir" -#: cola/widgets/bookmarks.py:470 +#: cola/widgets/bookmarks.py:469 msgid "Add Favorite" msgstr "Añadir favorito" -#: cola/widgets/editremotes.py:374 +#: cola/widgets/editremotes.py:373 msgid "Add Remote" msgstr "Añadir repositorio remoto" -#: cola/widgets/toolbar.py:315 +#: cola/widgets/toolbar.py:320 msgid "Add Separator" msgstr "Añadir separador" -#: cola/cmds.py:3030 cola/widgets/submodules.py:42 -#: cola/widgets/submodules.py:111 +#: cola/cmds.py:2976 cola/widgets/submodules.py:41 +#: cola/widgets/submodules.py:110 msgid "Add Submodule" msgstr "Añandir submódulo" -#: cola/cmds.py:3027 cola/widgets/main.py:381 +#: cola/cmds.py:2973 cola/widgets/main.py:376 msgid "Add Submodule..." msgstr "Añadir submódulo..." -#: cola/widgets/editremotes.py:62 +#: cola/widgets/editremotes.py:61 msgid "" "Add and remove remote repositories using the \n" "Add(+) and Delete(-) buttons on the left-hand side.\n" @@ -573,63 +598,63 @@ msgstr "" "seleccionando uno en la lista \n" "y presionando \"enter\", o haciendo doble clic." -#: cola/widgets/editremotes.py:81 +#: cola/widgets/editremotes.py:80 msgid "Add new remote git repository" msgstr "Añadir nuevo repositorio remoto de git" -#: cola/widgets/patch.py:103 +#: cola/widgets/diff.py:1697 msgid "Add patches (+)" msgstr "Añadir parches (+)" -#: cola/widgets/editremotes.py:433 +#: cola/widgets/editremotes.py:431 msgid "Add remote" msgstr "Añadir repositorio remoto" -#: cola/cmds.py:3028 +#: cola/cmds.py:2974 msgid "Add this submodule?" msgstr "¿Añadir este submódulo?" -#: cola/widgets/gitignore.py:54 +#: cola/widgets/gitignore.py:53 msgid "Add to .gitignore" msgstr "Añadir a .gitignore" -#: cola/widgets/status.py:286 +#: cola/widgets/status.py:287 msgid "Add to Git Annex" msgstr "Añadir a Git Annex" -#: cola/widgets/status.py:290 +#: cola/widgets/status.py:291 msgid "Add to Git LFS" msgstr "Añadir a Git LFS" -#: cola/widgets/gitignore.py:28 +#: cola/widgets/gitignore.py:27 msgid "Add to exclusions" msgstr "Añadir a exclusiones" -#: cola/widgets/gitignore.py:55 +#: cola/widgets/gitignore.py:54 msgid "Add to local .git/info/exclude" msgstr "Añadir a local .git/info/exclude" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Additions" msgstr "Adiciones" -#: cola/widgets/archive.py:134 +#: cola/widgets/archive.py:132 msgid "Advanced" msgstr "Avanzado" -#: cola/widgets/main.py:522 +#: cola/widgets/main.py:535 msgid "Against Commit... (Diff Mode)" msgstr "" -#: cola/models/browse.py:33 +#: cola/models/browse.py:32 msgid "Age" msgstr "Edad" -#: cola/widgets/prefs.py:403 +#: cola/widgets/prefs.py:441 msgid "All Repositories" msgstr "Todos los repositorios" -#: cola/cmds.py:3110 +#: cola/cmds.py:3056 #, python-format msgid "" "All submodules will be updated using\n" @@ -638,35 +663,35 @@ msgstr "" "Todos los submódulos serán actualizados usando\n" "\"%s\"" -#: cola/widgets/remote.py:195 +#: cola/widgets/remote.py:199 msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care" msgstr "Permitir actualizaciones \"non-fast-forward\". Utilizar \"force\" puede causar que el repositorio remoto pierda los commits, utilizar con cuidado" -#: cola/widgets/merge.py:61 +#: cola/widgets/merge.py:59 msgid "Always create a merge commit when enabled, even when the merge is a fast-forward update" msgstr "Siempre utilizar un \"merge commit\" cuando este habilitado, incluso cuando el \"merge\" es una actualización \"fast-forward\"" -#: cola/cmds.py:221 +#: cola/cmds.py:220 msgid "Amend" msgstr "Corregir" -#: cola/widgets/commitmsg.py:463 +#: cola/widgets/commitmsg.py:471 msgid "Amend Commit" msgstr "Corregir commit" -#: cola/widgets/commitmsg.py:110 cola/widgets/main.py:194 +#: cola/widgets/commitmsg.py:116 cola/widgets/main.py:193 msgid "Amend Last Commit" msgstr "Corregir el último commit" -#: cola/widgets/commitmsg.py:462 +#: cola/widgets/commitmsg.py:470 msgid "Amend the published commit?" msgstr "¿Corregir el commit publicado?" -#: cola/widgets/main.py:1157 +#: cola/widgets/main.py:1170 msgid "Amending" msgstr "Corrigiendo" -#: cola/widgets/cfgactions.py:151 +#: cola/widgets/cfgactions.py:150 msgid "" "An action is still running.\n" "Terminating it could result in data loss." @@ -674,7 +699,7 @@ msgstr "" "Una acción está siendo ejecutada.\n" "Cancelarla podría causar pérdida de información." -#: cola/cmds.py:2804 +#: cola/cmds.py:2750 msgid "" "An unsigned, lightweight tag will be created instead.\n" "Create an unsigned tag?" @@ -682,56 +707,56 @@ msgstr "" "Una etiqueta sin firmar, de poca entidad será creada.\n" "¿Crear una etiqueta sin firmar?" -#: cola/widgets/prefs.py:406 +#: cola/widgets/prefs.py:444 msgid "Appearance" msgstr "Apariencia" -#: cola/widgets/diff.py:1230 +#: cola/widgets/diff.py:1304 msgid "Append Patch" msgstr "" -#: cola/widgets/diff.py:1299 +#: cola/widgets/diff.py:1373 msgid "Append Patch..." msgstr "" -#: cola/widgets/patch.py:112 cola/widgets/stash.py:48 cola/widgets/stash.py:107 -#: cola/widgets/toolbar.py:323 +#: cola/widgets/diff.py:1706 cola/widgets/stash.py:50 cola/widgets/stash.py:110 +#: cola/widgets/toolbar.py:328 msgid "Apply" msgstr "Aplicar" -#: cola/widgets/patch.py:75 +#: cola/widgets/diff.py:1669 msgid "Apply Patches" msgstr "Aplicar parches" -#: cola/widgets/main.py:239 +#: cola/widgets/main.py:238 msgid "Apply Patches..." msgstr "Aplicar parches..." -#: cola/widgets/stash.py:64 +#: cola/widgets/stash.py:66 msgid "Apply and drop the selected stash (git stash pop)" msgstr "Aplicar y eliminar el stash seleccionado (git stash pop)" -#: cola/widgets/stash.py:48 +#: cola/widgets/stash.py:50 msgid "Apply the selected stash" msgstr "Aplicar el stash seleccionado" -#: cola/widgets/main.py:1167 +#: cola/widgets/main.py:1180 msgid "Applying Patch" msgstr "" -#: cola/widgets/cfgactions.py:207 +#: cola/widgets/cfgactions.py:205 msgid "Arguments" msgstr "Argumentos" -#: cola/qtutils.py:850 +#: cola/qtutils.py:887 msgid "Attach" msgstr "Adjuntar" -#: cola/models/browse.py:33 cola/models/browse.py:72 cola/widgets/dag.py:506 +#: cola/models/browse.py:32 cola/models/browse.py:71 cola/widgets/dag.py:572 msgid "Author" msgstr "Autor" -#: cola/widgets/about.py:93 +#: cola/widgets/about.py:91 msgid "Authors" msgstr "Autores" @@ -739,43 +764,43 @@ msgstr "Autores" msgid "Auto" msgstr "Auto" -#: cola/widgets/commitmsg.py:137 cola/widgets/prefs.py:259 +#: cola/widgets/commitmsg.py:143 cola/widgets/prefs.py:280 msgid "Auto-Wrap Lines" msgstr "Salto de línea automático" -#: cola/widgets/prefs.py:184 +#: cola/widgets/prefs.py:206 msgid "Autocomplete Paths" msgstr "Autocompletar rutas" -#: cola/widgets/prefs.py:176 +#: cola/widgets/prefs.py:198 msgid "Automatically Load Commit Message Template" msgstr "Cargar automáticamente la plantilla de mensajes de commit" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Basic Regexp" msgstr "Regexp básico" -#: cola/widgets/prefs.py:255 +#: cola/widgets/prefs.py:276 msgid "Blame Viewer" msgstr "Visor de responsables" -#: cola/widgets/browse.py:205 +#: cola/widgets/browse.py:206 msgid "Blame selected paths" msgstr "Responsables de las rutas seleccionadas" -#: cola/cmds.py:545 cola/widgets/status.py:282 +#: cola/cmds.py:546 cola/widgets/status.py:283 msgid "Blame..." msgstr "Responsable..." -#: cola/widgets/prefs.py:347 +#: cola/widgets/prefs.py:367 msgid "Bold on dark headers instead of italic" msgstr "Fuente en negrita con fondo negro en vez de cabeceras en cursiva" -#: cola/widgets/main.py:806 cola/widgets/submodules.py:119 +#: cola/widgets/main.py:819 cola/widgets/submodules.py:118 msgid "Branch" msgstr "Rama" -#: cola/widgets/remote.py:600 +#: cola/widgets/remote.py:635 #, python-format msgid "" "Branch \"%(branch)s\" does not exist in \"%(remote)s\".\n" @@ -784,84 +809,84 @@ msgstr "" "La rama \"%(branch)s\" no existe en \"%(remote)s\".\n" "Se publicará una nueva rama remota." -#: cola/widgets/createbranch.py:258 +#: cola/widgets/createbranch.py:256 #, python-format msgid "Branch \"%s\" already exists." msgstr "La rama \"%s\" ya existe." -#: cola/widgets/compare.py:44 +#: cola/widgets/compare.py:43 msgid "Branch Diff Viewer" msgstr "Visor de diferencias en ramas." -#: cola/widgets/createbranch.py:259 cola/widgets/createbranch.py:271 +#: cola/widgets/createbranch.py:257 cola/widgets/createbranch.py:269 msgid "Branch Exists" msgstr "Rama existe" -#: cola/widgets/createbranch.py:98 +#: cola/widgets/createbranch.py:96 msgid "Branch Name" msgstr "Nombre de la rama" -#: cola/widgets/submodules.py:89 +#: cola/widgets/submodules.py:88 msgid "Branch name" msgstr "Nombre de la rama" -#: cola/widgets/browse.py:89 cola/widgets/main.py:1097 +#: cola/widgets/browse.py:89 cola/widgets/main.py:1110 #, python-format msgid "Branch: %s" msgstr "Rama: %s" -#: cola/widgets/branch.py:85 cola/widgets/main.py:131 +#: cola/widgets/branch.py:87 cola/widgets/main.py:129 msgid "Branches" msgstr "Ramas" -#: cola/widgets/main.py:538 +#: cola/widgets/main.py:551 msgid "Branches..." msgstr "Ramas..." -#: cola/widgets/about.py:414 cola/widgets/about.py:417 -#: cola/widgets/about.py:437 +#: cola/widgets/about.py:397 cola/widgets/about.py:400 +#: cola/widgets/about.py:420 msgid "Brazilian translation" msgstr "Traducción al Brasileño" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse" msgstr "Navegar" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse Commits..." msgstr "Navegar por los commits..." -#: cola/widgets/main.py:499 +#: cola/widgets/main.py:512 msgid "Browse Current Branch..." msgstr "Navegar por la rama actual..." -#: cola/widgets/main.py:505 +#: cola/widgets/main.py:518 msgid "Browse Other Branch..." msgstr "Navegar por otra rama..." -#: cola/widgets/editremotes.py:437 cola/widgets/search.py:46 -#: cola/widgets/startup.py:65 cola/widgets/startup.py:285 +#: cola/widgets/editremotes.py:435 cola/widgets/search.py:45 +#: cola/widgets/startup.py:64 cola/widgets/startup.py:284 msgid "Browse..." msgstr "Navegar..." -#: cola/widgets/main.py:89 +#: cola/widgets/main.py:87 msgid "Browser" msgstr "Navegador" -#: cola/widgets/browse.py:589 +#: cola/widgets/browse.py:590 #, python-format msgid "Browsing %s" msgstr "Navegando por %s" -#: cola/widgets/commitmsg.py:118 +#: cola/widgets/commitmsg.py:124 msgid "Bypass Commit Hooks" msgstr "Evitar Commit Hooks" -#: cola/sequenceeditor.py:175 cola/widgets/standard.py:991 +#: cola/sequenceeditor.py:173 cola/widgets/standard.py:1058 msgid "Cancel" msgstr "Cancelar" -#: cola/sequenceeditor.py:176 +#: cola/sequenceeditor.py:174 msgid "" "Cancel rebase\n" "Shortcut: Ctrl+Q" @@ -869,188 +894,200 @@ msgstr "" "Cancelar rebase\n" "Atajo de teclado: Ctrl+Q" -#: cola/cmds.py:254 +#: cola/cmds.py:253 msgid "Cannot Amend" msgstr "No se puede corregir" -#: cola/cmds.py:560 +#: cola/cmds.py:561 #, python-format msgid "Cannot exec \"%s\": please configure a blame viewer" msgstr "No se puede ejecutar \"%s\": por favor configure un visor de responsable" -#: cola/cmds.py:3146 +#: cola/cmds.py:3092 #, python-format msgid "Cannot exec \"%s\": please configure a history browser" msgstr "No se pudo ejecutar \"%s\": por favor, configure un navegador de historial" -#: cola/cmds.py:1583 +#: cola/cmds.py:1571 #, python-format msgid "Cannot exec \"%s\": please configure your editor" msgstr "No se pudo ejecutar \"%s\": por favor, configure su editor" -#: cola/models/browse.py:336 +#: cola/models/browse.py:335 msgid "Changed Upstream" msgstr "Cambiado aguas arriba (upstream)" -#: cola/widgets/prefs.py:186 +#: cola/widgets/prefs.py:208 msgid "Check Published Commits when Amending" msgstr "Comprobar commits publicados al modificar" -#: cola/widgets/commitmsg.py:130 +#: cola/widgets/commitmsg.py:136 msgid "Check Spelling" msgstr "Comprobar ortografía" -#: cola/widgets/prefs.py:265 +#: cola/widgets/prefs.py:286 msgid "Check spelling" msgstr "Comprobar ortografía" -#: cola/widgets/prefs.py:163 +#: cola/widgets/prefs.py:186 msgid "Check whether a commit has been published when amending" msgstr "Comprobar si se ha publicado un commit al modificar" -#: cola/guicmds.py:62 cola/widgets/branch.py:222 +#: cola/guicmds.py:61 cola/widgets/branch.py:233 msgid "Checkout" msgstr "Checkout" -#: cola/widgets/createbranch.py:130 +#: cola/widgets/createbranch.py:128 msgid "Checkout After Creation" msgstr "Checkout después de crear" -#: cola/guicmds.py:62 cola/widgets/dag.py:410 +#: cola/guicmds.py:61 cola/widgets/dag.py:409 msgid "Checkout Branch" msgstr "Checkout rama" -#: cola/widgets/dag.py:414 +#: cola/widgets/dag.py:413 msgid "Checkout Detached HEAD" msgstr "Checkout HEAD separado" -#: cola/cmds.py:480 cola/cmds.py:518 +#: cola/cmds.py:481 cola/cmds.py:519 msgid "Checkout Files" msgstr "" -#: cola/widgets/branch.py:226 +#: cola/widgets/branch.py:237 msgid "Checkout as new branch" msgstr "Checkout como nueva rama" -#: cola/cmds.py:507 +#: cola/cmds.py:508 msgid "Checkout files from our branch (HEAD)" msgstr "" -#: cola/cmds.py:511 +#: cola/cmds.py:512 msgid "Checkout files from our branch?" msgstr "" -#: cola/cmds.py:469 +#: cola/cmds.py:470 msgid "Checkout files from their branch (MERGE_HEAD)" msgstr "" -#: cola/cmds.py:473 +#: cola/cmds.py:474 msgid "Checkout files from their branch?" msgstr "" -#: cola/widgets/main.py:576 +#: cola/widgets/main.py:589 msgid "Checkout..." msgstr "Checkout..." -#: cola/widgets/dag.py:387 cola/widgets/search.py:79 +#: cola/widgets/dag.py:386 cola/widgets/search.py:78 msgid "Cherry Pick" msgstr "Cherry Pick" -#: cola/guicmds.py:73 +#: cola/guicmds.py:72 msgid "Cherry-Pick Commit" msgstr "Cherry-Pick Commit" -#: cola/widgets/main.py:328 +#: cola/widgets/main.py:323 msgid "Cherry-Pick..." msgstr "Cherry-Pick..." -#: cola/cmds.py:584 +#: cola/cmds.py:585 msgid "Cherry-pick failed" msgstr "" -#: cola/widgets/main.py:1161 +#: cola/widgets/main.py:1174 msgid "Cherry-picking" msgstr "" -#: cola/widgets/diff.py:1247 +#: cola/widgets/diff.py:1321 msgid "Choose Patch..." msgstr "" -#: cola/widgets/search.py:319 +#: cola/widgets/search.py:318 msgid "Choose Paths" msgstr "Escoger rutas" -#: cola/widgets/grep.py:116 +#: cola/widgets/grep.py:114 msgid "Choose the \"git grep\" regular expression mode" msgstr "Escoger el modo de expresión regular \"git grep\"" -#: cola/widgets/bookmarks.py:229 cola/widgets/startup.py:352 +#: cola/widgets/bookmarks.py:228 cola/widgets/startup.py:351 msgid "Clear Default Repository" msgstr "Limpiar el repositorio predeterminado" -#: cola/widgets/commitmsg.py:305 +#: cola/widgets/commitmsg.py:313 msgid "Clear commit message" msgstr "Limpiar el mensaje de commit" -#: cola/widgets/commitmsg.py:302 +#: cola/widgets/commitmsg.py:310 msgid "Clear commit message?" msgstr "¿Limpiar el mensaje de commit?" -#: cola/widgets/commitmsg.py:62 +#: cola/widgets/commitmsg.py:63 msgid "Clear..." msgstr "Limpiar..." -#: cola/widgets/clone.py:126 +#: cola/widgets/clone.py:124 msgid "Clone" msgstr "Clonar" -#: cola/widgets/clone.py:62 cola/widgets/clone.py:104 +#: cola/widgets/clone.py:61 cola/widgets/clone.py:102 msgid "Clone Repository" msgstr "Clonar repositorio" -#: cola/widgets/main.py:465 cola/widgets/startup.py:58 +#: cola/widgets/main.py:478 cola/widgets/startup.py:57 msgid "Clone..." msgstr "Clonar..." -#: cola/widgets/clone.py:62 +#: cola/widgets/clone.py:61 #, python-format msgid "Cloning repository at %s" msgstr "Clonando repositorio en %s" -#: cola/qtutils.py:757 cola/qtutils.py:807 cola/widgets/about.py:508 -#: cola/widgets/remote.py:328 cola/widgets/text.py:1094 +#: cola/qtutils.py:788 cola/qtutils.py:838 cola/widgets/about.py:491 +#: cola/widgets/remote.py:362 cola/widgets/text.py:1090 msgid "Close" msgstr "Cerrar" -#: cola/widgets/text.py:402 +#: cola/widgets/remote.py:222 +msgid "Close dialog when completed" +msgstr "" + +#: cola/widgets/remote.py:221 +msgid "Close on completion" +msgstr "" + +#: cola/widgets/text.py:399 msgid "Close the find bar" msgstr "" -#: cola/qtutils.py:623 +#: cola/qtutils.py:651 msgid "Close..." msgstr "Cerrar..." -#: cola/widgets/recent.py:71 +#: cola/widgets/recent.py:69 msgid "Collapse all" msgstr "Colapsar todo" -#: cola/sequenceeditor.py:323 +#: cola/sequenceeditor.py:320 msgid "Command" msgstr "Comando" -#: cola/widgets/main.py:163 cola/widgets/merge.py:74 +#: cola/widgets/main.py:161 cola/widgets/merge.py:72 msgid "Commit" msgstr "Commit" -#: cola/cmds.py:837 +#: cola/widgets/prefs.py:192 +msgid "Commit Message Cleanup" +msgstr "" + +#: cola/widgets/commitmsg.py:495 msgid "Commit failed" msgstr "Commit fallido" -#: cola/widgets/commitmsg.py:61 +#: cola/widgets/commitmsg.py:62 msgid "Commit staged changes" msgstr "Hacer un commit de los cambios en \"stage\"" -#: cola/widgets/commitmsg.py:93 +#: cola/widgets/commitmsg.py:94 msgid "" "Commit staged changes\n" "Shortcut: Ctrl+Enter" @@ -1058,361 +1095,365 @@ msgstr "" "Hacer un commit de los cambios en \"stage\"\n" "Atajo de teclado: Ctrl+Enter" -#: cola/widgets/commitmsg.py:564 +#: cola/widgets/commitmsg.py:590 msgid "Commit summary" msgstr "Sumario de commit" -#: cola/widgets/main.py:259 +#: cola/widgets/main.py:253 msgid "Commit the current state and continue applying patches" msgstr "" -#: cola/widgets/merge.py:70 +#: cola/widgets/merge.py:68 msgid "Commit the merge if there are no conflicts. Uncheck to leave the merge uncommitted" msgstr "Hacer un commit del merge sin no hay conflictos. Desmarcar para dejar el merge sin commit" -#: cola/widgets/commitmsg.py:58 cola/widgets/commitmsg.py:95 -#: cola/widgets/main.py:778 cola/widgets/main.py:779 +#: cola/widgets/commitmsg.py:59 cola/widgets/commitmsg.py:96 +#: cola/widgets/main.py:791 cola/widgets/main.py:792 msgid "Commit@@verb" msgstr "Commit@@verb" -#: cola/difftool.py:78 cola/widgets/compare.py:70 +#: cola/widgets/dag.py:487 +msgid "Commits authored by me" +msgstr "" + +#: cola/difftool.py:97 cola/widgets/compare.py:69 msgid "Compare" msgstr "Comparar" -#: cola/difftool.py:83 +#: cola/difftool.py:102 msgid "Compare All" msgstr "Comparar todo" -#: cola/widgets/toolbar.py:269 cola/widgets/toolbar.py:306 +#: cola/widgets/toolbar.py:274 cola/widgets/toolbar.py:311 msgid "Configure Toolbar" msgstr "Configurar barra de herramientas" -#: cola/widgets/remote.py:214 +#: cola/widgets/remote.py:218 msgid "Configure the remote branch as the the new upstream" msgstr "Configurar la rama remota como la nueva \"upstream\"" -#: cola/widgets/main.py:170 +#: cola/widgets/main.py:168 msgid "Console" msgstr "Terminal" -#: cola/interaction.py:111 cola/widgets/main.py:610 +#: cola/interaction.py:109 cola/widgets/main.py:623 msgid "Continue" msgstr "Continuar" -#: cola/widgets/main.py:255 +#: cola/widgets/main.py:252 msgid "Continue Applying Patches" msgstr "" -#: cola/widgets/bookmarks.py:248 cola/widgets/main.py:742 -#: cola/widgets/startup.py:371 +#: cola/widgets/bookmarks.py:247 cola/widgets/main.py:755 +#: cola/widgets/startup.py:370 msgid "Copy" msgstr "Copiar" -#: cola/widgets/status.py:268 +#: cola/widgets/status.py:269 msgid "Copy Basename to Clipboard" msgstr "Copiar el nombre base al portapapeles" -#: cola/widgets/diff.py:208 +#: cola/widgets/diff.py:209 msgid "Copy Diff" msgstr "" -#: cola/widgets/status.py:745 +#: cola/widgets/status.py:746 msgid "Copy Leading Path to Clipboard" msgstr "Copiar la ruta principal al portapapeles" -#: cola/widgets/status.py:251 +#: cola/widgets/status.py:252 msgid "Copy Path to Clipboard" msgstr "Copiar la ruta al portapapeles" -#: cola/widgets/status.py:259 +#: cola/widgets/status.py:260 msgid "Copy Relative Path to Clipboard" msgstr "Copiar la ruta relativa al portapapeles" -#: cola/sequenceeditor.py:334 cola/widgets/dag.py:474 +#: cola/sequenceeditor.py:330 cola/widgets/dag.py:473 msgid "Copy SHA-1" msgstr "Copiar SHA-1" -#: cola/widgets/status.py:737 +#: cola/widgets/status.py:738 msgid "Copy..." msgstr "Copiar..." -#: cola/app.py:490 +#: cola/app.py:493 #, python-format msgid "Could not open %s." msgstr "No se pudo abrir %s." -#: cola/widgets/clone.py:191 cola/widgets/clone.py:193 +#: cola/widgets/clone.py:189 cola/widgets/clone.py:191 #, python-format msgid "Could not parse Git URL: \"%s\"" msgstr "No fue posible procesar la Git URL: \"%s\"" -#: cola/app.py:500 +#: cola/app.py:503 msgid "Create" msgstr "Crear" -#: cola/widgets/createbranch.py:86 cola/widgets/createbranch.py:135 -#: cola/widgets/createbranch.py:301 cola/widgets/dag.py:369 +#: cola/widgets/createbranch.py:84 cola/widgets/createbranch.py:133 +#: cola/widgets/createbranch.py:299 cola/widgets/dag.py:368 msgid "Create Branch" msgstr "Crear rama" -#: cola/widgets/dag.py:373 +#: cola/widgets/dag.py:372 msgid "Create Patch" msgstr "Crear parche" -#: cola/widgets/remote.py:606 +#: cola/widgets/remote.py:641 msgid "Create Remote Branch" msgstr "Crear rama remota" -#: cola/widgets/commitmsg.py:124 cola/widgets/merge.py:78 +#: cola/widgets/commitmsg.py:130 cola/widgets/merge.py:76 msgid "Create Signed Commit" msgstr "Crear commit firmado" -#: cola/widgets/createtag.py:55 cola/widgets/createtag.py:91 -#: cola/widgets/dag.py:377 +#: cola/widgets/createtag.py:53 cola/widgets/createtag.py:89 +#: cola/widgets/dag.py:376 msgid "Create Tag" msgstr "Crear etiqueta" -#: cola/widgets/main.py:544 +#: cola/widgets/main.py:557 msgid "Create Tag..." msgstr "Crear etiqueta..." -#: cola/cmds.py:2807 +#: cola/cmds.py:2753 msgid "Create Unsigned Tag" msgstr "Crear etiqueta sin firmar" -#: cola/widgets/remote.py:188 +#: cola/widgets/remote.py:192 msgid "Create a merge commit even when the merge resolves as a fast-forward" msgstr "Crear un \"merge commit\" incluso cuando el \"merge\" se resuelva como un \"fast-forward\"" -#: cola/widgets/remote.py:605 +#: cola/widgets/remote.py:640 msgid "Create a new remote branch?" msgstr "¿Crear una nueva rama remota?" -#: cola/app.py:499 +#: cola/app.py:502 msgid "Create a new repository at that location?" msgstr "¿Crear un nuevo repositorio en esa ubicación?" -#: cola/widgets/submodules.py:100 +#: cola/widgets/submodules.py:99 msgid "Create a shallow clone with history truncated to the specified number of revisions. 0 performs a full clone." msgstr "Cree un clon superficial con el historial truncado al número especificado de revisiones. 0 realiza una clonación completa." -#: cola/widgets/main.py:551 +#: cola/widgets/main.py:564 msgid "Create..." msgstr "Crear..." -#: cola/cmds.py:2843 +#: cola/cmds.py:2789 #, python-format msgid "Created a new tag named \"%s\"" msgstr "Se creó una nueva etiqueta con nombre \"%s\"" -#: cola/widgets/prefs.py:266 +#: cola/widgets/prefs.py:287 msgid "Ctrl+MouseWheel to Zoom" msgstr "" -#: cola/widgets/prefs.py:404 +#: cola/widgets/prefs.py:442 msgid "Current Repository" msgstr "Repositorio actual" -#: cola/widgets/status.py:1371 +#: cola/widgets/status.py:1372 msgid "Custom Copy Actions" msgstr "Acciones de copiado personalizadas" -#: cola/widgets/status.py:273 +#: cola/widgets/status.py:274 msgid "Customize..." msgstr "Personalizar..." -#: cola/widgets/main.py:740 +#: cola/widgets/main.py:753 msgid "Cut" msgstr "Cortar" -#: cola/widgets/about.py:411 cola/widgets/about.py:442 +#: cola/widgets/about.py:394 cola/widgets/about.py:425 msgid "Czech translation" msgstr "Traducción al Checo" -#: cola/widgets/main.py:592 +#: cola/widgets/main.py:605 msgid "DAG..." msgstr "DAG..." -#: cola/icons.py:55 +#: cola/icons.py:54 msgid "Dark Theme" msgstr "Tema oscuro" -#: cola/widgets/dag.py:506 +#: cola/widgets/dag.py:572 msgid "Date, Time" msgstr "Fecha, hora" -#: cola/icons.py:54 cola/themes.py:637 +#: cola/icons.py:53 cola/themes.py:643 msgid "Default" msgstr "Predeterminado" -#: cola/widgets/prefs.py:126 +#: cola/widgets/prefs.py:124 msgid "" "Default directory when exporting patches.\n" "Relative paths are relative to the current repository.\n" "Absolute path are used as-is." msgstr "" -#: cola/cmds.py:925 cola/guicmds.py:26 cola/guicmds.py:35 -#: cola/widgets/bookmarks.py:75 cola/widgets/bookmarks.py:251 -#: cola/widgets/main.py:746 cola/widgets/startup.py:373 +#: cola/cmds.py:923 cola/guicmds.py:25 cola/guicmds.py:34 +#: cola/widgets/bookmarks.py:74 cola/widgets/bookmarks.py:250 +#: cola/widgets/main.py:759 cola/widgets/startup.py:372 msgid "Delete" msgstr "Eliminar" -#: cola/cmds.py:1088 +#: cola/cmds.py:1089 #, python-format msgid "Delete %d file(s)?" msgstr "¿Desea eliminar %d archivo(s)?" -#: cola/cmds.py:1016 +#: cola/cmds.py:1017 msgid "Delete Bookmark" msgstr "Eliminar marcadores" -#: cola/cmds.py:1014 +#: cola/cmds.py:1015 msgid "Delete Bookmark?" msgstr "¿Eliminar marcadores?" -#: cola/cmds.py:1114 cola/cmds.py:1117 cola/guicmds.py:26 -#: cola/widgets/branch.py:268 +#: cola/cmds.py:1115 cola/cmds.py:1118 cola/guicmds.py:25 +#: cola/widgets/branch.py:277 msgid "Delete Branch" msgstr "Eliminar rama" -#: cola/cmds.py:1089 +#: cola/cmds.py:1090 msgid "Delete Files" msgstr "Eliminar archivos" -#: cola/widgets/status.py:311 +#: cola/widgets/status.py:312 msgid "Delete Files..." msgstr "Eliminar archivos..." -#: cola/cmds.py:1085 +#: cola/cmds.py:1086 msgid "Delete Files?" msgstr "¿Eliminar archivos?" -#: cola/cmds.py:922 +#: cola/cmds.py:920 msgid "Delete Remote" msgstr "Eliminar repositorio remoto" -#: cola/guicmds.py:35 cola/widgets/branch.py:270 +#: cola/guicmds.py:34 cola/widgets/branch.py:279 msgid "Delete Remote Branch" msgstr "Eliminar rama remota" -#: cola/widgets/main.py:564 +#: cola/widgets/main.py:577 msgid "Delete Remote Branch..." msgstr "Eliminar rama remota..." -#: cola/widgets/toolbar.py:271 +#: cola/widgets/toolbar.py:276 msgid "Delete Toolbar" msgstr "Eliminar barra de herramientas" -#: cola/cmds.py:1115 +#: cola/cmds.py:1116 #, python-format msgid "Delete branch \"%s\"?" msgstr "¿Eliminar rama \"%s\"?" -#: cola/widgets/editremotes.py:88 +#: cola/widgets/editremotes.py:87 msgid "Delete remote" msgstr "Eliminar repositorio remoto" -#: cola/cmds.py:924 +#: cola/cmds.py:922 #, python-format msgid "Delete remote \"%s\"" msgstr "Eliminar repositorio remoto \"%s\"" -#: cola/cmds.py:923 +#: cola/cmds.py:921 msgid "Delete remote?" msgstr "¿Desea eliminar el repositorio remoto?" -#: cola/widgets/main.py:558 +#: cola/widgets/main.py:571 msgid "Delete..." msgstr "Eliminar..." -#: cola/cmds.py:1067 +#: cola/cmds.py:1068 #, python-format msgid "Deleting \"%s\" failed" msgstr "Fallo intentando eliminar \"%s\"" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Deletions" msgstr "Eliminaciones" -#: cola/widgets/submodules.py:120 +#: cola/widgets/submodules.py:119 msgid "Depth" msgstr "Profundidad" -#: cola/qtutils.py:811 cola/qtutils.py:852 +#: cola/qtutils.py:842 cola/qtutils.py:889 msgid "Detach" msgstr "Separar" -#: cola/widgets/prefs.py:181 +#: cola/widgets/prefs.py:203 msgid "Detect Conflict Markers" msgstr "Detectar Conflict Markers" -#: cola/widgets/prefs.py:151 +#: cola/widgets/prefs.py:174 msgid "Detect conflict markers in unmerged files" msgstr "Detectar conflicto en marcadores en archivos en los que no se haya hecho merge" -#: cola/widgets/about.py:271 cola/widgets/about.py:274 -#: cola/widgets/about.py:277 cola/widgets/about.py:278 -#: cola/widgets/about.py:279 cola/widgets/about.py:280 -#: cola/widgets/about.py:281 cola/widgets/about.py:282 -#: cola/widgets/about.py:283 cola/widgets/about.py:284 -#: cola/widgets/about.py:285 cola/widgets/about.py:286 -#: cola/widgets/about.py:287 cola/widgets/about.py:288 -#: cola/widgets/about.py:289 cola/widgets/about.py:290 -#: cola/widgets/about.py:291 cola/widgets/about.py:292 -#: cola/widgets/about.py:293 cola/widgets/about.py:294 -#: cola/widgets/about.py:295 cola/widgets/about.py:296 -#: cola/widgets/about.py:297 cola/widgets/about.py:298 -#: cola/widgets/about.py:299 cola/widgets/about.py:300 -#: cola/widgets/about.py:301 cola/widgets/about.py:302 -#: cola/widgets/about.py:303 cola/widgets/about.py:304 -#: cola/widgets/about.py:305 cola/widgets/about.py:306 -#: cola/widgets/about.py:307 cola/widgets/about.py:308 -#: cola/widgets/about.py:309 cola/widgets/about.py:310 -#: cola/widgets/about.py:311 cola/widgets/about.py:312 -#: cola/widgets/about.py:313 cola/widgets/about.py:314 -#: cola/widgets/about.py:315 cola/widgets/about.py:316 -#: cola/widgets/about.py:317 cola/widgets/about.py:318 -#: cola/widgets/about.py:319 cola/widgets/about.py:320 -#: cola/widgets/about.py:321 cola/widgets/about.py:322 -#: cola/widgets/about.py:323 cola/widgets/about.py:324 -#: cola/widgets/about.py:325 cola/widgets/about.py:326 -#: cola/widgets/about.py:327 cola/widgets/about.py:328 -#: cola/widgets/about.py:329 cola/widgets/about.py:330 -#: cola/widgets/about.py:331 cola/widgets/about.py:332 -#: cola/widgets/about.py:333 cola/widgets/about.py:334 -#: cola/widgets/about.py:335 cola/widgets/about.py:336 -#: cola/widgets/about.py:337 cola/widgets/about.py:338 -#: cola/widgets/about.py:339 cola/widgets/about.py:340 -#: cola/widgets/about.py:341 cola/widgets/about.py:342 -#: cola/widgets/about.py:343 cola/widgets/about.py:344 -#: cola/widgets/about.py:345 cola/widgets/about.py:346 -#: cola/widgets/about.py:347 cola/widgets/about.py:348 -#: cola/widgets/about.py:349 cola/widgets/about.py:350 -#: cola/widgets/about.py:351 cola/widgets/about.py:352 -#: cola/widgets/about.py:353 cola/widgets/about.py:354 -#: cola/widgets/about.py:355 cola/widgets/about.py:356 -#: cola/widgets/about.py:357 cola/widgets/about.py:358 -#: cola/widgets/about.py:359 cola/widgets/about.py:360 -#: cola/widgets/about.py:361 cola/widgets/about.py:362 -#: cola/widgets/about.py:363 cola/widgets/about.py:364 -#: cola/widgets/about.py:365 cola/widgets/about.py:366 -#: cola/widgets/about.py:367 cola/widgets/about.py:368 -#: cola/widgets/about.py:369 cola/widgets/about.py:370 -#: cola/widgets/about.py:371 cola/widgets/about.py:372 -#: cola/widgets/about.py:373 cola/widgets/about.py:374 -#: cola/widgets/about.py:375 cola/widgets/about.py:376 -#: cola/widgets/about.py:377 cola/widgets/about.py:378 -#: cola/widgets/about.py:379 cola/widgets/about.py:380 +#: cola/widgets/about.py:254 cola/widgets/about.py:257 +#: cola/widgets/about.py:260 cola/widgets/about.py:261 +#: cola/widgets/about.py:262 cola/widgets/about.py:263 +#: cola/widgets/about.py:264 cola/widgets/about.py:265 +#: cola/widgets/about.py:266 cola/widgets/about.py:267 +#: cola/widgets/about.py:268 cola/widgets/about.py:269 +#: cola/widgets/about.py:270 cola/widgets/about.py:271 +#: cola/widgets/about.py:272 cola/widgets/about.py:273 +#: cola/widgets/about.py:274 cola/widgets/about.py:275 +#: cola/widgets/about.py:276 cola/widgets/about.py:277 +#: cola/widgets/about.py:278 cola/widgets/about.py:279 +#: cola/widgets/about.py:280 cola/widgets/about.py:281 +#: cola/widgets/about.py:282 cola/widgets/about.py:283 +#: cola/widgets/about.py:284 cola/widgets/about.py:285 +#: cola/widgets/about.py:286 cola/widgets/about.py:287 +#: cola/widgets/about.py:288 cola/widgets/about.py:289 +#: cola/widgets/about.py:290 cola/widgets/about.py:291 +#: cola/widgets/about.py:292 cola/widgets/about.py:293 +#: cola/widgets/about.py:294 cola/widgets/about.py:295 +#: cola/widgets/about.py:296 cola/widgets/about.py:297 +#: cola/widgets/about.py:298 cola/widgets/about.py:299 +#: cola/widgets/about.py:300 cola/widgets/about.py:301 +#: cola/widgets/about.py:302 cola/widgets/about.py:303 +#: cola/widgets/about.py:304 cola/widgets/about.py:305 +#: cola/widgets/about.py:306 cola/widgets/about.py:307 +#: cola/widgets/about.py:308 cola/widgets/about.py:309 +#: cola/widgets/about.py:310 cola/widgets/about.py:311 +#: cola/widgets/about.py:312 cola/widgets/about.py:313 +#: cola/widgets/about.py:314 cola/widgets/about.py:315 +#: cola/widgets/about.py:316 cola/widgets/about.py:317 +#: cola/widgets/about.py:318 cola/widgets/about.py:319 +#: cola/widgets/about.py:320 cola/widgets/about.py:321 +#: cola/widgets/about.py:322 cola/widgets/about.py:323 +#: cola/widgets/about.py:324 cola/widgets/about.py:325 +#: cola/widgets/about.py:326 cola/widgets/about.py:327 +#: cola/widgets/about.py:328 cola/widgets/about.py:329 +#: cola/widgets/about.py:330 cola/widgets/about.py:331 +#: cola/widgets/about.py:332 cola/widgets/about.py:333 +#: cola/widgets/about.py:334 cola/widgets/about.py:335 +#: cola/widgets/about.py:336 cola/widgets/about.py:337 +#: cola/widgets/about.py:338 cola/widgets/about.py:339 +#: cola/widgets/about.py:340 cola/widgets/about.py:341 +#: cola/widgets/about.py:342 cola/widgets/about.py:343 +#: cola/widgets/about.py:344 cola/widgets/about.py:345 +#: cola/widgets/about.py:346 cola/widgets/about.py:347 +#: cola/widgets/about.py:348 cola/widgets/about.py:349 +#: cola/widgets/about.py:350 cola/widgets/about.py:351 +#: cola/widgets/about.py:352 cola/widgets/about.py:353 +#: cola/widgets/about.py:354 cola/widgets/about.py:355 +#: cola/widgets/about.py:356 cola/widgets/about.py:357 +#: cola/widgets/about.py:358 cola/widgets/about.py:359 +#: cola/widgets/about.py:360 cola/widgets/about.py:361 +#: cola/widgets/about.py:362 cola/widgets/about.py:363 msgid "Developer" msgstr "Desarrollador" -#: cola/guicmds.py:185 cola/widgets/dag.py:764 cola/widgets/diff.py:781 -#: cola/widgets/main.py:177 cola/widgets/main.py:797 +#: cola/guicmds.py:184 cola/widgets/dag.py:830 cola/widgets/diff.py:809 +#: cola/widgets/main.py:175 cola/widgets/main.py:810 msgid "Diff" msgstr "Diferencia" -#: cola/guicmds.py:185 +#: cola/guicmds.py:184 msgid "Diff Against Commit" msgstr "" @@ -1420,35 +1461,35 @@ msgstr "" msgid "Diff Against Predecessor..." msgstr "Diferencia respecto del predecesor..." -#: cola/widgets/main.py:1159 +#: cola/widgets/main.py:1172 msgid "Diff Mode" msgstr "" -#: cola/widgets/diff.py:772 cola/widgets/diff.py:796 +#: cola/widgets/diff.py:800 cola/widgets/diff.py:824 msgid "Diff Options" msgstr "Opciones al mostrar las diferencias" -#: cola/widgets/prefs.py:256 +#: cola/widgets/prefs.py:277 msgid "Diff Tool" msgstr "Herramienta de diferencias (Diff)" -#: cola/widgets/dag.py:364 +#: cola/widgets/dag.py:363 msgid "Diff selected -> this" msgstr "Diferencia seleccionada -> esta" -#: cola/widgets/dag.py:358 +#: cola/widgets/dag.py:357 msgid "Diff this -> selected" msgstr "Comprobar diferencias en esta -> seleccionada" -#: cola/widgets/main.py:218 +#: cola/widgets/main.py:217 msgid "Diffstat" msgstr "Mostrar diferencias (Diffstat)" -#: cola/cmds.py:3262 +#: cola/difftool.py:324 msgid "Difftool" msgstr "Herramienta Diff" -#: cola/widgets/clone.py:207 +#: cola/widgets/clone.py:205 msgid "Directory Exists" msgstr "La carpeta ya existe" @@ -1456,84 +1497,88 @@ msgstr "La carpeta ya existe" msgid "Disable" msgstr "Deshabilitar" -#: cola/widgets/prefs.py:180 +#: cola/widgets/prefs.py:202 msgid "Display Untracked Files" msgstr "Mostrar ficheros sin seguimiento" -#: cola/cmds.py:2094 +#: cola/widgets/remote.py:176 +msgid "Display remote messages in a separate dialog" +msgstr "" + +#: cola/cmds.py:2045 msgid "Do not update stacked branches" msgstr "" -#: cola/widgets/main.py:471 +#: cola/widgets/main.py:484 msgid "Documentation" msgstr "Documentación" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop" msgstr "Abandonar" -#: cola/widgets/stash.py:258 +#: cola/widgets/stash.py:276 msgid "Drop Stash" msgstr "Abandonar Stash" -#: cola/widgets/stash.py:255 +#: cola/widgets/stash.py:273 msgid "Drop Stash?" msgstr "¿Abandonar Stash?" -#: cola/widgets/stash.py:257 +#: cola/widgets/stash.py:275 #, python-format msgid "Drop the \"%s\" stash?" msgstr "¿Abandonar el Stash \"%s\"?" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop the selected stash" msgstr "Abandonar el Stash seleccionado" -#: cola/qtutils.py:764 cola/sequenceeditor.py:357 cola/widgets/grep.py:102 +#: cola/qtutils.py:795 cola/sequenceeditor.py:353 cola/widgets/grep.py:100 msgid "Edit" msgstr "Editar" -#: cola/widgets/diff.py:1019 +#: cola/widgets/diff.py:1058 msgid "Edit Diff Hunk to Revert..." msgstr "" -#: cola/widgets/diff.py:1017 +#: cola/widgets/diff.py:1056 msgid "Edit Diff Hunk to Stage..." msgstr "" -#: cola/widgets/diff.py:1062 +#: cola/widgets/diff.py:1124 msgid "Edit Diff Hunk to Unstage..." msgstr "" -#: cola/cmds.py:2166 +#: cola/cmds.py:2117 msgid "Edit Rebase" msgstr "Editar Rebase" -#: cola/widgets/editremotes.py:36 +#: cola/widgets/editremotes.py:35 msgid "Edit Remotes" msgstr "Editar repositorios remotos" -#: cola/widgets/main.py:298 +#: cola/widgets/main.py:293 msgid "Edit Remotes..." msgstr "Editar repositorios remotos..." -#: cola/widgets/diff.py:1014 +#: cola/widgets/diff.py:1053 msgid "Edit Selected Lines to Revert..." msgstr "" -#: cola/widgets/diff.py:1012 +#: cola/widgets/diff.py:1051 msgid "Edit Selected Lines to Stage..." msgstr "" -#: cola/widgets/diff.py:1059 +#: cola/widgets/diff.py:1122 msgid "Edit Selected Lines to Unstage..." msgstr "" -#: cola/widgets/editremotes.py:44 +#: cola/widgets/editremotes.py:43 msgid "Edit remotes by selecting them from the list" msgstr "Editar repositorios remotos seleccionándolos de la lista" -#: cola/widgets/browse.py:197 cola/widgets/common.py:39 +#: cola/widgets/browse.py:198 cola/widgets/common.py:38 msgid "Edit selected paths" msgstr "Editar rutas seleccionadas" @@ -1549,11 +1594,11 @@ msgstr "" msgid "Edit the following patch, which will then be applied to the worktree to revert the changes:" msgstr "" -#: cola/widgets/main.py:604 +#: cola/widgets/main.py:617 msgid "Edit..." msgstr "Editar..." -#: cola/widgets/prefs.py:253 +#: cola/widgets/prefs.py:274 msgid "Editor" msgstr "Editor" @@ -1562,153 +1607,158 @@ msgstr "Editor" msgid "Editor returned %s exit code. Not applying patch." msgstr "" -#: cola/widgets/prefs.py:167 +#: cola/widgets/prefs.py:190 msgid "Email Address" msgstr "Dirección de correo electrónico" -#: cola/widgets/about.py:258 cola/widgets/about.py:401 +#: cola/widgets/about.py:241 cola/widgets/about.py:384 msgid "Email contributor" msgstr "Dirección de correo electrónico del colaborador" -#: cola/widgets/prefs.py:182 +#: cola/widgets/prefs.py:204 msgid "Enable Gravatar Icons" msgstr "" -#: cola/widgets/prefs.py:160 +#: cola/widgets/prefs.py:183 msgid "Enable path autocompletion in tools" msgstr "Habilitar autocompletado de ruta en herramientas" -#: cola/widgets/diff.py:768 +#: cola/widgets/diff.py:796 msgid "Enable word wrapping" msgstr "Habilitar el ajuste de palabras" -#: cola/sequenceeditor.py:322 +#: cola/sequenceeditor.py:319 msgid "Enabled" msgstr "Habilitado" -#: cola/guicmds.py:333 cola/widgets/branch.py:445 +#: cola/guicmds.py:332 cola/widgets/branch.py:478 msgid "Enter New Branch Name" msgstr "Introducir el nombre de la nueva rama" -#: cola/guicmds.py:147 +#: cola/guicmds.py:146 msgid "Enter a name for the new bare repo" msgstr "Introducir el nombre para el nuevo repositorio remoto básico" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Enter a name for the stash" msgstr "Introducir el nombre para el Stash" -#: cola/cmds.py:146 cola/cmds.py:176 cola/cmds.py:207 cola/cmds.py:283 -#: cola/cmds.py:292 cola/cmds.py:307 cola/cmds.py:317 cola/cmds.py:460 -#: cola/cmds.py:496 cola/cmds.py:534 cola/cmds.py:633 cola/cmds.py:751 -#: cola/cmds.py:1067 cola/cmds.py:1164 cola/cmds.py:2005 cola/cmds.py:2394 -#: cola/cmds.py:2637 cola/cmds.py:2643 cola/cmds.py:2651 cola/cmds.py:2872 -#: cola/cmds.py:2890 cola/cmds.py:3180 cola/gitcmds.py:984 cola/guicmds.py:157 -#: cola/models/stash.py:70 cola/models/stash.py:87 cola/models/stash.py:108 -#: cola/widgets/bookmarks.py:482 cola/widgets/branch.py:777 +#: cola/widgets/stash.py:216 +msgid "Enter a new name for the stash" +msgstr "" + +#: cola/cmds.py:145 cola/cmds.py:175 cola/cmds.py:206 cola/cmds.py:284 +#: cola/cmds.py:293 cola/cmds.py:308 cola/cmds.py:318 cola/cmds.py:461 +#: cola/cmds.py:497 cola/cmds.py:535 cola/cmds.py:635 cola/cmds.py:753 +#: cola/cmds.py:1068 cola/cmds.py:1165 cola/cmds.py:1956 cola/cmds.py:2345 +#: cola/cmds.py:2579 cola/cmds.py:2585 cola/cmds.py:2593 cola/cmds.py:2818 +#: cola/cmds.py:2836 cola/cmds.py:3125 cola/gitcmds.py:994 cola/guicmds.py:156 +#: cola/models/stash.py:70 cola/models/stash.py:90 cola/models/stash.py:112 +#: cola/models/stash.py:138 cola/widgets/bookmarks.py:481 +#: cola/widgets/branch.py:829 msgid "Error" msgstr "Error" -#: cola/widgets/clone.py:191 +#: cola/widgets/clone.py:189 msgid "Error Cloning" msgstr "Error al clonar" -#: cola/widgets/createbranch.py:314 +#: cola/widgets/createbranch.py:312 msgid "Error Creating Branch" msgstr "Error al crear rama" -#: cola/app.py:502 cola/guicmds.py:101 +#: cola/app.py:505 cola/guicmds.py:100 msgid "Error Creating Repository" msgstr "Error al crear repositorio" -#: cola/cmds.py:1202 +#: cola/cmds.py:1206 msgid "Error Deleting Remote Branch" msgstr "Error al eliminar rama remota" -#: cola/cmds.py:1585 +#: cola/cmds.py:1573 msgid "Error Editing File" msgstr "Error al editar el archivo" -#: cola/cmds.py:559 +#: cola/cmds.py:560 msgid "Error Launching Blame Viewer" msgstr "Error al arrancar el visor de responsables" -#: cola/cmds.py:3145 +#: cola/cmds.py:3091 msgid "Error Launching History Browser" msgstr "Error al arrancar el navegador del historial" -#: cola/app.py:489 +#: cola/app.py:492 msgid "Error Opening Repository" msgstr "Error al abrir el repositorio" -#: cola/widgets/browse.py:566 +#: cola/models/stash.py:144 +msgid "Error Renaming Stash" +msgstr "" + +#: cola/widgets/browse.py:567 msgid "Error Saving File" msgstr "" -#: cola/cmds.py:914 +#: cola/cmds.py:912 #, python-format msgid "Error creating remote \"%s\"" msgstr "Error al crear el repositorio remoto \"%s\"" -#: cola/models/stash.py:197 +#: cola/models/stash.py:233 msgid "Error creating stash" msgstr "Error al crear Stash" -#: cola/cmds.py:1126 +#: cola/cmds.py:1127 #, python-format msgid "Error deleting branch \"%s\"" msgstr "Error al borrar la rama \"%s\"" -#: cola/cmds.py:932 +#: cola/cmds.py:930 #, python-format msgid "Error deleting remote \"%s\"" msgstr "Error al eliminar el repositorio remoto \"%s\"" -#: cola/cmds.py:956 +#: cola/cmds.py:955 #, python-format msgid "Error renaming \"%(name)s\" to \"%(new_name)s\"" msgstr "Error al renombrar \"%(name)s\" a \"%(new_name)s\"" -#: cola/cmds.py:1771 +#: cola/cmds.py:1722 msgid "Error running prepare-commitmsg hook" msgstr "Error al ejecutar el hook prepare-commitmsg" -#: cola/cmds.py:3043 cola/cmds.py:3089 +#: cola/cmds.py:2989 cola/cmds.py:3035 #, python-format msgid "Error updating submodule %s" msgstr "Error al actualizar el submódulo %s" -#: cola/cmds.py:3125 +#: cola/cmds.py:3071 msgid "Error updating submodules" msgstr "Error actualizando submódulos" -#: cola/widgets/diff.py:1326 +#: cola/widgets/diff.py:1400 msgid "Error writing patch" msgstr "" -#: cola/cmds.py:1710 +#: cola/cmds.py:1662 msgid "Error: Cannot find commit template" msgstr "Error: No se pudo encontrar la plantilla para el commit" -#: cola/widgets/stash.py:235 -msgid "Error: Stash exists" -msgstr "Error: ya existe el Stash" - -#: cola/cmds.py:1732 +#: cola/cmds.py:1684 msgid "Error: Unconfigured commit template" msgstr "Error: Plantilla para el commit no configurada" -#: cola/widgets/clone.py:53 +#: cola/widgets/clone.py:52 #, python-format msgid "Error: could not clone \"%s\"" msgstr "Error: no se pudo clonar \"%s\"" -#: cola/cmds.py:2835 +#: cola/cmds.py:2781 #, python-format msgid "Error: could not create tag \"%s\"" msgstr "Error: no se pudo crear la etiqueta \"%s\"" -#: cola/widgets/branch.py:421 +#: cola/widgets/branch.py:433 #, python-format msgid "Executing action %s" msgstr "Ejecutando la acción %s" @@ -1717,112 +1767,116 @@ msgstr "Ejecutando la acción %s" msgid "Exit \"Diff\" mode" msgstr "" -#: cola/widgets/action.py:67 +#: cola/widgets/action.py:81 msgid "Exit Diff" msgstr "" -#: cola/widgets/main.py:528 +#: cola/widgets/main.py:541 msgid "Exit Diff Mode" msgstr "" -#: cola/widgets/action.py:68 +#: cola/widgets/action.py:81 msgid "Exit Diff mode" msgstr "" -#: cola/widgets/recent.py:67 +#: cola/widgets/recent.py:65 msgid "Expand all" msgstr "Expandir todo" -#: cola/widgets/diff.py:1223 +#: cola/widgets/diff.py:1297 msgid "Export Patch" msgstr "" -#: cola/guicmds.py:168 cola/widgets/search.py:75 +#: cola/guicmds.py:167 cola/widgets/search.py:74 msgid "Export Patches" msgstr "Exportar parches" -#: cola/widgets/main.py:273 +#: cola/widgets/main.py:268 msgid "Export Patches..." msgstr "Exportar parches..." -#: cola/widgets/main.py:533 +#: cola/widgets/main.py:546 msgid "Expression..." msgstr "Expresión..." -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Extended Regexp" msgstr "Extender Regexp" -#: cola/widgets/commitmsg.py:612 +#: cola/widgets/commitmsg.py:638 msgid "Extended description..." msgstr "Descripción extendida..." -#: cola/cmds.py:387 +#: cola/cmds.py:388 msgid "Failed to commit and continue applying patches" msgstr "" -#: cola/cmds.py:403 +#: cola/cmds.py:404 msgid "Failed to continue applying patches after skipping the current patch" msgstr "" -#: cola/widgets/createbranch.py:124 +#: cola/widgets/createbranch.py:122 msgid "Fast Forward Only" msgstr "Sólo Fast Forward" -#: cola/widgets/remote.py:177 +#: cola/widgets/remote.py:181 msgid "Fast-forward only" msgstr "Sólo Fast-forward" -#: cola/widgets/bookmarks.py:91 +#: cola/widgets/bookmarks.py:90 msgid "Favorite repositories" msgstr "Repositorios favoritos" -#: cola/widgets/main.py:111 +#: cola/widgets/main.py:109 msgid "Favorites" msgstr "Favoritos" -#: cola/widgets/remote.py:673 +#: cola/widgets/remote.py:735 msgid "Fetch" msgstr "Extraer (Fetch)" -#: cola/widgets/createbranch.py:127 +#: cola/widgets/createbranch.py:125 msgid "Fetch Tracking Branch" msgstr "Extraer (Fetch) la rama en seguimiento" -#: cola/widgets/action.py:63 cola/widgets/main.py:387 +#: cola/widgets/action.py:67 cola/widgets/main.py:384 +msgid "Fetch from one or more remotes using \"git fetch\"" +msgstr "" + +#: cola/widgets/action.py:65 cola/widgets/main.py:383 msgid "Fetch..." msgstr "Extraer (Fetch)..." -#: cola/widgets/main.py:588 +#: cola/widgets/main.py:601 msgid "File Browser..." msgstr "Navegador de archivos..." -#: cola/widgets/compare.py:75 +#: cola/widgets/compare.py:74 msgid "File Differences" msgstr "Diferencias de archivos" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 msgid "File Saved" msgstr "Archivo guardado" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 #, python-format msgid "File saved to \"%s\"" msgstr "Archivo guardado en \"%s\"" -#: cola/fsmonitor.py:517 +#: cola/fsmonitor.py:528 msgid "File system change monitoring: disabled because \"cola.inotify\" is false.\n" msgstr "Supervisión del cambio del sistema de archivo: está desactivada porque \"cola.inotify\" es falso\n" -#: cola/fsmonitor.py:534 +#: cola/fsmonitor.py:545 msgid "File system change monitoring: disabled because libc does not support the inotify system calls.\n" msgstr "Supervisión del cambio del sistema de archivo: está desactivada porque libc no es compatible con el sistema de llamadas de inotify.\n" -#: cola/fsmonitor.py:528 +#: cola/fsmonitor.py:539 msgid "File system change monitoring: disabled because pywin32 is not installed.\n" msgstr "Supervisión del cambio del sistema de archivo: está desactivada porque pywin32 no está instalada.\n" -#: cola/fsmonitor.py:181 +#: cola/fsmonitor.py:184 msgid "" "File system change monitoring: disabled because the limit on the total number of inotify watches was reached. You may be able to increase the limit on the number of watches by running:\n" "\n" @@ -1832,296 +1886,304 @@ msgstr "" "\n" " echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n" -#: cola/fsmonitor.py:142 +#: cola/fsmonitor.py:145 msgid "File system change monitoring: enabled.\n" msgstr "Supervisión del cambio del sistema de archivo: activada.\n" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Filename" msgstr "Nombre de archivo" -#: cola/widgets/dag.py:755 +#: cola/widgets/dag.py:821 msgid "Files" msgstr "Archivos" -#: cola/widgets/branch.py:785 +#: cola/widgets/branch.py:837 msgid "Filter branches..." msgstr "Filtrar ramas..." -#: cola/widgets/status.py:1333 +#: cola/widgets/status.py:1334 msgid "Filter paths..." msgstr "Filtrar rutas..." -#: cola/widgets/finder.py:113 cola/widgets/main.py:312 +#: cola/widgets/finder.py:112 cola/widgets/main.py:307 msgid "Find Files" msgstr "Encontrar archivos" -#: cola/widgets/text.py:388 +#: cola/widgets/text.py:385 msgid "Find in diff" msgstr "" -#: cola/widgets/text.py:425 +#: cola/widgets/text.py:422 msgid "Find next item" msgstr "" -#: cola/widgets/text.py:431 +#: cola/widgets/text.py:428 msgid "Find previous item" msgstr "" -#: cola/widgets/text.py:395 +#: cola/widgets/text.py:392 msgid "Find the next occurrence of the phrase" msgstr "" -#: cola/widgets/text.py:391 +#: cola/widgets/text.py:388 msgid "Find the previous occurrence of the phrase" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Fixed String" msgstr "Cadena fijada" -#: cola/widgets/prefs.py:251 +#: cola/widgets/prefs.py:270 msgid "Fixed-Width Font" msgstr "Fijar ancho de fuente" -#: cola/sequenceeditor.py:362 +#: cola/sequenceeditor.py:358 msgid "Fixup" msgstr "Arreglar" -#: cola/widgets/commitmsg.py:148 +#: cola/widgets/commitmsg.py:154 msgid "Fixup Previous Commit" msgstr "Arreglar un Commit previo" -#: cola/themes.py:672 +#: cola/themes.py:684 msgid "Flat dark blue" msgstr "Azul oscuro plano" -#: cola/themes.py:693 +#: cola/themes.py:705 msgid "Flat dark green" msgstr "Verde oscuro plano" -#: cola/themes.py:686 +#: cola/themes.py:698 msgid "Flat dark grey" msgstr "Gris oscuro plano" -#: cola/themes.py:679 +#: cola/themes.py:691 msgid "Flat dark red" msgstr "Rojo oscuro plano" -#: cola/themes.py:644 +#: cola/themes.py:656 msgid "Flat light blue" msgstr "Azul claro plano" -#: cola/themes.py:665 +#: cola/themes.py:677 msgid "Flat light green" msgstr "Verde claro plano" -#: cola/themes.py:658 +#: cola/themes.py:670 msgid "Flat light grey" msgstr "Gris claro plano" -#: cola/themes.py:651 +#: cola/themes.py:663 msgid "Flat light red" msgstr "Rojo claro plano" -#: cola/widgets/startup.py:73 +#: cola/widgets/startup.py:72 msgid "Folder" msgstr "Carpeta" -#: cola/widgets/toolbar.py:177 +#: cola/widgets/toolbar.py:181 msgid "Follow System Style" msgstr "Seguir el estilo del sistema" -#: cola/widgets/prefs.py:252 +#: cola/widgets/prefs.py:271 msgid "Font Size" msgstr "Tamaño de fuente" -#: cola/widgets/remote.py:193 +#: cola/widgets/remote.py:197 msgid "Force" msgstr "Forzar" -#: cola/widgets/remote.py:617 +#: cola/widgets/remote.py:652 msgid "Force Fetch" msgstr "Forzar extracción (Fetch)" -#: cola/widgets/remote.py:614 +#: cola/widgets/remote.py:649 msgid "Force Fetch?" msgstr "¿Forzar extracción (Fetch)?" -#: cola/widgets/remote.py:625 +#: cola/widgets/remote.py:660 msgid "Force Push" msgstr "Forzar Push" -#: cola/widgets/remote.py:619 +#: cola/widgets/remote.py:654 msgid "Force Push?" msgstr "¿Forzar Push?" -#: cola/widgets/remote.py:616 +#: cola/widgets/remote.py:651 #, python-format msgid "Force fetching from %s?" msgstr "¿Forzar extracción desde %s?" -#: cola/widgets/remote.py:624 +#: cola/widgets/remote.py:659 #, python-format msgid "Force push to %s?" msgstr "¿Forzar Push a %s?" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Format String" msgstr "Formato de cadena" -#: cola/widgets/about.py:430 cola/widgets/about.py:431 +#: cola/widgets/about.py:413 cola/widgets/about.py:414 msgid "French translation" msgstr "Traducción al Francés" -#: cola/widgets/merge.py:80 +#: cola/widgets/merge.py:78 msgid "GPG-sign the merge commit" msgstr "Firmar mediante GPG el Merge Commit" -#: cola/widgets/prefs.py:344 +#: cola/widgets/prefs.py:364 msgid "GUI theme" msgstr "Tema de la interfaz" -#: cola/widgets/editremotes.py:318 +#: cola/widgets/editremotes.py:317 #, python-format msgid "Gathering info for \"%s\"..." msgstr "Reuniendo información para \"%s\"..." -#: cola/widgets/about.py:420 cola/widgets/about.py:428 -#: cola/widgets/about.py:429 +#: cola/widgets/about.py:403 cola/widgets/about.py:411 +#: cola/widgets/about.py:412 msgid "German translation" msgstr "Traducción al Alemán" -#: cola/widgets/main.py:511 +#: cola/widgets/main.py:524 msgid "Get Commit Message Template" msgstr "Aplicar plantilla de mensaje de Commit" -#: cola/widgets/dag.py:520 +#: cola/widgets/dag.py:586 msgid "Go Down" msgstr "Bajar" -#: cola/widgets/dag.py:516 +#: cola/widgets/dag.py:582 msgid "Go Up" msgstr "Subir" -#: cola/widgets/dag.py:467 cola/widgets/filelist.py:42 +#: cola/widgets/dag.py:466 cola/widgets/filelist.py:39 msgid "Grab File..." msgstr "Tomar archivo..." -#: cola/widgets/dag.py:782 +#: cola/widgets/dag.py:848 msgid "Graph" msgstr "Gráfico" -#: cola/widgets/main.py:358 +#: cola/widgets/main.py:353 msgid "Grep" msgstr "Grep" -#: cola/widgets/remote.py:662 +#: cola/widgets/remote.py:707 msgid "Have you rebased/pulled lately?" msgstr "¿Ha realizado un rebase/pull recientemente?" -#: cola/sequenceeditor.py:110 cola/sequenceeditor.py:171 -#: cola/widgets/finder.py:138 cola/widgets/main.py:854 +#: cola/sequenceeditor.py:108 cola/sequenceeditor.py:169 +#: cola/widgets/finder.py:137 cola/widgets/main.py:867 msgid "Help" msgstr "Ayuda" -#: cola/widgets/status.py:1322 +#: cola/widgets/status.py:1323 msgid "Help - Custom Copy Actions" msgstr "Ayuda - Acciones de copiado personalizadas" -#: cola/widgets/finder.py:79 +#: cola/widgets/finder.py:78 msgid "Help - Find Files" msgstr "Ayuda - Encontrar archivos" -#: cola/sequenceeditor.py:737 +#: cola/sequenceeditor.py:732 msgid "Help - git-cola-sequence-editor" msgstr "Ayuda - git-cola-sequence-editor" -#: cola/widgets/prefs.py:346 +#: cola/widgets/prefs.py:366 msgid "High DPI" msgstr "DPI alto" -#: cola/gitcmds.py:876 +#: cola/gitcmds.py:886 msgid "Hint: The \"Actions > Abort Cherry-Pick\" menu action can be used to cancel the current cherry-pick." msgstr "" -#: cola/widgets/prefs.py:254 +#: cola/widgets/prefs.py:275 msgid "History Browser" msgstr "Navegador de historial" -#: cola/widgets/about.py:427 cola/widgets/about.py:441 +#: cola/widgets/about.py:410 cola/widgets/about.py:424 msgid "Hungarian translation" msgstr "Traducción al Húngaro" -#: cola/widgets/toolbar.py:178 +#: cola/widgets/toolbar.py:182 msgid "Icon Only" msgstr "Solo iconos" -#: cola/widgets/prefs.py:345 +#: cola/widgets/prefs.py:365 msgid "Icon theme" msgstr "Tema de iconos" -#: cola/widgets/diff.py:758 +#: cola/widgets/diff.py:787 msgid "Ignore all whitespace" msgstr "Ignorar todos los espacios en blanco" -#: cola/widgets/diff.py:755 +#: cola/widgets/diff.py:785 msgid "Ignore changes in amount of whitespace" msgstr "Ignorar cambios en la cantidad de espacios en blanco" -#: cola/widgets/diff.py:751 +#: cola/widgets/diff.py:782 msgid "Ignore changes in whitespace at EOL" msgstr "Ignorar cambios de espacios en blanco en EOL" -#: cola/widgets/gitignore.py:46 +#: cola/widgets/gitignore.py:45 msgid "Ignore custom pattern" msgstr "Ignorar patrón personalizado" -#: cola/widgets/gitignore.py:44 +#: cola/widgets/gitignore.py:43 msgid "Ignore exact filename" msgstr "Ignorar el nombre de archivo exacto" -#: cola/widgets/gitignore.py:32 +#: cola/widgets/gitignore.py:31 msgid "Ignore filename or pattern" msgstr "Ignorar nombre de archivo o patrón" -#: cola/widgets/status.py:933 +#: cola/widgets/dag.py:498 +msgid "Ignore merge commits" +msgstr "" + +#: cola/widgets/status.py:934 msgid "Ignore..." msgstr "Ignorar..." -#: cola/widgets/remote.py:203 +#: cola/widgets/remote.py:207 msgid "Include tags " msgstr "Incluir etiquetas " -#: cola/widgets/prefs.py:349 +#: cola/widgets/prefs.py:369 msgid "Indent Status paths" msgstr "Rutas de estado de sangría" -#: cola/widgets/about.py:419 cola/widgets/about.py:426 +#: cola/widgets/about.py:402 cola/widgets/about.py:409 msgid "Indonesian translation" msgstr "Traducción al Indonesio" -#: cola/widgets/main.py:643 +#: cola/widgets/main.py:656 msgid "Initialize Git Annex" msgstr "Inicializar Git Annex" -#: cola/widgets/main.py:647 +#: cola/widgets/main.py:660 msgid "Initialize Git LFS" msgstr "Inicializar Git LFS" -#: cola/widgets/clone.py:116 +#: cola/widgets/clone.py:114 msgid "Inititalize submodules" msgstr "Inicializar submódulos" -#: cola/widgets/prefs.py:260 +#: cola/widgets/prefs.py:281 msgid "Insert spaces instead of tabs" msgstr "Insertar espacios en vez de tabulaciones" -#: cola/cmds.py:2130 +#: cola/widgets/action.py:73 cola/widgets/main.py:402 +msgid "Integrate changes using \"git pull\"" +msgstr "" + +#: cola/cmds.py:2081 msgid "Interactive Rebase" msgstr "Rebase interactivo" -#: cola/cmds.py:2364 +#: cola/cmds.py:2315 msgid "Invalid Revision" msgstr "Revisión inválida" @@ -2129,40 +2191,40 @@ msgstr "Revisión inválida" msgid "It is not necessary to update the hunk header lines as they will be regenerated automatically." msgstr "" -#: cola/widgets/about.py:421 cola/widgets/about.py:424 +#: cola/widgets/about.py:404 cola/widgets/about.py:407 msgid "Japanese translation" msgstr "Traducción al Japonés" -#: cola/widgets/prefs.py:262 +#: cola/widgets/prefs.py:283 msgid "Keep *.orig Merge Backups" msgstr "Conservar Merge Backups *.orig" -#: cola/widgets/stash.py:71 +#: cola/widgets/stash.py:73 msgid "Keep Index" msgstr "Mantener Index" -#: cola/widgets/main.py:477 +#: cola/widgets/main.py:490 msgid "Keyboard Shortcuts" msgstr "Atajos de teclado" -#: cola/cmds.py:1608 cola/sequenceeditor.py:165 cola/sequenceeditor.py:338 -#: cola/widgets/dag.py:395 cola/widgets/filelist.py:34 +#: cola/difftool.py:27 cola/sequenceeditor.py:163 cola/sequenceeditor.py:334 +#: cola/widgets/dag.py:394 cola/widgets/filelist.py:31 msgid "Launch Diff Tool" msgstr "Ejecutar la herramienta de comparación" -#: cola/widgets/dag.py:402 +#: cola/widgets/dag.py:401 msgid "Launch Directory Diff Tool" msgstr "Ejecutar la herramienta de comparación de carpetas" -#: cola/cmds.py:1541 cola/cmds.py:1679 cola/widgets/filelist.py:38 +#: cola/cmds.py:1529 cola/cmds.py:1631 cola/widgets/filelist.py:35 msgid "Launch Editor" msgstr "Abrir Editor" -#: cola/cmds.py:1644 +#: cola/cmds.py:1596 msgid "Launch Terminal" msgstr "Abrir Terminal" -#: cola/sequenceeditor.py:166 +#: cola/sequenceeditor.py:164 msgid "" "Launch external diff tool\n" "Shortcut: Ctrl+D" @@ -2170,8 +2232,8 @@ msgstr "" "Abrir una herramienta de diferencias externa\n" "Atajo de teclado: Ctrl+D" -#: cola/widgets/diff.py:1005 cola/widgets/diff.py:1051 -#: cola/widgets/status.py:852 cola/widgets/status.py:948 +#: cola/widgets/diff.py:1044 cola/widgets/diff.py:1106 +#: cola/widgets/status.py:853 cola/widgets/status.py:949 msgid "Launch git-cola" msgstr "Ejecutar git-cola" @@ -2183,7 +2245,7 @@ msgstr "Ejecutar git-difftool en versiones previas" msgid "Launch git-difftool on the current path" msgstr "Ejecutar git-difftool en la ruta actual" -#: cola/icons.py:56 +#: cola/icons.py:55 msgid "Light Theme" msgstr "Tema claro" @@ -2192,167 +2254,183 @@ msgstr "Tema claro" msgid "Lines starting with '%s' will be ignored." msgstr "" -#: cola/widgets/startup.py:74 +#: cola/widgets/startup.py:73 msgid "List" msgstr "Lista" -#: cola/guicmds.py:267 +#: cola/guicmds.py:266 msgid "Load Commit Message" msgstr "Cargar el mensaje del Commit" -#: cola/widgets/main.py:339 +#: cola/widgets/main.py:334 msgid "Load Commit Message..." msgstr "Cargar el mensaje del Commit..." -#: cola/widgets/commitmsg.py:144 +#: cola/widgets/commitmsg.py:150 msgid "Load Previous Commit Message" msgstr "Cargar un mensaje del Commit previo" -#: cola/widgets/diff.py:264 +#: cola/widgets/diff.py:265 msgid "Loading..." msgstr "Cargando..." -#: cola/widgets/branch.py:169 cola/widgets/branch.py:240 -#: cola/widgets/branch.py:281 cola/widgets/compare.py:38 -#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/branch.py:173 cola/widgets/branch.py:250 +#: cola/widgets/branch.py:290 cola/widgets/compare.py:37 +#: cola/widgets/compare.py:52 cola/widgets/compare.py:57 msgid "Local" msgstr "Local" -#: cola/widgets/cfgactions.py:227 cola/widgets/merge.py:46 -#: cola/widgets/remote.py:138 +#: cola/widgets/cfgactions.py:225 cola/widgets/merge.py:44 +#: cola/widgets/remote.py:136 msgid "Local Branch" msgstr "Rama local" -#: cola/widgets/createbranch.py:114 +#: cola/widgets/createbranch.py:112 msgid "Local branch" msgstr "Rama local" -#: cola/widgets/dag.py:788 cola/widgets/main.py:651 +#: cola/widgets/dag.py:854 cola/widgets/main.py:664 msgid "Lock Layout" msgstr "Bloquear diseño" -#: cola/widgets/dag.py:750 +#: cola/widgets/dag.py:816 msgid "Log" msgstr "Registro" -#: cola/widgets/prefs.py:170 +#: cola/widgets/prefs.py:191 msgid "Log Date Format" msgstr "" -#: cola/widgets/about.py:268 +#: cola/themes.py:769 +msgid "MacOS Aqua dark" +msgstr "" + +#: cola/themes.py:765 +msgid "MacOS Aqua light" +msgstr "" + +#: cola/themes.py:781 +msgid "MacOS Vibrant dark" +msgstr "" + +#: cola/themes.py:775 +msgid "MacOS Vibrant light" +msgstr "" + +#: cola/widgets/about.py:251 msgid "Maintainer (since 2007) and developer" msgstr "Responsable (desde 2007) y desarrollador" -#: cola/widgets/text.py:398 +#: cola/widgets/text.py:395 msgid "Match Case" msgstr "" -#: cola/widgets/merge.py:88 +#: cola/widgets/merge.py:86 msgid "Merge" msgstr "Merge" -#: cola/widgets/merge.py:162 +#: cola/widgets/merge.py:160 #, python-format msgid "Merge \"%(revision)s\" into \"%(branch)s\"" msgstr "Merge \"%(revision)s\" con \"%(branch)s\"" -#: cola/widgets/prefs.py:257 +#: cola/widgets/prefs.py:278 msgid "Merge Tool" msgstr "Herramienta Merge" -#: cola/widgets/prefs.py:171 +#: cola/widgets/prefs.py:193 msgid "Merge Verbosity" msgstr "Mostrar mensajes de salida de Merge" -#: cola/cmds.py:1829 +#: cola/cmds.py:1780 msgid "Merge failed. Conflict resolution is required." msgstr "Falló Merge. Se necesita resolver los conflictos." -#: cola/widgets/merge.py:167 +#: cola/widgets/merge.py:165 #, python-format msgid "Merge into \"%s\"" msgstr "Merge en \"%s\"" -#: cola/widgets/branch.py:231 +#: cola/widgets/branch.py:242 msgid "Merge into current branch" msgstr "Merge en la rama actual" -#: cola/widgets/main.py:363 +#: cola/widgets/main.py:358 msgid "Merge..." msgstr "Merge..." -#: cola/widgets/main.py:1163 +#: cola/widgets/main.py:1176 msgid "Merging" msgstr "Uniendo" -#: cola/models/browse.py:33 cola/widgets/createtag.py:78 +#: cola/models/browse.py:32 cola/widgets/createtag.py:76 msgid "Message" msgstr "Mensaje" -#: cola/widgets/commitmsg.py:417 +#: cola/widgets/commitmsg.py:425 msgid "Missing Commit Message" msgstr "Mensaje de commit ausente" -#: cola/widgets/createbranch.py:252 +#: cola/widgets/createbranch.py:250 msgid "Missing Data" msgstr "Datos ausentes" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Missing Name" msgstr "Nombre ausente" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Missing Revision" msgstr "Revisión ausente" -#: cola/cmds.py:2801 +#: cola/cmds.py:2747 msgid "Missing Tag Message" msgstr "Mensaje de etiqueta ausente" -#: cola/models/browse.py:332 cola/widgets/status.py:158 -#: cola/widgets/status.py:631 +#: cola/models/browse.py:331 cola/widgets/status.py:158 +#: cola/widgets/status.py:632 msgid "Modified" msgstr "Modificado" -#: cola/widgets/commitmsg.py:506 +#: cola/widgets/commitmsg.py:532 msgid "More..." msgstr "Más..." -#: cola/widgets/standard.py:243 cola/widgets/status.py:233 +#: cola/widgets/standard.py:242 cola/widgets/status.py:234 msgid "Move Down" msgstr "Bajar" -#: cola/widgets/standard.py:235 cola/widgets/status.py:225 +#: cola/widgets/standard.py:234 cola/widgets/status.py:226 msgid "Move Up" msgstr "Subir" -#: cola/widgets/status.py:300 +#: cola/widgets/status.py:301 msgid "Move files to trash" msgstr "Mover los archivos a la papelera" -#: cola/models/browse.py:33 cola/widgets/bookmarks.py:467 -#: cola/widgets/createtag.py:61 cola/widgets/editremotes.py:450 -#: cola/widgets/status.py:1452 cola/widgets/toolbar.py:312 +#: cola/models/browse.py:32 cola/widgets/bookmarks.py:466 +#: cola/widgets/createtag.py:59 cola/widgets/editremotes.py:448 +#: cola/widgets/status.py:1453 cola/widgets/toolbar.py:317 msgid "Name" msgstr "Nombre" -#: cola/widgets/editremotes.py:434 +#: cola/widgets/editremotes.py:432 msgid "Name for the new remote" msgstr "Nombre para el nuevo repositorio remoto" -#: cola/guicmds.py:148 cola/widgets/main.py:285 +#: cola/guicmds.py:147 cola/widgets/main.py:280 msgid "New Bare Repository..." msgstr "Nuevo repositorio vacío..." -#: cola/guicmds.py:87 cola/widgets/main.py:280 +#: cola/guicmds.py:86 cola/widgets/main.py:275 msgid "New Repository..." msgstr "Nuevo repositorio..." -#: cola/widgets/main.py:983 +#: cola/widgets/main.py:996 msgid "New Toolbar" msgstr "Nueva barra de herramientas" -#: cola/widgets/startup.py:53 +#: cola/widgets/startup.py:52 msgid "New..." msgstr "Nuevo..." @@ -2360,15 +2438,19 @@ msgstr "Nuevo..." msgid "Next File" msgstr "Archivo siguiente" -#: cola/widgets/createbranch.py:123 cola/widgets/standard.py:1065 +#: cola/widgets/createbranch.py:121 cola/widgets/standard.py:1183 msgid "No" msgstr "No" -#: cola/widgets/merge.py:217 cola/widgets/merge.py:227 +#: cola/widgets/merge.py:215 cola/widgets/merge.py:225 msgid "No Revision Specified" msgstr "No se ha especificado una revisión" -#: cola/widgets/commitmsg.py:427 +#: cola/widgets/stash.py:225 +msgid "No change made" +msgstr "" + +#: cola/widgets/commitmsg.py:435 msgid "" "No changes to commit.\n" "\n" @@ -2378,27 +2460,27 @@ msgstr "" "\n" "Debe realizar al menos un cambio antes de poder hacer un commit." -#: cola/widgets/selectcommits.py:118 +#: cola/widgets/selectcommits.py:117 msgid "No commits exist in this branch." msgstr "No existen commits en esta rama." -#: cola/widgets/merge.py:65 +#: cola/widgets/merge.py:63 msgid "No fast forward" msgstr "Sin \"fast forward\"" -#: cola/widgets/remote.py:186 +#: cola/widgets/remote.py:190 msgid "No fast-forward" msgstr "Sin \"fast-forward\"" -#: cola/widgets/remote.py:577 +#: cola/widgets/remote.py:612 msgid "No repository selected." msgstr "Ningún repositorio ha sido seleccionado." -#: cola/widgets/remote.py:615 +#: cola/widgets/remote.py:650 msgid "Non-fast-forward fetch overwrites local history!" msgstr "¡Ningún \"fast-forward\" sobreescribe el historial local!" -#: cola/widgets/remote.py:621 +#: cola/widgets/remote.py:656 msgid "" "Non-fast-forward push overwrites published history!\n" "(Did you pull first?)" @@ -2406,7 +2488,7 @@ msgstr "" "¡Ningún \"fast-forward\" sobreescribe el historial publicado!\n" "(¿Ha ejecutado \"pull\" primero?)" -#: cola/widgets/commitmsg.py:444 +#: cola/widgets/commitmsg.py:452 msgid "Nothing to commit" msgstr "Nada para hace commit" @@ -2414,79 +2496,79 @@ msgstr "Nada para hace commit" msgid "Nothing to do" msgstr "Nada que hacer" -#: cola/widgets/prefs.py:172 +#: cola/widgets/prefs.py:194 msgid "Number of Diff Context Lines" msgstr "Numero de lineas de contexto Diff" -#: cola/widgets/bookmarks.py:79 cola/widgets/bookmarks.py:213 -#: cola/widgets/startup.py:336 +#: cola/widgets/bookmarks.py:78 cola/widgets/bookmarks.py:212 +#: cola/widgets/startup.py:335 msgid "Open" msgstr "Abrir" -#: cola/widgets/text.py:230 +#: cola/widgets/text.py:228 #, python-format msgid "Open \"%s\"" msgstr "" -#: cola/cmds.py:1857 +#: cola/cmds.py:1808 msgid "Open Directory" msgstr "" -#: cola/guicmds.py:205 cola/guicmds.py:214 cola/widgets/editremotes.py:473 -#: cola/widgets/startup.py:55 cola/widgets/startup.py:215 +#: cola/guicmds.py:204 cola/guicmds.py:213 cola/widgets/editremotes.py:471 +#: cola/widgets/startup.py:54 cola/widgets/startup.py:214 msgid "Open Git Repository" msgstr "Abrir repositorio git" -#: cola/widgets/submodules.py:49 +#: cola/widgets/submodules.py:48 msgid "Open Parent" msgstr "Abrir padre" -#: cola/cmds.py:1877 +#: cola/cmds.py:1828 msgid "Open Parent Directory" msgstr "Abrir carpeta padre" -#: cola/widgets/main.py:679 +#: cola/widgets/main.py:692 msgid "Open Recent" msgstr "Abrir recientes" -#: cola/cmds.py:1840 +#: cola/cmds.py:1791 msgid "Open Using Default Application" msgstr "Abrir utilizando la aplicación predeterminada" -#: cola/cmds.py:1890 +#: cola/cmds.py:1841 msgid "Open Worktree" msgstr "" -#: cola/widgets/bookmarks.py:221 cola/widgets/startup.py:344 +#: cola/widgets/bookmarks.py:220 cola/widgets/startup.py:343 msgid "Open in New Window" msgstr "Abrir en una ventana nueva" -#: cola/widgets/main.py:408 +#: cola/widgets/main.py:415 msgid "Open in New Window..." msgstr "Abrir en una ventana nueva..." -#: cola/widgets/main.py:402 +#: cola/widgets/main.py:409 msgid "Open..." msgstr "Abrir..." -#: cola/widgets/branch.py:345 +#: cola/widgets/branch.py:354 msgid "Other branches" msgstr "Otras ramas" -#: cola/widgets/archive.py:210 +#: cola/widgets/archive.py:208 msgid "Overwrite" msgstr "Sobrescribir" -#: cola/widgets/archive.py:209 +#: cola/widgets/archive.py:207 #, python-format msgid "Overwrite \"%s\"?" msgstr "¿Desea sobrescribir \"%s\"?" -#: cola/widgets/archive.py:207 +#: cola/widgets/archive.py:205 msgid "Overwrite File?" msgstr "¿Desea sobrescribir el archivo?" -#: cola/widgets/grep.py:144 +#: cola/widgets/grep.py:142 msgid "" "Parse arguments using a shell.\n" "Queries with spaces will require \"double quotes\"." @@ -2494,63 +2576,67 @@ msgstr "" "Analizar los argumentos utilizando la línea de comandos.\n" "Las consultas con espacios requerirán \"comillas dobles\". " -#: cola/models/browse.py:330 +#: cola/models/browse.py:329 msgid "Partially Staged" msgstr "En \"Stage\" parcialmente" -#: cola/widgets/main.py:744 +#: cola/widgets/main.py:757 msgid "Paste" msgstr "Pegar" -#: cola/cmds.py:363 +#: cola/cmds.py:364 msgid "Patch failed to apply" msgstr "" -#: cola/cmds.py:375 +#: cola/cmds.py:376 msgid "Patch(es) Applied" msgstr "Parche(s) aplicado(s)" -#: cola/widgets/diff.py:1219 cola/widgets/main.py:695 +#: cola/widgets/diff.py:1293 cola/widgets/main.py:708 msgid "Patches" msgstr "" -#: cola/widgets/prefs.py:173 +#: cola/widgets/prefs.py:195 msgid "Patches Directory" msgstr "" -#: cola/widgets/bookmarks.py:468 cola/widgets/submodules.py:118 +#: cola/widgets/bookmarks.py:467 cola/widgets/submodules.py:117 msgid "Path" msgstr "Ruta" -#: cola/widgets/clone.py:112 +#: cola/widgets/clone.py:110 msgid "Path or URL to clone (Env. $VARS okay)" msgstr "Ruta o URL a clonar (Env. $VARS okay)" -#: cola/sequenceeditor.py:346 +#: cola/sequenceeditor.py:342 msgid "Pick" msgstr "Escoger" -#: cola/widgets/diff.py:781 +#: cola/widgets/dag.py:490 +msgid "Pickaxe search for changes containing text" +msgstr "" + +#: cola/widgets/diff.py:809 msgid "Pixel XOR" msgstr "Pixel XOR" -#: cola/widgets/createbranch.py:253 +#: cola/widgets/createbranch.py:251 msgid "Please provide both a branch name and revision expression." msgstr "Por favor proporcione tanto el nombre de la rama como la expresión de la revisión." -#: cola/cmds.py:2348 +#: cola/cmds.py:2299 msgid "Please select a file" msgstr "Por favor, seleccione un archivo" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Please specify a name for the new tag." msgstr "Por favor, especifique un nombre para la nueva etiqueta." -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Please specify a revision to tag." msgstr "Por favor, especifique una revisión para etiquetar." -#: cola/widgets/commitmsg.py:410 +#: cola/widgets/commitmsg.py:418 msgid "" "Please supply a commit message.\n" "\n" @@ -2568,31 +2654,31 @@ msgstr "" "- Segunda línea: En blanco.\n" "- Las líneas restantes: Describa porque este cambio es apropiado.\n" -#: cola/cmds.py:653 +#: cola/cmds.py:655 msgid "Point the current branch head to a new commit?" msgstr "¿Apuntar la el comienzo de la rama actual a un nuevo commit?" -#: cola/widgets/about.py:416 +#: cola/widgets/about.py:399 msgid "Polish translation" msgstr "Traducción al Polaco" -#: cola/widgets/stash.py:63 cola/widgets/stash.py:111 cola/widgets/stash.py:115 +#: cola/widgets/stash.py:65 cola/widgets/stash.py:114 cola/widgets/stash.py:118 msgid "Pop" msgstr "Pop" -#: cola/widgets/main.py:293 cola/widgets/prefs.py:395 +#: cola/widgets/main.py:288 cola/widgets/prefs.py:433 msgid "Preferences" msgstr "Preferencias" -#: cola/widgets/archive.py:129 +#: cola/widgets/archive.py:127 msgid "Prefix" msgstr "Prefijo" -#: cola/widgets/main.py:345 +#: cola/widgets/main.py:340 msgid "Prepare Commit Message" msgstr "Cargar mensaje de commit" -#: cola/widgets/prefs.py:157 +#: cola/widgets/prefs.py:180 msgid "Prevent \"Stage\" from staging all files when nothing is selected" msgstr "Evitar el \"Stage\" de todos los archivos cuando nada es seleccionado" @@ -2600,216 +2686,228 @@ msgstr "Evitar el \"Stage\" de todos los archivos cuando nada es seleccionado" msgid "Previous File" msgstr "Archivo anterior" -#: cola/widgets/remote.py:171 +#: cola/widgets/remote.py:169 msgid "Prompt on creation" msgstr "Solicitud de creación" -#: cola/widgets/remote.py:172 +#: cola/widgets/remote.py:170 msgid "Prompt when pushing creates new remote branches" msgstr "Solicitar que al hacer \"push\" cree nuevas ramas en el repositorio remoto" -#: cola/widgets/remote.py:208 +#: cola/widgets/remote.py:212 msgid "Prune " msgstr "Eliminar (Prune)" -#: cola/widgets/bookmarks.py:255 cola/widgets/startup.py:376 +#: cola/widgets/bookmarks.py:254 cola/widgets/startup.py:375 msgid "Prune Missing Entries" msgstr "Eliminar entradas faltantes" -#: cola/widgets/branch.py:247 cola/widgets/remote.py:728 +#: cola/widgets/branch.py:256 cola/widgets/remote.py:783 msgid "Pull" msgstr "Pull" -#: cola/widgets/action.py:65 cola/widgets/main.py:397 +#: cola/widgets/action.py:73 cola/widgets/main.py:401 msgid "Pull..." msgstr "Pull..." -#: cola/widgets/branch.py:253 cola/widgets/remote.py:593 -#: cola/widgets/remote.py:698 +#: cola/widgets/branch.py:262 cola/widgets/remote.py:628 +#: cola/widgets/remote.py:758 msgid "Push" msgstr "Push" -#: cola/widgets/action.py:64 cola/widgets/main.py:392 +#: cola/widgets/action.py:70 cola/widgets/main.py:393 +msgid "Push to one or more remotes using \"git push\"" +msgstr "" + +#: cola/widgets/action.py:70 cola/widgets/main.py:392 msgid "Push..." msgstr "Push..." -#: cola/guicmds.py:252 +#: cola/guicmds.py:251 msgid "Quick Open Repository" msgstr "" -#: cola/widgets/main.py:660 +#: cola/widgets/main.py:673 msgid "Quick Open..." msgstr "" -#: cola/widgets/main.py:355 +#: cola/widgets/main.py:350 msgid "Quit" msgstr "Salir" -#: cola/cmds.py:2144 cola/cmds.py:2180 cola/cmds.py:2181 cola/cmds.py:2194 -#: cola/cmds.py:2195 cola/sequenceeditor.py:158 cola/sequenceeditor.py:199 -#: cola/widgets/main.py:822 cola/widgets/remote.py:211 +#: cola/cmds.py:2095 cola/cmds.py:2131 cola/cmds.py:2132 cola/cmds.py:2145 +#: cola/cmds.py:2146 cola/sequenceeditor.py:156 cola/sequenceeditor.py:197 +#: cola/widgets/main.py:835 cola/widgets/remote.py:215 msgid "Rebase" msgstr "Rebase" -#: cola/cmds.py:2143 +#: cola/cmds.py:2094 #, python-format msgid "Rebase onto %s" msgstr "Rebase en %s" -#: cola/cmds.py:2156 +#: cola/cmds.py:2107 msgid "Rebase stopped" msgstr "Rebase detenido" -#: cola/widgets/remote.py:210 +#: cola/widgets/remote.py:214 msgid "Rebase the current branch instead of merging" msgstr "Hacer \"rebase\" de la rama actual en vez de unirlas (merge)" -#: cola/widgets/dag.py:419 +#: cola/widgets/dag.py:418 msgid "Rebase to this commit" msgstr "" -#: cola/widgets/main.py:1165 +#: cola/widgets/main.py:1178 msgid "Rebasing" msgstr "Rebasing" -#: cola/widgets/main.py:120 +#: cola/widgets/main.py:118 msgid "Recent" msgstr "Reciente" -#: cola/widgets/bookmarks.py:93 +#: cola/widgets/bookmarks.py:92 msgid "Recent repositories" msgstr "Repositorios recientes" -#: cola/widgets/prefs.py:258 +#: cola/widgets/prefs.py:279 msgid "Recent repository count" msgstr "Enumerar los repositorios recientes" -#: cola/widgets/recent.py:46 +#: cola/widgets/recent.py:44 msgid "Recently Modified Files" msgstr "Archivos modificados recientemente" -#: cola/widgets/main.py:320 +#: cola/widgets/main.py:315 msgid "Recently Modified Files..." msgstr "Archivos modificados recientemente..." -#: cola/widgets/stash.py:256 +#: cola/widgets/stash.py:274 msgid "Recovering a dropped stash is not possible." msgstr "No es posible recuperar un \"stash\" eliminado." -#: cola/widgets/createbranch.py:283 +#: cola/widgets/createbranch.py:281 msgid "Recovering lost commits may not be easy." msgstr "Recuperar \"commits\" perdidos puede que no sea sencillo." -#: cola/widgets/main.py:737 +#: cola/widgets/main.py:750 msgid "Redo" msgstr "Rehacer" -#: cola/widgets/clone.py:121 +#: cola/widgets/clone.py:119 msgid "Reduce commit history to minimum" msgstr "Reducir el historial de \"commit\" al mínimo" -#: cola/widgets/submodules.py:121 +#: cola/widgets/submodules.py:120 msgid "Reference Repository" msgstr "Repositorio de referencia" -#: cola/widgets/submodules.py:105 +#: cola/widgets/submodules.py:104 msgid "Reference URL" msgstr "URL de referencia" -#: cola/widgets/submodules.py:106 +#: cola/widgets/submodules.py:105 msgid "Reference repository to use when cloning (optional)" msgstr "Repositorio de referencia para usar al clonar (opcional)" -#: cola/cmds.py:2222 cola/qtutils.py:770 cola/widgets/action.py:62 -#: cola/widgets/dag.py:792 cola/widgets/editremotes.py:85 -#: cola/widgets/grep.py:105 cola/widgets/recent.py:116 -#: cola/widgets/submodules.py:45 +#: cola/cmds.py:2173 cola/qtutils.py:801 cola/widgets/action.py:63 +#: cola/widgets/dag.py:858 cola/widgets/editremotes.py:84 +#: cola/widgets/grep.py:103 cola/widgets/recent.py:114 +#: cola/widgets/submodules.py:44 msgid "Refresh" msgstr "Refrescar" -#: cola/widgets/remote.py:179 +#: cola/widgets/remote.py:183 msgid "Refuse to merge unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward" msgstr "Evite realizar un \"merge\" a menos que el HEAD actual ya esté actualizado o el \"merge\" se puede resolver como un \"fast-forward\"" -#: cola/widgets/branch.py:173 cola/widgets/branch.py:225 -#: cola/widgets/branch.py:269 cola/widgets/branch.py:470 -#: cola/widgets/compare.py:54 cola/widgets/compare.py:59 -#: cola/widgets/remote.py:147 +#: cola/widgets/branch.py:177 cola/widgets/branch.py:236 +#: cola/widgets/branch.py:278 cola/widgets/branch.py:513 +#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/remote.py:145 msgid "Remote" msgstr "Repositorio Remoto" -#: cola/widgets/remote.py:162 +#: cola/widgets/remote.py:160 msgid "Remote Branch" msgstr "Rama remota" -#: cola/cmds.py:1196 +#: cola/cmds.py:1197 msgid "Remote Branch Deleted" msgstr "Rama remota eliminada" -#: cola/widgets/editremotes.py:49 +#: cola/widgets/log.py:99 +msgid "Remote Messages" +msgstr "" + +#: cola/widgets/editremotes.py:48 msgid "Remote git repositories - double-click to rename" msgstr "Repositorios de git remotos - doble clic para renombrar" -#: cola/cmds.py:1029 cola/widgets/patch.py:107 cola/widgets/patch.py:122 -#: cola/widgets/startup.py:265 cola/widgets/status.py:1382 +#: cola/cmds.py:1030 cola/widgets/diff.py:1701 cola/widgets/diff.py:1716 +#: cola/widgets/startup.py:264 cola/widgets/status.py:1383 msgid "Remove" msgstr "Eliminar" -#: cola/cmds.py:1027 +#: cola/cmds.py:1028 #, python-format msgid "Remove %s from the recent list?" msgstr "¿Eliminar %s de la lista de recientes?" -#: cola/widgets/toolbar.py:316 +#: cola/widgets/toolbar.py:321 msgid "Remove Element" msgstr "Eliminar elemento" -#: cola/widgets/remote.py:206 +#: cola/widgets/remote.py:210 msgid "Remove remote-tracking branches that no longer exist on the remote" msgstr "Eliminar el seguimiento de ramas remotas que ya no existen en el repositorio remoto" -#: cola/widgets/patch.py:109 +#: cola/widgets/diff.py:1703 msgid "Remove selected (Delete)" msgstr "Eliminar seleccionados (Delete)" -#: cola/widgets/bookmarks.py:258 cola/widgets/startup.py:379 +#: cola/widgets/bookmarks.py:257 cola/widgets/startup.py:378 msgid "Remove stale entries for repositories that no longer exist" msgstr "Eliminar entradas obsoletas para repositorios que ya no existen" -#: cola/guicmds.py:333 cola/widgets/browse.py:159 +#: cola/guicmds.py:332 cola/widgets/browse.py:159 cola/widgets/stash.py:44 msgid "Rename" msgstr "Renombrar" -#: cola/cmds.py:1153 +#: cola/cmds.py:1154 #, python-format msgid "Rename \"%s\"" msgstr "Renombrar \"%s\"" -#: cola/widgets/branch.py:259 +#: cola/widgets/branch.py:268 msgid "Rename Branch" msgstr "Renombrar rama" -#: cola/widgets/main.py:570 +#: cola/widgets/main.py:583 msgid "Rename Branch..." msgstr "Renombrar rama..." -#: cola/guicmds.py:330 +#: cola/guicmds.py:329 msgid "Rename Existing Branch" msgstr "Renombrar una rama existente" -#: cola/cmds.py:944 +#: cola/cmds.py:942 msgid "Rename Remote" msgstr "Renombrar repositorio remoto" -#: cola/widgets/bookmarks.py:233 cola/widgets/startup.py:356 +#: cola/widgets/bookmarks.py:232 cola/widgets/startup.py:355 msgid "Rename Repository" msgstr "Renombrar repositorio" -#: cola/widgets/branch.py:445 +#: cola/widgets/stash.py:218 +msgid "Rename Stash" +msgstr "" + +#: cola/widgets/branch.py:478 msgid "Rename branch" msgstr "Renombrar rama" -#: cola/cmds.py:945 +#: cola/cmds.py:943 #, python-format msgid "Rename remote \"%(current)s\" to \"%(new)s\"?" msgstr "¿Desea renombrar el repositorio remoto \"%(current)s\" como \"%(new)s\"?" @@ -2818,179 +2916,183 @@ msgstr "¿Desea renombrar el repositorio remoto \"%(current)s\" como \"%(new)s\" msgid "Rename selected paths" msgstr "Renombrar las rutas seleccionadas" -#: cola/app.py:497 cola/widgets/startup.py:262 +#: cola/widgets/stash.py:45 +msgid "Rename the selected stash" +msgstr "" + +#: cola/app.py:500 cola/widgets/startup.py:261 msgid "Repository Not Found" msgstr "Repositorio no encontrado" -#: cola/widgets/browse.py:87 cola/widgets/main.py:1095 +#: cola/widgets/browse.py:87 cola/widgets/main.py:1108 #, python-format msgid "Repository: %s" msgstr "Repositorio: %s" -#: cola/guicmds.py:351 cola/widgets/createbranch.py:125 cola/widgets/dag.py:331 -#: cola/widgets/editremotes.py:58 cola/widgets/main.py:832 +#: cola/guicmds.py:350 cola/widgets/createbranch.py:123 cola/widgets/dag.py:330 +#: cola/widgets/editremotes.py:57 cola/widgets/main.py:845 msgid "Reset" msgstr "Reiniciar" -#: cola/widgets/createbranch.py:286 +#: cola/widgets/createbranch.py:284 #, python-format msgid "Reset \"%(branch)s\" to \"%(revision)s\"?" msgstr "¿Reiniciar \"%(branch)s\" a \"%(revision)s\"?" -#: cola/guicmds.py:359 +#: cola/guicmds.py:358 msgid "Reset All (Keep Unstaged Changes)" msgstr "Restablecer todo (mantener los cambios que no están en \"stage\")" -#: cola/cmds.py:655 cola/cmds.py:706 cola/guicmds.py:342 -#: cola/widgets/createbranch.py:295 +#: cola/cmds.py:657 cola/cmds.py:708 cola/guicmds.py:341 +#: cola/widgets/createbranch.py:293 msgid "Reset Branch" msgstr "Reiniciar rama" -#: cola/cmds.py:703 cola/guicmds.py:341 cola/widgets/dag.py:425 -#: cola/widgets/main.py:419 +#: cola/cmds.py:705 cola/guicmds.py:340 cola/widgets/dag.py:424 +#: cola/widgets/main.py:431 msgid "Reset Branch (Soft)" msgstr "Reiniciar rama (Soft)" -#: cola/cmds.py:652 cola/guicmds.py:350 cola/widgets/dag.py:431 -#: cola/widgets/main.py:426 +#: cola/cmds.py:654 cola/guicmds.py:349 cola/widgets/dag.py:430 +#: cola/widgets/main.py:439 msgid "Reset Branch and Stage (Mixed)" msgstr "Reiniciar rama y Stage (Mixed)" -#: cola/widgets/createbranch.py:292 +#: cola/widgets/createbranch.py:290 msgid "Reset Branch?" msgstr "¿Reiniciar rama?" -#: cola/widgets/main.py:655 +#: cola/widgets/main.py:668 msgid "Reset Layout" msgstr "Reiniciar diseño" -#: cola/cmds.py:687 +#: cola/cmds.py:689 msgid "Reset Worktree and Reset All?" msgstr "¿Reiniciar rama de trabajo y reiniciar todo?" -#: cola/cmds.py:672 cola/cmds.py:689 cola/cmds.py:723 cola/guicmds.py:360 -#: cola/guicmds.py:373 cola/guicmds.py:382 +#: cola/cmds.py:674 cola/cmds.py:691 cola/cmds.py:725 cola/guicmds.py:359 +#: cola/guicmds.py:372 cola/guicmds.py:381 msgid "Reset and Restore" msgstr "Reiniciar y restaurar" -#: cola/cmds.py:704 +#: cola/cmds.py:706 msgid "Reset branch?" msgstr "¿Reiniciar rama?" -#: cola/widgets/createbranch.py:266 +#: cola/widgets/createbranch.py:264 #, python-format msgid "Resetting \"%(branch)s\" to \"%(revision)s\" will lose commits." msgstr "Reiniciar \"%(branch)s\" a \"%(revision)s\" hará que se pierdan los \"commits\"." -#: cola/widgets/prefs.py:264 +#: cola/widgets/prefs.py:285 msgid "Resize File Browser columns" msgstr "Cambiar el tamaño de las columnas del explorador de archivos" -#: cola/widgets/prefs.py:374 +#: cola/widgets/prefs.py:412 msgid "Restart the application after changing appearance settings." msgstr "Reinicie la aplicación después de cambiar la configuración de apariencia." -#: cola/cmds.py:757 cola/cmds.py:760 cola/guicmds.py:390 cola/guicmds.py:391 -#: cola/widgets/dag.py:461 cola/widgets/main.py:457 +#: cola/cmds.py:759 cola/cmds.py:762 cola/guicmds.py:389 cola/guicmds.py:390 +#: cola/widgets/dag.py:460 cola/widgets/main.py:471 msgid "Restore Worktree" msgstr "Restaurar árbol de trabajo" -#: cola/cmds.py:720 cola/guicmds.py:381 cola/widgets/dag.py:454 -#: cola/widgets/main.py:450 +#: cola/cmds.py:722 cola/guicmds.py:380 cola/widgets/dag.py:453 +#: cola/widgets/main.py:463 msgid "Restore Worktree and Reset All (Hard)" msgstr "Restaurar árbol de trabajo y reiniciar todo (Hard)" -#: cola/cmds.py:669 cola/widgets/main.py:434 +#: cola/cmds.py:671 cola/widgets/main.py:447 msgid "Restore Worktree and Reset All (Keep Unstaged Changes)" msgstr "Restaurar árbol de trabajo y reiniciar todo (Mantener cambios que no estén en Stage)" -#: cola/widgets/dag.py:438 +#: cola/widgets/dag.py:437 msgid "Restore Worktree and Reset All (Keep Unstaged Edits)" msgstr "Restaurar árbol de trabajo y reiniciar todo (Mantener las ediciones que no estén en Stage)" -#: cola/cmds.py:686 cola/guicmds.py:372 cola/widgets/dag.py:446 -#: cola/widgets/main.py:442 +#: cola/cmds.py:688 cola/guicmds.py:371 cola/widgets/dag.py:445 +#: cola/widgets/main.py:455 msgid "Restore Worktree and Reset All (Merge)" msgstr "Restaurar árbol de trabajo y reiniciar todo (Merge)" -#: cola/cmds.py:721 +#: cola/cmds.py:723 msgid "Restore Worktree and Reset All?" msgstr "¿Restaurar árbol de trabajo y reiniciar todo?" -#: cola/cmds.py:758 +#: cola/cmds.py:760 #, python-format msgid "Restore Worktree to %s?" msgstr "¿Restaurar árbol de trabajo a %s?" -#: cola/cmds.py:670 +#: cola/cmds.py:672 msgid "Restore worktree, reset, and preserve unstaged edits?" msgstr "¿Restaurar árbol de trabajo, reset y mantener las ediciones que no estén en Stage?" -#: cola/widgets/dag.py:390 +#: cola/widgets/dag.py:389 msgid "Revert" msgstr "Revertir" -#: cola/widgets/diff.py:1153 +#: cola/widgets/diff.py:1227 msgid "Revert Diff Hunk" msgstr "Revertir Diff Hunk" -#: cola/widgets/diff.py:1018 +#: cola/widgets/diff.py:1057 msgid "Revert Diff Hunk..." msgstr "Revertir Diff Hunk..." -#: cola/widgets/diff.py:1152 +#: cola/widgets/diff.py:1226 msgid "Revert Diff Hunk?" msgstr "¿Revertir Diff Hunk?" -#: cola/widgets/diff.py:1150 +#: cola/widgets/diff.py:1224 msgid "Revert Selected Lines" msgstr "Revertir las líneas seleccionadas" -#: cola/widgets/diff.py:1013 +#: cola/widgets/diff.py:1052 msgid "Revert Selected Lines..." msgstr "Revertir las líneas seleccionadas..." -#: cola/widgets/diff.py:1149 +#: cola/widgets/diff.py:1223 msgid "Revert Selected Lines?" msgstr "¿Revertir las líneas seleccionadas?" -#: cola/cmds.py:2311 +#: cola/cmds.py:2262 msgid "Revert Uncommitted Changes" msgstr "Revertir los cambios en los que no se haya hecho \"commit\"" -#: cola/cmds.py:2305 +#: cola/cmds.py:2256 msgid "Revert Uncommitted Changes?" msgstr "¿Revertir los cambios en los que no se haya hecho \"commit\"?" -#: cola/cmds.py:2298 +#: cola/cmds.py:2249 msgid "Revert Uncommitted Edits..." msgstr "Revertir las ediciones en las que no se haya hecho \"commit\"..." -#: cola/cmds.py:2289 +#: cola/cmds.py:2240 msgid "Revert Unstaged Changes" msgstr "Revertir cambios que no estén en \"stage\"" -#: cola/cmds.py:2283 +#: cola/cmds.py:2234 msgid "Revert Unstaged Changes?" msgstr "¿Revertir cambios que no estén en \"stage\"?" -#: cola/cmds.py:2275 +#: cola/cmds.py:2226 msgid "Revert Unstaged Edits..." msgstr "Revertir cambios que no estén en \"stage\"..." -#: cola/cmds.py:598 +#: cola/cmds.py:599 msgid "Revert failed" msgstr "" -#: cola/cmds.py:2310 cola/widgets/diff.py:1161 +#: cola/cmds.py:2261 cola/widgets/diff.py:1235 msgid "Revert the uncommitted changes?" msgstr "¿Revertir los cambios en los que no se haya hecho commit?" -#: cola/cmds.py:2288 +#: cola/cmds.py:2239 msgid "Revert the unstaged changes?" msgstr "¿Revertir cambios que no estén en \"stage\"?" -#: cola/widgets/browse.py:189 +#: cola/widgets/browse.py:190 msgid "Revert uncommitted changes to selected paths" msgstr "Revertir los cambios en los que no se haya hecho \"commit\" a las rutas seleccionadas" @@ -2998,243 +3100,247 @@ msgstr "Revertir los cambios en los que no se haya hecho \"commit\" a las rutas msgid "Revert unstaged changes to selected paths" msgstr "Revertir cambios que no estén en \"stage\" a las rutas seleccionadas" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Review" msgstr "Revisar" -#: cola/widgets/main.py:583 +#: cola/widgets/main.py:596 msgid "Review..." msgstr "Revisar..." -#: cola/widgets/cfgactions.py:233 cola/widgets/createtag.py:84 +#: cola/widgets/cfgactions.py:231 cola/widgets/createtag.py:82 msgid "Revision" msgstr "Revisión" -#: cola/widgets/selectcommits.py:62 +#: cola/widgets/selectcommits.py:61 msgid "Revision Expression:" msgstr "Expresión de revisión:" -#: cola/widgets/merge.py:39 cola/widgets/merge.py:42 +#: cola/widgets/merge.py:37 cola/widgets/merge.py:40 msgid "Revision to Merge" msgstr "Revisión a unir (merge)" -#: cola/sequenceeditor.py:351 +#: cola/sequenceeditor.py:347 msgid "Reword" msgstr "Redactar de otra forma" -#: cola/cmds.py:776 cola/widgets/commitmsg.py:456 +#: cola/cmds.py:778 cola/widgets/commitmsg.py:464 msgid "Rewrite Published Commit?" msgstr "¿Reescribir el commit publicado?" -#: cola/widgets/log.py:31 +#: cola/widgets/log.py:31 cola/widgets/log.py:133 msgid "Right-click links to open:" msgstr "" -#: cola/interaction.py:127 cola/widgets/cfgactions.py:245 +#: cola/interaction.py:125 cola/widgets/cfgactions.py:243 msgid "Run" msgstr "Ejecutar" -#: cola/cmds.py:2341 +#: cola/cmds.py:2292 #, python-format msgid "Run \"%s\"?" msgstr "¿Desea ejecutar \"%s\"?" -#: cola/interaction.py:124 +#: cola/interaction.py:122 #, python-format msgid "Run %s?" msgstr "¿Desea ejecutar %s?" -#: cola/interaction.py:125 +#: cola/interaction.py:123 #, python-format msgid "Run the \"%s\" command?" msgstr "¿Desea ejecutar el comando \"%s\"?" -#: cola/cmds.py:2380 +#: cola/cmds.py:2331 #, python-format msgid "Running command: %s" msgstr "Ejecutando comando: %s" -#: cola/widgets/about.py:422 +#: cola/widgets/about.py:405 msgid "Russian translation" msgstr "Traducción al Ruso" -#: cola/sequenceeditor.py:324 +#: cola/sequenceeditor.py:321 msgid "SHA-1" msgstr "SHA-1" -#: cola/widgets/prefs.py:183 +#: cola/widgets/prefs.py:205 msgid "Safe Mode" msgstr "Modo seguro" -#: cola/cmds.py:2167 cola/widgets/archive.py:126 cola/widgets/browse.py:609 -#: cola/widgets/editremotes.py:54 cola/widgets/stash.py:52 -#: cola/widgets/status.py:1388 +#: cola/cmds.py:2118 cola/widgets/archive.py:124 cola/widgets/browse.py:610 +#: cola/widgets/editremotes.py:53 cola/widgets/stash.py:54 +#: cola/widgets/status.py:1389 msgid "Save" msgstr "Guardar" -#: cola/widgets/archive.py:113 +#: cola/widgets/archive.py:111 msgid "Save Archive" msgstr "Guardar archivo" -#: cola/widgets/dag.py:382 cola/widgets/main.py:351 +#: cola/widgets/dag.py:381 cola/widgets/main.py:346 msgid "Save As Tarball/Zip..." msgstr "Guardar como Tarball/Zip..." -#: cola/widgets/prefs.py:263 +#: cola/widgets/prefs.py:284 msgid "Save GUI Settings" msgstr "Guardar ajustes de la interfaz de usuario" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Save Stash" msgstr "Guardar Stash" -#: cola/widgets/stash.py:53 +#: cola/widgets/stash.py:55 msgid "Save modified state to new stash" msgstr "Guardar el estado modificado a un nuevo \"stash\"" -#: cola/widgets/browse.py:570 +#: cola/widgets/browse.py:571 #, python-format msgid "Saved \"%(filename)s\" from \"%(ref)s\" to \"%(destination)s\"" msgstr "Se guardó \"%(filename)s\" de \"%(ref)s\" en \"%(destination)s\"" -#: cola/widgets/bookmarks.py:83 cola/widgets/grep.py:98 -#: cola/widgets/search.py:42 cola/widgets/search.py:62 +#: cola/widgets/bookmarks.py:82 cola/widgets/grep.py:96 +#: cola/widgets/search.py:41 cola/widgets/search.py:61 msgid "Search" msgstr "Buscar" -#: cola/widgets/search.py:226 +#: cola/widgets/search.py:225 msgid "Search Authors" msgstr "Buscar autores" -#: cola/widgets/search.py:224 +#: cola/widgets/search.py:223 msgid "Search Commit Messages" msgstr "Buscar mensajes de commit" -#: cola/widgets/search.py:227 +#: cola/widgets/search.py:226 msgid "Search Committers" msgstr "Buscar a quien ha realizado commits" -#: cola/widgets/search.py:228 +#: cola/widgets/search.py:227 msgid "Search Date Range" msgstr "Buscar en un rango de fechas" -#: cola/widgets/search.py:225 +#: cola/widgets/search.py:224 msgid "Search Diffs" msgstr "Buscar Diffs" -#: cola/widgets/search.py:222 +#: cola/widgets/search.py:221 msgid "Search by Expression" msgstr "Buscar por expresión" -#: cola/widgets/search.py:223 +#: cola/widgets/search.py:222 msgid "Search by Path" msgstr "Buscar por ruta" -#: cola/widgets/grep.py:124 +#: cola/widgets/dag.py:494 +msgid "Search commit messages" +msgstr "" + +#: cola/widgets/grep.py:122 msgid "Search for a fixed string" msgstr "Buscar por una cadena fija" -#: cola/widgets/diff.py:519 cola/widgets/diff.py:1514 +#: cola/widgets/diff.py:526 cola/widgets/diff.py:1576 msgid "Search in Diff" msgstr "" -#: cola/guicmds.py:253 cola/widgets/bookmarks.py:62 +#: cola/guicmds.py:252 cola/widgets/bookmarks.py:61 msgid "Search repositories by name..." msgstr "" -#: cola/widgets/grep.py:122 +#: cola/widgets/grep.py:120 msgid "Search using a POSIX basic regular expression" msgstr "Buscar utilizando expresión regular básica POSIX " -#: cola/widgets/grep.py:123 +#: cola/widgets/grep.py:121 msgid "Search using a POSIX extended regular expression" msgstr "Buscar utilizando expresión regular extendida POSIX " -#: cola/widgets/main.py:493 +#: cola/widgets/main.py:506 msgid "Search..." msgstr "Buscar..." -#: cola/widgets/selectcommits.py:67 +#: cola/widgets/selectcommits.py:66 msgid "Search:" msgstr "Buscar:" -#: cola/guicmds.py:330 cola/widgets/selectcommits.py:74 +#: cola/guicmds.py:329 cola/widgets/selectcommits.py:73 msgid "Select" msgstr "Seleccionar" -#: cola/widgets/main.py:750 +#: cola/widgets/main.py:763 msgid "Select All" msgstr "Seleccionar todo" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Select Branch to Review" msgstr "Seleccionar rama para revisar" -#: cola/widgets/dag.py:1610 +#: cola/widgets/dag.py:1667 msgid "Select Child" msgstr "Seleccionar hijo" -#: cola/widgets/commitmsg.py:512 +#: cola/widgets/commitmsg.py:538 msgid "Select Commit" msgstr "Seleccionar commit" -#: cola/guicmds.py:137 +#: cola/guicmds.py:136 msgid "Select Directory..." msgstr "Seleccionar carpeta..." -#: cola/cmds.py:2129 +#: cola/cmds.py:2080 msgid "Select New Upstream" msgstr "Seleccionar un nuevo repositorio aguas arriba (upstream)" -#: cola/widgets/dag.py:1614 +#: cola/widgets/dag.py:1671 msgid "Select Newest Child" msgstr "Seleccionar hijo más reciente" -#: cola/widgets/dag.py:1604 +#: cola/widgets/dag.py:1661 msgid "Select Oldest Parent" msgstr "Seleccionar padre más antiguo" -#: cola/widgets/dag.py:1599 +#: cola/widgets/dag.py:1656 msgid "Select Parent" msgstr "Seleccionar padre" -#: cola/widgets/browse.py:525 +#: cola/widgets/browse.py:526 msgid "Select Previous Version" msgstr "Seleccionar una versión previa" -#: cola/widgets/clone.py:197 +#: cola/widgets/clone.py:195 msgid "Select a parent directory for the new clone" msgstr "Seleccione un directorio padre para el nuevo clonado" -#: cola/widgets/standard.py:756 cola/widgets/standard.py:779 +#: cola/widgets/standard.py:826 cola/widgets/standard.py:848 msgid "Select directory" msgstr "" -#: cola/widgets/selectcommits.py:162 +#: cola/widgets/selectcommits.py:161 msgid "Select output dir" msgstr "Seleccionar un directorio de salida" -#: cola/widgets/selectcommits.py:183 +#: cola/widgets/selectcommits.py:182 msgid "Select output directory" msgstr "Seleccionar carpeta de salida" -#: cola/widgets/patch.py:175 +#: cola/widgets/diff.py:1769 msgid "Select patch file(s)..." msgstr "Seleccionar archivo(s) de parche..." -#: cola/widgets/editremotes.py:437 +#: cola/widgets/editremotes.py:435 msgid "Select repository" msgstr "Seleccionar repositorio..." -#: cola/widgets/bookmarks.py:225 cola/widgets/startup.py:348 +#: cola/widgets/bookmarks.py:224 cola/widgets/startup.py:347 msgid "Set Default Repository" msgstr "Establecer el repositorio como predeterminado" -#: cola/widgets/branch.py:282 +#: cola/widgets/branch.py:291 msgid "Set Upstream Branch" msgstr "Establecer rama aguas arriba (upstream)" -#: cola/widgets/branch.py:72 +#: cola/widgets/branch.py:74 msgid "" "Set the sort order for branches and tags.\n" "Toggle between date-based and version-name-based sorting." @@ -3242,52 +3348,56 @@ msgstr "" "Establezca el orden de clasificación para ramas y etiquetas.\n" "Alterne entre clasificación basada en la fecha y basada en el nombre de la versión." -#: cola/widgets/remote.py:213 +#: cola/widgets/remote.py:217 msgid "Set upstream" msgstr "Establecer aguas arriba (upstream)" -#: cola/widgets/prefs.py:405 +#: cola/widgets/prefs.py:443 msgid "Settings" msgstr "Ajustes" -#: cola/widgets/grep.py:142 +#: cola/widgets/grep.py:140 msgid "Shell arguments" msgstr "Argumentos línea de comandos" -#: cola/sequenceeditor.py:375 +#: cola/sequenceeditor.py:371 msgid "Shift Down" msgstr "Desplazar hacia abajo" -#: cola/sequenceeditor.py:379 +#: cola/sequenceeditor.py:375 msgid "Shift Up" msgstr "Desplazar hacia arriba" -#: cola/widgets/about.py:499 +#: cola/widgets/about.py:482 msgid "Shortcuts" msgstr "Atajos" -#: cola/widgets/prefs.py:179 +#: cola/widgets/prefs.py:201 msgid "Show Diffstat After Merge" msgstr "Mostrar \"Diffstat\" tras hacer \"merge\"" -#: cola/widgets/prefs.py:178 +#: cola/widgets/prefs.py:200 msgid "Show Full Paths in the Window Title" msgstr "Mostrar las rutas completas en el título de la ventana" -#: cola/sequenceeditor.py:106 cola/widgets/finder.py:187 -#: cola/widgets/status.py:1384 +#: cola/sequenceeditor.py:104 cola/widgets/finder.py:186 +#: cola/widgets/status.py:1385 msgid "Show Help" msgstr "Mostrar ayuda" -#: cola/widgets/filelist.py:30 +#: cola/widgets/filelist.py:27 msgid "Show History" msgstr "Mostrar historial" -#: cola/widgets/prefs.py:348 +#: cola/widgets/prefs.py:368 msgid "Show file counts in Status titles" msgstr "Mostrar recuentos de archivos en títulos de estado" -#: cola/sequenceeditor.py:171 cola/widgets/finder.py:138 +#: cola/widgets/diff.py:794 +msgid "Show filenames" +msgstr "" + +#: cola/sequenceeditor.py:169 cola/widgets/finder.py:137 msgid "" "Show help\n" "Shortcut: ?" @@ -3295,137 +3405,145 @@ msgstr "" "Mostrar ayuda\n" "Atajo de teclado: ?" -#: cola/widgets/diff.py:765 +#: cola/widgets/diff.py:792 msgid "Show line numbers" msgstr "Mostrar números de línea" -#: cola/widgets/diff.py:761 +#: cola/widgets/remote.py:175 +msgid "Show remote messages" +msgstr "" + +#: cola/widgets/diff.py:789 msgid "Show whole surrounding functions of changes" msgstr "Mostrar todo lo que rodea las funciones de cambios" -#: cola/widgets/recent.py:58 +#: cola/widgets/recent.py:56 msgid "Showing changes since" msgstr "Mostrando cambios desde" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "Side by side" msgstr "Lado al lado" -#: cola/cmds.py:2512 +#: cola/cmds.py:2463 msgid "Sign Off" msgstr "Cerrar sesión" -#: cola/widgets/createtag.py:71 +#: cola/widgets/createtag.py:69 msgid "Sign Tag" msgstr "Firmar etiqueta" -#: cola/widgets/commitmsg.py:55 +#: cola/widgets/commitmsg.py:56 msgid "Sign off on this commit" msgstr "Cerrar sesión en este \"commit\"" -#: cola/widgets/about.py:412 cola/widgets/about.py:425 +#: cola/widgets/about.py:395 cola/widgets/about.py:408 msgid "Simplified Chinese translation" msgstr "Traducción al Chino simplificado" -#: cola/cmds.py:2587 +#: cola/cmds.py:2529 msgid "Skip" msgstr "Omitir" -#: cola/widgets/main.py:264 cola/widgets/main.py:617 +#: cola/widgets/main.py:260 cola/widgets/main.py:630 msgid "Skip Current Patch" msgstr "Omitir el parche actual" -#: cola/widgets/main.py:267 +#: cola/widgets/main.py:261 msgid "Skip applying the current patch and continue applying patches" msgstr "" -#: cola/widgets/prefs.py:261 +#: cola/widgets/prefs.py:282 msgid "Sort bookmarks alphabetically" msgstr "Ordenar los marcadores alfabéticamente" -#: cola/widgets/about.py:413 cola/widgets/about.py:436 -#: cola/widgets/about.py:440 +#: cola/widgets/about.py:396 cola/widgets/about.py:419 +#: cola/widgets/about.py:423 msgid "Spanish translation" msgstr "Traducción al Español" -#: cola/widgets/createtag.py:88 +#: cola/widgets/createtag.py:86 msgid "Specifies the SHA-1 to tag" msgstr "Especifica la firma SHA-1 a la etiqueta" -#: cola/widgets/createtag.py:81 +#: cola/widgets/createtag.py:79 msgid "Specifies the tag message" msgstr "Especifica el mensaje de la etiqueta" -#: cola/widgets/createtag.py:65 +#: cola/widgets/createtag.py:63 msgid "Specifies the tag name" msgstr "Especifica el nombre de la etiqueta" -#: cola/widgets/spellcheck.py:46 +#: cola/widgets/spellcheck.py:45 msgid "Spelling Suggestions" msgstr "Sugerencias de ortografía" -#: cola/sequenceeditor.py:369 cola/widgets/merge.py:58 +#: cola/sequenceeditor.py:365 cola/widgets/merge.py:56 msgid "Squash" msgstr "Concentrar (squash)" -#: cola/widgets/merge.py:57 +#: cola/widgets/merge.py:55 msgid "Squash the merged commits into a single commit" msgstr "Concentrar los commits unidos (merged) en un único commit" -#: cola/cmds.py:2598 cola/widgets/action.py:60 cola/widgets/diff.py:982 +#: cola/cmds.py:2540 cola/widgets/action.py:58 cola/widgets/diff.py:1168 msgid "Stage" msgstr "Realizar Stage" -#: cola/cmds.py:2753 +#: cola/cmds.py:2699 msgid "Stage / Unstage" msgstr "Realizar Stage / Unstage" -#: cola/cmds.py:2735 +#: cola/cmds.py:2681 msgid "Stage / Unstage All" msgstr "Realizar Stage / Unstage todo" -#: cola/widgets/diff.py:1016 +#: cola/widgets/diff.py:1055 msgid "Stage Diff Hunk" msgstr "Realizar Stage Diff Hunk" -#: cola/cmds.py:2691 +#: cola/cmds.py:2633 msgid "Stage Modified" msgstr "Stage modificado" -#: cola/cmds.py:2724 +#: cola/cmds.py:2670 msgid "Stage Modified and Untracked" msgstr "Stage modificado y sin seguimiento" -#: cola/widgets/status.py:872 cola/widgets/status.py:894 -#: cola/widgets/status.py:962 +#: cola/widgets/status.py:873 cola/widgets/status.py:895 +#: cola/widgets/status.py:963 msgid "Stage Selected" msgstr "Stage seleccionado" -#: cola/widgets/diff.py:1011 +#: cola/widgets/diff.py:1050 msgid "Stage Selected Lines" msgstr "Líneas de Stage seleccionado" -#: cola/cmds.py:2702 +#: cola/cmds.py:2644 msgid "Stage Unmerged" msgstr "Stage sin hacer merge" -#: cola/cmds.py:2713 +#: cola/cmds.py:2655 msgid "Stage Untracked" msgstr "Stage sin seguimiento" -#: cola/widgets/commitmsg.py:438 +#: cola/widgets/commitmsg.py:446 msgid "Stage and Commit" msgstr "Stage y commit" -#: cola/widgets/commitmsg.py:435 +#: cola/widgets/commitmsg.py:443 msgid "Stage and commit?" msgstr "¿Stage y commit?" -#: cola/cmds.py:2586 +#: cola/widgets/action.py:58 +msgid "Stage changes using \"git add\"" +msgstr "" + +#: cola/cmds.py:2528 msgid "Stage conflicts" msgstr "Realizar Stage a conflictos" -#: cola/cmds.py:2577 +#: cola/cmds.py:2519 msgid "Stage conflicts?" msgstr "¿Realizar Stage a conflictos?" @@ -3433,45 +3551,45 @@ msgstr "¿Realizar Stage a conflictos?" msgid "Stage/unstage selected paths for commit" msgstr "Stage/unstage rutas seleccionadas para confirmar" -#: cola/models/browse.py:334 cola/widgets/status.py:156 -#: cola/widgets/status.py:620 +#: cola/models/browse.py:333 cola/widgets/status.py:156 +#: cola/widgets/status.py:621 msgid "Staged" msgstr "Staged" -#: cola/cmds.py:2605 +#: cola/cmds.py:2547 #, python-format msgid "Staging: %s" msgstr "Realizando Stage: %s" -#: cola/widgets/main.py:597 +#: cola/widgets/main.py:610 msgid "Start Interactive Rebase..." msgstr "Comenzar rebase interactivo..." -#: cola/widgets/createbranch.py:107 +#: cola/widgets/createbranch.py:105 msgid "Starting Revision" msgstr "Comenzando revisión" -#: cola/widgets/stash.py:40 +#: cola/widgets/stash.py:36 msgid "Stash" msgstr "Stash" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash Index" msgstr "Stash índice" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash staged changes only" msgstr "Realizar Stash solo a los cambios que se ha realizado Stage" -#: cola/widgets/stash.py:73 +#: cola/widgets/stash.py:75 msgid "Stash unstaged changes only, keeping staged changes" msgstr "Realizar Stash solo a los cambios que no se ha realizado Stage, manteniendo los cambios que se realizó Stage" -#: cola/widgets/action.py:66 cola/widgets/main.py:414 +#: cola/widgets/action.py:76 cola/widgets/main.py:422 msgid "Stash..." msgstr "Stash..." -#: cola/models/browse.py:33 cola/widgets/main.py:102 +#: cola/models/browse.py:32 cola/widgets/main.py:100 msgid "Status" msgstr "Estado" @@ -3479,128 +3597,136 @@ msgstr "Estado" msgid "Stop tracking paths" msgstr "Dejar de seguir las rutas" -#: cola/widgets/submodules.py:82 +#: cola/widgets/submodules.py:81 msgid "Submodule URL (can be relative, ex: ../repo.git)" msgstr "URL del submódulo (puede ser relativa, por ejemplo: ../repo.git)" -#: cola/widgets/submodules.py:90 +#: cola/widgets/submodules.py:89 msgid "Submodule branch to track (optional)" msgstr "Rama de submódulo para seguir (opcional)" -#: cola/widgets/submodules.py:86 +#: cola/widgets/submodules.py:85 msgid "Submodule path within the current repository (optional)" msgstr "Ruta de submódulo dentro del repositorio actual (opcional)" -#: cola/widgets/main.py:143 cola/widgets/submodules.py:32 +#: cola/widgets/main.py:141 cola/widgets/submodules.py:31 msgid "Submodules" msgstr "Submódulos" -#: cola/widgets/prefs.py:174 +#: cola/widgets/prefs.py:196 msgid "Summarize Merge Commits" msgstr "Sumario de Merge Commits" -#: cola/sequenceeditor.py:325 cola/widgets/dag.py:506 +#: cola/sequenceeditor.py:322 cola/widgets/dag.py:572 msgid "Summary" msgstr "Resumen" -#: cola/widgets/prefs.py:168 +#: cola/widgets/prefs.py:273 msgid "Tab Width" msgstr "Ancho de tabulación" -#: cola/widgets/cfgactions.py:229 cola/widgets/createbranch.py:116 -#: cola/widgets/merge.py:48 +#: cola/widgets/cfgactions.py:227 cola/widgets/createbranch.py:114 +#: cola/widgets/merge.py:46 msgid "Tag" msgstr "Etiqueta" -#: cola/cmds.py:2842 +#: cola/cmds.py:2788 msgid "Tag Created" msgstr "Etiqueta Creada" -#: cola/widgets/createtag.py:80 +#: cola/widgets/createtag.py:78 msgid "Tag message..." msgstr "Mensaje de etiqueta..." -#: cola/cmds.py:2802 +#: cola/cmds.py:2748 msgid "Tag-signing was requested but the tag message is empty." msgstr "Se necesitó una firma de la etiqueta pero el mensaje de la etiqueta está vacío." -#: cola/widgets/branch.py:179 cola/widgets/branch.py:238 +#: cola/widgets/branch.py:183 cola/widgets/branch.py:248 msgid "Tags" msgstr "Etiquetas" -#: cola/widgets/toolbar.py:180 +#: cola/widgets/action.py:78 cola/widgets/main.py:423 +msgid "Temporarily stash away uncommitted changes using \"git stash\"" +msgstr "" + +#: cola/widgets/toolbar.py:184 msgid "Text Beside Icon" msgstr "Texto junto al icono" -#: cola/widgets/toolbar.py:179 +#: cola/widgets/toolbar.py:183 msgid "Text Only" msgstr "Solo texto" -#: cola/widgets/toolbar.py:181 +#: cola/widgets/toolbar.py:185 msgid "Text Under Icon" msgstr "Texto bajo el icono" -#: cola/widgets/prefs.py:169 +#: cola/widgets/prefs.py:272 msgid "Text Width" msgstr "Ancho del texto" -#: cola/cmds.py:1116 +#: cola/cmds.py:1117 msgid "The branch will be no longer available." msgstr "La rama no volverá a estar disponible." -#: cola/cmds.py:648 +#: cola/cmds.py:650 #, python-format msgid "The branch will be reset using \"git reset --mixed %s\"" msgstr "La rama será reiniciada utilizando \"git reset --mixed %s\"" -#: cola/cmds.py:699 cola/cmds.py:790 +#: cola/cmds.py:701 cola/cmds.py:792 #, python-format msgid "The branch will be reset using \"git reset --soft %s\"" msgstr "La rama será reiniciada utilizando \"git reset --soft %s\"" -#: cola/widgets/commitmsg.py:303 +#: cola/widgets/commitmsg.py:311 msgid "The commit message will be cleared." msgstr "El mensaje del commit será borrado." -#: cola/widgets/prefs.py:146 +#: cola/widgets/prefs.py:169 msgid "" "The date-time format used when displaying dates in Git DAG.\n" "This value is passed to git log --date=" msgstr "" -#: cola/widgets/archive.py:208 +#: cola/widgets/archive.py:206 #, python-format msgid "The file \"%s\" exists and will be overwritten." msgstr "El archivo \"%s\" ya existe y será sobrescrito." -#: cola/cmds.py:1086 +#: cola/cmds.py:1087 msgid "The following files will be deleted:" msgstr "Los siguientes archivos serán eliminados:" -#: cola/widgets/status.py:1646 +#: cola/widgets/status.py:1647 msgid "The number of leading paths to strip" msgstr "" -#: cola/cmds.py:716 +#: cola/cmds.py:718 #, python-format msgid "The repository will be reset using \"git reset --hard %s\"" msgstr "El repositorio se restablecerá usando \"git reset --hard %s\"" -#: cola/cmds.py:665 +#: cola/cmds.py:667 #, python-format msgid "The repository will be reset using \"git reset --keep %s\"" msgstr "El repositorio se restablecerá usando \"git reset --keep %s\"" -#: cola/cmds.py:682 +#: cola/cmds.py:684 #, python-format msgid "The repository will be reset using \"git reset --merge %s\"" msgstr "El repositorio se restablecerá usando \"git reset --merge %s\"" -#: cola/cmds.py:2365 +#: cola/cmds.py:2316 msgid "The revision expression cannot be empty." msgstr "La expresión de revisión no puede estar vacía." -#: cola/cmds.py:3029 +#: cola/widgets/stash.py:225 +msgid "The stash has not been renamed" +msgstr "" + +#: cola/cmds.py:2975 #, python-format msgid "" "The submodule will be added using\n" @@ -3609,7 +3735,7 @@ msgstr "" "El submódulo será añadido utilizando\n" "\"%s\"" -#: cola/cmds.py:3074 +#: cola/cmds.py:3020 #, python-format msgid "" "The submodule will be updated using\n" @@ -3618,16 +3744,16 @@ msgstr "" "El submódulo será actualizado utilizando\n" "\"%s\"" -#: cola/cmds.py:736 +#: cola/cmds.py:738 #, python-format msgid "The worktree will be restored using \"git read-tree --reset -u %s\"" msgstr "El árbol de trabajo se restaurará usando \"git read-tree --reset -u %s\"" -#: cola/widgets/commitmsg.py:304 +#: cola/widgets/commitmsg.py:312 msgid "This cannot be undone. Clear commit message?" msgstr "Esto no se puede deshacer. ¿Borrar mensaje de commit?" -#: cola/cmds.py:778 cola/widgets/commitmsg.py:458 +#: cola/cmds.py:780 cola/widgets/commitmsg.py:466 msgid "" "This commit has already been published.\n" "This operation will rewrite published history.\n" @@ -3637,7 +3763,7 @@ msgstr "" "Esta operación reescribirá el historial publicado.\n" "Probablemente no quiere hacer esto." -#: cola/widgets/diff.py:1158 +#: cola/widgets/diff.py:1232 msgid "" "This operation drops uncommitted changes.\n" "These changes cannot be recovered." @@ -3645,7 +3771,7 @@ msgstr "" "Esta operación eliminará los cambios en los que no se haya hecho commit.\n" "Estos cambios no pueden ser recuperados." -#: cola/cmds.py:2307 +#: cola/cmds.py:2258 msgid "" "This operation removes uncommitted edits from selected files.\n" "These changes cannot be recovered." @@ -3653,7 +3779,7 @@ msgstr "" "Esta operación eliminará las ediciones en las que no se haya hecho commit de los archivos seleccionados.\n" "Estos cambios no pueden ser recuperados." -#: cola/cmds.py:2285 +#: cola/cmds.py:2236 msgid "" "This operation removes unstaged edits from selected files.\n" "These changes cannot be recovered." @@ -3661,27 +3787,27 @@ msgstr "" "Esta operación elimina ediciones que no estén en \"stage\" de los archivos seleccionados.\n" "Estos cambios no pueden ser recuperados." -#: cola/cmds.py:475 +#: cola/cmds.py:476 msgid "" "This operation will replace the selected unmerged files with content from the branch being merged using \"git checkout --theirs\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:513 +#: cola/cmds.py:514 msgid "" "This operation will replace the selected unmerged files with content from your current branch using \"git checkout --ours\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/widgets/main.py:1109 +#: cola/widgets/main.py:1122 msgid "" "This repository has unresolved conflicts after applying a patch.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1102 +#: cola/widgets/main.py:1115 msgid "" "This repository is currently being rebased.\n" "Resolve conflicts, commit changes, and run:\n" @@ -3691,13 +3817,13 @@ msgstr "" "Resolver los conflictos, hacer commit con los cambios, y ejecutar:\n" " Rebase > Continue" -#: cola/widgets/main.py:1115 +#: cola/widgets/main.py:1128 msgid "" "This repository is in the middle of a cherry-pick.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1121 +#: cola/widgets/main.py:1134 msgid "" "This repository is in the middle of a merge.\n" "Resolve conflicts and commit changes." @@ -3717,15 +3843,15 @@ msgstr "" msgid "To avoid applying removal lines ('-'), change them to context lines (' ')." msgstr "" -#: cola/sequenceeditor.py:342 +#: cola/sequenceeditor.py:338 msgid "Toggle Enabled" msgstr "Alternar habilitado" -#: cola/widgets/diff.py:776 +#: cola/widgets/diff.py:804 msgid "Toggle image diff" msgstr "Alternar imagen de diferencia" -#: cola/widgets/branch.py:63 +#: cola/widgets/branch.py:65 msgid "Toggle the branches filter" msgstr "Alternar el filtro de las ramas" @@ -3733,51 +3859,51 @@ msgstr "Alternar el filtro de las ramas" msgid "Toggle the paths filter" msgstr "Alternar el filtro de las rutas" -#: cola/widgets/toolbar.py:317 +#: cola/widgets/toolbar.py:322 msgid "Toolbar Style:" msgstr "Estilo de barra de herramientas:" -#: cola/widgets/cfgactions.py:228 cola/widgets/merge.py:47 +#: cola/widgets/cfgactions.py:226 cola/widgets/merge.py:45 msgid "Tracking Branch" msgstr "Rama en seguimiento" -#: cola/widgets/createbranch.py:115 +#: cola/widgets/createbranch.py:113 msgid "Tracking branch" msgstr "Rama en seguimiento" -#: cola/widgets/about.py:408 cola/widgets/about.py:434 -#: cola/widgets/about.py:445 +#: cola/widgets/about.py:391 cola/widgets/about.py:417 +#: cola/widgets/about.py:428 msgid "Traditional Chinese (Taiwan) translation" msgstr "Traducción al Chino (Taiwan) tradicional" -#: cola/widgets/about.py:439 +#: cola/widgets/about.py:422 msgid "Translation" msgstr "Traducción" -#: cola/widgets/about.py:94 +#: cola/widgets/about.py:92 msgid "Translators" msgstr "Traductores" -#: cola/widgets/about.py:418 cola/widgets/about.py:423 -#: cola/widgets/about.py:438 +#: cola/widgets/about.py:401 cola/widgets/about.py:406 +#: cola/widgets/about.py:421 msgid "Turkish translation" msgstr "Traducción al Turco" -#: cola/widgets/clone.py:109 cola/widgets/editremotes.py:451 -#: cola/widgets/submodules.py:117 +#: cola/widgets/clone.py:107 cola/widgets/editremotes.py:449 +#: cola/widgets/submodules.py:116 msgid "URL" msgstr "URL" -#: cola/widgets/remote.py:463 +#: cola/widgets/remote.py:497 #, python-format msgid "URL: %s" msgstr "URL: %s" -#: cola/widgets/about.py:415 +#: cola/widgets/about.py:398 msgid "Ukranian translation" msgstr "Traducción al Ucraniano" -#: cola/cmds.py:2122 +#: cola/cmds.py:2073 msgid "Unable to rebase" msgstr "Incapaz de hacer rebase" @@ -3786,53 +3912,58 @@ msgstr "Incapaz de hacer rebase" msgid "Unable to set URL for \"%(name)s\" to \"%(url)s\"" msgstr "Imposible especificar la URL para \"%(name)s\" a \"%(url)s\"" -#: cola/widgets/diff.py:1327 +#: cola/widgets/diff.py:1401 #, python-format msgid "Unable to write patch to \"%s\". Check permissions?" msgstr "" -#: cola/widgets/main.py:735 +#: cola/widgets/main.py:748 msgid "Undo" msgstr "Deshacer" -#: cola/cmds.py:783 cola/cmds.py:788 cola/cmds.py:791 cola/widgets/main.py:208 +#: cola/cmds.py:785 cola/cmds.py:790 cola/cmds.py:793 cola/widgets/main.py:207 msgid "Undo Last Commit" msgstr "Deshacer último commit" -#: cola/cmds.py:789 +#: cola/cmds.py:791 msgid "Undo last commit?" msgstr "¿Deshacer último commit?" -#: cola/cmds.py:782 +#: cola/cmds.py:784 msgid "Undo the published commit?" msgstr "¿Deshacer el commit publicado?" -#: cola/models/browse.py:328 cola/widgets/status.py:157 -#: cola/widgets/status.py:640 +#: cola/models/browse.py:327 cola/widgets/status.py:157 +#: cola/widgets/status.py:641 msgid "Unmerged" msgstr "No fusionado (unmerged)" -#: cola/cmds.py:2855 cola/widgets/action.py:61 cola/widgets/diff.py:985 +#: cola/cmds.py:2801 cola/widgets/action.py:61 cola/widgets/diff.py:1165 +#: cola/widgets/main.py:212 msgid "Unstage" msgstr "Unstage" -#: cola/widgets/main.py:203 cola/widgets/status.py:790 +#: cola/widgets/main.py:202 cola/widgets/status.py:791 msgid "Unstage All" msgstr "Unstage a todo" -#: cola/widgets/diff.py:1061 +#: cola/widgets/diff.py:1017 msgid "Unstage Diff Hunk" msgstr "Unstage Diff Hunk" -#: cola/widgets/status.py:823 cola/widgets/status.py:858 +#: cola/widgets/status.py:824 cola/widgets/status.py:859 msgid "Unstage Selected" msgstr "Unstage seleccionado" -#: cola/widgets/diff.py:1058 +#: cola/widgets/diff.py:1015 msgid "Unstage Selected Lines" msgstr "Líneas de Stage seleccionado" -#: cola/cmds.py:2867 +#: cola/widgets/action.py:61 +msgid "Unstage changes using \"git reset\"" +msgstr "" + +#: cola/cmds.py:2813 #, python-format msgid "Unstaging: %s" msgstr "Sin hacer Stage: %s" @@ -3841,85 +3972,84 @@ msgstr "Sin hacer Stage: %s" msgid "Untrack Selected" msgstr "Sin seguimiento (untrack) seleccionado" -#: cola/widgets/status.py:159 cola/widgets/status.py:646 +#: cola/widgets/status.py:159 cola/widgets/status.py:647 msgid "Untracked" msgstr "Sin seguimiento" -#: cola/cmds.py:1141 cola/cmds.py:2923 +#: cola/cmds.py:1142 cola/cmds.py:2869 #, python-format msgid "Untracking: %s" msgstr "Sin seguimiento: %s" -#: cola/widgets/main.py:374 +#: cola/widgets/main.py:369 msgid "Update All Submodules..." msgstr "Actualizar todos los submódulo..." -#: cola/widgets/createbranch.py:121 +#: cola/widgets/createbranch.py:119 msgid "Update Existing Branch:" msgstr "Actualizar rama existente:" -#: cola/cmds.py:3075 +#: cola/cmds.py:3021 msgid "Update Submodule" msgstr "Actualizar submódulo" -#: cola/cmds.py:3072 +#: cola/cmds.py:3018 msgid "Update Submodule..." msgstr "Actualizar submódulo..." -#: cola/cmds.py:3111 +#: cola/cmds.py:3057 msgid "Update Submodules" msgstr "Actualizar submódulos" -#: cola/cmds.py:3109 +#: cola/cmds.py:3055 msgid "Update all submodules?" msgstr "¿Actualizar todos los submódulos?" -#: cola/cmds.py:2093 +#: cola/cmds.py:2044 msgid "Update stacked branches" msgstr "" -#: cola/cmds.py:2085 cola/cmds.py:2092 +#: cola/cmds.py:2036 cola/cmds.py:2043 msgid "Update stacked branches when rebasing?" msgstr "" -#: cola/cmds.py:3108 +#: cola/cmds.py:3054 msgid "Update submodules..." msgstr "Actualizar submódulos..." -#: cola/widgets/status.py:953 +#: cola/widgets/status.py:954 msgid "Update this submodule" msgstr "Actualizar este submódulo" -#: cola/cmds.py:3073 +#: cola/cmds.py:3019 msgid "Update this submodule?" msgstr "¿Actualizar este submódulo?" -#: cola/widgets/branch.py:421 cola/widgets/createbranch.py:302 -#: cola/widgets/remote.py:135 +#: cola/widgets/branch.py:433 cola/widgets/createbranch.py:300 msgid "Updating" msgstr "Actualizando" -#: cola/widgets/prefs.py:350 +#: cola/widgets/prefs.py:370 msgid "Use a block cursor in diff editors" msgstr "" -#: cola/widgets/prefs.py:154 +#: cola/widgets/prefs.py:177 msgid "Use gravatar.com to lookup icons for author emails" msgstr "" -#: cola/widgets/prefs.py:166 +#: cola/widgets/prefs.py:189 msgid "User Name" msgstr "Nombre de Usuario" -#: cola/widgets/about.py:92 +#: cola/widgets/about.py:90 msgid "Version" msgstr "Versión" -#: cola/widgets/dag.py:800 cola/widgets/main.py:845 cola/widgets/main.py:966 +#: cola/widgets/dag.py:866 cola/widgets/main.py:858 cola/widgets/main.py:979 msgid "View" msgstr "Ver" -#: cola/widgets/browse.py:137 cola/widgets/status.py:278 +#: cola/widgets/browse.py:137 cola/widgets/status.py:279 msgid "View History..." msgstr "Ver historial..." @@ -3927,39 +4057,39 @@ msgstr "Ver historial..." msgid "View history for selected paths" msgstr "Ver historial para las rutas seleccionadas" -#: cola/widgets/merge.py:54 +#: cola/widgets/branch.py:224 cola/widgets/merge.py:52 msgid "Visualize" msgstr "Visualizar" -#: cola/widgets/main.py:488 +#: cola/widgets/main.py:501 msgid "Visualize All Branches..." msgstr "Visualizar todas las ramas..." -#: cola/widgets/main.py:482 +#: cola/widgets/main.py:495 msgid "Visualize Current Branch..." msgstr "Visualizar la rama actual..." -#: cola/widgets/createtag.py:73 +#: cola/widgets/createtag.py:71 msgid "Whether to sign the tag (git tag -s)" msgstr "Ya sea para firmar la etiqueta (git tag -s)" -#: cola/widgets/text.py:399 +#: cola/widgets/text.py:396 msgid "Whole Words" msgstr "" -#: cola/widgets/commitmsg.py:432 +#: cola/widgets/commitmsg.py:440 msgid "Would you like to stage and commit all modified files?" msgstr "¿Le gustaría hacer stage y commit de todos los archivos modificados?" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "XOR" msgstr "XOR" -#: cola/widgets/standard.py:1064 +#: cola/widgets/standard.py:1182 msgid "Yes" msgstr "Sí" -#: cola/cmds.py:256 +#: cola/cmds.py:255 msgid "" "You are in the middle of a merge.\n" "Cannot amend while merging." @@ -3967,36 +4097,36 @@ msgstr "" "Está en medio de un merge.\n" "No se puede modificar mientras se ejecuta el merge." -#: cola/cmds.py:2123 +#: cola/cmds.py:2074 msgid "You cannot rebase with uncommitted changes." msgstr "No puede realizar rebase con cambios en los que no se ha hecho commit." -#: cola/widgets/merge.py:227 +#: cola/widgets/merge.py:225 msgid "You must specify a revision to merge." msgstr "Debe especificar una revisión para hacer merge." -#: cola/widgets/merge.py:217 +#: cola/widgets/merge.py:215 msgid "You must specify a revision to view." msgstr "Debe especificar una revisión para hacer ver." -#: cola/widgets/dag.py:710 cola/widgets/dag.py:1588 +#: cola/widgets/dag.py:776 cola/widgets/dag.py:1645 msgid "Zoom In" msgstr "Acercar" -#: cola/widgets/dag.py:706 cola/widgets/dag.py:1594 +#: cola/widgets/dag.py:772 cola/widgets/dag.py:1651 msgid "Zoom Out" msgstr "Alejar" -#: cola/widgets/dag.py:524 cola/widgets/dag.py:714 cola/widgets/dag.py:1596 -#: cola/widgets/diff.py:785 +#: cola/widgets/dag.py:590 cola/widgets/dag.py:780 cola/widgets/dag.py:1653 +#: cola/widgets/diff.py:813 msgid "Zoom to Fit" msgstr "Ajustar el zoom" -#: cola/widgets/grep.py:112 +#: cola/widgets/grep.py:110 msgid "command-line arguments" msgstr "argumentos de la línea de comandos" -#: cola/widgets/main.py:932 cola/widgets/main.py:938 +#: cola/widgets/main.py:945 cola/widgets/main.py:951 msgid "error: unable to execute git" msgstr "error: imposible ejecutar git" @@ -4005,45 +4135,41 @@ msgstr "error: imposible ejecutar git" msgid "exit code %s" msgstr "código de salida %s" -#: cola/app.py:301 +#: cola/app.py:304 #, python-format msgid "fatal: \"%s\" is not a directory. Please specify a correct --repo ." msgstr "fatal: \"%s\" no es una carpeta. Por favor especifique un correcto --repo ." -#: cola/widgets/main.py:928 +#: cola/widgets/main.py:941 #, python-format msgid "git cola version %s" msgstr "versión de git cola %s" -#: cola/widgets/startup.py:35 +#: cola/widgets/startup.py:34 msgid "git-cola" msgstr "git-cola" -#: cola/difftool.py:63 +#: cola/difftool.py:82 msgid "git-cola diff" msgstr "git-cola diff" -#: cola/widgets/submodules.py:81 +#: cola/widgets/submodules.py:80 msgid "git://git.example.com/repo.git" msgstr "git://git.example.com/repo.git" -#: cola/widgets/grep.py:132 +#: cola/widgets/grep.py:130 msgid "grep result..." msgstr "resultados de grep..." -#: cola/widgets/about.py:486 +#: cola/widgets/about.py:469 msgid "hotkeys.html" msgstr "hotkeys.html" -#: cola/widgets/submodules.py:85 +#: cola/widgets/submodules.py:84 msgid "path/to/submodule" msgstr "ruta/a/submódulo" -#: cola/cmds.py:2537 -msgid "unknown" -msgstr "desconocido" - -#: cola/widgets/createtag.py:63 +#: cola/widgets/createtag.py:61 msgid "vX.Y.Z" msgstr "vX.Y.Z" @@ -4052,14 +4178,18 @@ msgid "x 1" msgstr "x 1" #: cola/hidpi.py:44 +msgid "x 1.25" +msgstr "" + +#: cola/hidpi.py:45 msgid "x 1.5" msgstr "x 1.5" -#: cola/hidpi.py:45 +#: cola/hidpi.py:46 msgid "x 2" msgstr "x 2" -#: cola/widgets/search.py:53 cola/widgets/search.py:58 +#: cola/widgets/search.py:52 cola/widgets/search.py:57 msgid "yyyy-MM-dd" msgstr "aaaa-MM-dd" @@ -4134,9 +4264,16 @@ msgstr "aaaa-MM-dd" #~ "ctrl+q = cancelar y abortar el rebase\n" #~ "ctrl+d = arrancar la herramienta difftool\n" +#, python-format +#~ msgid "A stash named \"%s\" already exists" +#~ msgstr "Un \"stash\" llamado \"%s\" ya existe" + #~ msgid "Delete selected branch?" #~ msgstr "¿Desea eliminar la rama seleccionada?" +#~ msgid "Error: Stash exists" +#~ msgstr "Error: ya existe el Stash" + #~ msgid "Hide Details.." #~ msgstr "Ocultar detalles..." @@ -4190,3 +4327,6 @@ msgstr "aaaa-MM-dd" #~ msgid "title" #~ msgstr "título" + +#~ msgid "unknown" +#~ msgstr "desconocido" diff --git a/cola/i18n/fr.po b/cola/i18n/fr.po index 7edbf4de..1eac2b87 100644 --- a/cola/i18n/fr.po +++ b/cola/i18n/fr.po @@ -22,7 +22,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Poedit-Bookmarks: -1,537,-1,-1,-1,-1,-1,-1,-1,-1\n" -#: cola/widgets/patch.py:86 +#: cola/widgets/diff.py:1680 msgid "" "\n" "

\n" @@ -38,7 +38,7 @@ msgstr "" "

\n" " " -#: cola/widgets/about.py:455 +#: cola/widgets/about.py:438 #, python-format msgid "" "\n" @@ -91,7 +91,7 @@ msgstr "" "\n" " " -#: cola/widgets/about.py:180 +#: cola/widgets/about.py:182 #, python-format msgid "" "\n" @@ -120,7 +120,7 @@ msgstr "" " \n" " " -#: cola/widgets/about.py:387 +#: cola/widgets/about.py:370 #, python-format msgid "" "\n" @@ -135,7 +135,7 @@ msgstr "" "
\n" " " -#: cola/widgets/status.py:1310 +#: cola/widgets/status.py:1311 #, python-format msgid "" "\n" @@ -160,7 +160,7 @@ msgstr "" " %(basename)s = nom de fichier sans l'extension\n" " %(ext)s = extension du fichier\n" -#: cola/sequenceeditor.py:700 +#: cola/sequenceeditor.py:695 msgid "" "\n" "Commands\n" @@ -199,7 +199,7 @@ msgid "" "ctrl+d = launch difftool\n" msgstr "" -#: cola/widgets/finder.py:65 +#: cola/widgets/finder.py:64 msgid "" "\n" "Keyboard Shortcuts\n" @@ -226,45 +226,71 @@ msgstr "" "\n" "Les flèches du haut et du bas font naviguer le curseur entre les champs d'entrée et les résultats.\n" -#: cola/widgets/dag.py:894 +#: cola/widgets/prefs.py:133 +msgid "" +"\n" +"This option determines how the supplied commit message should be\n" +"cleaned up before committing.\n" +"\n" +"The can be strip, whitespace, verbatim, scissors or default.\n" +"\n" +"strip\n" +" Strip leading and trailing empty lines, trailing whitespace,\n" +" commentary and collapse consecutive empty lines.\n" +"\n" +"whitespace\n" +" Same as strip except #commentary is not removed.\n" +"\n" +"verbatim\n" +" Do not change the message at all.\n" +"\n" +"scissors\n" +" Same as whitespace except that everything from (and including) the line\n" +" found below is truncated, if the message is to be edited.\n" +" \"#\" can be customized with core.commentChar.\n" +"\n" +" # ------------------------ >8 ------------------------" +msgstr "" + +#: cola/widgets/dag.py:960 msgid " - DAG" msgstr " - DAG" -#: cola/widgets/recent.py:54 +#: cola/widgets/recent.py:52 msgid " commits ago" msgstr " commits avant" -#: cola/cmds.py:1197 +#: cola/cmds.py:1198 #, python-format msgid "\"%(branch)s\" has been deleted from \"%(remote)s\"." msgstr "La branche « %(branch)s » a été supprimée de « %(remote)s »." -#: cola/widgets/createbranch.py:316 +#: cola/widgets/createbranch.py:314 #, python-format msgid "\"%(command)s\" returned exit status \"%(status)d\"" msgstr "La commande « %(command)s » a retourné le statut de sortie  %(status)d »" -#: cola/interaction.py:39 +#: cola/interaction.py:38 #, python-format msgid "\"%(command)s\" returned exit status %(status)d" msgstr "La commande « %(command)s » a retourné le statut de sortie %(status)d" -#: cola/guicmds.py:157 +#: cola/guicmds.py:156 #, python-format msgid "\"%s\" already exists" msgstr "« %s » existe déjà" -#: cola/widgets/clone.py:206 +#: cola/widgets/clone.py:204 #, python-format msgid "\"%s\" already exists, cola will create a new directory" msgstr "« %s » existe déjà, git-cola va créer un nouveau répertoire" -#: cola/cmds.py:2349 +#: cola/cmds.py:2300 #, python-format msgid "\"%s\" requires a selected file." msgstr "« %s » nécessite de sélectionner un fichier." -#: cola/cmds.py:2087 +#: cola/cmds.py:2038 msgid "" "\"git rebase --update-refs\" automatically force-updates any\n" "branches that point to commits that are being rebased.\n" @@ -274,7 +300,11 @@ msgid "" "Using this feature is helpful for \"stacked\" branch workflows." msgstr "" -#: cola/sequenceeditor.py:321 +#: cola/models/stash.py:145 +msgid "\"git stash drop\" did not return a ref to rename." +msgstr "" + +#: cola/sequenceeditor.py:318 msgid "#" msgstr "#" @@ -283,37 +313,37 @@ msgstr "#" msgid "%(project)s: %(branch)s - Browse" msgstr "%(project)s : %(branch)s - Naviguer" -#: cola/widgets/dag.py:887 +#: cola/widgets/dag.py:953 #, python-format msgid "%(project)s: %(ref)s - DAG" msgstr "%(project)s : %(ref)s - DAG" -#: cola/models/browse.py:315 +#: cola/models/browse.py:314 #, python-format msgid "%d days ago" msgstr "il y a %d jours" -#: cola/models/browse.py:314 +#: cola/models/browse.py:313 #, python-format msgid "%d hours ago" msgstr "il y a %d heures" -#: cola/models/browse.py:307 cola/models/browse.py:311 +#: cola/models/browse.py:306 cola/models/browse.py:310 #, python-format msgid "%d minutes ago" msgstr "il y a %d minutes" -#: cola/cmds.py:376 +#: cola/cmds.py:377 #, python-format msgid "%d patch(es) applied." msgstr "%d patch(s) appliqué(s)." -#: cola/widgets/createbranch.py:281 +#: cola/widgets/createbranch.py:279 #, python-format msgid "%d skipped" msgstr "%d passé(s)" -#: cola/cmds.py:2580 +#: cola/cmds.py:2522 #, python-format msgid "" "%s appears to contain merge conflicts.\n" @@ -326,36 +356,36 @@ msgstr "" "Vous devriez ignorer ce fichier.\n" "Le commiter malgré tout ?" -#: cola/widgets/startup.py:263 +#: cola/widgets/startup.py:262 #, python-format msgid "%s could not be opened. Remove from bookmarks?" msgstr "%s n'a pu être ouvert. Le retirer des marque-pages ?" -#: cola/app.py:498 cola/widgets/bookmarks.py:482 +#: cola/app.py:501 cola/widgets/bookmarks.py:481 #, python-format msgid "%s is not a Git repository." msgstr "%s n'est pas un dépôt Git." -#: cola/cmds.py:1015 +#: cola/cmds.py:1016 #, python-format msgid "%s will be removed from your bookmarks." msgstr "%s sera supprimé de vos marque-pages." -#: cola/cmds.py:1028 +#: cola/cmds.py:1029 #, python-format msgid "%s will be removed from your recent repositories." msgstr "%s sera supprimé de vos dépôts récents." -#: cola/cmds.py:1711 +#: cola/cmds.py:1663 #, python-format msgid "%s: No such file or directory." msgstr "%s : fichier ou répertoire inexistant." -#: cola/widgets/main.py:734 +#: cola/widgets/main.py:747 msgid "&Edit" msgstr "&Éditer" -#: cola/widgets/main.py:676 +#: cola/widgets/main.py:689 msgid "&File" msgstr "&Fichier" @@ -363,43 +393,43 @@ msgstr "&Fichier" msgid "(Amending)" msgstr "(Correction)" -#: cola/widgets/compare.py:36 +#: cola/widgets/compare.py:35 msgid "*** Branch Point ***" msgstr "*** Point de branchement ***" -#: cola/widgets/compare.py:37 +#: cola/widgets/compare.py:36 msgid "*** Sandbox ***" msgstr "*** Bac à sable ***" -#: cola/widgets/diff.py:788 +#: cola/widgets/diff.py:816 msgid "100%" msgstr "100 %" -#: cola/widgets/diff.py:789 +#: cola/widgets/diff.py:817 msgid "200%" msgstr "200 %" -#: cola/widgets/diff.py:786 +#: cola/widgets/diff.py:814 msgid "25%" msgstr "25 %" -#: cola/widgets/diff.py:790 +#: cola/widgets/diff.py:818 msgid "400%" msgstr "400 %" -#: cola/widgets/diff.py:787 +#: cola/widgets/diff.py:815 msgid "50%" msgstr "50 %" -#: cola/widgets/diff.py:791 +#: cola/widgets/diff.py:819 msgid "800%" msgstr "800 %" -#: cola/widgets/finder.py:119 +#: cola/widgets/finder.py:118 msgid " ..." msgstr "..." -#: cola/cmds.py:1734 +#: cola/cmds.py:1686 msgid "" "A commit template has not been configured.\n" "Use \"git config\" to define \"commit.template\"\n" @@ -409,81 +439,76 @@ msgstr "" "Utilisez « git config » pour définir « commit.template »\n" "de sorte qu'il pointe vers un modèle de commit." -#: cola/cmds.py:1784 +#: cola/cmds.py:1735 #, python-format msgid "A hook must be provided at \"%s\"" msgstr "Un crochet doit être spécifié à « %s »" -#: cola/widgets/stash.py:236 -#, python-format -msgid "A stash named \"%s\" already exists" -msgstr "Un stash nommé « %s » existe déjà" - -#: cola/widgets/cfgactions.py:82 cola/widgets/main.py:622 +#: cola/widgets/cfgactions.py:81 cola/widgets/main.py:635 msgid "Abort" msgstr "Abandonner" -#: cola/widgets/cfgactions.py:149 cola/widgets/cfgactions.py:155 +#: cola/widgets/cfgactions.py:148 cola/widgets/cfgactions.py:154 msgid "Abort Action" msgstr "Abandonner l'action" -#: cola/cmds.py:132 +#: cola/cmds.py:131 msgid "Abort Applying Patch" msgstr "" -#: cola/cmds.py:126 +#: cola/cmds.py:125 msgid "Abort Applying Patch..." msgstr "" -#: cola/widgets/main.py:245 +#: cola/widgets/main.py:244 msgid "Abort Applying Patches..." msgstr "" -#: cola/cmds.py:162 +#: cola/cmds.py:161 msgid "Abort Cherry-Pick" msgstr "" -#: cola/cmds.py:156 cola/widgets/main.py:334 +#: cola/cmds.py:155 cola/widgets/main.py:329 msgid "Abort Cherry-Pick..." msgstr "" -#: cola/cmds.py:193 +#: cola/cmds.py:192 msgid "Abort Merge" msgstr "Abandonner la fusion" -#: cola/cmds.py:186 cola/widgets/main.py:368 +#: cola/cmds.py:185 cola/widgets/main.py:363 msgid "Abort Merge..." msgstr "Abandonner la fusion..." -#: cola/widgets/cfgactions.py:154 +#: cola/widgets/cfgactions.py:153 msgid "Abort the action?" msgstr "Abandonner l'action ?" -#: cola/widgets/main.py:250 +#: cola/widgets/main.py:245 msgid "Abort the current \"git am\" patch session" msgstr "" -#: cola/cmds.py:159 +#: cola/cmds.py:158 msgid "" "Aborting a cherry-pick can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:129 +#: cola/cmds.py:128 msgid "" "Aborting a patch can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:127 +#: cola/cmds.py:126 msgid "Aborting applying the current patch?" msgstr "" -#: cola/cmds.py:157 +#: cola/cmds.py:156 msgid "Aborting the current cherry-pick?" msgstr "" -#: cola/cmds.py:189 +#: cola/cmds.py:188 msgid "" "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." @@ -491,23 +516,23 @@ msgstr "" "Abandonner la fusion courante entraînera la perte de *TOUTES* les modifications non commitées.\n" "La récupération des modifications non commitées ne sera pas possible." -#: cola/cmds.py:187 +#: cola/cmds.py:186 msgid "Aborting the current merge?" msgstr "Abandonner la fusion actuelle ?" -#: cola/widgets/about.py:91 cola/widgets/main.py:517 +#: cola/widgets/about.py:89 cola/widgets/main.py:530 msgid "About" msgstr "A propos" -#: cola/widgets/about.py:67 +#: cola/widgets/about.py:65 msgid "About git-cola" msgstr "À propos de git-cola" -#: cola/widgets/bookmarks.py:217 cola/widgets/startup.py:340 +#: cola/widgets/bookmarks.py:216 cola/widgets/startup.py:339 msgid "Accept" msgstr "Accepter" -#: cola/sequenceeditor.py:159 +#: cola/sequenceeditor.py:157 msgid "" "Accept changes and rebase\n" "Shortcut: Ctrl+Enter" @@ -515,50 +540,50 @@ msgstr "" "Accepter les modifications et rétablir\n" "Raccourcis : Ctrl+Entrée" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Action Name" msgstr "Nom de l'action" -#: cola/sequenceeditor.py:528 cola/widgets/bookmarks.py:321 -#: cola/widgets/branch.py:217 cola/widgets/browse.py:374 -#: cola/widgets/commitmsg.py:99 cola/widgets/dag.py:315 -#: cola/widgets/filelist.py:110 cola/widgets/main.py:95 -#: cola/widgets/main.py:757 cola/widgets/startup.py:436 +#: cola/sequenceeditor.py:524 cola/widgets/bookmarks.py:320 +#: cola/widgets/branch.py:221 cola/widgets/browse.py:375 +#: cola/widgets/commitmsg.py:105 cola/widgets/dag.py:314 +#: cola/widgets/filelist.py:107 cola/widgets/main.py:93 +#: cola/widgets/main.py:770 cola/widgets/startup.py:435 msgid "Actions" msgstr "Actions" -#: cola/widgets/commitmsg.py:101 +#: cola/widgets/commitmsg.py:107 msgid "Actions..." msgstr "Actions..." -#: cola/widgets/bookmarks.py:71 cola/widgets/gitignore.py:64 -#: cola/widgets/patch.py:103 cola/widgets/patch.py:117 -#: cola/widgets/status.py:1381 +#: cola/widgets/bookmarks.py:70 cola/widgets/diff.py:1697 +#: cola/widgets/diff.py:1711 cola/widgets/gitignore.py:63 +#: cola/widgets/status.py:1382 msgid "Add" msgstr "Ajouter" -#: cola/widgets/bookmarks.py:470 +#: cola/widgets/bookmarks.py:469 msgid "Add Favorite" msgstr "Ajouter comme marque-page" -#: cola/widgets/editremotes.py:374 +#: cola/widgets/editremotes.py:373 msgid "Add Remote" msgstr "Ajouter un élément distant" -#: cola/widgets/toolbar.py:315 +#: cola/widgets/toolbar.py:320 msgid "Add Separator" msgstr "Ajouter un séparateur" -#: cola/cmds.py:3030 cola/widgets/submodules.py:42 -#: cola/widgets/submodules.py:111 +#: cola/cmds.py:2976 cola/widgets/submodules.py:41 +#: cola/widgets/submodules.py:110 msgid "Add Submodule" msgstr "Ajouter un sous-module" -#: cola/cmds.py:3027 cola/widgets/main.py:381 +#: cola/cmds.py:2973 cola/widgets/main.py:376 msgid "Add Submodule..." msgstr "Ajouter un sous-module..." -#: cola/widgets/editremotes.py:62 +#: cola/widgets/editremotes.py:61 msgid "" "Add and remove remote repositories using the \n" "Add(+) and Delete(-) buttons on the left-hand side.\n" @@ -572,63 +597,63 @@ msgstr "" "Les éléments distants peuvent être renommés en les sélectionnant dans la liste\n" "et en appuyant sur « Entrée », ou en double-cliquant." -#: cola/widgets/editremotes.py:81 +#: cola/widgets/editremotes.py:80 msgid "Add new remote git repository" msgstr "Ajouter un nouveau dépôt Git distant" -#: cola/widgets/patch.py:103 +#: cola/widgets/diff.py:1697 msgid "Add patches (+)" msgstr "Ajouter les patchs (+)" -#: cola/widgets/editremotes.py:433 +#: cola/widgets/editremotes.py:431 msgid "Add remote" msgstr "Ajouter un élément distant" -#: cola/cmds.py:3028 +#: cola/cmds.py:2974 msgid "Add this submodule?" msgstr "Ajouter ce sous-module ?" -#: cola/widgets/gitignore.py:54 +#: cola/widgets/gitignore.py:53 msgid "Add to .gitignore" msgstr "Ajouter à .gitignore" -#: cola/widgets/status.py:286 +#: cola/widgets/status.py:287 msgid "Add to Git Annex" msgstr "Ajouter à Git Annex" -#: cola/widgets/status.py:290 +#: cola/widgets/status.py:291 msgid "Add to Git LFS" msgstr "Ajouter à Git LFS" -#: cola/widgets/gitignore.py:28 +#: cola/widgets/gitignore.py:27 msgid "Add to exclusions" msgstr "Marquer à exclure" -#: cola/widgets/gitignore.py:55 +#: cola/widgets/gitignore.py:54 msgid "Add to local .git/info/exclude" msgstr "Ajouter au fichier local .git/info/exclude" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Additions" msgstr "Ajouts" -#: cola/widgets/archive.py:134 +#: cola/widgets/archive.py:132 msgid "Advanced" msgstr "Avancé" -#: cola/widgets/main.py:522 +#: cola/widgets/main.py:535 msgid "Against Commit... (Diff Mode)" msgstr "" -#: cola/models/browse.py:33 +#: cola/models/browse.py:32 msgid "Age" msgstr "Âge" -#: cola/widgets/prefs.py:403 +#: cola/widgets/prefs.py:441 msgid "All Repositories" msgstr "Tous les dépôts" -#: cola/cmds.py:3110 +#: cola/cmds.py:3056 #, python-format msgid "" "All submodules will be updated using\n" @@ -637,35 +662,35 @@ msgstr "" "Tous les sous-modules seront mis à jour avec\n" "« %s »" -#: cola/widgets/remote.py:195 +#: cola/widgets/remote.py:199 msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care" msgstr "Autoriser les mises à jour non rapides. Utiliser « force » peut provoquer des pertes de commit au niveau du dépôt distant : utilisez-le avec précaution" -#: cola/widgets/merge.py:61 +#: cola/widgets/merge.py:59 msgid "Always create a merge commit when enabled, even when the merge is a fast-forward update" msgstr "Toujours créer un commit fusionné quand cela est possible, même si la fusion est une mise à jour rapide" -#: cola/cmds.py:221 +#: cola/cmds.py:220 msgid "Amend" msgstr "Correction" -#: cola/widgets/commitmsg.py:463 +#: cola/widgets/commitmsg.py:471 msgid "Amend Commit" msgstr "Corriger le commit" -#: cola/widgets/commitmsg.py:110 cola/widgets/main.py:194 +#: cola/widgets/commitmsg.py:116 cola/widgets/main.py:193 msgid "Amend Last Commit" msgstr "Corriger le dernier commit" -#: cola/widgets/commitmsg.py:462 +#: cola/widgets/commitmsg.py:470 msgid "Amend the published commit?" msgstr "Corriger le commit publié ?" -#: cola/widgets/main.py:1157 +#: cola/widgets/main.py:1170 msgid "Amending" msgstr "Correction" -#: cola/widgets/cfgactions.py:151 +#: cola/widgets/cfgactions.py:150 msgid "" "An action is still running.\n" "Terminating it could result in data loss." @@ -673,7 +698,7 @@ msgstr "" "Une action est toujours en cours.\n" "L'interrompre pourrait entraîner une perte de données." -#: cola/cmds.py:2804 +#: cola/cmds.py:2750 msgid "" "An unsigned, lightweight tag will be created instead.\n" "Create an unsigned tag?" @@ -681,56 +706,56 @@ msgstr "" "Un marqueur non signé et léger sera créé à la place.\n" "Créer un tag non signé ?" -#: cola/widgets/prefs.py:406 +#: cola/widgets/prefs.py:444 msgid "Appearance" msgstr "Apparence" -#: cola/widgets/diff.py:1230 +#: cola/widgets/diff.py:1304 msgid "Append Patch" msgstr "" -#: cola/widgets/diff.py:1299 +#: cola/widgets/diff.py:1373 msgid "Append Patch..." msgstr "" -#: cola/widgets/patch.py:112 cola/widgets/stash.py:48 cola/widgets/stash.py:107 -#: cola/widgets/toolbar.py:323 +#: cola/widgets/diff.py:1706 cola/widgets/stash.py:50 cola/widgets/stash.py:110 +#: cola/widgets/toolbar.py:328 msgid "Apply" msgstr "Appliquer" -#: cola/widgets/patch.py:75 +#: cola/widgets/diff.py:1669 msgid "Apply Patches" msgstr "Appliquer les patchs" -#: cola/widgets/main.py:239 +#: cola/widgets/main.py:238 msgid "Apply Patches..." msgstr "Appliquer les patchs..." -#: cola/widgets/stash.py:64 +#: cola/widgets/stash.py:66 msgid "Apply and drop the selected stash (git stash pop)" msgstr "Appliquer et supprimer le remisage sélectionné (git stash pop)" -#: cola/widgets/stash.py:48 +#: cola/widgets/stash.py:50 msgid "Apply the selected stash" msgstr "Appliquer la remise actuelle" -#: cola/widgets/main.py:1167 +#: cola/widgets/main.py:1180 msgid "Applying Patch" msgstr "" -#: cola/widgets/cfgactions.py:207 +#: cola/widgets/cfgactions.py:205 msgid "Arguments" msgstr "Arguments" -#: cola/qtutils.py:850 +#: cola/qtutils.py:887 msgid "Attach" msgstr "Attacher" -#: cola/models/browse.py:33 cola/models/browse.py:72 cola/widgets/dag.py:506 +#: cola/models/browse.py:32 cola/models/browse.py:71 cola/widgets/dag.py:572 msgid "Author" msgstr "Auteur" -#: cola/widgets/about.py:93 +#: cola/widgets/about.py:91 msgid "Authors" msgstr "Auteurs" @@ -738,43 +763,43 @@ msgstr "Auteurs" msgid "Auto" msgstr "Auto" -#: cola/widgets/commitmsg.py:137 cola/widgets/prefs.py:259 +#: cola/widgets/commitmsg.py:143 cola/widgets/prefs.py:280 msgid "Auto-Wrap Lines" msgstr "Retour à la ligne automatique" -#: cola/widgets/prefs.py:184 +#: cola/widgets/prefs.py:206 msgid "Autocomplete Paths" msgstr "Auto-compléter les chemins" -#: cola/widgets/prefs.py:176 +#: cola/widgets/prefs.py:198 msgid "Automatically Load Commit Message Template" msgstr "Charger automatiquement le modèle de message de commit" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Basic Regexp" msgstr "Regexp basique" -#: cola/widgets/prefs.py:255 +#: cola/widgets/prefs.py:276 msgid "Blame Viewer" msgstr "Visionneur de fichier" -#: cola/widgets/browse.py:205 +#: cola/widgets/browse.py:206 msgid "Blame selected paths" msgstr "Visionner les chemins sélectionnés" -#: cola/cmds.py:545 cola/widgets/status.py:282 +#: cola/cmds.py:546 cola/widgets/status.py:283 msgid "Blame..." msgstr "Visionner..." -#: cola/widgets/prefs.py:347 +#: cola/widgets/prefs.py:367 msgid "Bold on dark headers instead of italic" msgstr "Police en gras avec fond sombre pour les en-têtes plutôt que l'italique" -#: cola/widgets/main.py:806 cola/widgets/submodules.py:119 +#: cola/widgets/main.py:819 cola/widgets/submodules.py:118 msgid "Branch" msgstr "Branche" -#: cola/widgets/remote.py:600 +#: cola/widgets/remote.py:635 #, python-format msgid "" "Branch \"%(branch)s\" does not exist in \"%(remote)s\".\n" @@ -783,84 +808,84 @@ msgstr "" "La branche « %(branch)s » n'existe pas dans « %(remote)s ».\n" "Une nouvelle branche distante sera publiée." -#: cola/widgets/createbranch.py:258 +#: cola/widgets/createbranch.py:256 #, python-format msgid "Branch \"%s\" already exists." msgstr "La branche « %s » existe déjà." -#: cola/widgets/compare.py:44 +#: cola/widgets/compare.py:43 msgid "Branch Diff Viewer" msgstr "Visionneur de différence de branches" -#: cola/widgets/createbranch.py:259 cola/widgets/createbranch.py:271 +#: cola/widgets/createbranch.py:257 cola/widgets/createbranch.py:269 msgid "Branch Exists" msgstr "La branche existe" -#: cola/widgets/createbranch.py:98 +#: cola/widgets/createbranch.py:96 msgid "Branch Name" msgstr "Nom de branche" -#: cola/widgets/submodules.py:89 +#: cola/widgets/submodules.py:88 msgid "Branch name" msgstr "Nom de branche" -#: cola/widgets/browse.py:89 cola/widgets/main.py:1097 +#: cola/widgets/browse.py:89 cola/widgets/main.py:1110 #, python-format msgid "Branch: %s" msgstr "Branche : %s" -#: cola/widgets/branch.py:85 cola/widgets/main.py:131 +#: cola/widgets/branch.py:87 cola/widgets/main.py:129 msgid "Branches" msgstr "Branches" -#: cola/widgets/main.py:538 +#: cola/widgets/main.py:551 msgid "Branches..." msgstr "Branches..." -#: cola/widgets/about.py:414 cola/widgets/about.py:417 -#: cola/widgets/about.py:437 +#: cola/widgets/about.py:397 cola/widgets/about.py:400 +#: cola/widgets/about.py:420 msgid "Brazilian translation" msgstr "Traduction brésilienne" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse" msgstr "Parcourir" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse Commits..." msgstr "Parcourir les commits..." -#: cola/widgets/main.py:499 +#: cola/widgets/main.py:512 msgid "Browse Current Branch..." msgstr "Parcourir la branche courante..." -#: cola/widgets/main.py:505 +#: cola/widgets/main.py:518 msgid "Browse Other Branch..." msgstr "Parcourir les autres branches..." -#: cola/widgets/editremotes.py:437 cola/widgets/search.py:46 -#: cola/widgets/startup.py:65 cola/widgets/startup.py:285 +#: cola/widgets/editremotes.py:435 cola/widgets/search.py:45 +#: cola/widgets/startup.py:64 cola/widgets/startup.py:284 msgid "Browse..." msgstr "Parcourir..." -#: cola/widgets/main.py:89 +#: cola/widgets/main.py:87 msgid "Browser" msgstr "Parcourir" -#: cola/widgets/browse.py:589 +#: cola/widgets/browse.py:590 #, python-format msgid "Browsing %s" msgstr "Parcours de %s" -#: cola/widgets/commitmsg.py:118 +#: cola/widgets/commitmsg.py:124 msgid "Bypass Commit Hooks" msgstr "Contourner le crochet de commit" -#: cola/sequenceeditor.py:175 cola/widgets/standard.py:991 +#: cola/sequenceeditor.py:173 cola/widgets/standard.py:1058 msgid "Cancel" msgstr "Annuler" -#: cola/sequenceeditor.py:176 +#: cola/sequenceeditor.py:174 msgid "" "Cancel rebase\n" "Shortcut: Ctrl+Q" @@ -868,188 +893,200 @@ msgstr "" "Annuler le rétablissement\n" "Raccourcis : Ctrl+Q" -#: cola/cmds.py:254 +#: cola/cmds.py:253 msgid "Cannot Amend" msgstr "Impossible de corriger" -#: cola/cmds.py:560 +#: cola/cmds.py:561 #, python-format msgid "Cannot exec \"%s\": please configure a blame viewer" msgstr "Impossible d'exécuter « %s » : veuillez configurer un visionneur de fichier" -#: cola/cmds.py:3146 +#: cola/cmds.py:3092 #, python-format msgid "Cannot exec \"%s\": please configure a history browser" msgstr "Impossible d'exécuter « %s » : veuillez configurer un navigateur d'historique" -#: cola/cmds.py:1583 +#: cola/cmds.py:1571 #, python-format msgid "Cannot exec \"%s\": please configure your editor" msgstr "Impossible d'exécuter « %s » : veuillez configurer votre éditeur" -#: cola/models/browse.py:336 +#: cola/models/browse.py:335 msgid "Changed Upstream" msgstr "Source modifiée" -#: cola/widgets/prefs.py:186 +#: cola/widgets/prefs.py:208 msgid "Check Published Commits when Amending" msgstr "Vérifier la publication d'un commit lors de sa correction" -#: cola/widgets/commitmsg.py:130 +#: cola/widgets/commitmsg.py:136 msgid "Check Spelling" msgstr "Vérifier l'orthographe" -#: cola/widgets/prefs.py:265 +#: cola/widgets/prefs.py:286 msgid "Check spelling" msgstr "Vérifier l'orthographe" -#: cola/widgets/prefs.py:163 +#: cola/widgets/prefs.py:186 msgid "Check whether a commit has been published when amending" msgstr "Vérifier si un commit a été publié avant qu'il soit corriger" -#: cola/guicmds.py:62 cola/widgets/branch.py:222 +#: cola/guicmds.py:61 cola/widgets/branch.py:233 msgid "Checkout" msgstr "Emprunter" -#: cola/widgets/createbranch.py:130 +#: cola/widgets/createbranch.py:128 msgid "Checkout After Creation" msgstr "Emprunt après création" -#: cola/guicmds.py:62 cola/widgets/dag.py:410 +#: cola/guicmds.py:61 cola/widgets/dag.py:409 msgid "Checkout Branch" msgstr "Emprunter la branche" -#: cola/widgets/dag.py:414 +#: cola/widgets/dag.py:413 msgid "Checkout Detached HEAD" msgstr "Emprunter le HEAD détaché" -#: cola/cmds.py:480 cola/cmds.py:518 +#: cola/cmds.py:481 cola/cmds.py:519 msgid "Checkout Files" msgstr "" -#: cola/widgets/branch.py:226 +#: cola/widgets/branch.py:237 msgid "Checkout as new branch" msgstr "Emprunter comme nouvelle branche" -#: cola/cmds.py:507 +#: cola/cmds.py:508 msgid "Checkout files from our branch (HEAD)" msgstr "" -#: cola/cmds.py:511 +#: cola/cmds.py:512 msgid "Checkout files from our branch?" msgstr "" -#: cola/cmds.py:469 +#: cola/cmds.py:470 msgid "Checkout files from their branch (MERGE_HEAD)" msgstr "" -#: cola/cmds.py:473 +#: cola/cmds.py:474 msgid "Checkout files from their branch?" msgstr "" -#: cola/widgets/main.py:576 +#: cola/widgets/main.py:589 msgid "Checkout..." msgstr "Emprunter..." -#: cola/widgets/dag.py:387 cola/widgets/search.py:79 +#: cola/widgets/dag.py:386 cola/widgets/search.py:78 msgid "Cherry Pick" msgstr "Copier" -#: cola/guicmds.py:73 +#: cola/guicmds.py:72 msgid "Cherry-Pick Commit" msgstr "Copier commit" -#: cola/widgets/main.py:328 +#: cola/widgets/main.py:323 msgid "Cherry-Pick..." msgstr "Copier..." -#: cola/cmds.py:584 +#: cola/cmds.py:585 msgid "Cherry-pick failed" msgstr "" -#: cola/widgets/main.py:1161 +#: cola/widgets/main.py:1174 msgid "Cherry-picking" msgstr "" -#: cola/widgets/diff.py:1247 +#: cola/widgets/diff.py:1321 msgid "Choose Patch..." msgstr "" -#: cola/widgets/search.py:319 +#: cola/widgets/search.py:318 msgid "Choose Paths" msgstr "Choisir les chemins" -#: cola/widgets/grep.py:116 +#: cola/widgets/grep.py:114 msgid "Choose the \"git grep\" regular expression mode" msgstr "Choisissez le mode d'expression régulière pour « git grep »" -#: cola/widgets/bookmarks.py:229 cola/widgets/startup.py:352 +#: cola/widgets/bookmarks.py:228 cola/widgets/startup.py:351 msgid "Clear Default Repository" msgstr "Effacer le dépôt par défaut" -#: cola/widgets/commitmsg.py:305 +#: cola/widgets/commitmsg.py:313 msgid "Clear commit message" msgstr "Effacer le message de commit" -#: cola/widgets/commitmsg.py:302 +#: cola/widgets/commitmsg.py:310 msgid "Clear commit message?" msgstr "Effacer le message de commit ?" -#: cola/widgets/commitmsg.py:62 +#: cola/widgets/commitmsg.py:63 msgid "Clear..." msgstr "Effacer..." -#: cola/widgets/clone.py:126 +#: cola/widgets/clone.py:124 msgid "Clone" msgstr "Cloner" -#: cola/widgets/clone.py:62 cola/widgets/clone.py:104 +#: cola/widgets/clone.py:61 cola/widgets/clone.py:102 msgid "Clone Repository" msgstr "Cloner le dépôt" -#: cola/widgets/main.py:465 cola/widgets/startup.py:58 +#: cola/widgets/main.py:478 cola/widgets/startup.py:57 msgid "Clone..." msgstr "Cloner..." -#: cola/widgets/clone.py:62 +#: cola/widgets/clone.py:61 #, python-format msgid "Cloning repository at %s" msgstr "Cloner le dépôt à %s" -#: cola/qtutils.py:757 cola/qtutils.py:807 cola/widgets/about.py:508 -#: cola/widgets/remote.py:328 cola/widgets/text.py:1094 +#: cola/qtutils.py:788 cola/qtutils.py:838 cola/widgets/about.py:491 +#: cola/widgets/remote.py:362 cola/widgets/text.py:1090 msgid "Close" msgstr "Fermer" -#: cola/widgets/text.py:402 +#: cola/widgets/remote.py:222 +msgid "Close dialog when completed" +msgstr "" + +#: cola/widgets/remote.py:221 +msgid "Close on completion" +msgstr "" + +#: cola/widgets/text.py:399 msgid "Close the find bar" msgstr "" -#: cola/qtutils.py:623 +#: cola/qtutils.py:651 msgid "Close..." msgstr "Fermer..." -#: cola/widgets/recent.py:71 +#: cola/widgets/recent.py:69 msgid "Collapse all" msgstr "Tout réduire" -#: cola/sequenceeditor.py:323 +#: cola/sequenceeditor.py:320 msgid "Command" msgstr "Commande" -#: cola/widgets/main.py:163 cola/widgets/merge.py:74 +#: cola/widgets/main.py:161 cola/widgets/merge.py:72 msgid "Commit" msgstr "Commit" -#: cola/cmds.py:837 +#: cola/widgets/prefs.py:192 +msgid "Commit Message Cleanup" +msgstr "" + +#: cola/widgets/commitmsg.py:495 msgid "Commit failed" msgstr "Le commit a échoué" -#: cola/widgets/commitmsg.py:61 +#: cola/widgets/commitmsg.py:62 msgid "Commit staged changes" msgstr "Commiter les modifications pré-commitées" -#: cola/widgets/commitmsg.py:93 +#: cola/widgets/commitmsg.py:94 msgid "" "Commit staged changes\n" "Shortcut: Ctrl+Enter" @@ -1057,361 +1094,365 @@ msgstr "" "Commit des modifications\n" "Raccourci : Ctrl+Entrée" -#: cola/widgets/commitmsg.py:564 +#: cola/widgets/commitmsg.py:590 msgid "Commit summary" msgstr "Résumé du commit" -#: cola/widgets/main.py:259 +#: cola/widgets/main.py:253 msgid "Commit the current state and continue applying patches" msgstr "" -#: cola/widgets/merge.py:70 +#: cola/widgets/merge.py:68 msgid "Commit the merge if there are no conflicts. Uncheck to leave the merge uncommitted" msgstr "Commiter la fusion s'il n'y a pas de conflits. Décocher pour laisser la fusion non commitée" -#: cola/widgets/commitmsg.py:58 cola/widgets/commitmsg.py:95 -#: cola/widgets/main.py:778 cola/widgets/main.py:779 +#: cola/widgets/commitmsg.py:59 cola/widgets/commitmsg.py:96 +#: cola/widgets/main.py:791 cola/widgets/main.py:792 msgid "Commit@@verb" msgstr "Commiter" -#: cola/difftool.py:78 cola/widgets/compare.py:70 +#: cola/widgets/dag.py:487 +msgid "Commits authored by me" +msgstr "" + +#: cola/difftool.py:97 cola/widgets/compare.py:69 msgid "Compare" msgstr "Comparer" -#: cola/difftool.py:83 +#: cola/difftool.py:102 msgid "Compare All" msgstr "Tout comparer" -#: cola/widgets/toolbar.py:269 cola/widgets/toolbar.py:306 +#: cola/widgets/toolbar.py:274 cola/widgets/toolbar.py:311 msgid "Configure Toolbar" msgstr "Configurer la barre d'outils" -#: cola/widgets/remote.py:214 +#: cola/widgets/remote.py:218 msgid "Configure the remote branch as the the new upstream" msgstr "Configurer la branche distante comme la nouvelle source" -#: cola/widgets/main.py:170 +#: cola/widgets/main.py:168 msgid "Console" msgstr "Terminal" -#: cola/interaction.py:111 cola/widgets/main.py:610 +#: cola/interaction.py:109 cola/widgets/main.py:623 msgid "Continue" msgstr "Continuer" -#: cola/widgets/main.py:255 +#: cola/widgets/main.py:252 msgid "Continue Applying Patches" msgstr "" -#: cola/widgets/bookmarks.py:248 cola/widgets/main.py:742 -#: cola/widgets/startup.py:371 +#: cola/widgets/bookmarks.py:247 cola/widgets/main.py:755 +#: cola/widgets/startup.py:370 msgid "Copy" msgstr "Copier" -#: cola/widgets/status.py:268 +#: cola/widgets/status.py:269 msgid "Copy Basename to Clipboard" msgstr "Copier le nom de base dans le presse-papiers" -#: cola/widgets/diff.py:208 +#: cola/widgets/diff.py:209 msgid "Copy Diff" msgstr "" -#: cola/widgets/status.py:745 +#: cola/widgets/status.py:746 msgid "Copy Leading Path to Clipboard" msgstr "Copier le chemin principal dans le presse-papiers" -#: cola/widgets/status.py:251 +#: cola/widgets/status.py:252 msgid "Copy Path to Clipboard" msgstr "Copier le chemin dans le presse-papiers" -#: cola/widgets/status.py:259 +#: cola/widgets/status.py:260 msgid "Copy Relative Path to Clipboard" msgstr "Copier le chemin relatif dans le presse-papiers" -#: cola/sequenceeditor.py:334 cola/widgets/dag.py:474 +#: cola/sequenceeditor.py:330 cola/widgets/dag.py:473 msgid "Copy SHA-1" msgstr "Copier SHA-1" -#: cola/widgets/status.py:737 +#: cola/widgets/status.py:738 msgid "Copy..." msgstr "Copier..." -#: cola/app.py:490 +#: cola/app.py:493 #, python-format msgid "Could not open %s." msgstr "Ne peut pas ouvrir %s." -#: cola/widgets/clone.py:191 cola/widgets/clone.py:193 +#: cola/widgets/clone.py:189 cola/widgets/clone.py:191 #, python-format msgid "Could not parse Git URL: \"%s\"" msgstr "Impossible d'interpréter l'URL Git : « %s »" -#: cola/app.py:500 +#: cola/app.py:503 msgid "Create" msgstr "Créer" -#: cola/widgets/createbranch.py:86 cola/widgets/createbranch.py:135 -#: cola/widgets/createbranch.py:301 cola/widgets/dag.py:369 +#: cola/widgets/createbranch.py:84 cola/widgets/createbranch.py:133 +#: cola/widgets/createbranch.py:299 cola/widgets/dag.py:368 msgid "Create Branch" msgstr "Créer branche" -#: cola/widgets/dag.py:373 +#: cola/widgets/dag.py:372 msgid "Create Patch" msgstr "Créer patch" -#: cola/widgets/remote.py:606 +#: cola/widgets/remote.py:641 msgid "Create Remote Branch" msgstr "Créer une branche distante" -#: cola/widgets/commitmsg.py:124 cola/widgets/merge.py:78 +#: cola/widgets/commitmsg.py:130 cola/widgets/merge.py:76 msgid "Create Signed Commit" msgstr "Créer un commit signé" -#: cola/widgets/createtag.py:55 cola/widgets/createtag.py:91 -#: cola/widgets/dag.py:377 +#: cola/widgets/createtag.py:53 cola/widgets/createtag.py:89 +#: cola/widgets/dag.py:376 msgid "Create Tag" msgstr "Créer marque" -#: cola/widgets/main.py:544 +#: cola/widgets/main.py:557 msgid "Create Tag..." msgstr "Créer une marque..." -#: cola/cmds.py:2807 +#: cola/cmds.py:2753 msgid "Create Unsigned Tag" msgstr "Créer un marqueur non signé" -#: cola/widgets/remote.py:188 +#: cola/widgets/remote.py:192 msgid "Create a merge commit even when the merge resolves as a fast-forward" msgstr "Créer un commit fusionné même quand la fusion se résout rapidement" -#: cola/widgets/remote.py:605 +#: cola/widgets/remote.py:640 msgid "Create a new remote branch?" msgstr "Créer une nouvelle branche distante ?" -#: cola/app.py:499 +#: cola/app.py:502 msgid "Create a new repository at that location?" msgstr "Créer un nouveau dépôt à cet emplacement ?" -#: cola/widgets/submodules.py:100 +#: cola/widgets/submodules.py:99 msgid "Create a shallow clone with history truncated to the specified number of revisions. 0 performs a full clone." msgstr "Créer un clonage de surface avec l'historique limité au nombre de révision spécifiée. 0 pour un clonage en entier." -#: cola/widgets/main.py:551 +#: cola/widgets/main.py:564 msgid "Create..." msgstr "Créer..." -#: cola/cmds.py:2843 +#: cola/cmds.py:2789 #, python-format msgid "Created a new tag named \"%s\"" msgstr "Créer un nouveau marqueur appelé « %s »" -#: cola/widgets/prefs.py:266 +#: cola/widgets/prefs.py:287 msgid "Ctrl+MouseWheel to Zoom" msgstr "" -#: cola/widgets/prefs.py:404 +#: cola/widgets/prefs.py:442 msgid "Current Repository" msgstr "Dépôt actuel" -#: cola/widgets/status.py:1371 +#: cola/widgets/status.py:1372 msgid "Custom Copy Actions" msgstr "Actions de copie personnalisées" -#: cola/widgets/status.py:273 +#: cola/widgets/status.py:274 msgid "Customize..." msgstr "Personnaliser..." -#: cola/widgets/main.py:740 +#: cola/widgets/main.py:753 msgid "Cut" msgstr "Couper" -#: cola/widgets/about.py:411 cola/widgets/about.py:442 +#: cola/widgets/about.py:394 cola/widgets/about.py:425 msgid "Czech translation" msgstr "Traduction tchèque" -#: cola/widgets/main.py:592 +#: cola/widgets/main.py:605 msgid "DAG..." msgstr "DAG..." -#: cola/icons.py:55 +#: cola/icons.py:54 msgid "Dark Theme" msgstr "Thème sombre" -#: cola/widgets/dag.py:506 +#: cola/widgets/dag.py:572 msgid "Date, Time" msgstr "Date, heure" -#: cola/icons.py:54 cola/themes.py:637 +#: cola/icons.py:53 cola/themes.py:643 msgid "Default" msgstr "Défaut" -#: cola/widgets/prefs.py:126 +#: cola/widgets/prefs.py:124 msgid "" "Default directory when exporting patches.\n" "Relative paths are relative to the current repository.\n" "Absolute path are used as-is." msgstr "" -#: cola/cmds.py:925 cola/guicmds.py:26 cola/guicmds.py:35 -#: cola/widgets/bookmarks.py:75 cola/widgets/bookmarks.py:251 -#: cola/widgets/main.py:746 cola/widgets/startup.py:373 +#: cola/cmds.py:923 cola/guicmds.py:25 cola/guicmds.py:34 +#: cola/widgets/bookmarks.py:74 cola/widgets/bookmarks.py:250 +#: cola/widgets/main.py:759 cola/widgets/startup.py:372 msgid "Delete" msgstr "Supprimer" -#: cola/cmds.py:1088 +#: cola/cmds.py:1089 #, python-format msgid "Delete %d file(s)?" msgstr "Supprimer %d fichier(s) ?" -#: cola/cmds.py:1016 +#: cola/cmds.py:1017 msgid "Delete Bookmark" msgstr "Supprimer marque-page" -#: cola/cmds.py:1014 +#: cola/cmds.py:1015 msgid "Delete Bookmark?" msgstr "Supprimer le marque-page ?" -#: cola/cmds.py:1114 cola/cmds.py:1117 cola/guicmds.py:26 -#: cola/widgets/branch.py:268 +#: cola/cmds.py:1115 cola/cmds.py:1118 cola/guicmds.py:25 +#: cola/widgets/branch.py:277 msgid "Delete Branch" msgstr "Supprimer la branche" -#: cola/cmds.py:1089 +#: cola/cmds.py:1090 msgid "Delete Files" msgstr "Supprimer les fichiers" -#: cola/widgets/status.py:311 +#: cola/widgets/status.py:312 msgid "Delete Files..." msgstr "Supprimer les fichiers..." -#: cola/cmds.py:1085 +#: cola/cmds.py:1086 msgid "Delete Files?" msgstr "Supprimer les fichiers ?" -#: cola/cmds.py:922 +#: cola/cmds.py:920 msgid "Delete Remote" msgstr "Supprimer le dépôt distant" -#: cola/guicmds.py:35 cola/widgets/branch.py:270 +#: cola/guicmds.py:34 cola/widgets/branch.py:279 msgid "Delete Remote Branch" msgstr "Supprimer la branche distante" -#: cola/widgets/main.py:564 +#: cola/widgets/main.py:577 msgid "Delete Remote Branch..." msgstr "Supprimer la branche distante..." -#: cola/widgets/toolbar.py:271 +#: cola/widgets/toolbar.py:276 msgid "Delete Toolbar" msgstr "Supprimer la barre d'outils" -#: cola/cmds.py:1115 +#: cola/cmds.py:1116 #, python-format msgid "Delete branch \"%s\"?" msgstr "Supprimer la branche « %s » ?" -#: cola/widgets/editremotes.py:88 +#: cola/widgets/editremotes.py:87 msgid "Delete remote" msgstr "Supprimer élément distant" -#: cola/cmds.py:924 +#: cola/cmds.py:922 #, python-format msgid "Delete remote \"%s\"" msgstr "Supprimer la branche distante « %s »" -#: cola/cmds.py:923 +#: cola/cmds.py:921 msgid "Delete remote?" msgstr "Supprimer la branche distante ?" -#: cola/widgets/main.py:558 +#: cola/widgets/main.py:571 msgid "Delete..." msgstr "Supprimer..." -#: cola/cmds.py:1067 +#: cola/cmds.py:1068 #, python-format msgid "Deleting \"%s\" failed" msgstr "Suppression de « %s » a échoué" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Deletions" msgstr "Suppressions" -#: cola/widgets/submodules.py:120 +#: cola/widgets/submodules.py:119 msgid "Depth" msgstr "Profondeur" -#: cola/qtutils.py:811 cola/qtutils.py:852 +#: cola/qtutils.py:842 cola/qtutils.py:889 msgid "Detach" msgstr "Détacher" -#: cola/widgets/prefs.py:181 +#: cola/widgets/prefs.py:203 msgid "Detect Conflict Markers" msgstr "Détecter les marqueurs de conflit" -#: cola/widgets/prefs.py:151 +#: cola/widgets/prefs.py:174 msgid "Detect conflict markers in unmerged files" msgstr "Détecter des marqueurs de conflits dans les fichiers non fusionnés" -#: cola/widgets/about.py:271 cola/widgets/about.py:274 -#: cola/widgets/about.py:277 cola/widgets/about.py:278 -#: cola/widgets/about.py:279 cola/widgets/about.py:280 -#: cola/widgets/about.py:281 cola/widgets/about.py:282 -#: cola/widgets/about.py:283 cola/widgets/about.py:284 -#: cola/widgets/about.py:285 cola/widgets/about.py:286 -#: cola/widgets/about.py:287 cola/widgets/about.py:288 -#: cola/widgets/about.py:289 cola/widgets/about.py:290 -#: cola/widgets/about.py:291 cola/widgets/about.py:292 -#: cola/widgets/about.py:293 cola/widgets/about.py:294 -#: cola/widgets/about.py:295 cola/widgets/about.py:296 -#: cola/widgets/about.py:297 cola/widgets/about.py:298 -#: cola/widgets/about.py:299 cola/widgets/about.py:300 -#: cola/widgets/about.py:301 cola/widgets/about.py:302 -#: cola/widgets/about.py:303 cola/widgets/about.py:304 -#: cola/widgets/about.py:305 cola/widgets/about.py:306 -#: cola/widgets/about.py:307 cola/widgets/about.py:308 -#: cola/widgets/about.py:309 cola/widgets/about.py:310 -#: cola/widgets/about.py:311 cola/widgets/about.py:312 -#: cola/widgets/about.py:313 cola/widgets/about.py:314 -#: cola/widgets/about.py:315 cola/widgets/about.py:316 -#: cola/widgets/about.py:317 cola/widgets/about.py:318 -#: cola/widgets/about.py:319 cola/widgets/about.py:320 -#: cola/widgets/about.py:321 cola/widgets/about.py:322 -#: cola/widgets/about.py:323 cola/widgets/about.py:324 -#: cola/widgets/about.py:325 cola/widgets/about.py:326 -#: cola/widgets/about.py:327 cola/widgets/about.py:328 -#: cola/widgets/about.py:329 cola/widgets/about.py:330 -#: cola/widgets/about.py:331 cola/widgets/about.py:332 -#: cola/widgets/about.py:333 cola/widgets/about.py:334 -#: cola/widgets/about.py:335 cola/widgets/about.py:336 -#: cola/widgets/about.py:337 cola/widgets/about.py:338 -#: cola/widgets/about.py:339 cola/widgets/about.py:340 -#: cola/widgets/about.py:341 cola/widgets/about.py:342 -#: cola/widgets/about.py:343 cola/widgets/about.py:344 -#: cola/widgets/about.py:345 cola/widgets/about.py:346 -#: cola/widgets/about.py:347 cola/widgets/about.py:348 -#: cola/widgets/about.py:349 cola/widgets/about.py:350 -#: cola/widgets/about.py:351 cola/widgets/about.py:352 -#: cola/widgets/about.py:353 cola/widgets/about.py:354 -#: cola/widgets/about.py:355 cola/widgets/about.py:356 -#: cola/widgets/about.py:357 cola/widgets/about.py:358 -#: cola/widgets/about.py:359 cola/widgets/about.py:360 -#: cola/widgets/about.py:361 cola/widgets/about.py:362 -#: cola/widgets/about.py:363 cola/widgets/about.py:364 -#: cola/widgets/about.py:365 cola/widgets/about.py:366 -#: cola/widgets/about.py:367 cola/widgets/about.py:368 -#: cola/widgets/about.py:369 cola/widgets/about.py:370 -#: cola/widgets/about.py:371 cola/widgets/about.py:372 -#: cola/widgets/about.py:373 cola/widgets/about.py:374 -#: cola/widgets/about.py:375 cola/widgets/about.py:376 -#: cola/widgets/about.py:377 cola/widgets/about.py:378 -#: cola/widgets/about.py:379 cola/widgets/about.py:380 +#: cola/widgets/about.py:254 cola/widgets/about.py:257 +#: cola/widgets/about.py:260 cola/widgets/about.py:261 +#: cola/widgets/about.py:262 cola/widgets/about.py:263 +#: cola/widgets/about.py:264 cola/widgets/about.py:265 +#: cola/widgets/about.py:266 cola/widgets/about.py:267 +#: cola/widgets/about.py:268 cola/widgets/about.py:269 +#: cola/widgets/about.py:270 cola/widgets/about.py:271 +#: cola/widgets/about.py:272 cola/widgets/about.py:273 +#: cola/widgets/about.py:274 cola/widgets/about.py:275 +#: cola/widgets/about.py:276 cola/widgets/about.py:277 +#: cola/widgets/about.py:278 cola/widgets/about.py:279 +#: cola/widgets/about.py:280 cola/widgets/about.py:281 +#: cola/widgets/about.py:282 cola/widgets/about.py:283 +#: cola/widgets/about.py:284 cola/widgets/about.py:285 +#: cola/widgets/about.py:286 cola/widgets/about.py:287 +#: cola/widgets/about.py:288 cola/widgets/about.py:289 +#: cola/widgets/about.py:290 cola/widgets/about.py:291 +#: cola/widgets/about.py:292 cola/widgets/about.py:293 +#: cola/widgets/about.py:294 cola/widgets/about.py:295 +#: cola/widgets/about.py:296 cola/widgets/about.py:297 +#: cola/widgets/about.py:298 cola/widgets/about.py:299 +#: cola/widgets/about.py:300 cola/widgets/about.py:301 +#: cola/widgets/about.py:302 cola/widgets/about.py:303 +#: cola/widgets/about.py:304 cola/widgets/about.py:305 +#: cola/widgets/about.py:306 cola/widgets/about.py:307 +#: cola/widgets/about.py:308 cola/widgets/about.py:309 +#: cola/widgets/about.py:310 cola/widgets/about.py:311 +#: cola/widgets/about.py:312 cola/widgets/about.py:313 +#: cola/widgets/about.py:314 cola/widgets/about.py:315 +#: cola/widgets/about.py:316 cola/widgets/about.py:317 +#: cola/widgets/about.py:318 cola/widgets/about.py:319 +#: cola/widgets/about.py:320 cola/widgets/about.py:321 +#: cola/widgets/about.py:322 cola/widgets/about.py:323 +#: cola/widgets/about.py:324 cola/widgets/about.py:325 +#: cola/widgets/about.py:326 cola/widgets/about.py:327 +#: cola/widgets/about.py:328 cola/widgets/about.py:329 +#: cola/widgets/about.py:330 cola/widgets/about.py:331 +#: cola/widgets/about.py:332 cola/widgets/about.py:333 +#: cola/widgets/about.py:334 cola/widgets/about.py:335 +#: cola/widgets/about.py:336 cola/widgets/about.py:337 +#: cola/widgets/about.py:338 cola/widgets/about.py:339 +#: cola/widgets/about.py:340 cola/widgets/about.py:341 +#: cola/widgets/about.py:342 cola/widgets/about.py:343 +#: cola/widgets/about.py:344 cola/widgets/about.py:345 +#: cola/widgets/about.py:346 cola/widgets/about.py:347 +#: cola/widgets/about.py:348 cola/widgets/about.py:349 +#: cola/widgets/about.py:350 cola/widgets/about.py:351 +#: cola/widgets/about.py:352 cola/widgets/about.py:353 +#: cola/widgets/about.py:354 cola/widgets/about.py:355 +#: cola/widgets/about.py:356 cola/widgets/about.py:357 +#: cola/widgets/about.py:358 cola/widgets/about.py:359 +#: cola/widgets/about.py:360 cola/widgets/about.py:361 +#: cola/widgets/about.py:362 cola/widgets/about.py:363 msgid "Developer" msgstr "Développeur" -#: cola/guicmds.py:185 cola/widgets/dag.py:764 cola/widgets/diff.py:781 -#: cola/widgets/main.py:177 cola/widgets/main.py:797 +#: cola/guicmds.py:184 cola/widgets/dag.py:830 cola/widgets/diff.py:809 +#: cola/widgets/main.py:175 cola/widgets/main.py:810 msgid "Diff" msgstr "Différence" -#: cola/guicmds.py:185 +#: cola/guicmds.py:184 msgid "Diff Against Commit" msgstr "" @@ -1419,35 +1460,35 @@ msgstr "" msgid "Diff Against Predecessor..." msgstr "Différence par rapport au prédécesseur..." -#: cola/widgets/main.py:1159 +#: cola/widgets/main.py:1172 msgid "Diff Mode" msgstr "" -#: cola/widgets/diff.py:772 cola/widgets/diff.py:796 +#: cola/widgets/diff.py:800 cola/widgets/diff.py:824 msgid "Diff Options" msgstr "Options des différences" -#: cola/widgets/prefs.py:256 +#: cola/widgets/prefs.py:277 msgid "Diff Tool" msgstr "Outil de différence" -#: cola/widgets/dag.py:364 +#: cola/widgets/dag.py:363 msgid "Diff selected -> this" msgstr "Différence sélection -> ceci" -#: cola/widgets/dag.py:358 +#: cola/widgets/dag.py:357 msgid "Diff this -> selected" msgstr "Différence ceci -> sélection" -#: cola/widgets/main.py:218 +#: cola/widgets/main.py:217 msgid "Diffstat" msgstr "Diffstat" -#: cola/cmds.py:3262 +#: cola/difftool.py:324 msgid "Difftool" msgstr "Difftool" -#: cola/widgets/clone.py:207 +#: cola/widgets/clone.py:205 msgid "Directory Exists" msgstr "Le répertoire existe" @@ -1455,84 +1496,88 @@ msgstr "Le répertoire existe" msgid "Disable" msgstr "Désactiver" -#: cola/widgets/prefs.py:180 +#: cola/widgets/prefs.py:202 msgid "Display Untracked Files" msgstr "Afficher les fichiers non suivis" -#: cola/cmds.py:2094 +#: cola/widgets/remote.py:176 +msgid "Display remote messages in a separate dialog" +msgstr "" + +#: cola/cmds.py:2045 msgid "Do not update stacked branches" msgstr "" -#: cola/widgets/main.py:471 +#: cola/widgets/main.py:484 msgid "Documentation" msgstr "Documentation" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop" msgstr "Supprimer" -#: cola/widgets/stash.py:258 +#: cola/widgets/stash.py:276 msgid "Drop Stash" msgstr "Supprimer le remisage" -#: cola/widgets/stash.py:255 +#: cola/widgets/stash.py:273 msgid "Drop Stash?" msgstr "Supprimer le remisage ?" -#: cola/widgets/stash.py:257 +#: cola/widgets/stash.py:275 #, python-format msgid "Drop the \"%s\" stash?" msgstr "Supprimer le remisage « %s » ?" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop the selected stash" msgstr "Supprimer la remise sélectionnée" -#: cola/qtutils.py:764 cola/sequenceeditor.py:357 cola/widgets/grep.py:102 +#: cola/qtutils.py:795 cola/sequenceeditor.py:353 cola/widgets/grep.py:100 msgid "Edit" msgstr "Editer" -#: cola/widgets/diff.py:1019 +#: cola/widgets/diff.py:1058 msgid "Edit Diff Hunk to Revert..." msgstr "" -#: cola/widgets/diff.py:1017 +#: cola/widgets/diff.py:1056 msgid "Edit Diff Hunk to Stage..." msgstr "" -#: cola/widgets/diff.py:1062 +#: cola/widgets/diff.py:1124 msgid "Edit Diff Hunk to Unstage..." msgstr "" -#: cola/cmds.py:2166 +#: cola/cmds.py:2117 msgid "Edit Rebase" msgstr "Éditer rétablissement" -#: cola/widgets/editremotes.py:36 +#: cola/widgets/editremotes.py:35 msgid "Edit Remotes" msgstr "Éditer les éléments distants" -#: cola/widgets/main.py:298 +#: cola/widgets/main.py:293 msgid "Edit Remotes..." msgstr "Éditer les éléments distants..." -#: cola/widgets/diff.py:1014 +#: cola/widgets/diff.py:1053 msgid "Edit Selected Lines to Revert..." msgstr "" -#: cola/widgets/diff.py:1012 +#: cola/widgets/diff.py:1051 msgid "Edit Selected Lines to Stage..." msgstr "" -#: cola/widgets/diff.py:1059 +#: cola/widgets/diff.py:1122 msgid "Edit Selected Lines to Unstage..." msgstr "" -#: cola/widgets/editremotes.py:44 +#: cola/widgets/editremotes.py:43 msgid "Edit remotes by selecting them from the list" msgstr "Modifier les éléments distants en les sélectionnant depuis la liste" -#: cola/widgets/browse.py:197 cola/widgets/common.py:39 +#: cola/widgets/browse.py:198 cola/widgets/common.py:38 msgid "Edit selected paths" msgstr "Éditer les chemins sélectionnés" @@ -1548,11 +1593,11 @@ msgstr "" msgid "Edit the following patch, which will then be applied to the worktree to revert the changes:" msgstr "" -#: cola/widgets/main.py:604 +#: cola/widgets/main.py:617 msgid "Edit..." msgstr "Editer..." -#: cola/widgets/prefs.py:253 +#: cola/widgets/prefs.py:274 msgid "Editor" msgstr "Éditeur" @@ -1561,153 +1606,158 @@ msgstr "Éditeur" msgid "Editor returned %s exit code. Not applying patch." msgstr "" -#: cola/widgets/prefs.py:167 +#: cola/widgets/prefs.py:190 msgid "Email Address" msgstr "Adresse email" -#: cola/widgets/about.py:258 cola/widgets/about.py:401 +#: cola/widgets/about.py:241 cola/widgets/about.py:384 msgid "Email contributor" msgstr "Email des contributeurs" -#: cola/widgets/prefs.py:182 +#: cola/widgets/prefs.py:204 msgid "Enable Gravatar Icons" msgstr "" -#: cola/widgets/prefs.py:160 +#: cola/widgets/prefs.py:183 msgid "Enable path autocompletion in tools" msgstr "Activer l’auto-complétion des chemins dans les outils" -#: cola/widgets/diff.py:768 +#: cola/widgets/diff.py:796 msgid "Enable word wrapping" msgstr "" -#: cola/sequenceeditor.py:322 +#: cola/sequenceeditor.py:319 msgid "Enabled" msgstr "Activé" -#: cola/guicmds.py:333 cola/widgets/branch.py:445 +#: cola/guicmds.py:332 cola/widgets/branch.py:478 msgid "Enter New Branch Name" msgstr "Entrez le nouveau nom de la branche" -#: cola/guicmds.py:147 +#: cola/guicmds.py:146 msgid "Enter a name for the new bare repo" msgstr "Entrez un nom pour le nouveau dépôt vide" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Enter a name for the stash" msgstr "Entrer un nom pour le remisage" -#: cola/cmds.py:146 cola/cmds.py:176 cola/cmds.py:207 cola/cmds.py:283 -#: cola/cmds.py:292 cola/cmds.py:307 cola/cmds.py:317 cola/cmds.py:460 -#: cola/cmds.py:496 cola/cmds.py:534 cola/cmds.py:633 cola/cmds.py:751 -#: cola/cmds.py:1067 cola/cmds.py:1164 cola/cmds.py:2005 cola/cmds.py:2394 -#: cola/cmds.py:2637 cola/cmds.py:2643 cola/cmds.py:2651 cola/cmds.py:2872 -#: cola/cmds.py:2890 cola/cmds.py:3180 cola/gitcmds.py:984 cola/guicmds.py:157 -#: cola/models/stash.py:70 cola/models/stash.py:87 cola/models/stash.py:108 -#: cola/widgets/bookmarks.py:482 cola/widgets/branch.py:777 +#: cola/widgets/stash.py:216 +msgid "Enter a new name for the stash" +msgstr "" + +#: cola/cmds.py:145 cola/cmds.py:175 cola/cmds.py:206 cola/cmds.py:284 +#: cola/cmds.py:293 cola/cmds.py:308 cola/cmds.py:318 cola/cmds.py:461 +#: cola/cmds.py:497 cola/cmds.py:535 cola/cmds.py:635 cola/cmds.py:753 +#: cola/cmds.py:1068 cola/cmds.py:1165 cola/cmds.py:1956 cola/cmds.py:2345 +#: cola/cmds.py:2579 cola/cmds.py:2585 cola/cmds.py:2593 cola/cmds.py:2818 +#: cola/cmds.py:2836 cola/cmds.py:3125 cola/gitcmds.py:994 cola/guicmds.py:156 +#: cola/models/stash.py:70 cola/models/stash.py:90 cola/models/stash.py:112 +#: cola/models/stash.py:138 cola/widgets/bookmarks.py:481 +#: cola/widgets/branch.py:829 msgid "Error" msgstr "Erreur" -#: cola/widgets/clone.py:191 +#: cola/widgets/clone.py:189 msgid "Error Cloning" msgstr "Erreur lors du clonage" -#: cola/widgets/createbranch.py:314 +#: cola/widgets/createbranch.py:312 msgid "Error Creating Branch" msgstr "Erreur lors de la création de la branche" -#: cola/app.py:502 cola/guicmds.py:101 +#: cola/app.py:505 cola/guicmds.py:100 msgid "Error Creating Repository" msgstr "Erreur lors de la création du dépôt" -#: cola/cmds.py:1202 +#: cola/cmds.py:1206 msgid "Error Deleting Remote Branch" msgstr "Erreur lors de la suppression de la branche distante" -#: cola/cmds.py:1585 +#: cola/cmds.py:1573 msgid "Error Editing File" msgstr "Erreur en modifiant le fichier" -#: cola/cmds.py:559 +#: cola/cmds.py:560 msgid "Error Launching Blame Viewer" msgstr "Erreur lors de l'ouverture du visionneur de fichier" -#: cola/cmds.py:3145 +#: cola/cmds.py:3091 msgid "Error Launching History Browser" msgstr "Erreur lors de l'ouverture de l'historique" -#: cola/app.py:489 +#: cola/app.py:492 msgid "Error Opening Repository" msgstr "Erreur lors de l'ouverture du dépôt" -#: cola/widgets/browse.py:566 +#: cola/models/stash.py:144 +msgid "Error Renaming Stash" +msgstr "" + +#: cola/widgets/browse.py:567 msgid "Error Saving File" msgstr "" -#: cola/cmds.py:914 +#: cola/cmds.py:912 #, python-format msgid "Error creating remote \"%s\"" msgstr "Erreur lors de la création de l'élément distant « %s »" -#: cola/models/stash.py:197 +#: cola/models/stash.py:233 msgid "Error creating stash" msgstr "Erreur lors de la création du stash" -#: cola/cmds.py:1126 +#: cola/cmds.py:1127 #, python-format msgid "Error deleting branch \"%s\"" msgstr "Erreur lors de la suppression de la branche « %s »" -#: cola/cmds.py:932 +#: cola/cmds.py:930 #, python-format msgid "Error deleting remote \"%s\"" msgstr "Erreur lors de la suppression de la branche distante « %s »" -#: cola/cmds.py:956 +#: cola/cmds.py:955 #, python-format msgid "Error renaming \"%(name)s\" to \"%(new_name)s\"" msgstr "Erreur lors du renommage de « %(name)s » en « %(new_name)s »" -#: cola/cmds.py:1771 +#: cola/cmds.py:1722 msgid "Error running prepare-commitmsg hook" msgstr "Erreur lors du lancement de « prepare-commitmsg hook »" -#: cola/cmds.py:3043 cola/cmds.py:3089 +#: cola/cmds.py:2989 cola/cmds.py:3035 #, python-format msgid "Error updating submodule %s" msgstr "Erreur lors de la mise à jour du sous-module « %s »" -#: cola/cmds.py:3125 +#: cola/cmds.py:3071 msgid "Error updating submodules" msgstr "Erreur lors de la mise à jour des sous-modules" -#: cola/widgets/diff.py:1326 +#: cola/widgets/diff.py:1400 msgid "Error writing patch" msgstr "" -#: cola/cmds.py:1710 +#: cola/cmds.py:1662 msgid "Error: Cannot find commit template" msgstr "Erreur : impossible de trouver un modèle de commit" -#: cola/widgets/stash.py:235 -msgid "Error: Stash exists" -msgstr "Erreur : le stash existe" - -#: cola/cmds.py:1732 +#: cola/cmds.py:1684 msgid "Error: Unconfigured commit template" msgstr "Erreur : modèle de commit non configuré" -#: cola/widgets/clone.py:53 +#: cola/widgets/clone.py:52 #, python-format msgid "Error: could not clone \"%s\"" msgstr "Erreur : impossible de cloner « %s »" -#: cola/cmds.py:2835 +#: cola/cmds.py:2781 #, python-format msgid "Error: could not create tag \"%s\"" msgstr "Erreur : impossible de créer le tag « %s »" -#: cola/widgets/branch.py:421 +#: cola/widgets/branch.py:433 #, python-format msgid "Executing action %s" msgstr "Exécution de l'action %s" @@ -1716,112 +1766,116 @@ msgstr "Exécution de l'action %s" msgid "Exit \"Diff\" mode" msgstr "" -#: cola/widgets/action.py:67 +#: cola/widgets/action.py:81 msgid "Exit Diff" msgstr "" -#: cola/widgets/main.py:528 +#: cola/widgets/main.py:541 msgid "Exit Diff Mode" msgstr "" -#: cola/widgets/action.py:68 +#: cola/widgets/action.py:81 msgid "Exit Diff mode" msgstr "" -#: cola/widgets/recent.py:67 +#: cola/widgets/recent.py:65 msgid "Expand all" msgstr "Tout développer" -#: cola/widgets/diff.py:1223 +#: cola/widgets/diff.py:1297 msgid "Export Patch" msgstr "" -#: cola/guicmds.py:168 cola/widgets/search.py:75 +#: cola/guicmds.py:167 cola/widgets/search.py:74 msgid "Export Patches" msgstr "Exporter les patchs" -#: cola/widgets/main.py:273 +#: cola/widgets/main.py:268 msgid "Export Patches..." msgstr "Exporter les patchs..." -#: cola/widgets/main.py:533 +#: cola/widgets/main.py:546 msgid "Expression..." msgstr "Expression..." -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Extended Regexp" msgstr "Regexp approfondi" -#: cola/widgets/commitmsg.py:612 +#: cola/widgets/commitmsg.py:638 msgid "Extended description..." msgstr "Détailler la description..." -#: cola/cmds.py:387 +#: cola/cmds.py:388 msgid "Failed to commit and continue applying patches" msgstr "" -#: cola/cmds.py:403 +#: cola/cmds.py:404 msgid "Failed to continue applying patches after skipping the current patch" msgstr "" -#: cola/widgets/createbranch.py:124 +#: cola/widgets/createbranch.py:122 msgid "Fast Forward Only" msgstr "Avance rapide seulement" -#: cola/widgets/remote.py:177 +#: cola/widgets/remote.py:181 msgid "Fast-forward only" msgstr "Avance rapide seulement" -#: cola/widgets/bookmarks.py:91 +#: cola/widgets/bookmarks.py:90 msgid "Favorite repositories" msgstr "Dépôts favoris" -#: cola/widgets/main.py:111 +#: cola/widgets/main.py:109 msgid "Favorites" msgstr "Favoris" -#: cola/widgets/remote.py:673 +#: cola/widgets/remote.py:735 msgid "Fetch" msgstr "Récupération" -#: cola/widgets/createbranch.py:127 +#: cola/widgets/createbranch.py:125 msgid "Fetch Tracking Branch" msgstr "Récupérer la branche suivie" -#: cola/widgets/action.py:63 cola/widgets/main.py:387 +#: cola/widgets/action.py:67 cola/widgets/main.py:384 +msgid "Fetch from one or more remotes using \"git fetch\"" +msgstr "" + +#: cola/widgets/action.py:65 cola/widgets/main.py:383 msgid "Fetch..." msgstr "Récupérer..." -#: cola/widgets/main.py:588 +#: cola/widgets/main.py:601 msgid "File Browser..." msgstr "Navigateur de fichier..." -#: cola/widgets/compare.py:75 +#: cola/widgets/compare.py:74 msgid "File Differences" msgstr "Différences des fichiers" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 msgid "File Saved" msgstr "Fichier enregistré" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 #, python-format msgid "File saved to \"%s\"" msgstr "Fichier enregistré sous « %s »" -#: cola/fsmonitor.py:517 +#: cola/fsmonitor.py:528 msgid "File system change monitoring: disabled because \"cola.inotify\" is false.\n" msgstr "Surveillance du changement de système de fichiers : désactivé car « cola.inotify » vaut « false ».\n" -#: cola/fsmonitor.py:534 +#: cola/fsmonitor.py:545 msgid "File system change monitoring: disabled because libc does not support the inotify system calls.\n" msgstr "Surveillance du système de fichiers : désactivé car libc ne supporte pas le système d'appels de inotify.\n" -#: cola/fsmonitor.py:528 +#: cola/fsmonitor.py:539 msgid "File system change monitoring: disabled because pywin32 is not installed.\n" msgstr "Surveillance du changement de système de fichiers : désactivé car pywin32 n'est pas installé.\n" -#: cola/fsmonitor.py:181 +#: cola/fsmonitor.py:184 msgid "" "File system change monitoring: disabled because the limit on the total number of inotify watches was reached. You may be able to increase the limit on the number of watches by running:\n" "\n" @@ -1831,296 +1885,304 @@ msgstr "" "\n" " echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n" -#: cola/fsmonitor.py:142 +#: cola/fsmonitor.py:145 msgid "File system change monitoring: enabled.\n" msgstr "Surveillance des changements dans le système de fichiers : activé.\n" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Filename" msgstr "Nom de fichier" -#: cola/widgets/dag.py:755 +#: cola/widgets/dag.py:821 msgid "Files" msgstr "Fichiers" -#: cola/widgets/branch.py:785 +#: cola/widgets/branch.py:837 msgid "Filter branches..." msgstr "Filtrer les branches..." -#: cola/widgets/status.py:1333 +#: cola/widgets/status.py:1334 msgid "Filter paths..." msgstr "Filtrer les chemins..." -#: cola/widgets/finder.py:113 cola/widgets/main.py:312 +#: cola/widgets/finder.py:112 cola/widgets/main.py:307 msgid "Find Files" msgstr "Trouver des fichiers" -#: cola/widgets/text.py:388 +#: cola/widgets/text.py:385 msgid "Find in diff" msgstr "" -#: cola/widgets/text.py:425 +#: cola/widgets/text.py:422 msgid "Find next item" msgstr "" -#: cola/widgets/text.py:431 +#: cola/widgets/text.py:428 msgid "Find previous item" msgstr "" -#: cola/widgets/text.py:395 +#: cola/widgets/text.py:392 msgid "Find the next occurrence of the phrase" msgstr "" -#: cola/widgets/text.py:391 +#: cola/widgets/text.py:388 msgid "Find the previous occurrence of the phrase" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Fixed String" msgstr "Chaîne fixe" -#: cola/widgets/prefs.py:251 +#: cola/widgets/prefs.py:270 msgid "Fixed-Width Font" msgstr "Police à largeur fixe" -#: cola/sequenceeditor.py:362 +#: cola/sequenceeditor.py:358 msgid "Fixup" msgstr "Réparer" -#: cola/widgets/commitmsg.py:148 +#: cola/widgets/commitmsg.py:154 msgid "Fixup Previous Commit" msgstr "Réparer le commit précédent" -#: cola/themes.py:672 +#: cola/themes.py:684 msgid "Flat dark blue" msgstr "Simple bleu foncé" -#: cola/themes.py:693 +#: cola/themes.py:705 msgid "Flat dark green" msgstr "Simple vert foncé" -#: cola/themes.py:686 +#: cola/themes.py:698 msgid "Flat dark grey" msgstr "Simple gris foncé" -#: cola/themes.py:679 +#: cola/themes.py:691 msgid "Flat dark red" msgstr "Simple rouge foncé" -#: cola/themes.py:644 +#: cola/themes.py:656 msgid "Flat light blue" msgstr "Simple bleu clair" -#: cola/themes.py:665 +#: cola/themes.py:677 msgid "Flat light green" msgstr "Simple vert clair" -#: cola/themes.py:658 +#: cola/themes.py:670 msgid "Flat light grey" msgstr "Simple gris clair" -#: cola/themes.py:651 +#: cola/themes.py:663 msgid "Flat light red" msgstr "Simple rouge clair" -#: cola/widgets/startup.py:73 +#: cola/widgets/startup.py:72 msgid "Folder" msgstr "Répertoire" -#: cola/widgets/toolbar.py:177 +#: cola/widgets/toolbar.py:181 msgid "Follow System Style" msgstr "" -#: cola/widgets/prefs.py:252 +#: cola/widgets/prefs.py:271 msgid "Font Size" msgstr "Taille de police" -#: cola/widgets/remote.py:193 +#: cola/widgets/remote.py:197 msgid "Force" msgstr "Forcer" -#: cola/widgets/remote.py:617 +#: cola/widgets/remote.py:652 msgid "Force Fetch" msgstr "Forcer la récupération" -#: cola/widgets/remote.py:614 +#: cola/widgets/remote.py:649 msgid "Force Fetch?" msgstr "Forcer la récupération ?" -#: cola/widgets/remote.py:625 +#: cola/widgets/remote.py:660 msgid "Force Push" msgstr "Forcer la poussée" -#: cola/widgets/remote.py:619 +#: cola/widgets/remote.py:654 msgid "Force Push?" msgstr "Forcer la poussée ?" -#: cola/widgets/remote.py:616 +#: cola/widgets/remote.py:651 #, python-format msgid "Force fetching from %s?" msgstr "Forcer la récupération depuis %s ?" -#: cola/widgets/remote.py:624 +#: cola/widgets/remote.py:659 #, python-format msgid "Force push to %s?" msgstr "Forcer la poussée vers %s ?" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Format String" msgstr "Le texte du format" -#: cola/widgets/about.py:430 cola/widgets/about.py:431 +#: cola/widgets/about.py:413 cola/widgets/about.py:414 msgid "French translation" msgstr "Traduction française" -#: cola/widgets/merge.py:80 +#: cola/widgets/merge.py:78 msgid "GPG-sign the merge commit" msgstr "GPG-signer le commit fusionné" -#: cola/widgets/prefs.py:344 +#: cola/widgets/prefs.py:364 msgid "GUI theme" msgstr "Thème de l'interface" -#: cola/widgets/editremotes.py:318 +#: cola/widgets/editremotes.py:317 #, python-format msgid "Gathering info for \"%s\"..." msgstr "Récupération des informations de %s..." -#: cola/widgets/about.py:420 cola/widgets/about.py:428 -#: cola/widgets/about.py:429 +#: cola/widgets/about.py:403 cola/widgets/about.py:411 +#: cola/widgets/about.py:412 msgid "German translation" msgstr "Traduction allemande" -#: cola/widgets/main.py:511 +#: cola/widgets/main.py:524 msgid "Get Commit Message Template" msgstr "Obtenir un modèle de message de commit" -#: cola/widgets/dag.py:520 +#: cola/widgets/dag.py:586 msgid "Go Down" msgstr "Descendre" -#: cola/widgets/dag.py:516 +#: cola/widgets/dag.py:582 msgid "Go Up" msgstr "Monter" -#: cola/widgets/dag.py:467 cola/widgets/filelist.py:42 +#: cola/widgets/dag.py:466 cola/widgets/filelist.py:39 msgid "Grab File..." msgstr "Maintenir le fichier..." -#: cola/widgets/dag.py:782 +#: cola/widgets/dag.py:848 msgid "Graph" msgstr "Graphe" -#: cola/widgets/main.py:358 +#: cola/widgets/main.py:353 msgid "Grep" msgstr "Grep" -#: cola/widgets/remote.py:662 +#: cola/widgets/remote.py:707 msgid "Have you rebased/pulled lately?" msgstr "Avez-vous restauré/tiré récemment ?" -#: cola/sequenceeditor.py:110 cola/sequenceeditor.py:171 -#: cola/widgets/finder.py:138 cola/widgets/main.py:854 +#: cola/sequenceeditor.py:108 cola/sequenceeditor.py:169 +#: cola/widgets/finder.py:137 cola/widgets/main.py:867 msgid "Help" msgstr "Aide" -#: cola/widgets/status.py:1322 +#: cola/widgets/status.py:1323 msgid "Help - Custom Copy Actions" msgstr "Aide - Actions de copie personnalisées" -#: cola/widgets/finder.py:79 +#: cola/widgets/finder.py:78 msgid "Help - Find Files" msgstr "Aide - Trouver des fichiers" -#: cola/sequenceeditor.py:737 +#: cola/sequenceeditor.py:732 msgid "Help - git-cola-sequence-editor" msgstr "Aide - git-cola-sequence-editor" -#: cola/widgets/prefs.py:346 +#: cola/widgets/prefs.py:366 msgid "High DPI" msgstr "Haut DPI" -#: cola/gitcmds.py:876 +#: cola/gitcmds.py:886 msgid "Hint: The \"Actions > Abort Cherry-Pick\" menu action can be used to cancel the current cherry-pick." msgstr "" -#: cola/widgets/prefs.py:254 +#: cola/widgets/prefs.py:275 msgid "History Browser" msgstr "Navigateur de l'historique" -#: cola/widgets/about.py:427 cola/widgets/about.py:441 +#: cola/widgets/about.py:410 cola/widgets/about.py:424 msgid "Hungarian translation" msgstr "Traduction hongroise" -#: cola/widgets/toolbar.py:178 +#: cola/widgets/toolbar.py:182 msgid "Icon Only" msgstr "" -#: cola/widgets/prefs.py:345 +#: cola/widgets/prefs.py:365 msgid "Icon theme" msgstr "Thème des icônes" -#: cola/widgets/diff.py:758 +#: cola/widgets/diff.py:787 msgid "Ignore all whitespace" msgstr "Ignorer tous les espaces blancs" -#: cola/widgets/diff.py:755 +#: cola/widgets/diff.py:785 msgid "Ignore changes in amount of whitespace" msgstr "Ignorer les changements de quantités d'espaces" -#: cola/widgets/diff.py:751 +#: cola/widgets/diff.py:782 msgid "Ignore changes in whitespace at EOL" msgstr "Ignorer les changements d'espaces à la fin des lignes" -#: cola/widgets/gitignore.py:46 +#: cola/widgets/gitignore.py:45 msgid "Ignore custom pattern" msgstr "Ignorer les motifs personnalisés" -#: cola/widgets/gitignore.py:44 +#: cola/widgets/gitignore.py:43 msgid "Ignore exact filename" msgstr "Ignorer les noms de fichier exacts" -#: cola/widgets/gitignore.py:32 +#: cola/widgets/gitignore.py:31 msgid "Ignore filename or pattern" msgstr "Ignorer un nom de fichier ou un motif" -#: cola/widgets/status.py:933 +#: cola/widgets/dag.py:498 +msgid "Ignore merge commits" +msgstr "" + +#: cola/widgets/status.py:934 msgid "Ignore..." msgstr "Ignorer..." -#: cola/widgets/remote.py:203 +#: cola/widgets/remote.py:207 msgid "Include tags " msgstr "Inclure les marques " -#: cola/widgets/prefs.py:349 +#: cola/widgets/prefs.py:369 msgid "Indent Status paths" msgstr "Indenter le chemin des statuts" -#: cola/widgets/about.py:419 cola/widgets/about.py:426 +#: cola/widgets/about.py:402 cola/widgets/about.py:409 msgid "Indonesian translation" msgstr "Traduction indonésienne" -#: cola/widgets/main.py:643 +#: cola/widgets/main.py:656 msgid "Initialize Git Annex" msgstr "Initialiser Git Annex" -#: cola/widgets/main.py:647 +#: cola/widgets/main.py:660 msgid "Initialize Git LFS" msgstr "Initialiser Git LFS" -#: cola/widgets/clone.py:116 +#: cola/widgets/clone.py:114 msgid "Inititalize submodules" msgstr "Initialiser les sous-modules" -#: cola/widgets/prefs.py:260 +#: cola/widgets/prefs.py:281 msgid "Insert spaces instead of tabs" msgstr "Insérer des espaces au lieu de tabulations" -#: cola/cmds.py:2130 +#: cola/widgets/action.py:73 cola/widgets/main.py:402 +msgid "Integrate changes using \"git pull\"" +msgstr "" + +#: cola/cmds.py:2081 msgid "Interactive Rebase" msgstr "Rétablissement interactif" -#: cola/cmds.py:2364 +#: cola/cmds.py:2315 msgid "Invalid Revision" msgstr "Révision invalide" @@ -2128,40 +2190,40 @@ msgstr "Révision invalide" msgid "It is not necessary to update the hunk header lines as they will be regenerated automatically." msgstr "" -#: cola/widgets/about.py:421 cola/widgets/about.py:424 +#: cola/widgets/about.py:404 cola/widgets/about.py:407 msgid "Japanese translation" msgstr "Traduction japonaise" -#: cola/widgets/prefs.py:262 +#: cola/widgets/prefs.py:283 msgid "Keep *.orig Merge Backups" msgstr "Conserver les sauvegardes de fusion *.orig" -#: cola/widgets/stash.py:71 +#: cola/widgets/stash.py:73 msgid "Keep Index" msgstr "Conserver l'index" -#: cola/widgets/main.py:477 +#: cola/widgets/main.py:490 msgid "Keyboard Shortcuts" msgstr "Raccourcis clavier" -#: cola/cmds.py:1608 cola/sequenceeditor.py:165 cola/sequenceeditor.py:338 -#: cola/widgets/dag.py:395 cola/widgets/filelist.py:34 +#: cola/difftool.py:27 cola/sequenceeditor.py:163 cola/sequenceeditor.py:334 +#: cola/widgets/dag.py:394 cola/widgets/filelist.py:31 msgid "Launch Diff Tool" msgstr "Lancer l'outil de différence" -#: cola/widgets/dag.py:402 +#: cola/widgets/dag.py:401 msgid "Launch Directory Diff Tool" msgstr "Lancer l'outil de différence de répertoire" -#: cola/cmds.py:1541 cola/cmds.py:1679 cola/widgets/filelist.py:38 +#: cola/cmds.py:1529 cola/cmds.py:1631 cola/widgets/filelist.py:35 msgid "Launch Editor" msgstr "Lancer l'éditeur" -#: cola/cmds.py:1644 +#: cola/cmds.py:1596 msgid "Launch Terminal" msgstr "Lancer le terminal" -#: cola/sequenceeditor.py:166 +#: cola/sequenceeditor.py:164 msgid "" "Launch external diff tool\n" "Shortcut: Ctrl+D" @@ -2169,8 +2231,8 @@ msgstr "" "Lancer un outil de diff externe\n" "Raccourcis : Ctrl+D" -#: cola/widgets/diff.py:1005 cola/widgets/diff.py:1051 -#: cola/widgets/status.py:852 cola/widgets/status.py:948 +#: cola/widgets/diff.py:1044 cola/widgets/diff.py:1106 +#: cola/widgets/status.py:853 cola/widgets/status.py:949 msgid "Launch git-cola" msgstr "Lancer git-cola" @@ -2182,7 +2244,7 @@ msgstr "Lancer git-difftool par rapport aux versions précédentes" msgid "Launch git-difftool on the current path" msgstr "Lancer git-difftool sur le chemin actuel" -#: cola/icons.py:56 +#: cola/icons.py:55 msgid "Light Theme" msgstr "Thème clair" @@ -2191,167 +2253,183 @@ msgstr "Thème clair" msgid "Lines starting with '%s' will be ignored." msgstr "" -#: cola/widgets/startup.py:74 +#: cola/widgets/startup.py:73 msgid "List" msgstr "Liste" -#: cola/guicmds.py:267 +#: cola/guicmds.py:266 msgid "Load Commit Message" msgstr "Charger le message de commit" -#: cola/widgets/main.py:339 +#: cola/widgets/main.py:334 msgid "Load Commit Message..." msgstr "Charger le message de commit..." -#: cola/widgets/commitmsg.py:144 +#: cola/widgets/commitmsg.py:150 msgid "Load Previous Commit Message" msgstr "Charger le message du précédent commit" -#: cola/widgets/diff.py:264 +#: cola/widgets/diff.py:265 msgid "Loading..." msgstr "Chargement..." -#: cola/widgets/branch.py:169 cola/widgets/branch.py:240 -#: cola/widgets/branch.py:281 cola/widgets/compare.py:38 -#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/branch.py:173 cola/widgets/branch.py:250 +#: cola/widgets/branch.py:290 cola/widgets/compare.py:37 +#: cola/widgets/compare.py:52 cola/widgets/compare.py:57 msgid "Local" msgstr "Local" -#: cola/widgets/cfgactions.py:227 cola/widgets/merge.py:46 -#: cola/widgets/remote.py:138 +#: cola/widgets/cfgactions.py:225 cola/widgets/merge.py:44 +#: cola/widgets/remote.py:136 msgid "Local Branch" msgstr "Branche locale" -#: cola/widgets/createbranch.py:114 +#: cola/widgets/createbranch.py:112 msgid "Local branch" msgstr "Branche locale" -#: cola/widgets/dag.py:788 cola/widgets/main.py:651 +#: cola/widgets/dag.py:854 cola/widgets/main.py:664 msgid "Lock Layout" msgstr "Verrouiller la disposition" -#: cola/widgets/dag.py:750 +#: cola/widgets/dag.py:816 msgid "Log" msgstr "Journal" -#: cola/widgets/prefs.py:170 +#: cola/widgets/prefs.py:191 msgid "Log Date Format" msgstr "" -#: cola/widgets/about.py:268 +#: cola/themes.py:769 +msgid "MacOS Aqua dark" +msgstr "" + +#: cola/themes.py:765 +msgid "MacOS Aqua light" +msgstr "" + +#: cola/themes.py:781 +msgid "MacOS Vibrant dark" +msgstr "" + +#: cola/themes.py:775 +msgid "MacOS Vibrant light" +msgstr "" + +#: cola/widgets/about.py:251 msgid "Maintainer (since 2007) and developer" msgstr "Mainteneur (depuis 2007) et développeur" -#: cola/widgets/text.py:398 +#: cola/widgets/text.py:395 msgid "Match Case" msgstr "" -#: cola/widgets/merge.py:88 +#: cola/widgets/merge.py:86 msgid "Merge" msgstr "Fusionner" -#: cola/widgets/merge.py:162 +#: cola/widgets/merge.py:160 #, python-format msgid "Merge \"%(revision)s\" into \"%(branch)s\"" msgstr "Fusionner « %(revision)s » vers « %(branch)s »" -#: cola/widgets/prefs.py:257 +#: cola/widgets/prefs.py:278 msgid "Merge Tool" msgstr "Outil de fusion" -#: cola/widgets/prefs.py:171 +#: cola/widgets/prefs.py:193 msgid "Merge Verbosity" msgstr "Fusion détaillée" -#: cola/cmds.py:1829 +#: cola/cmds.py:1780 msgid "Merge failed. Conflict resolution is required." msgstr "La fusion a échouée. Il est nécessaire de résoudre les conflits." -#: cola/widgets/merge.py:167 +#: cola/widgets/merge.py:165 #, python-format msgid "Merge into \"%s\"" msgstr "Fusionner dans « %s »" -#: cola/widgets/branch.py:231 +#: cola/widgets/branch.py:242 msgid "Merge into current branch" msgstr "Fusionner dans la branche actuelle" -#: cola/widgets/main.py:363 +#: cola/widgets/main.py:358 msgid "Merge..." msgstr "Fusionner..." -#: cola/widgets/main.py:1163 +#: cola/widgets/main.py:1176 msgid "Merging" msgstr "Fusion" -#: cola/models/browse.py:33 cola/widgets/createtag.py:78 +#: cola/models/browse.py:32 cola/widgets/createtag.py:76 msgid "Message" msgstr "Message" -#: cola/widgets/commitmsg.py:417 +#: cola/widgets/commitmsg.py:425 msgid "Missing Commit Message" msgstr "Message de commit manquant" -#: cola/widgets/createbranch.py:252 +#: cola/widgets/createbranch.py:250 msgid "Missing Data" msgstr "Données manquantes" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Missing Name" msgstr "Nom manquant" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Missing Revision" msgstr "Révision manquante" -#: cola/cmds.py:2801 +#: cola/cmds.py:2747 msgid "Missing Tag Message" msgstr "Message du marqueur manquant" -#: cola/models/browse.py:332 cola/widgets/status.py:158 -#: cola/widgets/status.py:631 +#: cola/models/browse.py:331 cola/widgets/status.py:158 +#: cola/widgets/status.py:632 msgid "Modified" msgstr "Modifié" -#: cola/widgets/commitmsg.py:506 +#: cola/widgets/commitmsg.py:532 msgid "More..." msgstr "Plus..." -#: cola/widgets/standard.py:243 cola/widgets/status.py:233 +#: cola/widgets/standard.py:242 cola/widgets/status.py:234 msgid "Move Down" msgstr "Déplacer vers le bas" -#: cola/widgets/standard.py:235 cola/widgets/status.py:225 +#: cola/widgets/standard.py:234 cola/widgets/status.py:226 msgid "Move Up" msgstr "Déplacer vers le haut" -#: cola/widgets/status.py:300 +#: cola/widgets/status.py:301 msgid "Move files to trash" msgstr "Mettre les fichiers à la corbeille" -#: cola/models/browse.py:33 cola/widgets/bookmarks.py:467 -#: cola/widgets/createtag.py:61 cola/widgets/editremotes.py:450 -#: cola/widgets/status.py:1452 cola/widgets/toolbar.py:312 +#: cola/models/browse.py:32 cola/widgets/bookmarks.py:466 +#: cola/widgets/createtag.py:59 cola/widgets/editremotes.py:448 +#: cola/widgets/status.py:1453 cola/widgets/toolbar.py:317 msgid "Name" msgstr "Nom" -#: cola/widgets/editremotes.py:434 +#: cola/widgets/editremotes.py:432 msgid "Name for the new remote" msgstr "Nom pour le nouvel élément distant" -#: cola/guicmds.py:148 cola/widgets/main.py:285 +#: cola/guicmds.py:147 cola/widgets/main.py:280 msgid "New Bare Repository..." msgstr "Nouveau dépôt vide..." -#: cola/guicmds.py:87 cola/widgets/main.py:280 +#: cola/guicmds.py:86 cola/widgets/main.py:275 msgid "New Repository..." msgstr "Nouveau dépôt..." -#: cola/widgets/main.py:983 +#: cola/widgets/main.py:996 msgid "New Toolbar" msgstr "Nouvelle barre d'outils" -#: cola/widgets/startup.py:53 +#: cola/widgets/startup.py:52 msgid "New..." msgstr "Nouveau..." @@ -2359,15 +2437,19 @@ msgstr "Nouveau..." msgid "Next File" msgstr "Fichier suivant" -#: cola/widgets/createbranch.py:123 cola/widgets/standard.py:1065 +#: cola/widgets/createbranch.py:121 cola/widgets/standard.py:1183 msgid "No" msgstr "Non" -#: cola/widgets/merge.py:217 cola/widgets/merge.py:227 +#: cola/widgets/merge.py:215 cola/widgets/merge.py:225 msgid "No Revision Specified" msgstr "Pas de révision sélectionnée" -#: cola/widgets/commitmsg.py:427 +#: cola/widgets/stash.py:225 +msgid "No change made" +msgstr "" + +#: cola/widgets/commitmsg.py:435 msgid "" "No changes to commit.\n" "\n" @@ -2377,27 +2459,27 @@ msgstr "" "\n" "Vous devez pré-commiter au moins 1 fichier avant de pouvoir commiter." -#: cola/widgets/selectcommits.py:118 +#: cola/widgets/selectcommits.py:117 msgid "No commits exist in this branch." msgstr "Aucun commit n'existe dans cette branche." -#: cola/widgets/merge.py:65 +#: cola/widgets/merge.py:63 msgid "No fast forward" msgstr "Pas d'avance rapide" -#: cola/widgets/remote.py:186 +#: cola/widgets/remote.py:190 msgid "No fast-forward" msgstr "Pas d'avance rapide" -#: cola/widgets/remote.py:577 +#: cola/widgets/remote.py:612 msgid "No repository selected." msgstr "Aucun dépôt n'est sélectionné." -#: cola/widgets/remote.py:615 +#: cola/widgets/remote.py:650 msgid "Non-fast-forward fetch overwrites local history!" msgstr "La récupération non rapide écrase l'historique local !" -#: cola/widgets/remote.py:621 +#: cola/widgets/remote.py:656 msgid "" "Non-fast-forward push overwrites published history!\n" "(Did you pull first?)" @@ -2405,7 +2487,7 @@ msgstr "" "La poussée non rapide écrase l'historique publié !\n" "(Voulez-vous tirer en premier ?)" -#: cola/widgets/commitmsg.py:444 +#: cola/widgets/commitmsg.py:452 msgid "Nothing to commit" msgstr "Rien à commiter" @@ -2413,79 +2495,79 @@ msgstr "Rien à commiter" msgid "Nothing to do" msgstr "Il n'y a rien à faire" -#: cola/widgets/prefs.py:172 +#: cola/widgets/prefs.py:194 msgid "Number of Diff Context Lines" msgstr "Nombre de lignes de contexte dans les diffs" -#: cola/widgets/bookmarks.py:79 cola/widgets/bookmarks.py:213 -#: cola/widgets/startup.py:336 +#: cola/widgets/bookmarks.py:78 cola/widgets/bookmarks.py:212 +#: cola/widgets/startup.py:335 msgid "Open" msgstr "Ouvrir" -#: cola/widgets/text.py:230 +#: cola/widgets/text.py:228 #, python-format msgid "Open \"%s\"" msgstr "" -#: cola/cmds.py:1857 +#: cola/cmds.py:1808 msgid "Open Directory" msgstr "" -#: cola/guicmds.py:205 cola/guicmds.py:214 cola/widgets/editremotes.py:473 -#: cola/widgets/startup.py:55 cola/widgets/startup.py:215 +#: cola/guicmds.py:204 cola/guicmds.py:213 cola/widgets/editremotes.py:471 +#: cola/widgets/startup.py:54 cola/widgets/startup.py:214 msgid "Open Git Repository" msgstr "Ouvrir un dépôt Git" -#: cola/widgets/submodules.py:49 +#: cola/widgets/submodules.py:48 msgid "Open Parent" msgstr "Ouvrir le parent" -#: cola/cmds.py:1877 +#: cola/cmds.py:1828 msgid "Open Parent Directory" msgstr "Ouvrir le répertoire parent" -#: cola/widgets/main.py:679 +#: cola/widgets/main.py:692 msgid "Open Recent" msgstr "Ouvrir récent" -#: cola/cmds.py:1840 +#: cola/cmds.py:1791 msgid "Open Using Default Application" msgstr "Ouvrir en utilisant l'application par défaut" -#: cola/cmds.py:1890 +#: cola/cmds.py:1841 msgid "Open Worktree" msgstr "" -#: cola/widgets/bookmarks.py:221 cola/widgets/startup.py:344 +#: cola/widgets/bookmarks.py:220 cola/widgets/startup.py:343 msgid "Open in New Window" msgstr "Ouvrir dans une nouvelle fenêtre" -#: cola/widgets/main.py:408 +#: cola/widgets/main.py:415 msgid "Open in New Window..." msgstr "Ouvrir dans une nouvelle fenêtre..." -#: cola/widgets/main.py:402 +#: cola/widgets/main.py:409 msgid "Open..." msgstr "Ouvrir..." -#: cola/widgets/branch.py:345 +#: cola/widgets/branch.py:354 msgid "Other branches" msgstr "Autres branches" -#: cola/widgets/archive.py:210 +#: cola/widgets/archive.py:208 msgid "Overwrite" msgstr "Écraser" -#: cola/widgets/archive.py:209 +#: cola/widgets/archive.py:207 #, python-format msgid "Overwrite \"%s\"?" msgstr "Écraser « %s » ?" -#: cola/widgets/archive.py:207 +#: cola/widgets/archive.py:205 msgid "Overwrite File?" msgstr "Écraser le fichier ?" -#: cola/widgets/grep.py:144 +#: cola/widgets/grep.py:142 msgid "" "Parse arguments using a shell.\n" "Queries with spaces will require \"double quotes\"." @@ -2493,63 +2575,67 @@ msgstr "" "Interpréter les arguments en utilisant un shell.\n" "Les requêtes comportant des espaces nécessiteront \"des guillemets doubles\"." -#: cola/models/browse.py:330 +#: cola/models/browse.py:329 msgid "Partially Staged" msgstr "Partiellement pré-commité" -#: cola/widgets/main.py:744 +#: cola/widgets/main.py:757 msgid "Paste" msgstr "Coller" -#: cola/cmds.py:363 +#: cola/cmds.py:364 msgid "Patch failed to apply" msgstr "" -#: cola/cmds.py:375 +#: cola/cmds.py:376 msgid "Patch(es) Applied" msgstr "Patch(s) appliqué(s)" -#: cola/widgets/diff.py:1219 cola/widgets/main.py:695 +#: cola/widgets/diff.py:1293 cola/widgets/main.py:708 msgid "Patches" msgstr "" -#: cola/widgets/prefs.py:173 +#: cola/widgets/prefs.py:195 msgid "Patches Directory" msgstr "" -#: cola/widgets/bookmarks.py:468 cola/widgets/submodules.py:118 +#: cola/widgets/bookmarks.py:467 cola/widgets/submodules.py:117 msgid "Path" msgstr "Chemin" -#: cola/widgets/clone.py:112 +#: cola/widgets/clone.py:110 msgid "Path or URL to clone (Env. $VARS okay)" msgstr "Chemin ou URL à cloner (Env. $VARS ok)" -#: cola/sequenceeditor.py:346 +#: cola/sequenceeditor.py:342 msgid "Pick" msgstr "Choisir" -#: cola/widgets/diff.py:781 +#: cola/widgets/dag.py:490 +msgid "Pickaxe search for changes containing text" +msgstr "" + +#: cola/widgets/diff.py:809 msgid "Pixel XOR" msgstr "Ou-exclusif des pixels" -#: cola/widgets/createbranch.py:253 +#: cola/widgets/createbranch.py:251 msgid "Please provide both a branch name and revision expression." msgstr "Veuillez donner un nom de branche et une expression de révision." -#: cola/cmds.py:2348 +#: cola/cmds.py:2299 msgid "Please select a file" msgstr "Veuillez choisir un fichier" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Please specify a name for the new tag." msgstr "Veuillez spécifier un nom pour le nouveau marqueur." -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Please specify a revision to tag." msgstr "Veuillez spécifier une révision à marquer." -#: cola/widgets/commitmsg.py:410 +#: cola/widgets/commitmsg.py:418 msgid "" "Please supply a commit message.\n" "\n" @@ -2567,31 +2653,31 @@ msgstr "" "- Deuxième ligne : Vide.\n" "- Lignes suivantes : Expliquer l'intérêt de vos modifications.\n" -#: cola/cmds.py:653 +#: cola/cmds.py:655 msgid "Point the current branch head to a new commit?" msgstr "Pointer la tête de branche actuelle vers un nouveau commit ?" -#: cola/widgets/about.py:416 +#: cola/widgets/about.py:399 msgid "Polish translation" msgstr "Traduction polonaise" -#: cola/widgets/stash.py:63 cola/widgets/stash.py:111 cola/widgets/stash.py:115 +#: cola/widgets/stash.py:65 cola/widgets/stash.py:114 cola/widgets/stash.py:118 msgid "Pop" msgstr "Supprimer" -#: cola/widgets/main.py:293 cola/widgets/prefs.py:395 +#: cola/widgets/main.py:288 cola/widgets/prefs.py:433 msgid "Preferences" msgstr "Préférences" -#: cola/widgets/archive.py:129 +#: cola/widgets/archive.py:127 msgid "Prefix" msgstr "Préfixe" -#: cola/widgets/main.py:345 +#: cola/widgets/main.py:340 msgid "Prepare Commit Message" msgstr "Préparer le message de commit" -#: cola/widgets/prefs.py:157 +#: cola/widgets/prefs.py:180 msgid "Prevent \"Stage\" from staging all files when nothing is selected" msgstr "Empêcher \"Pré-commiter\" de tout pré-commiter si aucun fichier n'est sélectionné" @@ -2599,216 +2685,228 @@ msgstr "Empêcher \"Pré-commiter\" de tout pré-commiter si aucun fichier n'est msgid "Previous File" msgstr "Fichier précédent" -#: cola/widgets/remote.py:171 +#: cola/widgets/remote.py:169 msgid "Prompt on creation" msgstr "Confirmation à la création" -#: cola/widgets/remote.py:172 +#: cola/widgets/remote.py:170 msgid "Prompt when pushing creates new remote branches" msgstr "Confirmation lorsque la poussée créée des nouvelles branches distantes" -#: cola/widgets/remote.py:208 +#: cola/widgets/remote.py:212 msgid "Prune " msgstr "Réviser " -#: cola/widgets/bookmarks.py:255 cola/widgets/startup.py:376 +#: cola/widgets/bookmarks.py:254 cola/widgets/startup.py:375 msgid "Prune Missing Entries" msgstr "Réviser les entrées manquantes" -#: cola/widgets/branch.py:247 cola/widgets/remote.py:728 +#: cola/widgets/branch.py:256 cola/widgets/remote.py:783 msgid "Pull" msgstr "Tirer" -#: cola/widgets/action.py:65 cola/widgets/main.py:397 +#: cola/widgets/action.py:73 cola/widgets/main.py:401 msgid "Pull..." msgstr "Tirer..." -#: cola/widgets/branch.py:253 cola/widgets/remote.py:593 -#: cola/widgets/remote.py:698 +#: cola/widgets/branch.py:262 cola/widgets/remote.py:628 +#: cola/widgets/remote.py:758 msgid "Push" msgstr "Pousser" -#: cola/widgets/action.py:64 cola/widgets/main.py:392 +#: cola/widgets/action.py:70 cola/widgets/main.py:393 +msgid "Push to one or more remotes using \"git push\"" +msgstr "" + +#: cola/widgets/action.py:70 cola/widgets/main.py:392 msgid "Push..." msgstr "Pousser..." -#: cola/guicmds.py:252 +#: cola/guicmds.py:251 msgid "Quick Open Repository" msgstr "" -#: cola/widgets/main.py:660 +#: cola/widgets/main.py:673 msgid "Quick Open..." msgstr "" -#: cola/widgets/main.py:355 +#: cola/widgets/main.py:350 msgid "Quit" msgstr "Quitter" -#: cola/cmds.py:2144 cola/cmds.py:2180 cola/cmds.py:2181 cola/cmds.py:2194 -#: cola/cmds.py:2195 cola/sequenceeditor.py:158 cola/sequenceeditor.py:199 -#: cola/widgets/main.py:822 cola/widgets/remote.py:211 +#: cola/cmds.py:2095 cola/cmds.py:2131 cola/cmds.py:2132 cola/cmds.py:2145 +#: cola/cmds.py:2146 cola/sequenceeditor.py:156 cola/sequenceeditor.py:197 +#: cola/widgets/main.py:835 cola/widgets/remote.py:215 msgid "Rebase" msgstr "Rétablir" -#: cola/cmds.py:2143 +#: cola/cmds.py:2094 #, python-format msgid "Rebase onto %s" msgstr "Rétablir sur %s" -#: cola/cmds.py:2156 +#: cola/cmds.py:2107 msgid "Rebase stopped" msgstr "Rétablissement arrêté" -#: cola/widgets/remote.py:210 +#: cola/widgets/remote.py:214 msgid "Rebase the current branch instead of merging" msgstr "Rétablir la branche courante au lieu de la fusionner" -#: cola/widgets/dag.py:419 +#: cola/widgets/dag.py:418 msgid "Rebase to this commit" msgstr "" -#: cola/widgets/main.py:1165 +#: cola/widgets/main.py:1178 msgid "Rebasing" msgstr "Rétablir" -#: cola/widgets/main.py:120 +#: cola/widgets/main.py:118 msgid "Recent" msgstr "Récent" -#: cola/widgets/bookmarks.py:93 +#: cola/widgets/bookmarks.py:92 msgid "Recent repositories" msgstr "Dépôts récents" -#: cola/widgets/prefs.py:258 +#: cola/widgets/prefs.py:279 msgid "Recent repository count" msgstr "Nombre de dépôts récents" -#: cola/widgets/recent.py:46 +#: cola/widgets/recent.py:44 msgid "Recently Modified Files" msgstr "Fichiers récemment modifiés" -#: cola/widgets/main.py:320 +#: cola/widgets/main.py:315 msgid "Recently Modified Files..." msgstr "Fichiers récemment modifiés..." -#: cola/widgets/stash.py:256 +#: cola/widgets/stash.py:274 msgid "Recovering a dropped stash is not possible." msgstr "Restaurer un remisage supprimé n'est pas possible." -#: cola/widgets/createbranch.py:283 +#: cola/widgets/createbranch.py:281 msgid "Recovering lost commits may not be easy." msgstr "Récupérer les commits perdus n'est pas toujours évident." -#: cola/widgets/main.py:737 +#: cola/widgets/main.py:750 msgid "Redo" msgstr "Refaire" -#: cola/widgets/clone.py:121 +#: cola/widgets/clone.py:119 msgid "Reduce commit history to minimum" msgstr "Réduire l'historique des commits au minimum" -#: cola/widgets/submodules.py:121 +#: cola/widgets/submodules.py:120 msgid "Reference Repository" msgstr "Dépôt de référence" -#: cola/widgets/submodules.py:105 +#: cola/widgets/submodules.py:104 msgid "Reference URL" msgstr "URL de référence" -#: cola/widgets/submodules.py:106 +#: cola/widgets/submodules.py:105 msgid "Reference repository to use when cloning (optional)" msgstr "Le dépôt de référence à utiliser lors du clonage (facultatif)" -#: cola/cmds.py:2222 cola/qtutils.py:770 cola/widgets/action.py:62 -#: cola/widgets/dag.py:792 cola/widgets/editremotes.py:85 -#: cola/widgets/grep.py:105 cola/widgets/recent.py:116 -#: cola/widgets/submodules.py:45 +#: cola/cmds.py:2173 cola/qtutils.py:801 cola/widgets/action.py:63 +#: cola/widgets/dag.py:858 cola/widgets/editremotes.py:84 +#: cola/widgets/grep.py:103 cola/widgets/recent.py:114 +#: cola/widgets/submodules.py:44 msgid "Refresh" msgstr "Rafraichir" -#: cola/widgets/remote.py:179 +#: cola/widgets/remote.py:183 msgid "Refuse to merge unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward" msgstr "Refuser de fusionner sauf si l'en-tête actuelle est déjà mis à jour ou bien que la fusion peut être résolue rapidement" -#: cola/widgets/branch.py:173 cola/widgets/branch.py:225 -#: cola/widgets/branch.py:269 cola/widgets/branch.py:470 -#: cola/widgets/compare.py:54 cola/widgets/compare.py:59 -#: cola/widgets/remote.py:147 +#: cola/widgets/branch.py:177 cola/widgets/branch.py:236 +#: cola/widgets/branch.py:278 cola/widgets/branch.py:513 +#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/remote.py:145 msgid "Remote" msgstr "Élément distant" -#: cola/widgets/remote.py:162 +#: cola/widgets/remote.py:160 msgid "Remote Branch" msgstr "Branche distante" -#: cola/cmds.py:1196 +#: cola/cmds.py:1197 msgid "Remote Branch Deleted" msgstr "Branche distante supprimée" -#: cola/widgets/editremotes.py:49 +#: cola/widgets/log.py:99 +msgid "Remote Messages" +msgstr "" + +#: cola/widgets/editremotes.py:48 msgid "Remote git repositories - double-click to rename" msgstr "Dépôts Git distants - double-cliquez pour renommer" -#: cola/cmds.py:1029 cola/widgets/patch.py:107 cola/widgets/patch.py:122 -#: cola/widgets/startup.py:265 cola/widgets/status.py:1382 +#: cola/cmds.py:1030 cola/widgets/diff.py:1701 cola/widgets/diff.py:1716 +#: cola/widgets/startup.py:264 cola/widgets/status.py:1383 msgid "Remove" msgstr "Supprimer" -#: cola/cmds.py:1027 +#: cola/cmds.py:1028 #, python-format msgid "Remove %s from the recent list?" msgstr "Supprimer %s de la liste des dépôts récents ?" -#: cola/widgets/toolbar.py:316 +#: cola/widgets/toolbar.py:321 msgid "Remove Element" msgstr "Supprimer l'élément" -#: cola/widgets/remote.py:206 +#: cola/widgets/remote.py:210 msgid "Remove remote-tracking branches that no longer exist on the remote" msgstr "Retirer les branches distantes suivies qui n'existent plus dans l'élément distant" -#: cola/widgets/patch.py:109 +#: cola/widgets/diff.py:1703 msgid "Remove selected (Delete)" msgstr "Supprimer la sélection" -#: cola/widgets/bookmarks.py:258 cola/widgets/startup.py:379 +#: cola/widgets/bookmarks.py:257 cola/widgets/startup.py:378 msgid "Remove stale entries for repositories that no longer exist" msgstr "Retirer les entrées obsolètes du dépôt qui n'existent plus" -#: cola/guicmds.py:333 cola/widgets/browse.py:159 +#: cola/guicmds.py:332 cola/widgets/browse.py:159 cola/widgets/stash.py:44 msgid "Rename" msgstr "Renommer" -#: cola/cmds.py:1153 +#: cola/cmds.py:1154 #, python-format msgid "Rename \"%s\"" msgstr "Renommer « %s »" -#: cola/widgets/branch.py:259 +#: cola/widgets/branch.py:268 msgid "Rename Branch" msgstr "Renommer branche" -#: cola/widgets/main.py:570 +#: cola/widgets/main.py:583 msgid "Rename Branch..." msgstr "Renommer branche..." -#: cola/guicmds.py:330 +#: cola/guicmds.py:329 msgid "Rename Existing Branch" msgstr "Renommer la branche existante" -#: cola/cmds.py:944 +#: cola/cmds.py:942 msgid "Rename Remote" msgstr "Renommer l'élément distant" -#: cola/widgets/bookmarks.py:233 cola/widgets/startup.py:356 +#: cola/widgets/bookmarks.py:232 cola/widgets/startup.py:355 msgid "Rename Repository" msgstr "Renommer le dépôt" -#: cola/widgets/branch.py:445 +#: cola/widgets/stash.py:218 +msgid "Rename Stash" +msgstr "" + +#: cola/widgets/branch.py:478 msgid "Rename branch" msgstr "Renommer branche" -#: cola/cmds.py:945 +#: cola/cmds.py:943 #, python-format msgid "Rename remote \"%(current)s\" to \"%(new)s\"?" msgstr "Renommage de l'élément distant « %(current)s » en « %(new)s » ?" @@ -2817,179 +2915,183 @@ msgstr "Renommage de l'élément distant « %(current)s » en « %(new)s » msgid "Rename selected paths" msgstr "Renommer les chemins sélectionnés" -#: cola/app.py:497 cola/widgets/startup.py:262 +#: cola/widgets/stash.py:45 +msgid "Rename the selected stash" +msgstr "" + +#: cola/app.py:500 cola/widgets/startup.py:261 msgid "Repository Not Found" msgstr "Dépôt non trouvé" -#: cola/widgets/browse.py:87 cola/widgets/main.py:1095 +#: cola/widgets/browse.py:87 cola/widgets/main.py:1108 #, python-format msgid "Repository: %s" msgstr "Dépôt : %s" -#: cola/guicmds.py:351 cola/widgets/createbranch.py:125 cola/widgets/dag.py:331 -#: cola/widgets/editremotes.py:58 cola/widgets/main.py:832 +#: cola/guicmds.py:350 cola/widgets/createbranch.py:123 cola/widgets/dag.py:330 +#: cola/widgets/editremotes.py:57 cola/widgets/main.py:845 msgid "Reset" msgstr "Réinitialiser" -#: cola/widgets/createbranch.py:286 +#: cola/widgets/createbranch.py:284 #, python-format msgid "Reset \"%(branch)s\" to \"%(revision)s\"?" msgstr "Réinitialiser « %(branch)s » vers « %(revision)s » ?" -#: cola/guicmds.py:359 +#: cola/guicmds.py:358 msgid "Reset All (Keep Unstaged Changes)" msgstr "Tout réinitialiser (Garder les modifications non pré-commitées)" -#: cola/cmds.py:655 cola/cmds.py:706 cola/guicmds.py:342 -#: cola/widgets/createbranch.py:295 +#: cola/cmds.py:657 cola/cmds.py:708 cola/guicmds.py:341 +#: cola/widgets/createbranch.py:293 msgid "Reset Branch" msgstr "Réinitialiser la branche" -#: cola/cmds.py:703 cola/guicmds.py:341 cola/widgets/dag.py:425 -#: cola/widgets/main.py:419 +#: cola/cmds.py:705 cola/guicmds.py:340 cola/widgets/dag.py:424 +#: cola/widgets/main.py:431 msgid "Reset Branch (Soft)" msgstr "Réinitialiser la banche (Soft)" -#: cola/cmds.py:652 cola/guicmds.py:350 cola/widgets/dag.py:431 -#: cola/widgets/main.py:426 +#: cola/cmds.py:654 cola/guicmds.py:349 cola/widgets/dag.py:430 +#: cola/widgets/main.py:439 msgid "Reset Branch and Stage (Mixed)" msgstr "Réinitialiser la branche et pré-commiter (Mixed)" -#: cola/widgets/createbranch.py:292 +#: cola/widgets/createbranch.py:290 msgid "Reset Branch?" msgstr "Réinitialiser la branche ?" -#: cola/widgets/main.py:655 +#: cola/widgets/main.py:668 msgid "Reset Layout" msgstr "Réinitialiser la mise en page" -#: cola/cmds.py:687 +#: cola/cmds.py:689 msgid "Reset Worktree and Reset All?" msgstr "Réinitialiser l'arbre de travail et tout rétablir ?" -#: cola/cmds.py:672 cola/cmds.py:689 cola/cmds.py:723 cola/guicmds.py:360 -#: cola/guicmds.py:373 cola/guicmds.py:382 +#: cola/cmds.py:674 cola/cmds.py:691 cola/cmds.py:725 cola/guicmds.py:359 +#: cola/guicmds.py:372 cola/guicmds.py:381 msgid "Reset and Restore" msgstr "Réinitialiser et rétablir" -#: cola/cmds.py:704 +#: cola/cmds.py:706 msgid "Reset branch?" msgstr "Réinitialiser la branche ?" -#: cola/widgets/createbranch.py:266 +#: cola/widgets/createbranch.py:264 #, python-format msgid "Resetting \"%(branch)s\" to \"%(revision)s\" will lose commits." msgstr "Réinitialiser « %(branch)s » à « %(revision)s » perdra les commits." -#: cola/widgets/prefs.py:264 +#: cola/widgets/prefs.py:285 msgid "Resize File Browser columns" msgstr "" -#: cola/widgets/prefs.py:374 +#: cola/widgets/prefs.py:412 msgid "Restart the application after changing appearance settings." msgstr "Redémarrez l'application pour appliquer les modifications de l'apparence." -#: cola/cmds.py:757 cola/cmds.py:760 cola/guicmds.py:390 cola/guicmds.py:391 -#: cola/widgets/dag.py:461 cola/widgets/main.py:457 +#: cola/cmds.py:759 cola/cmds.py:762 cola/guicmds.py:389 cola/guicmds.py:390 +#: cola/widgets/dag.py:460 cola/widgets/main.py:471 msgid "Restore Worktree" msgstr "Rétablir l'arbre de travail" -#: cola/cmds.py:720 cola/guicmds.py:381 cola/widgets/dag.py:454 -#: cola/widgets/main.py:450 +#: cola/cmds.py:722 cola/guicmds.py:380 cola/widgets/dag.py:453 +#: cola/widgets/main.py:463 msgid "Restore Worktree and Reset All (Hard)" msgstr "Réinitialiser l'arbre de travail et tout rétablir (Hard)" -#: cola/cmds.py:669 cola/widgets/main.py:434 +#: cola/cmds.py:671 cola/widgets/main.py:447 msgid "Restore Worktree and Reset All (Keep Unstaged Changes)" msgstr "Réinitialiser l'arbre de travail et tout rétablir (Garder les modifications non pré-commitées)" -#: cola/widgets/dag.py:438 +#: cola/widgets/dag.py:437 msgid "Restore Worktree and Reset All (Keep Unstaged Edits)" msgstr "Réinitialiser l'arbre de travail et tout rétablir (Garder les modifications non pré-commitées)" -#: cola/cmds.py:686 cola/guicmds.py:372 cola/widgets/dag.py:446 -#: cola/widgets/main.py:442 +#: cola/cmds.py:688 cola/guicmds.py:371 cola/widgets/dag.py:445 +#: cola/widgets/main.py:455 msgid "Restore Worktree and Reset All (Merge)" msgstr "Réinitialiser l'arbre de travail et tout rétablir (Fusionner)" -#: cola/cmds.py:721 +#: cola/cmds.py:723 msgid "Restore Worktree and Reset All?" msgstr "Réinitialiser l'arbre de travail et tout rétablir ?" -#: cola/cmds.py:758 +#: cola/cmds.py:760 #, python-format msgid "Restore Worktree to %s?" msgstr "Rétablir l'arbre de travail à %s ?" -#: cola/cmds.py:670 +#: cola/cmds.py:672 msgid "Restore worktree, reset, and preserve unstaged edits?" msgstr "Réinitialiser l'arbre de travail, rétablir, et garder les modifications non pré-commitées ?" -#: cola/widgets/dag.py:390 +#: cola/widgets/dag.py:389 msgid "Revert" msgstr "Rétablir" -#: cola/widgets/diff.py:1153 +#: cola/widgets/diff.py:1227 msgid "Revert Diff Hunk" msgstr "Rétablir la section de différences" -#: cola/widgets/diff.py:1018 +#: cola/widgets/diff.py:1057 msgid "Revert Diff Hunk..." msgstr "Rétablir la section de différences..." -#: cola/widgets/diff.py:1152 +#: cola/widgets/diff.py:1226 msgid "Revert Diff Hunk?" msgstr "Rétablir la section de différences ?" -#: cola/widgets/diff.py:1150 +#: cola/widgets/diff.py:1224 msgid "Revert Selected Lines" msgstr "Inverser les lignes sélectionnées" -#: cola/widgets/diff.py:1013 +#: cola/widgets/diff.py:1052 msgid "Revert Selected Lines..." msgstr "Inverser les lignes sélectionnées..." -#: cola/widgets/diff.py:1149 +#: cola/widgets/diff.py:1223 msgid "Revert Selected Lines?" msgstr "Inverser les lignes sélectionnées ?" -#: cola/cmds.py:2311 +#: cola/cmds.py:2262 msgid "Revert Uncommitted Changes" msgstr "Rétablir les modifications non commitées" -#: cola/cmds.py:2305 +#: cola/cmds.py:2256 msgid "Revert Uncommitted Changes?" msgstr "Rétablir les modifications non commitées ?" -#: cola/cmds.py:2298 +#: cola/cmds.py:2249 msgid "Revert Uncommitted Edits..." msgstr "Rétablir modifications non commitées..." -#: cola/cmds.py:2289 +#: cola/cmds.py:2240 msgid "Revert Unstaged Changes" msgstr "Rétablir les modifications non pré-commitées" -#: cola/cmds.py:2283 +#: cola/cmds.py:2234 msgid "Revert Unstaged Changes?" msgstr "Rétablir les modifications non pré-commitées ?" -#: cola/cmds.py:2275 +#: cola/cmds.py:2226 msgid "Revert Unstaged Edits..." msgstr "Rétablir les modifications non pré-commitées..." -#: cola/cmds.py:598 +#: cola/cmds.py:599 msgid "Revert failed" msgstr "" -#: cola/cmds.py:2310 cola/widgets/diff.py:1161 +#: cola/cmds.py:2261 cola/widgets/diff.py:1235 msgid "Revert the uncommitted changes?" msgstr "Rétablir les modifications non commitées ?" -#: cola/cmds.py:2288 +#: cola/cmds.py:2239 msgid "Revert the unstaged changes?" msgstr "Rétablir les modifications non pré-commités ?" -#: cola/widgets/browse.py:189 +#: cola/widgets/browse.py:190 msgid "Revert uncommitted changes to selected paths" msgstr "Rétablir les changements non commités dans les chemins sélectionnés" @@ -2997,243 +3099,247 @@ msgstr "Rétablir les changements non commités dans les chemins sélectionnés" msgid "Revert unstaged changes to selected paths" msgstr "Rétablir les changements non pré-commités dans les chemins sélectionnés" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Review" msgstr "Examiner" -#: cola/widgets/main.py:583 +#: cola/widgets/main.py:596 msgid "Review..." msgstr "Examiner..." -#: cola/widgets/cfgactions.py:233 cola/widgets/createtag.py:84 +#: cola/widgets/cfgactions.py:231 cola/widgets/createtag.py:82 msgid "Revision" msgstr "Révision" -#: cola/widgets/selectcommits.py:62 +#: cola/widgets/selectcommits.py:61 msgid "Revision Expression:" msgstr "Expression de révision :" -#: cola/widgets/merge.py:39 cola/widgets/merge.py:42 +#: cola/widgets/merge.py:37 cola/widgets/merge.py:40 msgid "Revision to Merge" msgstr "Révision à fusionner" -#: cola/sequenceeditor.py:351 +#: cola/sequenceeditor.py:347 msgid "Reword" msgstr "Renommer" -#: cola/cmds.py:776 cola/widgets/commitmsg.py:456 +#: cola/cmds.py:778 cola/widgets/commitmsg.py:464 msgid "Rewrite Published Commit?" msgstr "Réécrire les commits publiés ?" -#: cola/widgets/log.py:31 +#: cola/widgets/log.py:31 cola/widgets/log.py:133 msgid "Right-click links to open:" msgstr "" -#: cola/interaction.py:127 cola/widgets/cfgactions.py:245 +#: cola/interaction.py:125 cola/widgets/cfgactions.py:243 msgid "Run" msgstr "Exécuter" -#: cola/cmds.py:2341 +#: cola/cmds.py:2292 #, python-format msgid "Run \"%s\"?" msgstr "Exécuter « %s » ?" -#: cola/interaction.py:124 +#: cola/interaction.py:122 #, python-format msgid "Run %s?" msgstr "Exécuter %s ?" -#: cola/interaction.py:125 +#: cola/interaction.py:123 #, python-format msgid "Run the \"%s\" command?" msgstr "Exécuter la commande « %s » ?" -#: cola/cmds.py:2380 +#: cola/cmds.py:2331 #, python-format msgid "Running command: %s" msgstr "Exécution de la commande : %s" -#: cola/widgets/about.py:422 +#: cola/widgets/about.py:405 msgid "Russian translation" msgstr "Traduction russe" -#: cola/sequenceeditor.py:324 +#: cola/sequenceeditor.py:321 msgid "SHA-1" msgstr "SHA-1" -#: cola/widgets/prefs.py:183 +#: cola/widgets/prefs.py:205 msgid "Safe Mode" msgstr "Mode sûr" -#: cola/cmds.py:2167 cola/widgets/archive.py:126 cola/widgets/browse.py:609 -#: cola/widgets/editremotes.py:54 cola/widgets/stash.py:52 -#: cola/widgets/status.py:1388 +#: cola/cmds.py:2118 cola/widgets/archive.py:124 cola/widgets/browse.py:610 +#: cola/widgets/editremotes.py:53 cola/widgets/stash.py:54 +#: cola/widgets/status.py:1389 msgid "Save" msgstr "Enregistrer" -#: cola/widgets/archive.py:113 +#: cola/widgets/archive.py:111 msgid "Save Archive" msgstr "Enregistrer l'archive" -#: cola/widgets/dag.py:382 cola/widgets/main.py:351 +#: cola/widgets/dag.py:381 cola/widgets/main.py:346 msgid "Save As Tarball/Zip..." msgstr "Enregistrer comme Tarball/Zip..." -#: cola/widgets/prefs.py:263 +#: cola/widgets/prefs.py:284 msgid "Save GUI Settings" msgstr "Sauvegarder les paramètres de l'interface" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Save Stash" msgstr "Enregistrer la remise" -#: cola/widgets/stash.py:53 +#: cola/widgets/stash.py:55 msgid "Save modified state to new stash" msgstr "Enregistrer l'état modifié dans une nouvelle remise" -#: cola/widgets/browse.py:570 +#: cola/widgets/browse.py:571 #, python-format msgid "Saved \"%(filename)s\" from \"%(ref)s\" to \"%(destination)s\"" msgstr "Fichier(s) « %(filename)s » enregistré(s) à partir de « %(ref)s » dans « %(destination)s »" -#: cola/widgets/bookmarks.py:83 cola/widgets/grep.py:98 -#: cola/widgets/search.py:42 cola/widgets/search.py:62 +#: cola/widgets/bookmarks.py:82 cola/widgets/grep.py:96 +#: cola/widgets/search.py:41 cola/widgets/search.py:61 msgid "Search" msgstr "Rechercher" -#: cola/widgets/search.py:226 +#: cola/widgets/search.py:225 msgid "Search Authors" msgstr "Rechercher les auteurs" -#: cola/widgets/search.py:224 +#: cola/widgets/search.py:223 msgid "Search Commit Messages" msgstr "Rechercher par messages de commit" -#: cola/widgets/search.py:227 +#: cola/widgets/search.py:226 msgid "Search Committers" msgstr "Rechercher les commiteurs" -#: cola/widgets/search.py:228 +#: cola/widgets/search.py:227 msgid "Search Date Range" msgstr "Rechercher une période ciblée" -#: cola/widgets/search.py:225 +#: cola/widgets/search.py:224 msgid "Search Diffs" msgstr "Rechercher les différences" -#: cola/widgets/search.py:222 +#: cola/widgets/search.py:221 msgid "Search by Expression" msgstr "Rechercher par expression" -#: cola/widgets/search.py:223 +#: cola/widgets/search.py:222 msgid "Search by Path" msgstr "Rechercher par chemin" -#: cola/widgets/grep.py:124 +#: cola/widgets/dag.py:494 +msgid "Search commit messages" +msgstr "" + +#: cola/widgets/grep.py:122 msgid "Search for a fixed string" msgstr "Rechercher pour une chaîne donnée" -#: cola/widgets/diff.py:519 cola/widgets/diff.py:1514 +#: cola/widgets/diff.py:526 cola/widgets/diff.py:1576 msgid "Search in Diff" msgstr "" -#: cola/guicmds.py:253 cola/widgets/bookmarks.py:62 +#: cola/guicmds.py:252 cola/widgets/bookmarks.py:61 msgid "Search repositories by name..." msgstr "" -#: cola/widgets/grep.py:122 +#: cola/widgets/grep.py:120 msgid "Search using a POSIX basic regular expression" msgstr "Rechercher en utilisant une expression régulière basique POSIX" -#: cola/widgets/grep.py:123 +#: cola/widgets/grep.py:121 msgid "Search using a POSIX extended regular expression" msgstr "Rechercher en utilisant une expression régulière approfondie POSIX" -#: cola/widgets/main.py:493 +#: cola/widgets/main.py:506 msgid "Search..." msgstr "Rechercher..." -#: cola/widgets/selectcommits.py:67 +#: cola/widgets/selectcommits.py:66 msgid "Search:" msgstr "" -#: cola/guicmds.py:330 cola/widgets/selectcommits.py:74 +#: cola/guicmds.py:329 cola/widgets/selectcommits.py:73 msgid "Select" msgstr "Sélectionner" -#: cola/widgets/main.py:750 +#: cola/widgets/main.py:763 msgid "Select All" msgstr "Tout sélectionner" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Select Branch to Review" msgstr "Sélectionner une branche à examiner" -#: cola/widgets/dag.py:1610 +#: cola/widgets/dag.py:1667 msgid "Select Child" msgstr "Sélectionner un enfant" -#: cola/widgets/commitmsg.py:512 +#: cola/widgets/commitmsg.py:538 msgid "Select Commit" msgstr "Sélectionner commit" -#: cola/guicmds.py:137 +#: cola/guicmds.py:136 msgid "Select Directory..." msgstr "Sélectionnez un répertoire..." -#: cola/cmds.py:2129 +#: cola/cmds.py:2080 msgid "Select New Upstream" msgstr "Sélectionner une nouvelle source" -#: cola/widgets/dag.py:1614 +#: cola/widgets/dag.py:1671 msgid "Select Newest Child" msgstr "Sélectionner l'enfant le plus récent" -#: cola/widgets/dag.py:1604 +#: cola/widgets/dag.py:1661 msgid "Select Oldest Parent" msgstr "Sélectionner le parent le plus ancien" -#: cola/widgets/dag.py:1599 +#: cola/widgets/dag.py:1656 msgid "Select Parent" msgstr "Sélectionner le parent" -#: cola/widgets/browse.py:525 +#: cola/widgets/browse.py:526 msgid "Select Previous Version" msgstr "Sélectionner la version précédente" -#: cola/widgets/clone.py:197 +#: cola/widgets/clone.py:195 msgid "Select a parent directory for the new clone" msgstr "Sélectionner un répertoire parent pour le nouveau clonage" -#: cola/widgets/standard.py:756 cola/widgets/standard.py:779 +#: cola/widgets/standard.py:826 cola/widgets/standard.py:848 msgid "Select directory" msgstr "" -#: cola/widgets/selectcommits.py:162 +#: cola/widgets/selectcommits.py:161 msgid "Select output dir" msgstr "Sélectionner dossier de sortie" -#: cola/widgets/selectcommits.py:183 +#: cola/widgets/selectcommits.py:182 msgid "Select output directory" msgstr "Sélectionnez le répertoire de sortie" -#: cola/widgets/patch.py:175 +#: cola/widgets/diff.py:1769 msgid "Select patch file(s)..." msgstr "Sélectionnez le(s) fichier(s) de patch..." -#: cola/widgets/editremotes.py:437 +#: cola/widgets/editremotes.py:435 msgid "Select repository" msgstr "Sélectionner le dépôt" -#: cola/widgets/bookmarks.py:225 cola/widgets/startup.py:348 +#: cola/widgets/bookmarks.py:224 cola/widgets/startup.py:347 msgid "Set Default Repository" msgstr "Définirr le dépôt par défaut" -#: cola/widgets/branch.py:282 +#: cola/widgets/branch.py:291 msgid "Set Upstream Branch" msgstr "Définir la branche à jour" -#: cola/widgets/branch.py:72 +#: cola/widgets/branch.py:74 msgid "" "Set the sort order for branches and tags.\n" "Toggle between date-based and version-name-based sorting." @@ -3241,52 +3347,56 @@ msgstr "" "Définir l'ordre des branches et des marqueurs.\n" "Changer l'ordre entre basé sur la date ou sur le nom de la version." -#: cola/widgets/remote.py:213 +#: cola/widgets/remote.py:217 msgid "Set upstream" msgstr "Modifier la source" -#: cola/widgets/prefs.py:405 +#: cola/widgets/prefs.py:443 msgid "Settings" msgstr "Préférences" -#: cola/widgets/grep.py:142 +#: cola/widgets/grep.py:140 msgid "Shell arguments" msgstr "Arguments Shell" -#: cola/sequenceeditor.py:375 +#: cola/sequenceeditor.py:371 msgid "Shift Down" msgstr "Vers le bas" -#: cola/sequenceeditor.py:379 +#: cola/sequenceeditor.py:375 msgid "Shift Up" msgstr "Vers le haut" -#: cola/widgets/about.py:499 +#: cola/widgets/about.py:482 msgid "Shortcuts" msgstr "Raccourcis" -#: cola/widgets/prefs.py:179 +#: cola/widgets/prefs.py:201 msgid "Show Diffstat After Merge" msgstr "Montrer le Diffstat après la fusion" -#: cola/widgets/prefs.py:178 +#: cola/widgets/prefs.py:200 msgid "Show Full Paths in the Window Title" msgstr "Afficher le chemin complet dans le titre de la fenêtre" -#: cola/sequenceeditor.py:106 cola/widgets/finder.py:187 -#: cola/widgets/status.py:1384 +#: cola/sequenceeditor.py:104 cola/widgets/finder.py:186 +#: cola/widgets/status.py:1385 msgid "Show Help" msgstr "Afficher l'aide" -#: cola/widgets/filelist.py:30 +#: cola/widgets/filelist.py:27 msgid "Show History" msgstr "Afficher l'historique" -#: cola/widgets/prefs.py:348 +#: cola/widgets/prefs.py:368 msgid "Show file counts in Status titles" msgstr "Afficher le nombre de fichiers dans le titre du statut" -#: cola/sequenceeditor.py:171 cola/widgets/finder.py:138 +#: cola/widgets/diff.py:794 +msgid "Show filenames" +msgstr "" + +#: cola/sequenceeditor.py:169 cola/widgets/finder.py:137 msgid "" "Show help\n" "Shortcut: ?" @@ -3294,137 +3404,145 @@ msgstr "" "Afficher l'aide\n" "Raccourci : ?" -#: cola/widgets/diff.py:765 +#: cola/widgets/diff.py:792 msgid "Show line numbers" msgstr "Afficher le numéro des lignes" -#: cola/widgets/diff.py:761 +#: cola/widgets/remote.py:175 +msgid "Show remote messages" +msgstr "" + +#: cola/widgets/diff.py:789 msgid "Show whole surrounding functions of changes" msgstr "Afficher toutes les fonctions environnantes pour les changements" -#: cola/widgets/recent.py:58 +#: cola/widgets/recent.py:56 msgid "Showing changes since" msgstr "Afficher les modifications depuis" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "Side by side" msgstr "Côte-à-côte" -#: cola/cmds.py:2512 +#: cola/cmds.py:2463 msgid "Sign Off" msgstr "Signer" -#: cola/widgets/createtag.py:71 +#: cola/widgets/createtag.py:69 msgid "Sign Tag" msgstr "Signer le marqueur" -#: cola/widgets/commitmsg.py:55 +#: cola/widgets/commitmsg.py:56 msgid "Sign off on this commit" msgstr "Signer ce commit" -#: cola/widgets/about.py:412 cola/widgets/about.py:425 +#: cola/widgets/about.py:395 cola/widgets/about.py:408 msgid "Simplified Chinese translation" msgstr "Traductions en chinois simplifié" -#: cola/cmds.py:2587 +#: cola/cmds.py:2529 msgid "Skip" msgstr "Ignorer" -#: cola/widgets/main.py:264 cola/widgets/main.py:617 +#: cola/widgets/main.py:260 cola/widgets/main.py:630 msgid "Skip Current Patch" msgstr "Sauter le patch actuel" -#: cola/widgets/main.py:267 +#: cola/widgets/main.py:261 msgid "Skip applying the current patch and continue applying patches" msgstr "" -#: cola/widgets/prefs.py:261 +#: cola/widgets/prefs.py:282 msgid "Sort bookmarks alphabetically" msgstr "Trier les marque-pages par ordre alphabétique" -#: cola/widgets/about.py:413 cola/widgets/about.py:436 -#: cola/widgets/about.py:440 +#: cola/widgets/about.py:396 cola/widgets/about.py:419 +#: cola/widgets/about.py:423 msgid "Spanish translation" msgstr "Traduction espagnole" -#: cola/widgets/createtag.py:88 +#: cola/widgets/createtag.py:86 msgid "Specifies the SHA-1 to tag" msgstr "Spécifie le SHA-1 au marqueur" -#: cola/widgets/createtag.py:81 +#: cola/widgets/createtag.py:79 msgid "Specifies the tag message" msgstr "Définie le message du marqueur" -#: cola/widgets/createtag.py:65 +#: cola/widgets/createtag.py:63 msgid "Specifies the tag name" msgstr "Spécifie le nom du marqueur" -#: cola/widgets/spellcheck.py:46 +#: cola/widgets/spellcheck.py:45 msgid "Spelling Suggestions" msgstr "Suggestions d'orthographe" -#: cola/sequenceeditor.py:369 cola/widgets/merge.py:58 +#: cola/sequenceeditor.py:365 cola/widgets/merge.py:56 msgid "Squash" msgstr "Écraser" -#: cola/widgets/merge.py:57 +#: cola/widgets/merge.py:55 msgid "Squash the merged commits into a single commit" msgstr "Écraser les commits fusionnés en un seul commit" -#: cola/cmds.py:2598 cola/widgets/action.py:60 cola/widgets/diff.py:982 +#: cola/cmds.py:2540 cola/widgets/action.py:58 cola/widgets/diff.py:1168 msgid "Stage" msgstr "Pré-commiter" -#: cola/cmds.py:2753 +#: cola/cmds.py:2699 msgid "Stage / Unstage" msgstr "Pré-commiter/non pré-commiter" -#: cola/cmds.py:2735 +#: cola/cmds.py:2681 msgid "Stage / Unstage All" msgstr "Pré-commiter/non pré-commiter tous" -#: cola/widgets/diff.py:1016 +#: cola/widgets/diff.py:1055 msgid "Stage Diff Hunk" msgstr "Pré-commiter cette section" -#: cola/cmds.py:2691 +#: cola/cmds.py:2633 msgid "Stage Modified" msgstr "Pré-commit modifiés" -#: cola/cmds.py:2724 +#: cola/cmds.py:2670 msgid "Stage Modified and Untracked" msgstr "Pré-commiter les modifiés ou non suivis" -#: cola/widgets/status.py:872 cola/widgets/status.py:894 -#: cola/widgets/status.py:962 +#: cola/widgets/status.py:873 cola/widgets/status.py:895 +#: cola/widgets/status.py:963 msgid "Stage Selected" msgstr "Pré-commiter la sélection" -#: cola/widgets/diff.py:1011 +#: cola/widgets/diff.py:1050 msgid "Stage Selected Lines" msgstr "Pré-commiter lignes sélectionnées" -#: cola/cmds.py:2702 +#: cola/cmds.py:2644 msgid "Stage Unmerged" msgstr "Pré-commit défusionné" -#: cola/cmds.py:2713 +#: cola/cmds.py:2655 msgid "Stage Untracked" msgstr "Pré-commit démarqué" -#: cola/widgets/commitmsg.py:438 +#: cola/widgets/commitmsg.py:446 msgid "Stage and Commit" msgstr "Pré-commiter et commiter" -#: cola/widgets/commitmsg.py:435 +#: cola/widgets/commitmsg.py:443 msgid "Stage and commit?" msgstr "Pré-commiter et commiter ?" -#: cola/cmds.py:2586 +#: cola/widgets/action.py:58 +msgid "Stage changes using \"git add\"" +msgstr "" + +#: cola/cmds.py:2528 msgid "Stage conflicts" msgstr "Conflits de commit" -#: cola/cmds.py:2577 +#: cola/cmds.py:2519 msgid "Stage conflicts?" msgstr "Conflits de commit ?" @@ -3432,45 +3550,45 @@ msgstr "Conflits de commit ?" msgid "Stage/unstage selected paths for commit" msgstr "Non/Pré-commiter les chemins sélectionnés" -#: cola/models/browse.py:334 cola/widgets/status.py:156 -#: cola/widgets/status.py:620 +#: cola/models/browse.py:333 cola/widgets/status.py:156 +#: cola/widgets/status.py:621 msgid "Staged" msgstr "Pré-commité" -#: cola/cmds.py:2605 +#: cola/cmds.py:2547 #, python-format msgid "Staging: %s" msgstr "Pré-commit : %s" -#: cola/widgets/main.py:597 +#: cola/widgets/main.py:610 msgid "Start Interactive Rebase..." msgstr "Commencer le rétablissement interactif..." -#: cola/widgets/createbranch.py:107 +#: cola/widgets/createbranch.py:105 msgid "Starting Revision" msgstr "Début de révision" -#: cola/widgets/stash.py:40 +#: cola/widgets/stash.py:36 msgid "Stash" msgstr "Remiser" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash Index" msgstr "Remiser l'index" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash staged changes only" msgstr "Ne remiser que les modifications pré-commitées" -#: cola/widgets/stash.py:73 +#: cola/widgets/stash.py:75 msgid "Stash unstaged changes only, keeping staged changes" msgstr "Ne remiser que les modifications non pré-commitées, et garder celles pré-commitées" -#: cola/widgets/action.py:66 cola/widgets/main.py:414 +#: cola/widgets/action.py:76 cola/widgets/main.py:422 msgid "Stash..." msgstr "Cacher..." -#: cola/models/browse.py:33 cola/widgets/main.py:102 +#: cola/models/browse.py:32 cola/widgets/main.py:100 msgid "Status" msgstr "Statut" @@ -3478,128 +3596,136 @@ msgstr "Statut" msgid "Stop tracking paths" msgstr "Stopper le suivi des chemins" -#: cola/widgets/submodules.py:82 +#: cola/widgets/submodules.py:81 msgid "Submodule URL (can be relative, ex: ../repo.git)" msgstr "L'URL du sous-module (peut être relatif, par ex. ../repo.git)" -#: cola/widgets/submodules.py:90 +#: cola/widgets/submodules.py:89 msgid "Submodule branch to track (optional)" msgstr "La branche du sous-module à suivre (facultatif)" -#: cola/widgets/submodules.py:86 +#: cola/widgets/submodules.py:85 msgid "Submodule path within the current repository (optional)" msgstr "Le chemin du sous-module dans le dépôt actuel (facultatif)" -#: cola/widgets/main.py:143 cola/widgets/submodules.py:32 +#: cola/widgets/main.py:141 cola/widgets/submodules.py:31 msgid "Submodules" msgstr "Sous-modules" -#: cola/widgets/prefs.py:174 +#: cola/widgets/prefs.py:196 msgid "Summarize Merge Commits" msgstr "Résumer les commits de fusion" -#: cola/sequenceeditor.py:325 cola/widgets/dag.py:506 +#: cola/sequenceeditor.py:322 cola/widgets/dag.py:572 msgid "Summary" msgstr "Résumé" -#: cola/widgets/prefs.py:168 +#: cola/widgets/prefs.py:273 msgid "Tab Width" msgstr "Largeur de la tabulation" -#: cola/widgets/cfgactions.py:229 cola/widgets/createbranch.py:116 -#: cola/widgets/merge.py:48 +#: cola/widgets/cfgactions.py:227 cola/widgets/createbranch.py:114 +#: cola/widgets/merge.py:46 msgid "Tag" msgstr "Marquer" -#: cola/cmds.py:2842 +#: cola/cmds.py:2788 msgid "Tag Created" msgstr "Marqueur créé" -#: cola/widgets/createtag.py:80 +#: cola/widgets/createtag.py:78 msgid "Tag message..." msgstr "Message du marqueur..." -#: cola/cmds.py:2802 +#: cola/cmds.py:2748 msgid "Tag-signing was requested but the tag message is empty." msgstr "La signature du marqueur a été demandée mais le message du marqueur est vide." -#: cola/widgets/branch.py:179 cola/widgets/branch.py:238 +#: cola/widgets/branch.py:183 cola/widgets/branch.py:248 msgid "Tags" msgstr "Marqueurs" -#: cola/widgets/toolbar.py:180 +#: cola/widgets/action.py:78 cola/widgets/main.py:423 +msgid "Temporarily stash away uncommitted changes using \"git stash\"" +msgstr "" + +#: cola/widgets/toolbar.py:184 msgid "Text Beside Icon" msgstr "" -#: cola/widgets/toolbar.py:179 +#: cola/widgets/toolbar.py:183 msgid "Text Only" msgstr "" -#: cola/widgets/toolbar.py:181 +#: cola/widgets/toolbar.py:185 msgid "Text Under Icon" msgstr "" -#: cola/widgets/prefs.py:169 +#: cola/widgets/prefs.py:272 msgid "Text Width" msgstr "Largeur du texte" -#: cola/cmds.py:1116 +#: cola/cmds.py:1117 msgid "The branch will be no longer available." msgstr "Cette branche ne sera plus disponible." -#: cola/cmds.py:648 +#: cola/cmds.py:650 #, python-format msgid "The branch will be reset using \"git reset --mixed %s\"" msgstr "La branche sera réinitialisée en utilisant « git reset --mixed %s »" -#: cola/cmds.py:699 cola/cmds.py:790 +#: cola/cmds.py:701 cola/cmds.py:792 #, python-format msgid "The branch will be reset using \"git reset --soft %s\"" msgstr "La branche sera réinitialisée en utilisant « git reset --soft %s »" -#: cola/widgets/commitmsg.py:303 +#: cola/widgets/commitmsg.py:311 msgid "The commit message will be cleared." msgstr "Le message de commit sera effacé." -#: cola/widgets/prefs.py:146 +#: cola/widgets/prefs.py:169 msgid "" "The date-time format used when displaying dates in Git DAG.\n" "This value is passed to git log --date=" msgstr "" -#: cola/widgets/archive.py:208 +#: cola/widgets/archive.py:206 #, python-format msgid "The file \"%s\" exists and will be overwritten." msgstr "Le fichier « %s » existe et sera écrasé." -#: cola/cmds.py:1086 +#: cola/cmds.py:1087 msgid "The following files will be deleted:" msgstr "Les fichiers suivants seront effacés :" -#: cola/widgets/status.py:1646 +#: cola/widgets/status.py:1647 msgid "The number of leading paths to strip" msgstr "" -#: cola/cmds.py:716 +#: cola/cmds.py:718 #, python-format msgid "The repository will be reset using \"git reset --hard %s\"" msgstr "Le dépôt va être réinitialisé avec « git reset --hard %s »" -#: cola/cmds.py:665 +#: cola/cmds.py:667 #, python-format msgid "The repository will be reset using \"git reset --keep %s\"" msgstr "Le dépôt va être réinitialisé avec « git reset --keep %s »" -#: cola/cmds.py:682 +#: cola/cmds.py:684 #, python-format msgid "The repository will be reset using \"git reset --merge %s\"" msgstr "Le dépôt va être réinitialisé avec « git reset --merge %s »" -#: cola/cmds.py:2365 +#: cola/cmds.py:2316 msgid "The revision expression cannot be empty." msgstr "L'expression de révision est vide." -#: cola/cmds.py:3029 +#: cola/widgets/stash.py:225 +msgid "The stash has not been renamed" +msgstr "" + +#: cola/cmds.py:2975 #, python-format msgid "" "The submodule will be added using\n" @@ -3608,23 +3734,23 @@ msgstr "" "Le sous-module va être ajouté avec\n" "« %s »" -#: cola/cmds.py:3074 +#: cola/cmds.py:3020 #, python-format msgid "" "The submodule will be updated using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:736 +#: cola/cmds.py:738 #, python-format msgid "The worktree will be restored using \"git read-tree --reset -u %s\"" msgstr "L'arbre de travail sera restauré avec \"git read-tree --reset -u %s\"" -#: cola/widgets/commitmsg.py:304 +#: cola/widgets/commitmsg.py:312 msgid "This cannot be undone. Clear commit message?" msgstr "Cela ne peut pas être annulé. Effacer le message du commit ?" -#: cola/cmds.py:778 cola/widgets/commitmsg.py:458 +#: cola/cmds.py:780 cola/widgets/commitmsg.py:466 msgid "" "This commit has already been published.\n" "This operation will rewrite published history.\n" @@ -3634,7 +3760,7 @@ msgstr "" "Cette opération réécrira l'historique publié.\n" "Vous ne voulez probablement pas effectuer cela." -#: cola/widgets/diff.py:1158 +#: cola/widgets/diff.py:1232 msgid "" "This operation drops uncommitted changes.\n" "These changes cannot be recovered." @@ -3642,7 +3768,7 @@ msgstr "" "Cette opération supprime les modifications non commitées.\n" "Ces modifications ne pourront pas être récupérées." -#: cola/cmds.py:2307 +#: cola/cmds.py:2258 msgid "" "This operation removes uncommitted edits from selected files.\n" "These changes cannot be recovered." @@ -3650,7 +3776,7 @@ msgstr "" "Cette opération supprime les modifications non commitées.\n" "Ces modifications ne pourront pas être récupérées." -#: cola/cmds.py:2285 +#: cola/cmds.py:2236 msgid "" "This operation removes unstaged edits from selected files.\n" "These changes cannot be recovered." @@ -3658,27 +3784,27 @@ msgstr "" "Cette opération supprime les modifications pré-commitées.\n" "Ces modifications ne pourront pas être récupérées." -#: cola/cmds.py:475 +#: cola/cmds.py:476 msgid "" "This operation will replace the selected unmerged files with content from the branch being merged using \"git checkout --theirs\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:513 +#: cola/cmds.py:514 msgid "" "This operation will replace the selected unmerged files with content from your current branch using \"git checkout --ours\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/widgets/main.py:1109 +#: cola/widgets/main.py:1122 msgid "" "This repository has unresolved conflicts after applying a patch.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1102 +#: cola/widgets/main.py:1115 msgid "" "This repository is currently being rebased.\n" "Resolve conflicts, commit changes, and run:\n" @@ -3688,13 +3814,13 @@ msgstr "" "Résolvez les conflits, commitez les changements et exécutez :\n" " Rétablir > Continuer" -#: cola/widgets/main.py:1115 +#: cola/widgets/main.py:1128 msgid "" "This repository is in the middle of a cherry-pick.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1121 +#: cola/widgets/main.py:1134 msgid "" "This repository is in the middle of a merge.\n" "Resolve conflicts and commit changes." @@ -3714,15 +3840,15 @@ msgstr "" msgid "To avoid applying removal lines ('-'), change them to context lines (' ')." msgstr "" -#: cola/sequenceeditor.py:342 +#: cola/sequenceeditor.py:338 msgid "Toggle Enabled" msgstr "Dés/activer actif" -#: cola/widgets/diff.py:776 +#: cola/widgets/diff.py:804 msgid "Toggle image diff" msgstr "Dés/activer le différence des images" -#: cola/widgets/branch.py:63 +#: cola/widgets/branch.py:65 msgid "Toggle the branches filter" msgstr "Dés/activer le filtre des branches" @@ -3730,51 +3856,51 @@ msgstr "Dés/activer le filtre des branches" msgid "Toggle the paths filter" msgstr "Dés/activer le filtre des chemins" -#: cola/widgets/toolbar.py:317 +#: cola/widgets/toolbar.py:322 msgid "Toolbar Style:" msgstr "" -#: cola/widgets/cfgactions.py:228 cola/widgets/merge.py:47 +#: cola/widgets/cfgactions.py:226 cola/widgets/merge.py:45 msgid "Tracking Branch" msgstr "Suivi de branche" -#: cola/widgets/createbranch.py:115 +#: cola/widgets/createbranch.py:113 msgid "Tracking branch" msgstr "Suivi de branche" -#: cola/widgets/about.py:408 cola/widgets/about.py:434 -#: cola/widgets/about.py:445 +#: cola/widgets/about.py:391 cola/widgets/about.py:417 +#: cola/widgets/about.py:428 msgid "Traditional Chinese (Taiwan) translation" msgstr "Traduction chinois traditionnel (Taïwan)" -#: cola/widgets/about.py:439 +#: cola/widgets/about.py:422 msgid "Translation" msgstr "Traduction" -#: cola/widgets/about.py:94 +#: cola/widgets/about.py:92 msgid "Translators" msgstr "Traducteurs" -#: cola/widgets/about.py:418 cola/widgets/about.py:423 -#: cola/widgets/about.py:438 +#: cola/widgets/about.py:401 cola/widgets/about.py:406 +#: cola/widgets/about.py:421 msgid "Turkish translation" msgstr "Traduction turque" -#: cola/widgets/clone.py:109 cola/widgets/editremotes.py:451 -#: cola/widgets/submodules.py:117 +#: cola/widgets/clone.py:107 cola/widgets/editremotes.py:449 +#: cola/widgets/submodules.py:116 msgid "URL" msgstr "URL" -#: cola/widgets/remote.py:463 +#: cola/widgets/remote.py:497 #, python-format msgid "URL: %s" msgstr "URL : %s" -#: cola/widgets/about.py:415 +#: cola/widgets/about.py:398 msgid "Ukranian translation" msgstr "Traduction ukrainienne" -#: cola/cmds.py:2122 +#: cola/cmds.py:2073 msgid "Unable to rebase" msgstr "Impossible de rétablir" @@ -3783,53 +3909,58 @@ msgstr "Impossible de rétablir" msgid "Unable to set URL for \"%(name)s\" to \"%(url)s\"" msgstr "Impossible de mettre l'URL de « %(name)s » pour « %(url)s »" -#: cola/widgets/diff.py:1327 +#: cola/widgets/diff.py:1401 #, python-format msgid "Unable to write patch to \"%s\". Check permissions?" msgstr "" -#: cola/widgets/main.py:735 +#: cola/widgets/main.py:748 msgid "Undo" msgstr "Annuler" -#: cola/cmds.py:783 cola/cmds.py:788 cola/cmds.py:791 cola/widgets/main.py:208 +#: cola/cmds.py:785 cola/cmds.py:790 cola/cmds.py:793 cola/widgets/main.py:207 msgid "Undo Last Commit" msgstr "Annuler le dernier commit" -#: cola/cmds.py:789 +#: cola/cmds.py:791 msgid "Undo last commit?" msgstr "Annuler le dernier commit ?" -#: cola/cmds.py:782 +#: cola/cmds.py:784 msgid "Undo the published commit?" msgstr "Annuler le commit publié ?" -#: cola/models/browse.py:328 cola/widgets/status.py:157 -#: cola/widgets/status.py:640 +#: cola/models/browse.py:327 cola/widgets/status.py:157 +#: cola/widgets/status.py:641 msgid "Unmerged" msgstr "Non fusionné" -#: cola/cmds.py:2855 cola/widgets/action.py:61 cola/widgets/diff.py:985 +#: cola/cmds.py:2801 cola/widgets/action.py:61 cola/widgets/diff.py:1165 +#: cola/widgets/main.py:212 msgid "Unstage" msgstr "Retirer du pré-commit" -#: cola/widgets/main.py:203 cola/widgets/status.py:790 +#: cola/widgets/main.py:202 cola/widgets/status.py:791 msgid "Unstage All" msgstr "Tout retirer du pré-commit" -#: cola/widgets/diff.py:1061 +#: cola/widgets/diff.py:1017 msgid "Unstage Diff Hunk" msgstr "Retirer ce diff du pré-commit" -#: cola/widgets/status.py:823 cola/widgets/status.py:858 +#: cola/widgets/status.py:824 cola/widgets/status.py:859 msgid "Unstage Selected" msgstr "Retirer sélection du pré-commit" -#: cola/widgets/diff.py:1058 +#: cola/widgets/diff.py:1015 msgid "Unstage Selected Lines" msgstr "Retirer les lignes sélectionnées du pré-commit" -#: cola/cmds.py:2867 +#: cola/widgets/action.py:61 +msgid "Unstage changes using \"git reset\"" +msgstr "" + +#: cola/cmds.py:2813 #, python-format msgid "Unstaging: %s" msgstr "Retirer du pré-commit : %s" @@ -3838,85 +3969,84 @@ msgstr "Retirer du pré-commit : %s" msgid "Untrack Selected" msgstr "Ne plus suivre la sélection" -#: cola/widgets/status.py:159 cola/widgets/status.py:646 +#: cola/widgets/status.py:159 cola/widgets/status.py:647 msgid "Untracked" msgstr "Non suivi" -#: cola/cmds.py:1141 cola/cmds.py:2923 +#: cola/cmds.py:1142 cola/cmds.py:2869 #, python-format msgid "Untracking: %s" msgstr "Non-suivi : %s" -#: cola/widgets/main.py:374 +#: cola/widgets/main.py:369 msgid "Update All Submodules..." msgstr "Mettre à jour tous les sous-modules..." -#: cola/widgets/createbranch.py:121 +#: cola/widgets/createbranch.py:119 msgid "Update Existing Branch:" msgstr "Mettre à jour branche existante :" -#: cola/cmds.py:3075 +#: cola/cmds.py:3021 msgid "Update Submodule" msgstr "Mettre à jour le sous-module" -#: cola/cmds.py:3072 +#: cola/cmds.py:3018 msgid "Update Submodule..." msgstr "Mettre à jour le sous-module..." -#: cola/cmds.py:3111 +#: cola/cmds.py:3057 msgid "Update Submodules" msgstr "Mettre à jour les sous-modules" -#: cola/cmds.py:3109 +#: cola/cmds.py:3055 msgid "Update all submodules?" msgstr "Mettre à jour tous les sous-modules ?" -#: cola/cmds.py:2093 +#: cola/cmds.py:2044 msgid "Update stacked branches" msgstr "" -#: cola/cmds.py:2085 cola/cmds.py:2092 +#: cola/cmds.py:2036 cola/cmds.py:2043 msgid "Update stacked branches when rebasing?" msgstr "" -#: cola/cmds.py:3108 +#: cola/cmds.py:3054 msgid "Update submodules..." msgstr "Mettre à jour les sous-modules..." -#: cola/widgets/status.py:953 +#: cola/widgets/status.py:954 msgid "Update this submodule" msgstr "Mettre à jour ce sous-module" -#: cola/cmds.py:3073 +#: cola/cmds.py:3019 msgid "Update this submodule?" msgstr "Mettre à jour ce sous-module ?" -#: cola/widgets/branch.py:421 cola/widgets/createbranch.py:302 -#: cola/widgets/remote.py:135 +#: cola/widgets/branch.py:433 cola/widgets/createbranch.py:300 msgid "Updating" msgstr "Mise à jour" -#: cola/widgets/prefs.py:350 +#: cola/widgets/prefs.py:370 msgid "Use a block cursor in diff editors" msgstr "" -#: cola/widgets/prefs.py:154 +#: cola/widgets/prefs.py:177 msgid "Use gravatar.com to lookup icons for author emails" msgstr "" -#: cola/widgets/prefs.py:166 +#: cola/widgets/prefs.py:189 msgid "User Name" msgstr "Nom d'utilisateur" -#: cola/widgets/about.py:92 +#: cola/widgets/about.py:90 msgid "Version" msgstr "Version" -#: cola/widgets/dag.py:800 cola/widgets/main.py:845 cola/widgets/main.py:966 +#: cola/widgets/dag.py:866 cola/widgets/main.py:858 cola/widgets/main.py:979 msgid "View" msgstr "Affichage" -#: cola/widgets/browse.py:137 cola/widgets/status.py:278 +#: cola/widgets/browse.py:137 cola/widgets/status.py:279 msgid "View History..." msgstr "Afficher l'historique..." @@ -3924,39 +4054,39 @@ msgstr "Afficher l'historique..." msgid "View history for selected paths" msgstr "Afficher l'historique pour les chemins sélectionnés" -#: cola/widgets/merge.py:54 +#: cola/widgets/branch.py:224 cola/widgets/merge.py:52 msgid "Visualize" msgstr "Visualiser" -#: cola/widgets/main.py:488 +#: cola/widgets/main.py:501 msgid "Visualize All Branches..." msgstr "Visualiser toutes les branches..." -#: cola/widgets/main.py:482 +#: cola/widgets/main.py:495 msgid "Visualize Current Branch..." msgstr "Visualiser la branche courante..." -#: cola/widgets/createtag.py:73 +#: cola/widgets/createtag.py:71 msgid "Whether to sign the tag (git tag -s)" msgstr "Si vous voulez signer le marqueur (git tag -s)" -#: cola/widgets/text.py:399 +#: cola/widgets/text.py:396 msgid "Whole Words" msgstr "" -#: cola/widgets/commitmsg.py:432 +#: cola/widgets/commitmsg.py:440 msgid "Would you like to stage and commit all modified files?" msgstr "Voulez-vous pré-commiter puis commiter tous les fichiers modifiés ?" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "XOR" msgstr "Ou-exclusif" -#: cola/widgets/standard.py:1064 +#: cola/widgets/standard.py:1182 msgid "Yes" msgstr "Oui" -#: cola/cmds.py:256 +#: cola/cmds.py:255 msgid "" "You are in the middle of a merge.\n" "Cannot amend while merging." @@ -3964,36 +4094,36 @@ msgstr "" "Vous êtes au milieu d'une fusion.\n" "Impossible de corriger durant cette fusion." -#: cola/cmds.py:2123 +#: cola/cmds.py:2074 msgid "You cannot rebase with uncommitted changes." msgstr "Vous ne pouvez pas rétablir avec des modifications non commitées." -#: cola/widgets/merge.py:227 +#: cola/widgets/merge.py:225 msgid "You must specify a revision to merge." msgstr "Vous devez spécifier une révision à fusionner." -#: cola/widgets/merge.py:217 +#: cola/widgets/merge.py:215 msgid "You must specify a revision to view." msgstr "Vous devez spécifier une révision à afficher." -#: cola/widgets/dag.py:710 cola/widgets/dag.py:1588 +#: cola/widgets/dag.py:776 cola/widgets/dag.py:1645 msgid "Zoom In" msgstr "Zoom avant" -#: cola/widgets/dag.py:706 cola/widgets/dag.py:1594 +#: cola/widgets/dag.py:772 cola/widgets/dag.py:1651 msgid "Zoom Out" msgstr "Zoom arrière" -#: cola/widgets/dag.py:524 cola/widgets/dag.py:714 cola/widgets/dag.py:1596 -#: cola/widgets/diff.py:785 +#: cola/widgets/dag.py:590 cola/widgets/dag.py:780 cola/widgets/dag.py:1653 +#: cola/widgets/diff.py:813 msgid "Zoom to Fit" msgstr "Ajuster à la largeur" -#: cola/widgets/grep.py:112 +#: cola/widgets/grep.py:110 msgid "command-line arguments" msgstr "arguments en ligne de commande" -#: cola/widgets/main.py:932 cola/widgets/main.py:938 +#: cola/widgets/main.py:945 cola/widgets/main.py:951 msgid "error: unable to execute git" msgstr "erreur : impossible d'exécuter git" @@ -4002,45 +4132,41 @@ msgstr "erreur : impossible d'exécuter git" msgid "exit code %s" msgstr "code de sortie %s" -#: cola/app.py:301 +#: cola/app.py:304 #, python-format msgid "fatal: \"%s\" is not a directory. Please specify a correct --repo ." msgstr "erreur fatale : « %s » n'est pas un répertoire. Veuillez sélectionner un --repo valide." -#: cola/widgets/main.py:928 +#: cola/widgets/main.py:941 #, python-format msgid "git cola version %s" msgstr "Version de git cola %s" -#: cola/widgets/startup.py:35 +#: cola/widgets/startup.py:34 msgid "git-cola" msgstr "git-cola" -#: cola/difftool.py:63 +#: cola/difftool.py:82 msgid "git-cola diff" msgstr "git-cola diff" -#: cola/widgets/submodules.py:81 +#: cola/widgets/submodules.py:80 msgid "git://git.example.com/repo.git" msgstr "git://git.example.com/repo.git" -#: cola/widgets/grep.py:132 +#: cola/widgets/grep.py:130 msgid "grep result..." msgstr "Résultat de grep..." -#: cola/widgets/about.py:486 +#: cola/widgets/about.py:469 msgid "hotkeys.html" msgstr "hotkeys.html" -#: cola/widgets/submodules.py:85 +#: cola/widgets/submodules.py:84 msgid "path/to/submodule" msgstr "path/to/submodule" -#: cola/cmds.py:2537 -msgid "unknown" -msgstr "inconnu" - -#: cola/widgets/createtag.py:63 +#: cola/widgets/createtag.py:61 msgid "vX.Y.Z" msgstr "vX.Y.Z" @@ -4049,14 +4175,18 @@ msgid "x 1" msgstr "1x" #: cola/hidpi.py:44 +msgid "x 1.25" +msgstr "" + +#: cola/hidpi.py:45 msgid "x 1.5" msgstr "1.5x" -#: cola/hidpi.py:45 +#: cola/hidpi.py:46 msgid "x 2" msgstr "2x" -#: cola/widgets/search.py:53 cola/widgets/search.py:58 +#: cola/widgets/search.py:52 cola/widgets/search.py:57 msgid "yyyy-MM-dd" msgstr "dd/MM/yyyy" @@ -4131,6 +4261,13 @@ msgstr "dd/MM/yyyy" #~ "ctrl+q = tout annuler dont le rétablissement\n" #~ "ctrl+d = lancer difftool\n" +#, python-format +#~ msgid "A stash named \"%s\" already exists" +#~ msgstr "Un stash nommé « %s » existe déjà" + +#~ msgid "Error: Stash exists" +#~ msgstr "Erreur : le stash existe" + #~ msgid "Reset Branch Head" #~ msgstr "Supprimer la branche principale" @@ -4160,3 +4297,6 @@ msgstr "dd/MM/yyyy" #~ msgid "title" #~ msgstr "titre" + +#~ msgid "unknown" +#~ msgstr "inconnu" diff --git a/cola/i18n/git-cola.pot b/cola/i18n/git-cola.pot index 1d3b5961..c791025b 100644 --- a/cola/i18n/git-cola.pot +++ b/cola/i18n/git-cola.pot @@ -1,4 +1,4 @@ -#: cola/widgets/patch.py:86 +#: cola/widgets/diff.py:1680 msgid "" "\n" "

\n" @@ -8,7 +8,7 @@ msgid "" " " msgstr "" -#: cola/widgets/about.py:455 +#: cola/widgets/about.py:438 #, python-format msgid "" "\n" @@ -37,7 +37,7 @@ msgid "" " " msgstr "" -#: cola/widgets/about.py:180 +#: cola/widgets/about.py:182 #, python-format msgid "" "\n" @@ -54,7 +54,7 @@ msgid "" " " msgstr "" -#: cola/widgets/about.py:387 +#: cola/widgets/about.py:370 #, python-format msgid "" "\n" @@ -64,7 +64,7 @@ msgid "" " " msgstr "" -#: cola/widgets/status.py:1310 +#: cola/widgets/status.py:1311 #, python-format msgid "" "\n" @@ -79,7 +79,7 @@ msgid "" " %(ext)s = file extension\n" msgstr "" -#: cola/sequenceeditor.py:700 +#: cola/sequenceeditor.py:695 msgid "" "\n" "Commands\n" @@ -118,7 +118,7 @@ msgid "" "ctrl+d = launch difftool\n" msgstr "" -#: cola/widgets/finder.py:65 +#: cola/widgets/finder.py:64 msgid "" "\n" "Keyboard Shortcuts\n" @@ -134,45 +134,71 @@ msgid "" "and the results.\n" msgstr "" -#: cola/widgets/dag.py:894 +#: cola/widgets/prefs.py:133 +msgid "" +"\n" +"This option determines how the supplied commit message should be\n" +"cleaned up before committing.\n" +"\n" +"The can be strip, whitespace, verbatim, scissors or default.\n" +"\n" +"strip\n" +" Strip leading and trailing empty lines, trailing whitespace,\n" +" commentary and collapse consecutive empty lines.\n" +"\n" +"whitespace\n" +" Same as strip except #commentary is not removed.\n" +"\n" +"verbatim\n" +" Do not change the message at all.\n" +"\n" +"scissors\n" +" Same as whitespace except that everything from (and including) the line\n" +" found below is truncated, if the message is to be edited.\n" +" \"#\" can be customized with core.commentChar.\n" +"\n" +" # ------------------------ >8 ------------------------" +msgstr "" + +#: cola/widgets/dag.py:960 msgid " - DAG" msgstr "" -#: cola/widgets/recent.py:54 +#: cola/widgets/recent.py:52 msgid " commits ago" msgstr "" -#: cola/cmds.py:1197 +#: cola/cmds.py:1198 #, python-format msgid "\"%(branch)s\" has been deleted from \"%(remote)s\"." msgstr "" -#: cola/widgets/createbranch.py:316 +#: cola/widgets/createbranch.py:314 #, python-format msgid "\"%(command)s\" returned exit status \"%(status)d\"" msgstr "" -#: cola/interaction.py:39 +#: cola/interaction.py:38 #, python-format msgid "\"%(command)s\" returned exit status %(status)d" msgstr "" -#: cola/guicmds.py:157 +#: cola/guicmds.py:156 #, python-format msgid "\"%s\" already exists" msgstr "" -#: cola/widgets/clone.py:206 +#: cola/widgets/clone.py:204 #, python-format msgid "\"%s\" already exists, cola will create a new directory" msgstr "" -#: cola/cmds.py:2349 +#: cola/cmds.py:2300 #, python-format msgid "\"%s\" requires a selected file." msgstr "" -#: cola/cmds.py:2087 +#: cola/cmds.py:2038 msgid "" "\"git rebase --update-refs\" automatically force-updates any\n" "branches that point to commits that are being rebased.\n" @@ -182,7 +208,11 @@ msgid "" "Using this feature is helpful for \"stacked\" branch workflows." msgstr "" -#: cola/sequenceeditor.py:321 +#: cola/models/stash.py:145 +msgid "\"git stash drop\" did not return a ref to rename." +msgstr "" + +#: cola/sequenceeditor.py:318 msgid "#" msgstr "" @@ -191,37 +221,37 @@ msgstr "" msgid "%(project)s: %(branch)s - Browse" msgstr "" -#: cola/widgets/dag.py:887 +#: cola/widgets/dag.py:953 #, python-format msgid "%(project)s: %(ref)s - DAG" msgstr "" -#: cola/models/browse.py:315 +#: cola/models/browse.py:314 #, python-format msgid "%d days ago" msgstr "" -#: cola/models/browse.py:314 +#: cola/models/browse.py:313 #, python-format msgid "%d hours ago" msgstr "" -#: cola/models/browse.py:307 cola/models/browse.py:311 +#: cola/models/browse.py:306 cola/models/browse.py:310 #, python-format msgid "%d minutes ago" msgstr "" -#: cola/cmds.py:376 +#: cola/cmds.py:377 #, python-format msgid "%d patch(es) applied." msgstr "" -#: cola/widgets/createbranch.py:281 +#: cola/widgets/createbranch.py:279 #, python-format msgid "%d skipped" msgstr "" -#: cola/cmds.py:2580 +#: cola/cmds.py:2522 #, python-format msgid "" "%s appears to contain merge conflicts.\n" @@ -230,36 +260,36 @@ msgid "" "Stage it anyways?" msgstr "" -#: cola/widgets/startup.py:263 +#: cola/widgets/startup.py:262 #, python-format msgid "%s could not be opened. Remove from bookmarks?" msgstr "" -#: cola/app.py:498 cola/widgets/bookmarks.py:482 +#: cola/app.py:501 cola/widgets/bookmarks.py:481 #, python-format msgid "%s is not a Git repository." msgstr "" -#: cola/cmds.py:1015 +#: cola/cmds.py:1016 #, python-format msgid "%s will be removed from your bookmarks." msgstr "" -#: cola/cmds.py:1028 +#: cola/cmds.py:1029 #, python-format msgid "%s will be removed from your recent repositories." msgstr "" -#: cola/cmds.py:1711 +#: cola/cmds.py:1663 #, python-format msgid "%s: No such file or directory." msgstr "" -#: cola/widgets/main.py:734 +#: cola/widgets/main.py:747 msgid "&Edit" msgstr "" -#: cola/widgets/main.py:676 +#: cola/widgets/main.py:689 msgid "&File" msgstr "" @@ -267,195 +297,190 @@ msgstr "" msgid "(Amending)" msgstr "" -#: cola/widgets/compare.py:36 +#: cola/widgets/compare.py:35 msgid "*** Branch Point ***" msgstr "" -#: cola/widgets/compare.py:37 +#: cola/widgets/compare.py:36 msgid "*** Sandbox ***" msgstr "" -#: cola/widgets/diff.py:788 +#: cola/widgets/diff.py:816 msgid "100%" msgstr "" -#: cola/widgets/diff.py:789 +#: cola/widgets/diff.py:817 msgid "200%" msgstr "" -#: cola/widgets/diff.py:786 +#: cola/widgets/diff.py:814 msgid "25%" msgstr "" -#: cola/widgets/diff.py:790 +#: cola/widgets/diff.py:818 msgid "400%" msgstr "" -#: cola/widgets/diff.py:787 +#: cola/widgets/diff.py:815 msgid "50%" msgstr "" -#: cola/widgets/diff.py:791 +#: cola/widgets/diff.py:819 msgid "800%" msgstr "" -#: cola/widgets/finder.py:119 +#: cola/widgets/finder.py:118 msgid " ..." msgstr "" -#: cola/cmds.py:1734 +#: cola/cmds.py:1686 msgid "" "A commit template has not been configured.\n" "Use \"git config\" to define \"commit.template\"\n" "so that it points to a commit template." msgstr "" -#: cola/cmds.py:1784 +#: cola/cmds.py:1735 #, python-format msgid "A hook must be provided at \"%s\"" msgstr "" -#: cola/widgets/stash.py:236 -#, python-format -msgid "A stash named \"%s\" already exists" -msgstr "" - -#: cola/widgets/cfgactions.py:82 cola/widgets/main.py:622 +#: cola/widgets/cfgactions.py:81 cola/widgets/main.py:635 msgid "Abort" msgstr "" -#: cola/widgets/cfgactions.py:149 cola/widgets/cfgactions.py:155 +#: cola/widgets/cfgactions.py:148 cola/widgets/cfgactions.py:154 msgid "Abort Action" msgstr "" -#: cola/cmds.py:132 +#: cola/cmds.py:131 msgid "Abort Applying Patch" msgstr "" -#: cola/cmds.py:126 +#: cola/cmds.py:125 msgid "Abort Applying Patch..." msgstr "" -#: cola/widgets/main.py:245 +#: cola/widgets/main.py:244 msgid "Abort Applying Patches..." msgstr "" -#: cola/cmds.py:162 +#: cola/cmds.py:161 msgid "Abort Cherry-Pick" msgstr "" -#: cola/cmds.py:156 cola/widgets/main.py:334 +#: cola/cmds.py:155 cola/widgets/main.py:329 msgid "Abort Cherry-Pick..." msgstr "" -#: cola/cmds.py:193 +#: cola/cmds.py:192 msgid "Abort Merge" msgstr "" -#: cola/cmds.py:186 cola/widgets/main.py:368 +#: cola/cmds.py:185 cola/widgets/main.py:363 msgid "Abort Merge..." msgstr "" -#: cola/widgets/cfgactions.py:154 +#: cola/widgets/cfgactions.py:153 msgid "Abort the action?" msgstr "" -#: cola/widgets/main.py:250 +#: cola/widgets/main.py:245 msgid "Abort the current \"git am\" patch session" msgstr "" -#: cola/cmds.py:159 +#: cola/cmds.py:158 msgid "" "Aborting a cherry-pick can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:129 +#: cola/cmds.py:128 msgid "" "Aborting a patch can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:127 +#: cola/cmds.py:126 msgid "Aborting applying the current patch?" msgstr "" -#: cola/cmds.py:157 +#: cola/cmds.py:156 msgid "Aborting the current cherry-pick?" msgstr "" -#: cola/cmds.py:189 +#: cola/cmds.py:188 msgid "" "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:187 +#: cola/cmds.py:186 msgid "Aborting the current merge?" msgstr "" -#: cola/widgets/about.py:91 cola/widgets/main.py:517 +#: cola/widgets/about.py:89 cola/widgets/main.py:530 msgid "About" msgstr "" -#: cola/widgets/about.py:67 +#: cola/widgets/about.py:65 msgid "About git-cola" msgstr "" -#: cola/widgets/bookmarks.py:217 cola/widgets/startup.py:340 +#: cola/widgets/bookmarks.py:216 cola/widgets/startup.py:339 msgid "Accept" msgstr "" -#: cola/sequenceeditor.py:159 +#: cola/sequenceeditor.py:157 msgid "" "Accept changes and rebase\n" "Shortcut: Ctrl+Enter" msgstr "" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Action Name" msgstr "" -#: cola/sequenceeditor.py:528 cola/widgets/bookmarks.py:321 -#: cola/widgets/branch.py:217 cola/widgets/browse.py:374 -#: cola/widgets/commitmsg.py:99 cola/widgets/dag.py:315 -#: cola/widgets/filelist.py:110 cola/widgets/main.py:95 -#: cola/widgets/main.py:757 cola/widgets/startup.py:436 +#: cola/sequenceeditor.py:524 cola/widgets/bookmarks.py:320 +#: cola/widgets/branch.py:221 cola/widgets/browse.py:375 +#: cola/widgets/commitmsg.py:105 cola/widgets/dag.py:314 +#: cola/widgets/filelist.py:107 cola/widgets/main.py:93 +#: cola/widgets/main.py:770 cola/widgets/startup.py:435 msgid "Actions" msgstr "" -#: cola/widgets/commitmsg.py:101 +#: cola/widgets/commitmsg.py:107 msgid "Actions..." msgstr "" -#: cola/widgets/bookmarks.py:71 cola/widgets/gitignore.py:64 -#: cola/widgets/patch.py:103 cola/widgets/patch.py:117 -#: cola/widgets/status.py:1381 +#: cola/widgets/bookmarks.py:70 cola/widgets/diff.py:1697 +#: cola/widgets/diff.py:1711 cola/widgets/gitignore.py:63 +#: cola/widgets/status.py:1382 msgid "Add" msgstr "" -#: cola/widgets/bookmarks.py:470 +#: cola/widgets/bookmarks.py:469 msgid "Add Favorite" msgstr "" -#: cola/widgets/editremotes.py:374 +#: cola/widgets/editremotes.py:373 msgid "Add Remote" msgstr "" -#: cola/widgets/toolbar.py:315 +#: cola/widgets/toolbar.py:320 msgid "Add Separator" msgstr "" -#: cola/cmds.py:3030 cola/widgets/submodules.py:42 -#: cola/widgets/submodules.py:111 +#: cola/cmds.py:2976 cola/widgets/submodules.py:41 +#: cola/widgets/submodules.py:110 msgid "Add Submodule" msgstr "" -#: cola/cmds.py:3027 cola/widgets/main.py:381 +#: cola/cmds.py:2973 cola/widgets/main.py:376 msgid "Add Submodule..." msgstr "" -#: cola/widgets/editremotes.py:62 +#: cola/widgets/editremotes.py:61 msgid "" "Add and remove remote repositories using the \n" "Add(+) and Delete(-) buttons on the left-hand side.\n" @@ -464,159 +489,159 @@ msgid "" "and pressing \"enter\", or by double-clicking." msgstr "" -#: cola/widgets/editremotes.py:81 +#: cola/widgets/editremotes.py:80 msgid "Add new remote git repository" msgstr "" -#: cola/widgets/patch.py:103 +#: cola/widgets/diff.py:1697 msgid "Add patches (+)" msgstr "" -#: cola/widgets/editremotes.py:433 +#: cola/widgets/editremotes.py:431 msgid "Add remote" msgstr "" -#: cola/cmds.py:3028 +#: cola/cmds.py:2974 msgid "Add this submodule?" msgstr "" -#: cola/widgets/gitignore.py:54 +#: cola/widgets/gitignore.py:53 msgid "Add to .gitignore" msgstr "" -#: cola/widgets/status.py:286 +#: cola/widgets/status.py:287 msgid "Add to Git Annex" msgstr "" -#: cola/widgets/status.py:290 +#: cola/widgets/status.py:291 msgid "Add to Git LFS" msgstr "" -#: cola/widgets/gitignore.py:28 +#: cola/widgets/gitignore.py:27 msgid "Add to exclusions" msgstr "" -#: cola/widgets/gitignore.py:55 +#: cola/widgets/gitignore.py:54 msgid "Add to local .git/info/exclude" msgstr "" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Additions" msgstr "" -#: cola/widgets/archive.py:134 +#: cola/widgets/archive.py:132 msgid "Advanced" msgstr "" -#: cola/widgets/main.py:522 +#: cola/widgets/main.py:535 msgid "Against Commit... (Diff Mode)" msgstr "" -#: cola/models/browse.py:33 +#: cola/models/browse.py:32 msgid "Age" msgstr "" -#: cola/widgets/prefs.py:403 +#: cola/widgets/prefs.py:441 msgid "All Repositories" msgstr "" -#: cola/cmds.py:3110 +#: cola/cmds.py:3056 #, python-format msgid "" "All submodules will be updated using\n" "\"%s\"" msgstr "" -#: cola/widgets/remote.py:195 +#: cola/widgets/remote.py:199 msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care" msgstr "" -#: cola/widgets/merge.py:61 +#: cola/widgets/merge.py:59 msgid "Always create a merge commit when enabled, even when the merge is a fast-forward update" msgstr "" -#: cola/cmds.py:221 +#: cola/cmds.py:220 msgid "Amend" msgstr "" -#: cola/widgets/commitmsg.py:463 +#: cola/widgets/commitmsg.py:471 msgid "Amend Commit" msgstr "" -#: cola/widgets/commitmsg.py:110 cola/widgets/main.py:194 +#: cola/widgets/commitmsg.py:116 cola/widgets/main.py:193 msgid "Amend Last Commit" msgstr "" -#: cola/widgets/commitmsg.py:462 +#: cola/widgets/commitmsg.py:470 msgid "Amend the published commit?" msgstr "" -#: cola/widgets/main.py:1157 +#: cola/widgets/main.py:1170 msgid "Amending" msgstr "" -#: cola/widgets/cfgactions.py:151 +#: cola/widgets/cfgactions.py:150 msgid "" "An action is still running.\n" "Terminating it could result in data loss." msgstr "" -#: cola/cmds.py:2804 +#: cola/cmds.py:2750 msgid "" "An unsigned, lightweight tag will be created instead.\n" "Create an unsigned tag?" msgstr "" -#: cola/widgets/prefs.py:406 +#: cola/widgets/prefs.py:444 msgid "Appearance" msgstr "" -#: cola/widgets/diff.py:1230 +#: cola/widgets/diff.py:1304 msgid "Append Patch" msgstr "" -#: cola/widgets/diff.py:1299 +#: cola/widgets/diff.py:1373 msgid "Append Patch..." msgstr "" -#: cola/widgets/patch.py:112 cola/widgets/stash.py:48 cola/widgets/stash.py:107 -#: cola/widgets/toolbar.py:323 +#: cola/widgets/diff.py:1706 cola/widgets/stash.py:50 cola/widgets/stash.py:110 +#: cola/widgets/toolbar.py:328 msgid "Apply" msgstr "" -#: cola/widgets/patch.py:75 +#: cola/widgets/diff.py:1669 msgid "Apply Patches" msgstr "" -#: cola/widgets/main.py:239 +#: cola/widgets/main.py:238 msgid "Apply Patches..." msgstr "" -#: cola/widgets/stash.py:64 +#: cola/widgets/stash.py:66 msgid "Apply and drop the selected stash (git stash pop)" msgstr "" -#: cola/widgets/stash.py:48 +#: cola/widgets/stash.py:50 msgid "Apply the selected stash" msgstr "" -#: cola/widgets/main.py:1167 +#: cola/widgets/main.py:1180 msgid "Applying Patch" msgstr "" -#: cola/widgets/cfgactions.py:207 +#: cola/widgets/cfgactions.py:205 msgid "Arguments" msgstr "" -#: cola/qtutils.py:850 +#: cola/qtutils.py:887 msgid "Attach" msgstr "" -#: cola/models/browse.py:33 cola/models/browse.py:72 cola/widgets/dag.py:506 +#: cola/models/browse.py:32 cola/models/browse.py:71 cola/widgets/dag.py:572 msgid "Author" msgstr "" -#: cola/widgets/about.py:93 +#: cola/widgets/about.py:91 msgid "Authors" msgstr "" @@ -624,674 +649,690 @@ msgstr "" msgid "Auto" msgstr "" -#: cola/widgets/commitmsg.py:137 cola/widgets/prefs.py:259 +#: cola/widgets/commitmsg.py:143 cola/widgets/prefs.py:280 msgid "Auto-Wrap Lines" msgstr "" -#: cola/widgets/prefs.py:184 +#: cola/widgets/prefs.py:206 msgid "Autocomplete Paths" msgstr "" -#: cola/widgets/prefs.py:176 +#: cola/widgets/prefs.py:198 msgid "Automatically Load Commit Message Template" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Basic Regexp" msgstr "" -#: cola/widgets/prefs.py:255 +#: cola/widgets/prefs.py:276 msgid "Blame Viewer" msgstr "" -#: cola/widgets/browse.py:205 +#: cola/widgets/browse.py:206 msgid "Blame selected paths" msgstr "" -#: cola/cmds.py:545 cola/widgets/status.py:282 +#: cola/cmds.py:546 cola/widgets/status.py:283 msgid "Blame..." msgstr "" -#: cola/widgets/prefs.py:347 +#: cola/widgets/prefs.py:367 msgid "Bold on dark headers instead of italic" msgstr "" -#: cola/widgets/main.py:806 cola/widgets/submodules.py:119 +#: cola/widgets/main.py:819 cola/widgets/submodules.py:118 msgid "Branch" msgstr "" -#: cola/widgets/remote.py:600 +#: cola/widgets/remote.py:635 #, python-format msgid "" "Branch \"%(branch)s\" does not exist in \"%(remote)s\".\n" "A new remote branch will be published." msgstr "" -#: cola/widgets/createbranch.py:258 +#: cola/widgets/createbranch.py:256 #, python-format msgid "Branch \"%s\" already exists." msgstr "" -#: cola/widgets/compare.py:44 +#: cola/widgets/compare.py:43 msgid "Branch Diff Viewer" msgstr "" -#: cola/widgets/createbranch.py:259 cola/widgets/createbranch.py:271 +#: cola/widgets/createbranch.py:257 cola/widgets/createbranch.py:269 msgid "Branch Exists" msgstr "" -#: cola/widgets/createbranch.py:98 +#: cola/widgets/createbranch.py:96 msgid "Branch Name" msgstr "" -#: cola/widgets/submodules.py:89 +#: cola/widgets/submodules.py:88 msgid "Branch name" msgstr "" -#: cola/widgets/browse.py:89 cola/widgets/main.py:1097 +#: cola/widgets/browse.py:89 cola/widgets/main.py:1110 #, python-format msgid "Branch: %s" msgstr "" -#: cola/widgets/branch.py:85 cola/widgets/main.py:131 +#: cola/widgets/branch.py:87 cola/widgets/main.py:129 msgid "Branches" msgstr "" -#: cola/widgets/main.py:538 +#: cola/widgets/main.py:551 msgid "Branches..." msgstr "" -#: cola/widgets/about.py:414 cola/widgets/about.py:417 -#: cola/widgets/about.py:437 +#: cola/widgets/about.py:397 cola/widgets/about.py:400 +#: cola/widgets/about.py:420 msgid "Brazilian translation" msgstr "" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse" msgstr "" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse Commits..." msgstr "" -#: cola/widgets/main.py:499 +#: cola/widgets/main.py:512 msgid "Browse Current Branch..." msgstr "" -#: cola/widgets/main.py:505 +#: cola/widgets/main.py:518 msgid "Browse Other Branch..." msgstr "" -#: cola/widgets/editremotes.py:437 cola/widgets/search.py:46 -#: cola/widgets/startup.py:65 cola/widgets/startup.py:285 +#: cola/widgets/editremotes.py:435 cola/widgets/search.py:45 +#: cola/widgets/startup.py:64 cola/widgets/startup.py:284 msgid "Browse..." msgstr "" -#: cola/widgets/main.py:89 +#: cola/widgets/main.py:87 msgid "Browser" msgstr "" -#: cola/widgets/browse.py:589 +#: cola/widgets/browse.py:590 #, python-format msgid "Browsing %s" msgstr "" -#: cola/widgets/commitmsg.py:118 +#: cola/widgets/commitmsg.py:124 msgid "Bypass Commit Hooks" msgstr "" -#: cola/sequenceeditor.py:175 cola/widgets/standard.py:991 +#: cola/sequenceeditor.py:173 cola/widgets/standard.py:1058 msgid "Cancel" msgstr "" -#: cola/sequenceeditor.py:176 +#: cola/sequenceeditor.py:174 msgid "" "Cancel rebase\n" "Shortcut: Ctrl+Q" msgstr "" -#: cola/cmds.py:254 +#: cola/cmds.py:253 msgid "Cannot Amend" msgstr "" -#: cola/cmds.py:560 +#: cola/cmds.py:561 #, python-format msgid "Cannot exec \"%s\": please configure a blame viewer" msgstr "" -#: cola/cmds.py:3146 +#: cola/cmds.py:3092 #, python-format msgid "Cannot exec \"%s\": please configure a history browser" msgstr "" -#: cola/cmds.py:1583 +#: cola/cmds.py:1571 #, python-format msgid "Cannot exec \"%s\": please configure your editor" msgstr "" -#: cola/models/browse.py:336 +#: cola/models/browse.py:335 msgid "Changed Upstream" msgstr "" -#: cola/widgets/prefs.py:186 +#: cola/widgets/prefs.py:208 msgid "Check Published Commits when Amending" msgstr "" -#: cola/widgets/commitmsg.py:130 +#: cola/widgets/commitmsg.py:136 msgid "Check Spelling" msgstr "" -#: cola/widgets/prefs.py:265 +#: cola/widgets/prefs.py:286 msgid "Check spelling" msgstr "" -#: cola/widgets/prefs.py:163 +#: cola/widgets/prefs.py:186 msgid "Check whether a commit has been published when amending" msgstr "" -#: cola/guicmds.py:62 cola/widgets/branch.py:222 +#: cola/guicmds.py:61 cola/widgets/branch.py:233 msgid "Checkout" msgstr "" -#: cola/widgets/createbranch.py:130 +#: cola/widgets/createbranch.py:128 msgid "Checkout After Creation" msgstr "" -#: cola/guicmds.py:62 cola/widgets/dag.py:410 +#: cola/guicmds.py:61 cola/widgets/dag.py:409 msgid "Checkout Branch" msgstr "" -#: cola/widgets/dag.py:414 +#: cola/widgets/dag.py:413 msgid "Checkout Detached HEAD" msgstr "" -#: cola/cmds.py:480 cola/cmds.py:518 +#: cola/cmds.py:481 cola/cmds.py:519 msgid "Checkout Files" msgstr "" -#: cola/widgets/branch.py:226 +#: cola/widgets/branch.py:237 msgid "Checkout as new branch" msgstr "" -#: cola/cmds.py:507 +#: cola/cmds.py:508 msgid "Checkout files from our branch (HEAD)" msgstr "" -#: cola/cmds.py:511 +#: cola/cmds.py:512 msgid "Checkout files from our branch?" msgstr "" -#: cola/cmds.py:469 +#: cola/cmds.py:470 msgid "Checkout files from their branch (MERGE_HEAD)" msgstr "" -#: cola/cmds.py:473 +#: cola/cmds.py:474 msgid "Checkout files from their branch?" msgstr "" -#: cola/widgets/main.py:576 +#: cola/widgets/main.py:589 msgid "Checkout..." msgstr "" -#: cola/widgets/dag.py:387 cola/widgets/search.py:79 +#: cola/widgets/dag.py:386 cola/widgets/search.py:78 msgid "Cherry Pick" msgstr "" -#: cola/guicmds.py:73 +#: cola/guicmds.py:72 msgid "Cherry-Pick Commit" msgstr "" -#: cola/widgets/main.py:328 +#: cola/widgets/main.py:323 msgid "Cherry-Pick..." msgstr "" -#: cola/cmds.py:584 +#: cola/cmds.py:585 msgid "Cherry-pick failed" msgstr "" -#: cola/widgets/main.py:1161 +#: cola/widgets/main.py:1174 msgid "Cherry-picking" msgstr "" -#: cola/widgets/diff.py:1247 +#: cola/widgets/diff.py:1321 msgid "Choose Patch..." msgstr "" -#: cola/widgets/search.py:319 +#: cola/widgets/search.py:318 msgid "Choose Paths" msgstr "" -#: cola/widgets/grep.py:116 +#: cola/widgets/grep.py:114 msgid "Choose the \"git grep\" regular expression mode" msgstr "" -#: cola/widgets/bookmarks.py:229 cola/widgets/startup.py:352 +#: cola/widgets/bookmarks.py:228 cola/widgets/startup.py:351 msgid "Clear Default Repository" msgstr "" -#: cola/widgets/commitmsg.py:305 +#: cola/widgets/commitmsg.py:313 msgid "Clear commit message" msgstr "" -#: cola/widgets/commitmsg.py:302 +#: cola/widgets/commitmsg.py:310 msgid "Clear commit message?" msgstr "" -#: cola/widgets/commitmsg.py:62 +#: cola/widgets/commitmsg.py:63 msgid "Clear..." msgstr "" -#: cola/widgets/clone.py:126 +#: cola/widgets/clone.py:124 msgid "Clone" msgstr "" -#: cola/widgets/clone.py:62 cola/widgets/clone.py:104 +#: cola/widgets/clone.py:61 cola/widgets/clone.py:102 msgid "Clone Repository" msgstr "" -#: cola/widgets/main.py:465 cola/widgets/startup.py:58 +#: cola/widgets/main.py:478 cola/widgets/startup.py:57 msgid "Clone..." msgstr "" -#: cola/widgets/clone.py:62 +#: cola/widgets/clone.py:61 #, python-format msgid "Cloning repository at %s" msgstr "" -#: cola/qtutils.py:757 cola/qtutils.py:807 cola/widgets/about.py:508 -#: cola/widgets/remote.py:328 cola/widgets/text.py:1094 +#: cola/qtutils.py:788 cola/qtutils.py:838 cola/widgets/about.py:491 +#: cola/widgets/remote.py:362 cola/widgets/text.py:1090 msgid "Close" msgstr "" -#: cola/widgets/text.py:402 +#: cola/widgets/remote.py:222 +msgid "Close dialog when completed" +msgstr "" + +#: cola/widgets/remote.py:221 +msgid "Close on completion" +msgstr "" + +#: cola/widgets/text.py:399 msgid "Close the find bar" msgstr "" -#: cola/qtutils.py:623 +#: cola/qtutils.py:651 msgid "Close..." msgstr "" -#: cola/widgets/recent.py:71 +#: cola/widgets/recent.py:69 msgid "Collapse all" msgstr "" -#: cola/sequenceeditor.py:323 +#: cola/sequenceeditor.py:320 msgid "Command" msgstr "" -#: cola/widgets/main.py:163 cola/widgets/merge.py:74 +#: cola/widgets/main.py:161 cola/widgets/merge.py:72 msgid "Commit" msgstr "" -#: cola/cmds.py:837 +#: cola/widgets/prefs.py:192 +msgid "Commit Message Cleanup" +msgstr "" + +#: cola/widgets/commitmsg.py:495 msgid "Commit failed" msgstr "" -#: cola/widgets/commitmsg.py:61 +#: cola/widgets/commitmsg.py:62 msgid "Commit staged changes" msgstr "" -#: cola/widgets/commitmsg.py:93 +#: cola/widgets/commitmsg.py:94 msgid "" "Commit staged changes\n" "Shortcut: Ctrl+Enter" msgstr "" -#: cola/widgets/commitmsg.py:564 +#: cola/widgets/commitmsg.py:590 msgid "Commit summary" msgstr "" -#: cola/widgets/main.py:259 +#: cola/widgets/main.py:253 msgid "Commit the current state and continue applying patches" msgstr "" -#: cola/widgets/merge.py:70 +#: cola/widgets/merge.py:68 msgid "Commit the merge if there are no conflicts. Uncheck to leave the merge uncommitted" msgstr "" -#: cola/widgets/commitmsg.py:58 cola/widgets/commitmsg.py:95 -#: cola/widgets/main.py:778 cola/widgets/main.py:779 +#: cola/widgets/commitmsg.py:59 cola/widgets/commitmsg.py:96 +#: cola/widgets/main.py:791 cola/widgets/main.py:792 msgid "Commit@@verb" msgstr "" -#: cola/difftool.py:78 cola/widgets/compare.py:70 +#: cola/widgets/dag.py:487 +msgid "Commits authored by me" +msgstr "" + +#: cola/difftool.py:97 cola/widgets/compare.py:69 msgid "Compare" msgstr "" -#: cola/difftool.py:83 +#: cola/difftool.py:102 msgid "Compare All" msgstr "" -#: cola/widgets/toolbar.py:269 cola/widgets/toolbar.py:306 +#: cola/widgets/toolbar.py:274 cola/widgets/toolbar.py:311 msgid "Configure Toolbar" msgstr "" -#: cola/widgets/remote.py:214 +#: cola/widgets/remote.py:218 msgid "Configure the remote branch as the the new upstream" msgstr "" -#: cola/widgets/main.py:170 +#: cola/widgets/main.py:168 msgid "Console" msgstr "" -#: cola/interaction.py:111 cola/widgets/main.py:610 +#: cola/interaction.py:109 cola/widgets/main.py:623 msgid "Continue" msgstr "" -#: cola/widgets/main.py:255 +#: cola/widgets/main.py:252 msgid "Continue Applying Patches" msgstr "" -#: cola/widgets/bookmarks.py:248 cola/widgets/main.py:742 -#: cola/widgets/startup.py:371 +#: cola/widgets/bookmarks.py:247 cola/widgets/main.py:755 +#: cola/widgets/startup.py:370 msgid "Copy" msgstr "" -#: cola/widgets/status.py:268 +#: cola/widgets/status.py:269 msgid "Copy Basename to Clipboard" msgstr "" -#: cola/widgets/diff.py:208 +#: cola/widgets/diff.py:209 msgid "Copy Diff" msgstr "" -#: cola/widgets/status.py:745 +#: cola/widgets/status.py:746 msgid "Copy Leading Path to Clipboard" msgstr "" -#: cola/widgets/status.py:251 +#: cola/widgets/status.py:252 msgid "Copy Path to Clipboard" msgstr "" -#: cola/widgets/status.py:259 +#: cola/widgets/status.py:260 msgid "Copy Relative Path to Clipboard" msgstr "" -#: cola/sequenceeditor.py:334 cola/widgets/dag.py:474 +#: cola/sequenceeditor.py:330 cola/widgets/dag.py:473 msgid "Copy SHA-1" msgstr "" -#: cola/widgets/status.py:737 +#: cola/widgets/status.py:738 msgid "Copy..." msgstr "" -#: cola/app.py:490 +#: cola/app.py:493 #, python-format msgid "Could not open %s." msgstr "" -#: cola/widgets/clone.py:191 cola/widgets/clone.py:193 +#: cola/widgets/clone.py:189 cola/widgets/clone.py:191 #, python-format msgid "Could not parse Git URL: \"%s\"" msgstr "" -#: cola/app.py:500 +#: cola/app.py:503 msgid "Create" msgstr "" -#: cola/widgets/createbranch.py:86 cola/widgets/createbranch.py:135 -#: cola/widgets/createbranch.py:301 cola/widgets/dag.py:369 +#: cola/widgets/createbranch.py:84 cola/widgets/createbranch.py:133 +#: cola/widgets/createbranch.py:299 cola/widgets/dag.py:368 msgid "Create Branch" msgstr "" -#: cola/widgets/dag.py:373 +#: cola/widgets/dag.py:372 msgid "Create Patch" msgstr "" -#: cola/widgets/remote.py:606 +#: cola/widgets/remote.py:641 msgid "Create Remote Branch" msgstr "" -#: cola/widgets/commitmsg.py:124 cola/widgets/merge.py:78 +#: cola/widgets/commitmsg.py:130 cola/widgets/merge.py:76 msgid "Create Signed Commit" msgstr "" -#: cola/widgets/createtag.py:55 cola/widgets/createtag.py:91 -#: cola/widgets/dag.py:377 +#: cola/widgets/createtag.py:53 cola/widgets/createtag.py:89 +#: cola/widgets/dag.py:376 msgid "Create Tag" msgstr "" -#: cola/widgets/main.py:544 +#: cola/widgets/main.py:557 msgid "Create Tag..." msgstr "" -#: cola/cmds.py:2807 +#: cola/cmds.py:2753 msgid "Create Unsigned Tag" msgstr "" -#: cola/widgets/remote.py:188 +#: cola/widgets/remote.py:192 msgid "Create a merge commit even when the merge resolves as a fast-forward" msgstr "" -#: cola/widgets/remote.py:605 +#: cola/widgets/remote.py:640 msgid "Create a new remote branch?" msgstr "" -#: cola/app.py:499 +#: cola/app.py:502 msgid "Create a new repository at that location?" msgstr "" -#: cola/widgets/submodules.py:100 +#: cola/widgets/submodules.py:99 msgid "Create a shallow clone with history truncated to the specified number of revisions. 0 performs a full clone." msgstr "" -#: cola/widgets/main.py:551 +#: cola/widgets/main.py:564 msgid "Create..." msgstr "" -#: cola/cmds.py:2843 +#: cola/cmds.py:2789 #, python-format msgid "Created a new tag named \"%s\"" msgstr "" -#: cola/widgets/prefs.py:266 +#: cola/widgets/prefs.py:287 msgid "Ctrl+MouseWheel to Zoom" msgstr "" -#: cola/widgets/prefs.py:404 +#: cola/widgets/prefs.py:442 msgid "Current Repository" msgstr "" -#: cola/widgets/status.py:1371 +#: cola/widgets/status.py:1372 msgid "Custom Copy Actions" msgstr "" -#: cola/widgets/status.py:273 +#: cola/widgets/status.py:274 msgid "Customize..." msgstr "" -#: cola/widgets/main.py:740 +#: cola/widgets/main.py:753 msgid "Cut" msgstr "" -#: cola/widgets/about.py:411 cola/widgets/about.py:442 +#: cola/widgets/about.py:394 cola/widgets/about.py:425 msgid "Czech translation" msgstr "" -#: cola/widgets/main.py:592 +#: cola/widgets/main.py:605 msgid "DAG..." msgstr "" -#: cola/icons.py:55 +#: cola/icons.py:54 msgid "Dark Theme" msgstr "" -#: cola/widgets/dag.py:506 +#: cola/widgets/dag.py:572 msgid "Date, Time" msgstr "" -#: cola/icons.py:54 cola/themes.py:637 +#: cola/icons.py:53 cola/themes.py:643 msgid "Default" msgstr "" -#: cola/widgets/prefs.py:126 +#: cola/widgets/prefs.py:124 msgid "" "Default directory when exporting patches.\n" "Relative paths are relative to the current repository.\n" "Absolute path are used as-is." msgstr "" -#: cola/cmds.py:925 cola/guicmds.py:26 cola/guicmds.py:35 -#: cola/widgets/bookmarks.py:75 cola/widgets/bookmarks.py:251 -#: cola/widgets/main.py:746 cola/widgets/startup.py:373 +#: cola/cmds.py:923 cola/guicmds.py:25 cola/guicmds.py:34 +#: cola/widgets/bookmarks.py:74 cola/widgets/bookmarks.py:250 +#: cola/widgets/main.py:759 cola/widgets/startup.py:372 msgid "Delete" msgstr "" -#: cola/cmds.py:1088 +#: cola/cmds.py:1089 #, python-format msgid "Delete %d file(s)?" msgstr "" -#: cola/cmds.py:1016 +#: cola/cmds.py:1017 msgid "Delete Bookmark" msgstr "" -#: cola/cmds.py:1014 +#: cola/cmds.py:1015 msgid "Delete Bookmark?" msgstr "" -#: cola/cmds.py:1114 cola/cmds.py:1117 cola/guicmds.py:26 -#: cola/widgets/branch.py:268 +#: cola/cmds.py:1115 cola/cmds.py:1118 cola/guicmds.py:25 +#: cola/widgets/branch.py:277 msgid "Delete Branch" msgstr "" -#: cola/cmds.py:1089 +#: cola/cmds.py:1090 msgid "Delete Files" msgstr "" -#: cola/widgets/status.py:311 +#: cola/widgets/status.py:312 msgid "Delete Files..." msgstr "" -#: cola/cmds.py:1085 +#: cola/cmds.py:1086 msgid "Delete Files?" msgstr "" -#: cola/cmds.py:922 +#: cola/cmds.py:920 msgid "Delete Remote" msgstr "" -#: cola/guicmds.py:35 cola/widgets/branch.py:270 +#: cola/guicmds.py:34 cola/widgets/branch.py:279 msgid "Delete Remote Branch" msgstr "" -#: cola/widgets/main.py:564 +#: cola/widgets/main.py:577 msgid "Delete Remote Branch..." msgstr "" -#: cola/widgets/toolbar.py:271 +#: cola/widgets/toolbar.py:276 msgid "Delete Toolbar" msgstr "" -#: cola/cmds.py:1115 +#: cola/cmds.py:1116 #, python-format msgid "Delete branch \"%s\"?" msgstr "" -#: cola/widgets/editremotes.py:88 +#: cola/widgets/editremotes.py:87 msgid "Delete remote" msgstr "" -#: cola/cmds.py:924 +#: cola/cmds.py:922 #, python-format msgid "Delete remote \"%s\"" msgstr "" -#: cola/cmds.py:923 +#: cola/cmds.py:921 msgid "Delete remote?" msgstr "" -#: cola/widgets/main.py:558 +#: cola/widgets/main.py:571 msgid "Delete..." msgstr "" -#: cola/cmds.py:1067 +#: cola/cmds.py:1068 #, python-format msgid "Deleting \"%s\" failed" msgstr "" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Deletions" msgstr "" -#: cola/widgets/submodules.py:120 +#: cola/widgets/submodules.py:119 msgid "Depth" msgstr "" -#: cola/qtutils.py:811 cola/qtutils.py:852 +#: cola/qtutils.py:842 cola/qtutils.py:889 msgid "Detach" msgstr "" -#: cola/widgets/prefs.py:181 +#: cola/widgets/prefs.py:203 msgid "Detect Conflict Markers" msgstr "" -#: cola/widgets/prefs.py:151 +#: cola/widgets/prefs.py:174 msgid "Detect conflict markers in unmerged files" msgstr "" -#: cola/widgets/about.py:271 cola/widgets/about.py:274 -#: cola/widgets/about.py:277 cola/widgets/about.py:278 -#: cola/widgets/about.py:279 cola/widgets/about.py:280 -#: cola/widgets/about.py:281 cola/widgets/about.py:282 -#: cola/widgets/about.py:283 cola/widgets/about.py:284 -#: cola/widgets/about.py:285 cola/widgets/about.py:286 -#: cola/widgets/about.py:287 cola/widgets/about.py:288 -#: cola/widgets/about.py:289 cola/widgets/about.py:290 -#: cola/widgets/about.py:291 cola/widgets/about.py:292 -#: cola/widgets/about.py:293 cola/widgets/about.py:294 -#: cola/widgets/about.py:295 cola/widgets/about.py:296 -#: cola/widgets/about.py:297 cola/widgets/about.py:298 -#: cola/widgets/about.py:299 cola/widgets/about.py:300 -#: cola/widgets/about.py:301 cola/widgets/about.py:302 -#: cola/widgets/about.py:303 cola/widgets/about.py:304 -#: cola/widgets/about.py:305 cola/widgets/about.py:306 -#: cola/widgets/about.py:307 cola/widgets/about.py:308 -#: cola/widgets/about.py:309 cola/widgets/about.py:310 -#: cola/widgets/about.py:311 cola/widgets/about.py:312 -#: cola/widgets/about.py:313 cola/widgets/about.py:314 -#: cola/widgets/about.py:315 cola/widgets/about.py:316 -#: cola/widgets/about.py:317 cola/widgets/about.py:318 -#: cola/widgets/about.py:319 cola/widgets/about.py:320 -#: cola/widgets/about.py:321 cola/widgets/about.py:322 -#: cola/widgets/about.py:323 cola/widgets/about.py:324 -#: cola/widgets/about.py:325 cola/widgets/about.py:326 -#: cola/widgets/about.py:327 cola/widgets/about.py:328 -#: cola/widgets/about.py:329 cola/widgets/about.py:330 -#: cola/widgets/about.py:331 cola/widgets/about.py:332 -#: cola/widgets/about.py:333 cola/widgets/about.py:334 -#: cola/widgets/about.py:335 cola/widgets/about.py:336 -#: cola/widgets/about.py:337 cola/widgets/about.py:338 -#: cola/widgets/about.py:339 cola/widgets/about.py:340 -#: cola/widgets/about.py:341 cola/widgets/about.py:342 -#: cola/widgets/about.py:343 cola/widgets/about.py:344 -#: cola/widgets/about.py:345 cola/widgets/about.py:346 -#: cola/widgets/about.py:347 cola/widgets/about.py:348 -#: cola/widgets/about.py:349 cola/widgets/about.py:350 -#: cola/widgets/about.py:351 cola/widgets/about.py:352 -#: cola/widgets/about.py:353 cola/widgets/about.py:354 -#: cola/widgets/about.py:355 cola/widgets/about.py:356 -#: cola/widgets/about.py:357 cola/widgets/about.py:358 -#: cola/widgets/about.py:359 cola/widgets/about.py:360 -#: cola/widgets/about.py:361 cola/widgets/about.py:362 -#: cola/widgets/about.py:363 cola/widgets/about.py:364 -#: cola/widgets/about.py:365 cola/widgets/about.py:366 -#: cola/widgets/about.py:367 cola/widgets/about.py:368 -#: cola/widgets/about.py:369 cola/widgets/about.py:370 -#: cola/widgets/about.py:371 cola/widgets/about.py:372 -#: cola/widgets/about.py:373 cola/widgets/about.py:374 -#: cola/widgets/about.py:375 cola/widgets/about.py:376 -#: cola/widgets/about.py:377 cola/widgets/about.py:378 -#: cola/widgets/about.py:379 cola/widgets/about.py:380 +#: cola/widgets/about.py:254 cola/widgets/about.py:257 +#: cola/widgets/about.py:260 cola/widgets/about.py:261 +#: cola/widgets/about.py:262 cola/widgets/about.py:263 +#: cola/widgets/about.py:264 cola/widgets/about.py:265 +#: cola/widgets/about.py:266 cola/widgets/about.py:267 +#: cola/widgets/about.py:268 cola/widgets/about.py:269 +#: cola/widgets/about.py:270 cola/widgets/about.py:271 +#: cola/widgets/about.py:272 cola/widgets/about.py:273 +#: cola/widgets/about.py:274 cola/widgets/about.py:275 +#: cola/widgets/about.py:276 cola/widgets/about.py:277 +#: cola/widgets/about.py:278 cola/widgets/about.py:279 +#: cola/widgets/about.py:280 cola/widgets/about.py:281 +#: cola/widgets/about.py:282 cola/widgets/about.py:283 +#: cola/widgets/about.py:284 cola/widgets/about.py:285 +#: cola/widgets/about.py:286 cola/widgets/about.py:287 +#: cola/widgets/about.py:288 cola/widgets/about.py:289 +#: cola/widgets/about.py:290 cola/widgets/about.py:291 +#: cola/widgets/about.py:292 cola/widgets/about.py:293 +#: cola/widgets/about.py:294 cola/widgets/about.py:295 +#: cola/widgets/about.py:296 cola/widgets/about.py:297 +#: cola/widgets/about.py:298 cola/widgets/about.py:299 +#: cola/widgets/about.py:300 cola/widgets/about.py:301 +#: cola/widgets/about.py:302 cola/widgets/about.py:303 +#: cola/widgets/about.py:304 cola/widgets/about.py:305 +#: cola/widgets/about.py:306 cola/widgets/about.py:307 +#: cola/widgets/about.py:308 cola/widgets/about.py:309 +#: cola/widgets/about.py:310 cola/widgets/about.py:311 +#: cola/widgets/about.py:312 cola/widgets/about.py:313 +#: cola/widgets/about.py:314 cola/widgets/about.py:315 +#: cola/widgets/about.py:316 cola/widgets/about.py:317 +#: cola/widgets/about.py:318 cola/widgets/about.py:319 +#: cola/widgets/about.py:320 cola/widgets/about.py:321 +#: cola/widgets/about.py:322 cola/widgets/about.py:323 +#: cola/widgets/about.py:324 cola/widgets/about.py:325 +#: cola/widgets/about.py:326 cola/widgets/about.py:327 +#: cola/widgets/about.py:328 cola/widgets/about.py:329 +#: cola/widgets/about.py:330 cola/widgets/about.py:331 +#: cola/widgets/about.py:332 cola/widgets/about.py:333 +#: cola/widgets/about.py:334 cola/widgets/about.py:335 +#: cola/widgets/about.py:336 cola/widgets/about.py:337 +#: cola/widgets/about.py:338 cola/widgets/about.py:339 +#: cola/widgets/about.py:340 cola/widgets/about.py:341 +#: cola/widgets/about.py:342 cola/widgets/about.py:343 +#: cola/widgets/about.py:344 cola/widgets/about.py:345 +#: cola/widgets/about.py:346 cola/widgets/about.py:347 +#: cola/widgets/about.py:348 cola/widgets/about.py:349 +#: cola/widgets/about.py:350 cola/widgets/about.py:351 +#: cola/widgets/about.py:352 cola/widgets/about.py:353 +#: cola/widgets/about.py:354 cola/widgets/about.py:355 +#: cola/widgets/about.py:356 cola/widgets/about.py:357 +#: cola/widgets/about.py:358 cola/widgets/about.py:359 +#: cola/widgets/about.py:360 cola/widgets/about.py:361 +#: cola/widgets/about.py:362 cola/widgets/about.py:363 msgid "Developer" msgstr "" -#: cola/guicmds.py:185 cola/widgets/dag.py:764 cola/widgets/diff.py:781 -#: cola/widgets/main.py:177 cola/widgets/main.py:797 +#: cola/guicmds.py:184 cola/widgets/dag.py:830 cola/widgets/diff.py:809 +#: cola/widgets/main.py:175 cola/widgets/main.py:810 msgid "Diff" msgstr "" -#: cola/guicmds.py:185 +#: cola/guicmds.py:184 msgid "Diff Against Commit" msgstr "" @@ -1299,35 +1340,35 @@ msgstr "" msgid "Diff Against Predecessor..." msgstr "" -#: cola/widgets/main.py:1159 +#: cola/widgets/main.py:1172 msgid "Diff Mode" msgstr "" -#: cola/widgets/diff.py:772 cola/widgets/diff.py:796 +#: cola/widgets/diff.py:800 cola/widgets/diff.py:824 msgid "Diff Options" msgstr "" -#: cola/widgets/prefs.py:256 +#: cola/widgets/prefs.py:277 msgid "Diff Tool" msgstr "" -#: cola/widgets/dag.py:364 +#: cola/widgets/dag.py:363 msgid "Diff selected -> this" msgstr "" -#: cola/widgets/dag.py:358 +#: cola/widgets/dag.py:357 msgid "Diff this -> selected" msgstr "" -#: cola/widgets/main.py:218 +#: cola/widgets/main.py:217 msgid "Diffstat" msgstr "" -#: cola/cmds.py:3262 +#: cola/difftool.py:324 msgid "Difftool" msgstr "" -#: cola/widgets/clone.py:207 +#: cola/widgets/clone.py:205 msgid "Directory Exists" msgstr "" @@ -1335,84 +1376,88 @@ msgstr "" msgid "Disable" msgstr "" -#: cola/widgets/prefs.py:180 +#: cola/widgets/prefs.py:202 msgid "Display Untracked Files" msgstr "" -#: cola/cmds.py:2094 +#: cola/widgets/remote.py:176 +msgid "Display remote messages in a separate dialog" +msgstr "" + +#: cola/cmds.py:2045 msgid "Do not update stacked branches" msgstr "" -#: cola/widgets/main.py:471 +#: cola/widgets/main.py:484 msgid "Documentation" msgstr "" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop" msgstr "" -#: cola/widgets/stash.py:258 +#: cola/widgets/stash.py:276 msgid "Drop Stash" msgstr "" -#: cola/widgets/stash.py:255 +#: cola/widgets/stash.py:273 msgid "Drop Stash?" msgstr "" -#: cola/widgets/stash.py:257 +#: cola/widgets/stash.py:275 #, python-format msgid "Drop the \"%s\" stash?" msgstr "" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop the selected stash" msgstr "" -#: cola/qtutils.py:764 cola/sequenceeditor.py:357 cola/widgets/grep.py:102 +#: cola/qtutils.py:795 cola/sequenceeditor.py:353 cola/widgets/grep.py:100 msgid "Edit" msgstr "" -#: cola/widgets/diff.py:1019 +#: cola/widgets/diff.py:1058 msgid "Edit Diff Hunk to Revert..." msgstr "" -#: cola/widgets/diff.py:1017 +#: cola/widgets/diff.py:1056 msgid "Edit Diff Hunk to Stage..." msgstr "" -#: cola/widgets/diff.py:1062 +#: cola/widgets/diff.py:1124 msgid "Edit Diff Hunk to Unstage..." msgstr "" -#: cola/cmds.py:2166 +#: cola/cmds.py:2117 msgid "Edit Rebase" msgstr "" -#: cola/widgets/editremotes.py:36 +#: cola/widgets/editremotes.py:35 msgid "Edit Remotes" msgstr "" -#: cola/widgets/main.py:298 +#: cola/widgets/main.py:293 msgid "Edit Remotes..." msgstr "" -#: cola/widgets/diff.py:1014 +#: cola/widgets/diff.py:1053 msgid "Edit Selected Lines to Revert..." msgstr "" -#: cola/widgets/diff.py:1012 +#: cola/widgets/diff.py:1051 msgid "Edit Selected Lines to Stage..." msgstr "" -#: cola/widgets/diff.py:1059 +#: cola/widgets/diff.py:1122 msgid "Edit Selected Lines to Unstage..." msgstr "" -#: cola/widgets/editremotes.py:44 +#: cola/widgets/editremotes.py:43 msgid "Edit remotes by selecting them from the list" msgstr "" -#: cola/widgets/browse.py:197 cola/widgets/common.py:39 +#: cola/widgets/browse.py:198 cola/widgets/common.py:38 msgid "Edit selected paths" msgstr "" @@ -1428,11 +1473,11 @@ msgstr "" msgid "Edit the following patch, which will then be applied to the worktree to revert the changes:" msgstr "" -#: cola/widgets/main.py:604 +#: cola/widgets/main.py:617 msgid "Edit..." msgstr "" -#: cola/widgets/prefs.py:253 +#: cola/widgets/prefs.py:274 msgid "Editor" msgstr "" @@ -1441,153 +1486,158 @@ msgstr "" msgid "Editor returned %s exit code. Not applying patch." msgstr "" -#: cola/widgets/prefs.py:167 +#: cola/widgets/prefs.py:190 msgid "Email Address" msgstr "" -#: cola/widgets/about.py:258 cola/widgets/about.py:401 +#: cola/widgets/about.py:241 cola/widgets/about.py:384 msgid "Email contributor" msgstr "" -#: cola/widgets/prefs.py:182 +#: cola/widgets/prefs.py:204 msgid "Enable Gravatar Icons" msgstr "" -#: cola/widgets/prefs.py:160 +#: cola/widgets/prefs.py:183 msgid "Enable path autocompletion in tools" msgstr "" -#: cola/widgets/diff.py:768 +#: cola/widgets/diff.py:796 msgid "Enable word wrapping" msgstr "" -#: cola/sequenceeditor.py:322 +#: cola/sequenceeditor.py:319 msgid "Enabled" msgstr "" -#: cola/guicmds.py:333 cola/widgets/branch.py:445 +#: cola/guicmds.py:332 cola/widgets/branch.py:478 msgid "Enter New Branch Name" msgstr "" -#: cola/guicmds.py:147 +#: cola/guicmds.py:146 msgid "Enter a name for the new bare repo" msgstr "" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Enter a name for the stash" msgstr "" -#: cola/cmds.py:146 cola/cmds.py:176 cola/cmds.py:207 cola/cmds.py:283 -#: cola/cmds.py:292 cola/cmds.py:307 cola/cmds.py:317 cola/cmds.py:460 -#: cola/cmds.py:496 cola/cmds.py:534 cola/cmds.py:633 cola/cmds.py:751 -#: cola/cmds.py:1067 cola/cmds.py:1164 cola/cmds.py:2005 cola/cmds.py:2394 -#: cola/cmds.py:2637 cola/cmds.py:2643 cola/cmds.py:2651 cola/cmds.py:2872 -#: cola/cmds.py:2890 cola/cmds.py:3180 cola/gitcmds.py:984 cola/guicmds.py:157 -#: cola/models/stash.py:70 cola/models/stash.py:87 cola/models/stash.py:108 -#: cola/widgets/bookmarks.py:482 cola/widgets/branch.py:777 +#: cola/widgets/stash.py:216 +msgid "Enter a new name for the stash" +msgstr "" + +#: cola/cmds.py:145 cola/cmds.py:175 cola/cmds.py:206 cola/cmds.py:284 +#: cola/cmds.py:293 cola/cmds.py:308 cola/cmds.py:318 cola/cmds.py:461 +#: cola/cmds.py:497 cola/cmds.py:535 cola/cmds.py:635 cola/cmds.py:753 +#: cola/cmds.py:1068 cola/cmds.py:1165 cola/cmds.py:1956 cola/cmds.py:2345 +#: cola/cmds.py:2579 cola/cmds.py:2585 cola/cmds.py:2593 cola/cmds.py:2818 +#: cola/cmds.py:2836 cola/cmds.py:3125 cola/gitcmds.py:994 cola/guicmds.py:156 +#: cola/models/stash.py:70 cola/models/stash.py:90 cola/models/stash.py:112 +#: cola/models/stash.py:138 cola/widgets/bookmarks.py:481 +#: cola/widgets/branch.py:829 msgid "Error" msgstr "" -#: cola/widgets/clone.py:191 +#: cola/widgets/clone.py:189 msgid "Error Cloning" msgstr "" -#: cola/widgets/createbranch.py:314 +#: cola/widgets/createbranch.py:312 msgid "Error Creating Branch" msgstr "" -#: cola/app.py:502 cola/guicmds.py:101 +#: cola/app.py:505 cola/guicmds.py:100 msgid "Error Creating Repository" msgstr "" -#: cola/cmds.py:1202 +#: cola/cmds.py:1206 msgid "Error Deleting Remote Branch" msgstr "" -#: cola/cmds.py:1585 +#: cola/cmds.py:1573 msgid "Error Editing File" msgstr "" -#: cola/cmds.py:559 +#: cola/cmds.py:560 msgid "Error Launching Blame Viewer" msgstr "" -#: cola/cmds.py:3145 +#: cola/cmds.py:3091 msgid "Error Launching History Browser" msgstr "" -#: cola/app.py:489 +#: cola/app.py:492 msgid "Error Opening Repository" msgstr "" -#: cola/widgets/browse.py:566 +#: cola/models/stash.py:144 +msgid "Error Renaming Stash" +msgstr "" + +#: cola/widgets/browse.py:567 msgid "Error Saving File" msgstr "" -#: cola/cmds.py:914 +#: cola/cmds.py:912 #, python-format msgid "Error creating remote \"%s\"" msgstr "" -#: cola/models/stash.py:197 +#: cola/models/stash.py:233 msgid "Error creating stash" msgstr "" -#: cola/cmds.py:1126 +#: cola/cmds.py:1127 #, python-format msgid "Error deleting branch \"%s\"" msgstr "" -#: cola/cmds.py:932 +#: cola/cmds.py:930 #, python-format msgid "Error deleting remote \"%s\"" msgstr "" -#: cola/cmds.py:956 +#: cola/cmds.py:955 #, python-format msgid "Error renaming \"%(name)s\" to \"%(new_name)s\"" msgstr "" -#: cola/cmds.py:1771 +#: cola/cmds.py:1722 msgid "Error running prepare-commitmsg hook" msgstr "" -#: cola/cmds.py:3043 cola/cmds.py:3089 +#: cola/cmds.py:2989 cola/cmds.py:3035 #, python-format msgid "Error updating submodule %s" msgstr "" -#: cola/cmds.py:3125 +#: cola/cmds.py:3071 msgid "Error updating submodules" msgstr "" -#: cola/widgets/diff.py:1326 +#: cola/widgets/diff.py:1400 msgid "Error writing patch" msgstr "" -#: cola/cmds.py:1710 +#: cola/cmds.py:1662 msgid "Error: Cannot find commit template" msgstr "" -#: cola/widgets/stash.py:235 -msgid "Error: Stash exists" -msgstr "" - -#: cola/cmds.py:1732 +#: cola/cmds.py:1684 msgid "Error: Unconfigured commit template" msgstr "" -#: cola/widgets/clone.py:53 +#: cola/widgets/clone.py:52 #, python-format msgid "Error: could not clone \"%s\"" msgstr "" -#: cola/cmds.py:2835 +#: cola/cmds.py:2781 #, python-format msgid "Error: could not create tag \"%s\"" msgstr "" -#: cola/widgets/branch.py:421 +#: cola/widgets/branch.py:433 #, python-format msgid "Executing action %s" msgstr "" @@ -1596,408 +1646,420 @@ msgstr "" msgid "Exit \"Diff\" mode" msgstr "" -#: cola/widgets/action.py:67 +#: cola/widgets/action.py:81 msgid "Exit Diff" msgstr "" -#: cola/widgets/main.py:528 +#: cola/widgets/main.py:541 msgid "Exit Diff Mode" msgstr "" -#: cola/widgets/action.py:68 +#: cola/widgets/action.py:81 msgid "Exit Diff mode" msgstr "" -#: cola/widgets/recent.py:67 +#: cola/widgets/recent.py:65 msgid "Expand all" msgstr "" -#: cola/widgets/diff.py:1223 +#: cola/widgets/diff.py:1297 msgid "Export Patch" msgstr "" -#: cola/guicmds.py:168 cola/widgets/search.py:75 +#: cola/guicmds.py:167 cola/widgets/search.py:74 msgid "Export Patches" msgstr "" -#: cola/widgets/main.py:273 +#: cola/widgets/main.py:268 msgid "Export Patches..." msgstr "" -#: cola/widgets/main.py:533 +#: cola/widgets/main.py:546 msgid "Expression..." msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Extended Regexp" msgstr "" -#: cola/widgets/commitmsg.py:612 +#: cola/widgets/commitmsg.py:638 msgid "Extended description..." msgstr "" -#: cola/cmds.py:387 +#: cola/cmds.py:388 msgid "Failed to commit and continue applying patches" msgstr "" -#: cola/cmds.py:403 +#: cola/cmds.py:404 msgid "Failed to continue applying patches after skipping the current patch" msgstr "" -#: cola/widgets/createbranch.py:124 +#: cola/widgets/createbranch.py:122 msgid "Fast Forward Only" msgstr "" -#: cola/widgets/remote.py:177 +#: cola/widgets/remote.py:181 msgid "Fast-forward only" msgstr "" -#: cola/widgets/bookmarks.py:91 +#: cola/widgets/bookmarks.py:90 msgid "Favorite repositories" msgstr "" -#: cola/widgets/main.py:111 +#: cola/widgets/main.py:109 msgid "Favorites" msgstr "" -#: cola/widgets/remote.py:673 +#: cola/widgets/remote.py:735 msgid "Fetch" msgstr "" -#: cola/widgets/createbranch.py:127 +#: cola/widgets/createbranch.py:125 msgid "Fetch Tracking Branch" msgstr "" -#: cola/widgets/action.py:63 cola/widgets/main.py:387 +#: cola/widgets/action.py:67 cola/widgets/main.py:384 +msgid "Fetch from one or more remotes using \"git fetch\"" +msgstr "" + +#: cola/widgets/action.py:65 cola/widgets/main.py:383 msgid "Fetch..." msgstr "" -#: cola/widgets/main.py:588 +#: cola/widgets/main.py:601 msgid "File Browser..." msgstr "" -#: cola/widgets/compare.py:75 +#: cola/widgets/compare.py:74 msgid "File Differences" msgstr "" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 msgid "File Saved" msgstr "" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 #, python-format msgid "File saved to \"%s\"" msgstr "" -#: cola/fsmonitor.py:517 +#: cola/fsmonitor.py:528 msgid "File system change monitoring: disabled because \"cola.inotify\" is false.\n" msgstr "" -#: cola/fsmonitor.py:534 +#: cola/fsmonitor.py:545 msgid "File system change monitoring: disabled because libc does not support the inotify system calls.\n" msgstr "" -#: cola/fsmonitor.py:528 +#: cola/fsmonitor.py:539 msgid "File system change monitoring: disabled because pywin32 is not installed.\n" msgstr "" -#: cola/fsmonitor.py:181 +#: cola/fsmonitor.py:184 msgid "" "File system change monitoring: disabled because the limit on the total number of inotify watches was reached. You may be able to increase the limit on the number of watches by running:\n" "\n" " echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n" msgstr "" -#: cola/fsmonitor.py:142 +#: cola/fsmonitor.py:145 msgid "File system change monitoring: enabled.\n" msgstr "" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Filename" msgstr "" -#: cola/widgets/dag.py:755 +#: cola/widgets/dag.py:821 msgid "Files" msgstr "" -#: cola/widgets/branch.py:785 +#: cola/widgets/branch.py:837 msgid "Filter branches..." msgstr "" -#: cola/widgets/status.py:1333 +#: cola/widgets/status.py:1334 msgid "Filter paths..." msgstr "" -#: cola/widgets/finder.py:113 cola/widgets/main.py:312 +#: cola/widgets/finder.py:112 cola/widgets/main.py:307 msgid "Find Files" msgstr "" -#: cola/widgets/text.py:388 +#: cola/widgets/text.py:385 msgid "Find in diff" msgstr "" -#: cola/widgets/text.py:425 +#: cola/widgets/text.py:422 msgid "Find next item" msgstr "" -#: cola/widgets/text.py:431 +#: cola/widgets/text.py:428 msgid "Find previous item" msgstr "" -#: cola/widgets/text.py:395 +#: cola/widgets/text.py:392 msgid "Find the next occurrence of the phrase" msgstr "" -#: cola/widgets/text.py:391 +#: cola/widgets/text.py:388 msgid "Find the previous occurrence of the phrase" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Fixed String" msgstr "" -#: cola/widgets/prefs.py:251 +#: cola/widgets/prefs.py:270 msgid "Fixed-Width Font" msgstr "" -#: cola/sequenceeditor.py:362 +#: cola/sequenceeditor.py:358 msgid "Fixup" msgstr "" -#: cola/widgets/commitmsg.py:148 +#: cola/widgets/commitmsg.py:154 msgid "Fixup Previous Commit" msgstr "" -#: cola/themes.py:672 +#: cola/themes.py:684 msgid "Flat dark blue" msgstr "" -#: cola/themes.py:693 +#: cola/themes.py:705 msgid "Flat dark green" msgstr "" -#: cola/themes.py:686 +#: cola/themes.py:698 msgid "Flat dark grey" msgstr "" -#: cola/themes.py:679 +#: cola/themes.py:691 msgid "Flat dark red" msgstr "" -#: cola/themes.py:644 +#: cola/themes.py:656 msgid "Flat light blue" msgstr "" -#: cola/themes.py:665 +#: cola/themes.py:677 msgid "Flat light green" msgstr "" -#: cola/themes.py:658 +#: cola/themes.py:670 msgid "Flat light grey" msgstr "" -#: cola/themes.py:651 +#: cola/themes.py:663 msgid "Flat light red" msgstr "" -#: cola/widgets/startup.py:73 +#: cola/widgets/startup.py:72 msgid "Folder" msgstr "" -#: cola/widgets/toolbar.py:177 +#: cola/widgets/toolbar.py:181 msgid "Follow System Style" msgstr "" -#: cola/widgets/prefs.py:252 +#: cola/widgets/prefs.py:271 msgid "Font Size" msgstr "" -#: cola/widgets/remote.py:193 +#: cola/widgets/remote.py:197 msgid "Force" msgstr "" -#: cola/widgets/remote.py:617 +#: cola/widgets/remote.py:652 msgid "Force Fetch" msgstr "" -#: cola/widgets/remote.py:614 +#: cola/widgets/remote.py:649 msgid "Force Fetch?" msgstr "" -#: cola/widgets/remote.py:625 +#: cola/widgets/remote.py:660 msgid "Force Push" msgstr "" -#: cola/widgets/remote.py:619 +#: cola/widgets/remote.py:654 msgid "Force Push?" msgstr "" -#: cola/widgets/remote.py:616 +#: cola/widgets/remote.py:651 #, python-format msgid "Force fetching from %s?" msgstr "" -#: cola/widgets/remote.py:624 +#: cola/widgets/remote.py:659 #, python-format msgid "Force push to %s?" msgstr "" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Format String" msgstr "" -#: cola/widgets/about.py:430 cola/widgets/about.py:431 +#: cola/widgets/about.py:413 cola/widgets/about.py:414 msgid "French translation" msgstr "" -#: cola/widgets/merge.py:80 +#: cola/widgets/merge.py:78 msgid "GPG-sign the merge commit" msgstr "" -#: cola/widgets/prefs.py:344 +#: cola/widgets/prefs.py:364 msgid "GUI theme" msgstr "" -#: cola/widgets/editremotes.py:318 +#: cola/widgets/editremotes.py:317 #, python-format msgid "Gathering info for \"%s\"..." msgstr "" -#: cola/widgets/about.py:420 cola/widgets/about.py:428 -#: cola/widgets/about.py:429 +#: cola/widgets/about.py:403 cola/widgets/about.py:411 +#: cola/widgets/about.py:412 msgid "German translation" msgstr "" -#: cola/widgets/main.py:511 +#: cola/widgets/main.py:524 msgid "Get Commit Message Template" msgstr "" -#: cola/widgets/dag.py:520 +#: cola/widgets/dag.py:586 msgid "Go Down" msgstr "" -#: cola/widgets/dag.py:516 +#: cola/widgets/dag.py:582 msgid "Go Up" msgstr "" -#: cola/widgets/dag.py:467 cola/widgets/filelist.py:42 +#: cola/widgets/dag.py:466 cola/widgets/filelist.py:39 msgid "Grab File..." msgstr "" -#: cola/widgets/dag.py:782 +#: cola/widgets/dag.py:848 msgid "Graph" msgstr "" -#: cola/widgets/main.py:358 +#: cola/widgets/main.py:353 msgid "Grep" msgstr "" -#: cola/widgets/remote.py:662 +#: cola/widgets/remote.py:707 msgid "Have you rebased/pulled lately?" msgstr "" -#: cola/sequenceeditor.py:110 cola/sequenceeditor.py:171 -#: cola/widgets/finder.py:138 cola/widgets/main.py:854 +#: cola/sequenceeditor.py:108 cola/sequenceeditor.py:169 +#: cola/widgets/finder.py:137 cola/widgets/main.py:867 msgid "Help" msgstr "" -#: cola/widgets/status.py:1322 +#: cola/widgets/status.py:1323 msgid "Help - Custom Copy Actions" msgstr "" -#: cola/widgets/finder.py:79 +#: cola/widgets/finder.py:78 msgid "Help - Find Files" msgstr "" -#: cola/sequenceeditor.py:737 +#: cola/sequenceeditor.py:732 msgid "Help - git-cola-sequence-editor" msgstr "" -#: cola/widgets/prefs.py:346 +#: cola/widgets/prefs.py:366 msgid "High DPI" msgstr "" -#: cola/gitcmds.py:876 +#: cola/gitcmds.py:886 msgid "Hint: The \"Actions > Abort Cherry-Pick\" menu action can be used to cancel the current cherry-pick." msgstr "" -#: cola/widgets/prefs.py:254 +#: cola/widgets/prefs.py:275 msgid "History Browser" msgstr "" -#: cola/widgets/about.py:427 cola/widgets/about.py:441 +#: cola/widgets/about.py:410 cola/widgets/about.py:424 msgid "Hungarian translation" msgstr "" -#: cola/widgets/toolbar.py:178 +#: cola/widgets/toolbar.py:182 msgid "Icon Only" msgstr "" -#: cola/widgets/prefs.py:345 +#: cola/widgets/prefs.py:365 msgid "Icon theme" msgstr "" -#: cola/widgets/diff.py:758 +#: cola/widgets/diff.py:787 msgid "Ignore all whitespace" msgstr "" -#: cola/widgets/diff.py:755 +#: cola/widgets/diff.py:785 msgid "Ignore changes in amount of whitespace" msgstr "" -#: cola/widgets/diff.py:751 +#: cola/widgets/diff.py:782 msgid "Ignore changes in whitespace at EOL" msgstr "" -#: cola/widgets/gitignore.py:46 +#: cola/widgets/gitignore.py:45 msgid "Ignore custom pattern" msgstr "" -#: cola/widgets/gitignore.py:44 +#: cola/widgets/gitignore.py:43 msgid "Ignore exact filename" msgstr "" -#: cola/widgets/gitignore.py:32 +#: cola/widgets/gitignore.py:31 msgid "Ignore filename or pattern" msgstr "" -#: cola/widgets/status.py:933 +#: cola/widgets/dag.py:498 +msgid "Ignore merge commits" +msgstr "" + +#: cola/widgets/status.py:934 msgid "Ignore..." msgstr "" -#: cola/widgets/remote.py:203 +#: cola/widgets/remote.py:207 msgid "Include tags " msgstr "" -#: cola/widgets/prefs.py:349 +#: cola/widgets/prefs.py:369 msgid "Indent Status paths" msgstr "" -#: cola/widgets/about.py:419 cola/widgets/about.py:426 +#: cola/widgets/about.py:402 cola/widgets/about.py:409 msgid "Indonesian translation" msgstr "" -#: cola/widgets/main.py:643 +#: cola/widgets/main.py:656 msgid "Initialize Git Annex" msgstr "" -#: cola/widgets/main.py:647 +#: cola/widgets/main.py:660 msgid "Initialize Git LFS" msgstr "" -#: cola/widgets/clone.py:116 +#: cola/widgets/clone.py:114 msgid "Inititalize submodules" msgstr "" -#: cola/widgets/prefs.py:260 +#: cola/widgets/prefs.py:281 msgid "Insert spaces instead of tabs" msgstr "" -#: cola/cmds.py:2130 +#: cola/widgets/action.py:73 cola/widgets/main.py:402 +msgid "Integrate changes using \"git pull\"" +msgstr "" + +#: cola/cmds.py:2081 msgid "Interactive Rebase" msgstr "" -#: cola/cmds.py:2364 +#: cola/cmds.py:2315 msgid "Invalid Revision" msgstr "" @@ -2005,47 +2067,47 @@ msgstr "" msgid "It is not necessary to update the hunk header lines as they will be regenerated automatically." msgstr "" -#: cola/widgets/about.py:421 cola/widgets/about.py:424 +#: cola/widgets/about.py:404 cola/widgets/about.py:407 msgid "Japanese translation" msgstr "" -#: cola/widgets/prefs.py:262 +#: cola/widgets/prefs.py:283 msgid "Keep *.orig Merge Backups" msgstr "" -#: cola/widgets/stash.py:71 +#: cola/widgets/stash.py:73 msgid "Keep Index" msgstr "" -#: cola/widgets/main.py:477 +#: cola/widgets/main.py:490 msgid "Keyboard Shortcuts" msgstr "" -#: cola/cmds.py:1608 cola/sequenceeditor.py:165 cola/sequenceeditor.py:338 -#: cola/widgets/dag.py:395 cola/widgets/filelist.py:34 +#: cola/difftool.py:27 cola/sequenceeditor.py:163 cola/sequenceeditor.py:334 +#: cola/widgets/dag.py:394 cola/widgets/filelist.py:31 msgid "Launch Diff Tool" msgstr "" -#: cola/widgets/dag.py:402 +#: cola/widgets/dag.py:401 msgid "Launch Directory Diff Tool" msgstr "" -#: cola/cmds.py:1541 cola/cmds.py:1679 cola/widgets/filelist.py:38 +#: cola/cmds.py:1529 cola/cmds.py:1631 cola/widgets/filelist.py:35 msgid "Launch Editor" msgstr "" -#: cola/cmds.py:1644 +#: cola/cmds.py:1596 msgid "Launch Terminal" msgstr "" -#: cola/sequenceeditor.py:166 +#: cola/sequenceeditor.py:164 msgid "" "Launch external diff tool\n" "Shortcut: Ctrl+D" msgstr "" -#: cola/widgets/diff.py:1005 cola/widgets/diff.py:1051 -#: cola/widgets/status.py:852 cola/widgets/status.py:948 +#: cola/widgets/diff.py:1044 cola/widgets/diff.py:1106 +#: cola/widgets/status.py:853 cola/widgets/status.py:949 msgid "Launch git-cola" msgstr "" @@ -2057,7 +2119,7 @@ msgstr "" msgid "Launch git-difftool on the current path" msgstr "" -#: cola/icons.py:56 +#: cola/icons.py:55 msgid "Light Theme" msgstr "" @@ -2066,167 +2128,183 @@ msgstr "" msgid "Lines starting with '%s' will be ignored." msgstr "" -#: cola/widgets/startup.py:74 +#: cola/widgets/startup.py:73 msgid "List" msgstr "" -#: cola/guicmds.py:267 +#: cola/guicmds.py:266 msgid "Load Commit Message" msgstr "" -#: cola/widgets/main.py:339 +#: cola/widgets/main.py:334 msgid "Load Commit Message..." msgstr "" -#: cola/widgets/commitmsg.py:144 +#: cola/widgets/commitmsg.py:150 msgid "Load Previous Commit Message" msgstr "" -#: cola/widgets/diff.py:264 +#: cola/widgets/diff.py:265 msgid "Loading..." msgstr "" -#: cola/widgets/branch.py:169 cola/widgets/branch.py:240 -#: cola/widgets/branch.py:281 cola/widgets/compare.py:38 -#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/branch.py:173 cola/widgets/branch.py:250 +#: cola/widgets/branch.py:290 cola/widgets/compare.py:37 +#: cola/widgets/compare.py:52 cola/widgets/compare.py:57 msgid "Local" msgstr "" -#: cola/widgets/cfgactions.py:227 cola/widgets/merge.py:46 -#: cola/widgets/remote.py:138 +#: cola/widgets/cfgactions.py:225 cola/widgets/merge.py:44 +#: cola/widgets/remote.py:136 msgid "Local Branch" msgstr "" -#: cola/widgets/createbranch.py:114 +#: cola/widgets/createbranch.py:112 msgid "Local branch" msgstr "" -#: cola/widgets/dag.py:788 cola/widgets/main.py:651 +#: cola/widgets/dag.py:854 cola/widgets/main.py:664 msgid "Lock Layout" msgstr "" -#: cola/widgets/dag.py:750 +#: cola/widgets/dag.py:816 msgid "Log" msgstr "" -#: cola/widgets/prefs.py:170 +#: cola/widgets/prefs.py:191 msgid "Log Date Format" msgstr "" -#: cola/widgets/about.py:268 +#: cola/themes.py:769 +msgid "MacOS Aqua dark" +msgstr "" + +#: cola/themes.py:765 +msgid "MacOS Aqua light" +msgstr "" + +#: cola/themes.py:781 +msgid "MacOS Vibrant dark" +msgstr "" + +#: cola/themes.py:775 +msgid "MacOS Vibrant light" +msgstr "" + +#: cola/widgets/about.py:251 msgid "Maintainer (since 2007) and developer" msgstr "" -#: cola/widgets/text.py:398 +#: cola/widgets/text.py:395 msgid "Match Case" msgstr "" -#: cola/widgets/merge.py:88 +#: cola/widgets/merge.py:86 msgid "Merge" msgstr "" -#: cola/widgets/merge.py:162 +#: cola/widgets/merge.py:160 #, python-format msgid "Merge \"%(revision)s\" into \"%(branch)s\"" msgstr "" -#: cola/widgets/prefs.py:257 +#: cola/widgets/prefs.py:278 msgid "Merge Tool" msgstr "" -#: cola/widgets/prefs.py:171 +#: cola/widgets/prefs.py:193 msgid "Merge Verbosity" msgstr "" -#: cola/cmds.py:1829 +#: cola/cmds.py:1780 msgid "Merge failed. Conflict resolution is required." msgstr "" -#: cola/widgets/merge.py:167 +#: cola/widgets/merge.py:165 #, python-format msgid "Merge into \"%s\"" msgstr "" -#: cola/widgets/branch.py:231 +#: cola/widgets/branch.py:242 msgid "Merge into current branch" msgstr "" -#: cola/widgets/main.py:363 +#: cola/widgets/main.py:358 msgid "Merge..." msgstr "" -#: cola/widgets/main.py:1163 +#: cola/widgets/main.py:1176 msgid "Merging" msgstr "" -#: cola/models/browse.py:33 cola/widgets/createtag.py:78 +#: cola/models/browse.py:32 cola/widgets/createtag.py:76 msgid "Message" msgstr "" -#: cola/widgets/commitmsg.py:417 +#: cola/widgets/commitmsg.py:425 msgid "Missing Commit Message" msgstr "" -#: cola/widgets/createbranch.py:252 +#: cola/widgets/createbranch.py:250 msgid "Missing Data" msgstr "" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Missing Name" msgstr "" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Missing Revision" msgstr "" -#: cola/cmds.py:2801 +#: cola/cmds.py:2747 msgid "Missing Tag Message" msgstr "" -#: cola/models/browse.py:332 cola/widgets/status.py:158 -#: cola/widgets/status.py:631 +#: cola/models/browse.py:331 cola/widgets/status.py:158 +#: cola/widgets/status.py:632 msgid "Modified" msgstr "" -#: cola/widgets/commitmsg.py:506 +#: cola/widgets/commitmsg.py:532 msgid "More..." msgstr "" -#: cola/widgets/standard.py:243 cola/widgets/status.py:233 +#: cola/widgets/standard.py:242 cola/widgets/status.py:234 msgid "Move Down" msgstr "" -#: cola/widgets/standard.py:235 cola/widgets/status.py:225 +#: cola/widgets/standard.py:234 cola/widgets/status.py:226 msgid "Move Up" msgstr "" -#: cola/widgets/status.py:300 +#: cola/widgets/status.py:301 msgid "Move files to trash" msgstr "" -#: cola/models/browse.py:33 cola/widgets/bookmarks.py:467 -#: cola/widgets/createtag.py:61 cola/widgets/editremotes.py:450 -#: cola/widgets/status.py:1452 cola/widgets/toolbar.py:312 +#: cola/models/browse.py:32 cola/widgets/bookmarks.py:466 +#: cola/widgets/createtag.py:59 cola/widgets/editremotes.py:448 +#: cola/widgets/status.py:1453 cola/widgets/toolbar.py:317 msgid "Name" msgstr "" -#: cola/widgets/editremotes.py:434 +#: cola/widgets/editremotes.py:432 msgid "Name for the new remote" msgstr "" -#: cola/guicmds.py:148 cola/widgets/main.py:285 +#: cola/guicmds.py:147 cola/widgets/main.py:280 msgid "New Bare Repository..." msgstr "" -#: cola/guicmds.py:87 cola/widgets/main.py:280 +#: cola/guicmds.py:86 cola/widgets/main.py:275 msgid "New Repository..." msgstr "" -#: cola/widgets/main.py:983 +#: cola/widgets/main.py:996 msgid "New Toolbar" msgstr "" -#: cola/widgets/startup.py:53 +#: cola/widgets/startup.py:52 msgid "New..." msgstr "" @@ -2234,48 +2312,52 @@ msgstr "" msgid "Next File" msgstr "" -#: cola/widgets/createbranch.py:123 cola/widgets/standard.py:1065 +#: cola/widgets/createbranch.py:121 cola/widgets/standard.py:1183 msgid "No" msgstr "" -#: cola/widgets/merge.py:217 cola/widgets/merge.py:227 +#: cola/widgets/merge.py:215 cola/widgets/merge.py:225 msgid "No Revision Specified" msgstr "" -#: cola/widgets/commitmsg.py:427 +#: cola/widgets/stash.py:225 +msgid "No change made" +msgstr "" + +#: cola/widgets/commitmsg.py:435 msgid "" "No changes to commit.\n" "\n" "You must stage at least 1 file before you can commit." msgstr "" -#: cola/widgets/selectcommits.py:118 +#: cola/widgets/selectcommits.py:117 msgid "No commits exist in this branch." msgstr "" -#: cola/widgets/merge.py:65 +#: cola/widgets/merge.py:63 msgid "No fast forward" msgstr "" -#: cola/widgets/remote.py:186 +#: cola/widgets/remote.py:190 msgid "No fast-forward" msgstr "" -#: cola/widgets/remote.py:577 +#: cola/widgets/remote.py:612 msgid "No repository selected." msgstr "" -#: cola/widgets/remote.py:615 +#: cola/widgets/remote.py:650 msgid "Non-fast-forward fetch overwrites local history!" msgstr "" -#: cola/widgets/remote.py:621 +#: cola/widgets/remote.py:656 msgid "" "Non-fast-forward push overwrites published history!\n" "(Did you pull first?)" msgstr "" -#: cola/widgets/commitmsg.py:444 +#: cola/widgets/commitmsg.py:452 msgid "Nothing to commit" msgstr "" @@ -2283,141 +2365,145 @@ msgstr "" msgid "Nothing to do" msgstr "" -#: cola/widgets/prefs.py:172 +#: cola/widgets/prefs.py:194 msgid "Number of Diff Context Lines" msgstr "" -#: cola/widgets/bookmarks.py:79 cola/widgets/bookmarks.py:213 -#: cola/widgets/startup.py:336 +#: cola/widgets/bookmarks.py:78 cola/widgets/bookmarks.py:212 +#: cola/widgets/startup.py:335 msgid "Open" msgstr "" -#: cola/widgets/text.py:230 +#: cola/widgets/text.py:228 #, python-format msgid "Open \"%s\"" msgstr "" -#: cola/cmds.py:1857 +#: cola/cmds.py:1808 msgid "Open Directory" msgstr "" -#: cola/guicmds.py:205 cola/guicmds.py:214 cola/widgets/editremotes.py:473 -#: cola/widgets/startup.py:55 cola/widgets/startup.py:215 +#: cola/guicmds.py:204 cola/guicmds.py:213 cola/widgets/editremotes.py:471 +#: cola/widgets/startup.py:54 cola/widgets/startup.py:214 msgid "Open Git Repository" msgstr "" -#: cola/widgets/submodules.py:49 +#: cola/widgets/submodules.py:48 msgid "Open Parent" msgstr "" -#: cola/cmds.py:1877 +#: cola/cmds.py:1828 msgid "Open Parent Directory" msgstr "" -#: cola/widgets/main.py:679 +#: cola/widgets/main.py:692 msgid "Open Recent" msgstr "" -#: cola/cmds.py:1840 +#: cola/cmds.py:1791 msgid "Open Using Default Application" msgstr "" -#: cola/cmds.py:1890 +#: cola/cmds.py:1841 msgid "Open Worktree" msgstr "" -#: cola/widgets/bookmarks.py:221 cola/widgets/startup.py:344 +#: cola/widgets/bookmarks.py:220 cola/widgets/startup.py:343 msgid "Open in New Window" msgstr "" -#: cola/widgets/main.py:408 +#: cola/widgets/main.py:415 msgid "Open in New Window..." msgstr "" -#: cola/widgets/main.py:402 +#: cola/widgets/main.py:409 msgid "Open..." msgstr "" -#: cola/widgets/branch.py:345 +#: cola/widgets/branch.py:354 msgid "Other branches" msgstr "" -#: cola/widgets/archive.py:210 +#: cola/widgets/archive.py:208 msgid "Overwrite" msgstr "" -#: cola/widgets/archive.py:209 +#: cola/widgets/archive.py:207 #, python-format msgid "Overwrite \"%s\"?" msgstr "" -#: cola/widgets/archive.py:207 +#: cola/widgets/archive.py:205 msgid "Overwrite File?" msgstr "" -#: cola/widgets/grep.py:144 +#: cola/widgets/grep.py:142 msgid "" "Parse arguments using a shell.\n" "Queries with spaces will require \"double quotes\"." msgstr "" -#: cola/models/browse.py:330 +#: cola/models/browse.py:329 msgid "Partially Staged" msgstr "" -#: cola/widgets/main.py:744 +#: cola/widgets/main.py:757 msgid "Paste" msgstr "" -#: cola/cmds.py:363 +#: cola/cmds.py:364 msgid "Patch failed to apply" msgstr "" -#: cola/cmds.py:375 +#: cola/cmds.py:376 msgid "Patch(es) Applied" msgstr "" -#: cola/widgets/diff.py:1219 cola/widgets/main.py:695 +#: cola/widgets/diff.py:1293 cola/widgets/main.py:708 msgid "Patches" msgstr "" -#: cola/widgets/prefs.py:173 +#: cola/widgets/prefs.py:195 msgid "Patches Directory" msgstr "" -#: cola/widgets/bookmarks.py:468 cola/widgets/submodules.py:118 +#: cola/widgets/bookmarks.py:467 cola/widgets/submodules.py:117 msgid "Path" msgstr "" -#: cola/widgets/clone.py:112 +#: cola/widgets/clone.py:110 msgid "Path or URL to clone (Env. $VARS okay)" msgstr "" -#: cola/sequenceeditor.py:346 +#: cola/sequenceeditor.py:342 msgid "Pick" msgstr "" -#: cola/widgets/diff.py:781 +#: cola/widgets/dag.py:490 +msgid "Pickaxe search for changes containing text" +msgstr "" + +#: cola/widgets/diff.py:809 msgid "Pixel XOR" msgstr "" -#: cola/widgets/createbranch.py:253 +#: cola/widgets/createbranch.py:251 msgid "Please provide both a branch name and revision expression." msgstr "" -#: cola/cmds.py:2348 +#: cola/cmds.py:2299 msgid "Please select a file" msgstr "" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Please specify a name for the new tag." msgstr "" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Please specify a revision to tag." msgstr "" -#: cola/widgets/commitmsg.py:410 +#: cola/widgets/commitmsg.py:418 msgid "" "Please supply a commit message.\n" "\n" @@ -2428,31 +2514,31 @@ msgid "" "- Remaining lines: Describe why this change is good.\n" msgstr "" -#: cola/cmds.py:653 +#: cola/cmds.py:655 msgid "Point the current branch head to a new commit?" msgstr "" -#: cola/widgets/about.py:416 +#: cola/widgets/about.py:399 msgid "Polish translation" msgstr "" -#: cola/widgets/stash.py:63 cola/widgets/stash.py:111 cola/widgets/stash.py:115 +#: cola/widgets/stash.py:65 cola/widgets/stash.py:114 cola/widgets/stash.py:118 msgid "Pop" msgstr "" -#: cola/widgets/main.py:293 cola/widgets/prefs.py:395 +#: cola/widgets/main.py:288 cola/widgets/prefs.py:433 msgid "Preferences" msgstr "" -#: cola/widgets/archive.py:129 +#: cola/widgets/archive.py:127 msgid "Prefix" msgstr "" -#: cola/widgets/main.py:345 +#: cola/widgets/main.py:340 msgid "Prepare Commit Message" msgstr "" -#: cola/widgets/prefs.py:157 +#: cola/widgets/prefs.py:180 msgid "Prevent \"Stage\" from staging all files when nothing is selected" msgstr "" @@ -2460,216 +2546,228 @@ msgstr "" msgid "Previous File" msgstr "" -#: cola/widgets/remote.py:171 +#: cola/widgets/remote.py:169 msgid "Prompt on creation" msgstr "" -#: cola/widgets/remote.py:172 +#: cola/widgets/remote.py:170 msgid "Prompt when pushing creates new remote branches" msgstr "" -#: cola/widgets/remote.py:208 +#: cola/widgets/remote.py:212 msgid "Prune " msgstr "" -#: cola/widgets/bookmarks.py:255 cola/widgets/startup.py:376 +#: cola/widgets/bookmarks.py:254 cola/widgets/startup.py:375 msgid "Prune Missing Entries" msgstr "" -#: cola/widgets/branch.py:247 cola/widgets/remote.py:728 +#: cola/widgets/branch.py:256 cola/widgets/remote.py:783 msgid "Pull" msgstr "" -#: cola/widgets/action.py:65 cola/widgets/main.py:397 +#: cola/widgets/action.py:73 cola/widgets/main.py:401 msgid "Pull..." msgstr "" -#: cola/widgets/branch.py:253 cola/widgets/remote.py:593 -#: cola/widgets/remote.py:698 +#: cola/widgets/branch.py:262 cola/widgets/remote.py:628 +#: cola/widgets/remote.py:758 msgid "Push" msgstr "" -#: cola/widgets/action.py:64 cola/widgets/main.py:392 +#: cola/widgets/action.py:70 cola/widgets/main.py:393 +msgid "Push to one or more remotes using \"git push\"" +msgstr "" + +#: cola/widgets/action.py:70 cola/widgets/main.py:392 msgid "Push..." msgstr "" -#: cola/guicmds.py:252 +#: cola/guicmds.py:251 msgid "Quick Open Repository" msgstr "" -#: cola/widgets/main.py:660 +#: cola/widgets/main.py:673 msgid "Quick Open..." msgstr "" -#: cola/widgets/main.py:355 +#: cola/widgets/main.py:350 msgid "Quit" msgstr "" -#: cola/cmds.py:2144 cola/cmds.py:2180 cola/cmds.py:2181 cola/cmds.py:2194 -#: cola/cmds.py:2195 cola/sequenceeditor.py:158 cola/sequenceeditor.py:199 -#: cola/widgets/main.py:822 cola/widgets/remote.py:211 +#: cola/cmds.py:2095 cola/cmds.py:2131 cola/cmds.py:2132 cola/cmds.py:2145 +#: cola/cmds.py:2146 cola/sequenceeditor.py:156 cola/sequenceeditor.py:197 +#: cola/widgets/main.py:835 cola/widgets/remote.py:215 msgid "Rebase" msgstr "" -#: cola/cmds.py:2143 +#: cola/cmds.py:2094 #, python-format msgid "Rebase onto %s" msgstr "" -#: cola/cmds.py:2156 +#: cola/cmds.py:2107 msgid "Rebase stopped" msgstr "" -#: cola/widgets/remote.py:210 +#: cola/widgets/remote.py:214 msgid "Rebase the current branch instead of merging" msgstr "" -#: cola/widgets/dag.py:419 +#: cola/widgets/dag.py:418 msgid "Rebase to this commit" msgstr "" -#: cola/widgets/main.py:1165 +#: cola/widgets/main.py:1178 msgid "Rebasing" msgstr "" -#: cola/widgets/main.py:120 +#: cola/widgets/main.py:118 msgid "Recent" msgstr "" -#: cola/widgets/bookmarks.py:93 +#: cola/widgets/bookmarks.py:92 msgid "Recent repositories" msgstr "" -#: cola/widgets/prefs.py:258 +#: cola/widgets/prefs.py:279 msgid "Recent repository count" msgstr "" -#: cola/widgets/recent.py:46 +#: cola/widgets/recent.py:44 msgid "Recently Modified Files" msgstr "" -#: cola/widgets/main.py:320 +#: cola/widgets/main.py:315 msgid "Recently Modified Files..." msgstr "" -#: cola/widgets/stash.py:256 +#: cola/widgets/stash.py:274 msgid "Recovering a dropped stash is not possible." msgstr "" -#: cola/widgets/createbranch.py:283 +#: cola/widgets/createbranch.py:281 msgid "Recovering lost commits may not be easy." msgstr "" -#: cola/widgets/main.py:737 +#: cola/widgets/main.py:750 msgid "Redo" msgstr "" -#: cola/widgets/clone.py:121 +#: cola/widgets/clone.py:119 msgid "Reduce commit history to minimum" msgstr "" -#: cola/widgets/submodules.py:121 +#: cola/widgets/submodules.py:120 msgid "Reference Repository" msgstr "" -#: cola/widgets/submodules.py:105 +#: cola/widgets/submodules.py:104 msgid "Reference URL" msgstr "" -#: cola/widgets/submodules.py:106 +#: cola/widgets/submodules.py:105 msgid "Reference repository to use when cloning (optional)" msgstr "" -#: cola/cmds.py:2222 cola/qtutils.py:770 cola/widgets/action.py:62 -#: cola/widgets/dag.py:792 cola/widgets/editremotes.py:85 -#: cola/widgets/grep.py:105 cola/widgets/recent.py:116 -#: cola/widgets/submodules.py:45 +#: cola/cmds.py:2173 cola/qtutils.py:801 cola/widgets/action.py:63 +#: cola/widgets/dag.py:858 cola/widgets/editremotes.py:84 +#: cola/widgets/grep.py:103 cola/widgets/recent.py:114 +#: cola/widgets/submodules.py:44 msgid "Refresh" msgstr "" -#: cola/widgets/remote.py:179 +#: cola/widgets/remote.py:183 msgid "Refuse to merge unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward" msgstr "" -#: cola/widgets/branch.py:173 cola/widgets/branch.py:225 -#: cola/widgets/branch.py:269 cola/widgets/branch.py:470 -#: cola/widgets/compare.py:54 cola/widgets/compare.py:59 -#: cola/widgets/remote.py:147 +#: cola/widgets/branch.py:177 cola/widgets/branch.py:236 +#: cola/widgets/branch.py:278 cola/widgets/branch.py:513 +#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/remote.py:145 msgid "Remote" msgstr "" -#: cola/widgets/remote.py:162 +#: cola/widgets/remote.py:160 msgid "Remote Branch" msgstr "" -#: cola/cmds.py:1196 +#: cola/cmds.py:1197 msgid "Remote Branch Deleted" msgstr "" -#: cola/widgets/editremotes.py:49 +#: cola/widgets/log.py:99 +msgid "Remote Messages" +msgstr "" + +#: cola/widgets/editremotes.py:48 msgid "Remote git repositories - double-click to rename" msgstr "" -#: cola/cmds.py:1029 cola/widgets/patch.py:107 cola/widgets/patch.py:122 -#: cola/widgets/startup.py:265 cola/widgets/status.py:1382 +#: cola/cmds.py:1030 cola/widgets/diff.py:1701 cola/widgets/diff.py:1716 +#: cola/widgets/startup.py:264 cola/widgets/status.py:1383 msgid "Remove" msgstr "" -#: cola/cmds.py:1027 +#: cola/cmds.py:1028 #, python-format msgid "Remove %s from the recent list?" msgstr "" -#: cola/widgets/toolbar.py:316 +#: cola/widgets/toolbar.py:321 msgid "Remove Element" msgstr "" -#: cola/widgets/remote.py:206 +#: cola/widgets/remote.py:210 msgid "Remove remote-tracking branches that no longer exist on the remote" msgstr "" -#: cola/widgets/patch.py:109 +#: cola/widgets/diff.py:1703 msgid "Remove selected (Delete)" msgstr "" -#: cola/widgets/bookmarks.py:258 cola/widgets/startup.py:379 +#: cola/widgets/bookmarks.py:257 cola/widgets/startup.py:378 msgid "Remove stale entries for repositories that no longer exist" msgstr "" -#: cola/guicmds.py:333 cola/widgets/browse.py:159 +#: cola/guicmds.py:332 cola/widgets/browse.py:159 cola/widgets/stash.py:44 msgid "Rename" msgstr "" -#: cola/cmds.py:1153 +#: cola/cmds.py:1154 #, python-format msgid "Rename \"%s\"" msgstr "" -#: cola/widgets/branch.py:259 +#: cola/widgets/branch.py:268 msgid "Rename Branch" msgstr "" -#: cola/widgets/main.py:570 +#: cola/widgets/main.py:583 msgid "Rename Branch..." msgstr "" -#: cola/guicmds.py:330 +#: cola/guicmds.py:329 msgid "Rename Existing Branch" msgstr "" -#: cola/cmds.py:944 +#: cola/cmds.py:942 msgid "Rename Remote" msgstr "" -#: cola/widgets/bookmarks.py:233 cola/widgets/startup.py:356 +#: cola/widgets/bookmarks.py:232 cola/widgets/startup.py:355 msgid "Rename Repository" msgstr "" -#: cola/widgets/branch.py:445 +#: cola/widgets/stash.py:218 +msgid "Rename Stash" +msgstr "" + +#: cola/widgets/branch.py:478 msgid "Rename branch" msgstr "" -#: cola/cmds.py:945 +#: cola/cmds.py:943 #, python-format msgid "Rename remote \"%(current)s\" to \"%(new)s\"?" msgstr "" @@ -2678,179 +2776,183 @@ msgstr "" msgid "Rename selected paths" msgstr "" -#: cola/app.py:497 cola/widgets/startup.py:262 +#: cola/widgets/stash.py:45 +msgid "Rename the selected stash" +msgstr "" + +#: cola/app.py:500 cola/widgets/startup.py:261 msgid "Repository Not Found" msgstr "" -#: cola/widgets/browse.py:87 cola/widgets/main.py:1095 +#: cola/widgets/browse.py:87 cola/widgets/main.py:1108 #, python-format msgid "Repository: %s" msgstr "" -#: cola/guicmds.py:351 cola/widgets/createbranch.py:125 cola/widgets/dag.py:331 -#: cola/widgets/editremotes.py:58 cola/widgets/main.py:832 +#: cola/guicmds.py:350 cola/widgets/createbranch.py:123 cola/widgets/dag.py:330 +#: cola/widgets/editremotes.py:57 cola/widgets/main.py:845 msgid "Reset" msgstr "" -#: cola/widgets/createbranch.py:286 +#: cola/widgets/createbranch.py:284 #, python-format msgid "Reset \"%(branch)s\" to \"%(revision)s\"?" msgstr "" -#: cola/guicmds.py:359 +#: cola/guicmds.py:358 msgid "Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/cmds.py:655 cola/cmds.py:706 cola/guicmds.py:342 -#: cola/widgets/createbranch.py:295 +#: cola/cmds.py:657 cola/cmds.py:708 cola/guicmds.py:341 +#: cola/widgets/createbranch.py:293 msgid "Reset Branch" msgstr "" -#: cola/cmds.py:703 cola/guicmds.py:341 cola/widgets/dag.py:425 -#: cola/widgets/main.py:419 +#: cola/cmds.py:705 cola/guicmds.py:340 cola/widgets/dag.py:424 +#: cola/widgets/main.py:431 msgid "Reset Branch (Soft)" msgstr "" -#: cola/cmds.py:652 cola/guicmds.py:350 cola/widgets/dag.py:431 -#: cola/widgets/main.py:426 +#: cola/cmds.py:654 cola/guicmds.py:349 cola/widgets/dag.py:430 +#: cola/widgets/main.py:439 msgid "Reset Branch and Stage (Mixed)" msgstr "" -#: cola/widgets/createbranch.py:292 +#: cola/widgets/createbranch.py:290 msgid "Reset Branch?" msgstr "" -#: cola/widgets/main.py:655 +#: cola/widgets/main.py:668 msgid "Reset Layout" msgstr "" -#: cola/cmds.py:687 +#: cola/cmds.py:689 msgid "Reset Worktree and Reset All?" msgstr "" -#: cola/cmds.py:672 cola/cmds.py:689 cola/cmds.py:723 cola/guicmds.py:360 -#: cola/guicmds.py:373 cola/guicmds.py:382 +#: cola/cmds.py:674 cola/cmds.py:691 cola/cmds.py:725 cola/guicmds.py:359 +#: cola/guicmds.py:372 cola/guicmds.py:381 msgid "Reset and Restore" msgstr "" -#: cola/cmds.py:704 +#: cola/cmds.py:706 msgid "Reset branch?" msgstr "" -#: cola/widgets/createbranch.py:266 +#: cola/widgets/createbranch.py:264 #, python-format msgid "Resetting \"%(branch)s\" to \"%(revision)s\" will lose commits." msgstr "" -#: cola/widgets/prefs.py:264 +#: cola/widgets/prefs.py:285 msgid "Resize File Browser columns" msgstr "" -#: cola/widgets/prefs.py:374 +#: cola/widgets/prefs.py:412 msgid "Restart the application after changing appearance settings." msgstr "" -#: cola/cmds.py:757 cola/cmds.py:760 cola/guicmds.py:390 cola/guicmds.py:391 -#: cola/widgets/dag.py:461 cola/widgets/main.py:457 +#: cola/cmds.py:759 cola/cmds.py:762 cola/guicmds.py:389 cola/guicmds.py:390 +#: cola/widgets/dag.py:460 cola/widgets/main.py:471 msgid "Restore Worktree" msgstr "" -#: cola/cmds.py:720 cola/guicmds.py:381 cola/widgets/dag.py:454 -#: cola/widgets/main.py:450 +#: cola/cmds.py:722 cola/guicmds.py:380 cola/widgets/dag.py:453 +#: cola/widgets/main.py:463 msgid "Restore Worktree and Reset All (Hard)" msgstr "" -#: cola/cmds.py:669 cola/widgets/main.py:434 +#: cola/cmds.py:671 cola/widgets/main.py:447 msgid "Restore Worktree and Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/widgets/dag.py:438 +#: cola/widgets/dag.py:437 msgid "Restore Worktree and Reset All (Keep Unstaged Edits)" msgstr "" -#: cola/cmds.py:686 cola/guicmds.py:372 cola/widgets/dag.py:446 -#: cola/widgets/main.py:442 +#: cola/cmds.py:688 cola/guicmds.py:371 cola/widgets/dag.py:445 +#: cola/widgets/main.py:455 msgid "Restore Worktree and Reset All (Merge)" msgstr "" -#: cola/cmds.py:721 +#: cola/cmds.py:723 msgid "Restore Worktree and Reset All?" msgstr "" -#: cola/cmds.py:758 +#: cola/cmds.py:760 #, python-format msgid "Restore Worktree to %s?" msgstr "" -#: cola/cmds.py:670 +#: cola/cmds.py:672 msgid "Restore worktree, reset, and preserve unstaged edits?" msgstr "" -#: cola/widgets/dag.py:390 +#: cola/widgets/dag.py:389 msgid "Revert" msgstr "" -#: cola/widgets/diff.py:1153 +#: cola/widgets/diff.py:1227 msgid "Revert Diff Hunk" msgstr "" -#: cola/widgets/diff.py:1018 +#: cola/widgets/diff.py:1057 msgid "Revert Diff Hunk..." msgstr "" -#: cola/widgets/diff.py:1152 +#: cola/widgets/diff.py:1226 msgid "Revert Diff Hunk?" msgstr "" -#: cola/widgets/diff.py:1150 +#: cola/widgets/diff.py:1224 msgid "Revert Selected Lines" msgstr "" -#: cola/widgets/diff.py:1013 +#: cola/widgets/diff.py:1052 msgid "Revert Selected Lines..." msgstr "" -#: cola/widgets/diff.py:1149 +#: cola/widgets/diff.py:1223 msgid "Revert Selected Lines?" msgstr "" -#: cola/cmds.py:2311 +#: cola/cmds.py:2262 msgid "Revert Uncommitted Changes" msgstr "" -#: cola/cmds.py:2305 +#: cola/cmds.py:2256 msgid "Revert Uncommitted Changes?" msgstr "" -#: cola/cmds.py:2298 +#: cola/cmds.py:2249 msgid "Revert Uncommitted Edits..." msgstr "" -#: cola/cmds.py:2289 +#: cola/cmds.py:2240 msgid "Revert Unstaged Changes" msgstr "" -#: cola/cmds.py:2283 +#: cola/cmds.py:2234 msgid "Revert Unstaged Changes?" msgstr "" -#: cola/cmds.py:2275 +#: cola/cmds.py:2226 msgid "Revert Unstaged Edits..." msgstr "" -#: cola/cmds.py:598 +#: cola/cmds.py:599 msgid "Revert failed" msgstr "" -#: cola/cmds.py:2310 cola/widgets/diff.py:1161 +#: cola/cmds.py:2261 cola/widgets/diff.py:1235 msgid "Revert the uncommitted changes?" msgstr "" -#: cola/cmds.py:2288 +#: cola/cmds.py:2239 msgid "Revert the unstaged changes?" msgstr "" -#: cola/widgets/browse.py:189 +#: cola/widgets/browse.py:190 msgid "Revert uncommitted changes to selected paths" msgstr "" @@ -2858,430 +2960,446 @@ msgstr "" msgid "Revert unstaged changes to selected paths" msgstr "" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Review" msgstr "" -#: cola/widgets/main.py:583 +#: cola/widgets/main.py:596 msgid "Review..." msgstr "" -#: cola/widgets/cfgactions.py:233 cola/widgets/createtag.py:84 +#: cola/widgets/cfgactions.py:231 cola/widgets/createtag.py:82 msgid "Revision" msgstr "" -#: cola/widgets/selectcommits.py:62 +#: cola/widgets/selectcommits.py:61 msgid "Revision Expression:" msgstr "" -#: cola/widgets/merge.py:39 cola/widgets/merge.py:42 +#: cola/widgets/merge.py:37 cola/widgets/merge.py:40 msgid "Revision to Merge" msgstr "" -#: cola/sequenceeditor.py:351 +#: cola/sequenceeditor.py:347 msgid "Reword" msgstr "" -#: cola/cmds.py:776 cola/widgets/commitmsg.py:456 +#: cola/cmds.py:778 cola/widgets/commitmsg.py:464 msgid "Rewrite Published Commit?" msgstr "" -#: cola/widgets/log.py:31 +#: cola/widgets/log.py:31 cola/widgets/log.py:133 msgid "Right-click links to open:" msgstr "" -#: cola/interaction.py:127 cola/widgets/cfgactions.py:245 +#: cola/interaction.py:125 cola/widgets/cfgactions.py:243 msgid "Run" msgstr "" -#: cola/cmds.py:2341 +#: cola/cmds.py:2292 #, python-format msgid "Run \"%s\"?" msgstr "" -#: cola/interaction.py:124 +#: cola/interaction.py:122 #, python-format msgid "Run %s?" msgstr "" -#: cola/interaction.py:125 +#: cola/interaction.py:123 #, python-format msgid "Run the \"%s\" command?" msgstr "" -#: cola/cmds.py:2380 +#: cola/cmds.py:2331 #, python-format msgid "Running command: %s" msgstr "" -#: cola/widgets/about.py:422 +#: cola/widgets/about.py:405 msgid "Russian translation" msgstr "" -#: cola/sequenceeditor.py:324 +#: cola/sequenceeditor.py:321 msgid "SHA-1" msgstr "" -#: cola/widgets/prefs.py:183 +#: cola/widgets/prefs.py:205 msgid "Safe Mode" msgstr "" -#: cola/cmds.py:2167 cola/widgets/archive.py:126 cola/widgets/browse.py:609 -#: cola/widgets/editremotes.py:54 cola/widgets/stash.py:52 -#: cola/widgets/status.py:1388 +#: cola/cmds.py:2118 cola/widgets/archive.py:124 cola/widgets/browse.py:610 +#: cola/widgets/editremotes.py:53 cola/widgets/stash.py:54 +#: cola/widgets/status.py:1389 msgid "Save" msgstr "" -#: cola/widgets/archive.py:113 +#: cola/widgets/archive.py:111 msgid "Save Archive" msgstr "" -#: cola/widgets/dag.py:382 cola/widgets/main.py:351 +#: cola/widgets/dag.py:381 cola/widgets/main.py:346 msgid "Save As Tarball/Zip..." msgstr "" -#: cola/widgets/prefs.py:263 +#: cola/widgets/prefs.py:284 msgid "Save GUI Settings" msgstr "" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Save Stash" msgstr "" -#: cola/widgets/stash.py:53 +#: cola/widgets/stash.py:55 msgid "Save modified state to new stash" msgstr "" -#: cola/widgets/browse.py:570 +#: cola/widgets/browse.py:571 #, python-format msgid "Saved \"%(filename)s\" from \"%(ref)s\" to \"%(destination)s\"" msgstr "" -#: cola/widgets/bookmarks.py:83 cola/widgets/grep.py:98 -#: cola/widgets/search.py:42 cola/widgets/search.py:62 +#: cola/widgets/bookmarks.py:82 cola/widgets/grep.py:96 +#: cola/widgets/search.py:41 cola/widgets/search.py:61 msgid "Search" msgstr "" -#: cola/widgets/search.py:226 +#: cola/widgets/search.py:225 msgid "Search Authors" msgstr "" -#: cola/widgets/search.py:224 +#: cola/widgets/search.py:223 msgid "Search Commit Messages" msgstr "" -#: cola/widgets/search.py:227 +#: cola/widgets/search.py:226 msgid "Search Committers" msgstr "" -#: cola/widgets/search.py:228 +#: cola/widgets/search.py:227 msgid "Search Date Range" msgstr "" -#: cola/widgets/search.py:225 +#: cola/widgets/search.py:224 msgid "Search Diffs" msgstr "" -#: cola/widgets/search.py:222 +#: cola/widgets/search.py:221 msgid "Search by Expression" msgstr "" -#: cola/widgets/search.py:223 +#: cola/widgets/search.py:222 msgid "Search by Path" msgstr "" -#: cola/widgets/grep.py:124 +#: cola/widgets/dag.py:494 +msgid "Search commit messages" +msgstr "" + +#: cola/widgets/grep.py:122 msgid "Search for a fixed string" msgstr "" -#: cola/widgets/diff.py:519 cola/widgets/diff.py:1514 +#: cola/widgets/diff.py:526 cola/widgets/diff.py:1576 msgid "Search in Diff" msgstr "" -#: cola/guicmds.py:253 cola/widgets/bookmarks.py:62 +#: cola/guicmds.py:252 cola/widgets/bookmarks.py:61 msgid "Search repositories by name..." msgstr "" -#: cola/widgets/grep.py:122 +#: cola/widgets/grep.py:120 msgid "Search using a POSIX basic regular expression" msgstr "" -#: cola/widgets/grep.py:123 +#: cola/widgets/grep.py:121 msgid "Search using a POSIX extended regular expression" msgstr "" -#: cola/widgets/main.py:493 +#: cola/widgets/main.py:506 msgid "Search..." msgstr "" -#: cola/widgets/selectcommits.py:67 +#: cola/widgets/selectcommits.py:66 msgid "Search:" msgstr "" -#: cola/guicmds.py:330 cola/widgets/selectcommits.py:74 +#: cola/guicmds.py:329 cola/widgets/selectcommits.py:73 msgid "Select" msgstr "" -#: cola/widgets/main.py:750 +#: cola/widgets/main.py:763 msgid "Select All" msgstr "" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Select Branch to Review" msgstr "" -#: cola/widgets/dag.py:1610 +#: cola/widgets/dag.py:1667 msgid "Select Child" msgstr "" -#: cola/widgets/commitmsg.py:512 +#: cola/widgets/commitmsg.py:538 msgid "Select Commit" msgstr "" -#: cola/guicmds.py:137 +#: cola/guicmds.py:136 msgid "Select Directory..." msgstr "" -#: cola/cmds.py:2129 +#: cola/cmds.py:2080 msgid "Select New Upstream" msgstr "" -#: cola/widgets/dag.py:1614 +#: cola/widgets/dag.py:1671 msgid "Select Newest Child" msgstr "" -#: cola/widgets/dag.py:1604 +#: cola/widgets/dag.py:1661 msgid "Select Oldest Parent" msgstr "" -#: cola/widgets/dag.py:1599 +#: cola/widgets/dag.py:1656 msgid "Select Parent" msgstr "" -#: cola/widgets/browse.py:525 +#: cola/widgets/browse.py:526 msgid "Select Previous Version" msgstr "" -#: cola/widgets/clone.py:197 +#: cola/widgets/clone.py:195 msgid "Select a parent directory for the new clone" msgstr "" -#: cola/widgets/standard.py:756 cola/widgets/standard.py:779 +#: cola/widgets/standard.py:826 cola/widgets/standard.py:848 msgid "Select directory" msgstr "" -#: cola/widgets/selectcommits.py:162 +#: cola/widgets/selectcommits.py:161 msgid "Select output dir" msgstr "" -#: cola/widgets/selectcommits.py:183 +#: cola/widgets/selectcommits.py:182 msgid "Select output directory" msgstr "" -#: cola/widgets/patch.py:175 +#: cola/widgets/diff.py:1769 msgid "Select patch file(s)..." msgstr "" -#: cola/widgets/editremotes.py:437 +#: cola/widgets/editremotes.py:435 msgid "Select repository" msgstr "" -#: cola/widgets/bookmarks.py:225 cola/widgets/startup.py:348 +#: cola/widgets/bookmarks.py:224 cola/widgets/startup.py:347 msgid "Set Default Repository" msgstr "" -#: cola/widgets/branch.py:282 +#: cola/widgets/branch.py:291 msgid "Set Upstream Branch" msgstr "" -#: cola/widgets/branch.py:72 +#: cola/widgets/branch.py:74 msgid "" "Set the sort order for branches and tags.\n" "Toggle between date-based and version-name-based sorting." msgstr "" -#: cola/widgets/remote.py:213 +#: cola/widgets/remote.py:217 msgid "Set upstream" msgstr "" -#: cola/widgets/prefs.py:405 +#: cola/widgets/prefs.py:443 msgid "Settings" msgstr "" -#: cola/widgets/grep.py:142 +#: cola/widgets/grep.py:140 msgid "Shell arguments" msgstr "" -#: cola/sequenceeditor.py:375 +#: cola/sequenceeditor.py:371 msgid "Shift Down" msgstr "" -#: cola/sequenceeditor.py:379 +#: cola/sequenceeditor.py:375 msgid "Shift Up" msgstr "" -#: cola/widgets/about.py:499 +#: cola/widgets/about.py:482 msgid "Shortcuts" msgstr "" -#: cola/widgets/prefs.py:179 +#: cola/widgets/prefs.py:201 msgid "Show Diffstat After Merge" msgstr "" -#: cola/widgets/prefs.py:178 +#: cola/widgets/prefs.py:200 msgid "Show Full Paths in the Window Title" msgstr "" -#: cola/sequenceeditor.py:106 cola/widgets/finder.py:187 -#: cola/widgets/status.py:1384 +#: cola/sequenceeditor.py:104 cola/widgets/finder.py:186 +#: cola/widgets/status.py:1385 msgid "Show Help" msgstr "" -#: cola/widgets/filelist.py:30 +#: cola/widgets/filelist.py:27 msgid "Show History" msgstr "" -#: cola/widgets/prefs.py:348 +#: cola/widgets/prefs.py:368 msgid "Show file counts in Status titles" msgstr "" -#: cola/sequenceeditor.py:171 cola/widgets/finder.py:138 +#: cola/widgets/diff.py:794 +msgid "Show filenames" +msgstr "" + +#: cola/sequenceeditor.py:169 cola/widgets/finder.py:137 msgid "" "Show help\n" "Shortcut: ?" msgstr "" -#: cola/widgets/diff.py:765 +#: cola/widgets/diff.py:792 msgid "Show line numbers" msgstr "" -#: cola/widgets/diff.py:761 +#: cola/widgets/remote.py:175 +msgid "Show remote messages" +msgstr "" + +#: cola/widgets/diff.py:789 msgid "Show whole surrounding functions of changes" msgstr "" -#: cola/widgets/recent.py:58 +#: cola/widgets/recent.py:56 msgid "Showing changes since" msgstr "" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "Side by side" msgstr "" -#: cola/cmds.py:2512 +#: cola/cmds.py:2463 msgid "Sign Off" msgstr "" -#: cola/widgets/createtag.py:71 +#: cola/widgets/createtag.py:69 msgid "Sign Tag" msgstr "" -#: cola/widgets/commitmsg.py:55 +#: cola/widgets/commitmsg.py:56 msgid "Sign off on this commit" msgstr "" -#: cola/widgets/about.py:412 cola/widgets/about.py:425 +#: cola/widgets/about.py:395 cola/widgets/about.py:408 msgid "Simplified Chinese translation" msgstr "" -#: cola/cmds.py:2587 +#: cola/cmds.py:2529 msgid "Skip" msgstr "" -#: cola/widgets/main.py:264 cola/widgets/main.py:617 +#: cola/widgets/main.py:260 cola/widgets/main.py:630 msgid "Skip Current Patch" msgstr "" -#: cola/widgets/main.py:267 +#: cola/widgets/main.py:261 msgid "Skip applying the current patch and continue applying patches" msgstr "" -#: cola/widgets/prefs.py:261 +#: cola/widgets/prefs.py:282 msgid "Sort bookmarks alphabetically" msgstr "" -#: cola/widgets/about.py:413 cola/widgets/about.py:436 -#: cola/widgets/about.py:440 +#: cola/widgets/about.py:396 cola/widgets/about.py:419 +#: cola/widgets/about.py:423 msgid "Spanish translation" msgstr "" -#: cola/widgets/createtag.py:88 +#: cola/widgets/createtag.py:86 msgid "Specifies the SHA-1 to tag" msgstr "" -#: cola/widgets/createtag.py:81 +#: cola/widgets/createtag.py:79 msgid "Specifies the tag message" msgstr "" -#: cola/widgets/createtag.py:65 +#: cola/widgets/createtag.py:63 msgid "Specifies the tag name" msgstr "" -#: cola/widgets/spellcheck.py:46 +#: cola/widgets/spellcheck.py:45 msgid "Spelling Suggestions" msgstr "" -#: cola/sequenceeditor.py:369 cola/widgets/merge.py:58 +#: cola/sequenceeditor.py:365 cola/widgets/merge.py:56 msgid "Squash" msgstr "" -#: cola/widgets/merge.py:57 +#: cola/widgets/merge.py:55 msgid "Squash the merged commits into a single commit" msgstr "" -#: cola/cmds.py:2598 cola/widgets/action.py:60 cola/widgets/diff.py:982 +#: cola/cmds.py:2540 cola/widgets/action.py:58 cola/widgets/diff.py:1168 msgid "Stage" msgstr "" -#: cola/cmds.py:2753 +#: cola/cmds.py:2699 msgid "Stage / Unstage" msgstr "" -#: cola/cmds.py:2735 +#: cola/cmds.py:2681 msgid "Stage / Unstage All" msgstr "" -#: cola/widgets/diff.py:1016 +#: cola/widgets/diff.py:1055 msgid "Stage Diff Hunk" msgstr "" -#: cola/cmds.py:2691 +#: cola/cmds.py:2633 msgid "Stage Modified" msgstr "" -#: cola/cmds.py:2724 +#: cola/cmds.py:2670 msgid "Stage Modified and Untracked" msgstr "" -#: cola/widgets/status.py:872 cola/widgets/status.py:894 -#: cola/widgets/status.py:962 +#: cola/widgets/status.py:873 cola/widgets/status.py:895 +#: cola/widgets/status.py:963 msgid "Stage Selected" msgstr "" -#: cola/widgets/diff.py:1011 +#: cola/widgets/diff.py:1050 msgid "Stage Selected Lines" msgstr "" -#: cola/cmds.py:2702 +#: cola/cmds.py:2644 msgid "Stage Unmerged" msgstr "" -#: cola/cmds.py:2713 +#: cola/cmds.py:2655 msgid "Stage Untracked" msgstr "" -#: cola/widgets/commitmsg.py:438 +#: cola/widgets/commitmsg.py:446 msgid "Stage and Commit" msgstr "" -#: cola/widgets/commitmsg.py:435 +#: cola/widgets/commitmsg.py:443 msgid "Stage and commit?" msgstr "" -#: cola/cmds.py:2586 +#: cola/widgets/action.py:58 +msgid "Stage changes using \"git add\"" +msgstr "" + +#: cola/cmds.py:2528 msgid "Stage conflicts" msgstr "" -#: cola/cmds.py:2577 +#: cola/cmds.py:2519 msgid "Stage conflicts?" msgstr "" @@ -3289,45 +3407,45 @@ msgstr "" msgid "Stage/unstage selected paths for commit" msgstr "" -#: cola/models/browse.py:334 cola/widgets/status.py:156 -#: cola/widgets/status.py:620 +#: cola/models/browse.py:333 cola/widgets/status.py:156 +#: cola/widgets/status.py:621 msgid "Staged" msgstr "" -#: cola/cmds.py:2605 +#: cola/cmds.py:2547 #, python-format msgid "Staging: %s" msgstr "" -#: cola/widgets/main.py:597 +#: cola/widgets/main.py:610 msgid "Start Interactive Rebase..." msgstr "" -#: cola/widgets/createbranch.py:107 +#: cola/widgets/createbranch.py:105 msgid "Starting Revision" msgstr "" -#: cola/widgets/stash.py:40 +#: cola/widgets/stash.py:36 msgid "Stash" msgstr "" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash Index" msgstr "" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash staged changes only" msgstr "" -#: cola/widgets/stash.py:73 +#: cola/widgets/stash.py:75 msgid "Stash unstaged changes only, keeping staged changes" msgstr "" -#: cola/widgets/action.py:66 cola/widgets/main.py:414 +#: cola/widgets/action.py:76 cola/widgets/main.py:422 msgid "Stash..." msgstr "" -#: cola/models/browse.py:33 cola/widgets/main.py:102 +#: cola/models/browse.py:32 cola/widgets/main.py:100 msgid "Status" msgstr "" @@ -3335,209 +3453,217 @@ msgstr "" msgid "Stop tracking paths" msgstr "" -#: cola/widgets/submodules.py:82 +#: cola/widgets/submodules.py:81 msgid "Submodule URL (can be relative, ex: ../repo.git)" msgstr "" -#: cola/widgets/submodules.py:90 +#: cola/widgets/submodules.py:89 msgid "Submodule branch to track (optional)" msgstr "" -#: cola/widgets/submodules.py:86 +#: cola/widgets/submodules.py:85 msgid "Submodule path within the current repository (optional)" msgstr "" -#: cola/widgets/main.py:143 cola/widgets/submodules.py:32 +#: cola/widgets/main.py:141 cola/widgets/submodules.py:31 msgid "Submodules" msgstr "" -#: cola/widgets/prefs.py:174 +#: cola/widgets/prefs.py:196 msgid "Summarize Merge Commits" msgstr "" -#: cola/sequenceeditor.py:325 cola/widgets/dag.py:506 +#: cola/sequenceeditor.py:322 cola/widgets/dag.py:572 msgid "Summary" msgstr "" -#: cola/widgets/prefs.py:168 +#: cola/widgets/prefs.py:273 msgid "Tab Width" msgstr "" -#: cola/widgets/cfgactions.py:229 cola/widgets/createbranch.py:116 -#: cola/widgets/merge.py:48 +#: cola/widgets/cfgactions.py:227 cola/widgets/createbranch.py:114 +#: cola/widgets/merge.py:46 msgid "Tag" msgstr "" -#: cola/cmds.py:2842 +#: cola/cmds.py:2788 msgid "Tag Created" msgstr "" -#: cola/widgets/createtag.py:80 +#: cola/widgets/createtag.py:78 msgid "Tag message..." msgstr "" -#: cola/cmds.py:2802 +#: cola/cmds.py:2748 msgid "Tag-signing was requested but the tag message is empty." msgstr "" -#: cola/widgets/branch.py:179 cola/widgets/branch.py:238 +#: cola/widgets/branch.py:183 cola/widgets/branch.py:248 msgid "Tags" msgstr "" -#: cola/widgets/toolbar.py:180 +#: cola/widgets/action.py:78 cola/widgets/main.py:423 +msgid "Temporarily stash away uncommitted changes using \"git stash\"" +msgstr "" + +#: cola/widgets/toolbar.py:184 msgid "Text Beside Icon" msgstr "" -#: cola/widgets/toolbar.py:179 +#: cola/widgets/toolbar.py:183 msgid "Text Only" msgstr "" -#: cola/widgets/toolbar.py:181 +#: cola/widgets/toolbar.py:185 msgid "Text Under Icon" msgstr "" -#: cola/widgets/prefs.py:169 +#: cola/widgets/prefs.py:272 msgid "Text Width" msgstr "" -#: cola/cmds.py:1116 +#: cola/cmds.py:1117 msgid "The branch will be no longer available." msgstr "" -#: cola/cmds.py:648 +#: cola/cmds.py:650 #, python-format msgid "The branch will be reset using \"git reset --mixed %s\"" msgstr "" -#: cola/cmds.py:699 cola/cmds.py:790 +#: cola/cmds.py:701 cola/cmds.py:792 #, python-format msgid "The branch will be reset using \"git reset --soft %s\"" msgstr "" -#: cola/widgets/commitmsg.py:303 +#: cola/widgets/commitmsg.py:311 msgid "The commit message will be cleared." msgstr "" -#: cola/widgets/prefs.py:146 +#: cola/widgets/prefs.py:169 msgid "" "The date-time format used when displaying dates in Git DAG.\n" "This value is passed to git log --date=" msgstr "" -#: cola/widgets/archive.py:208 +#: cola/widgets/archive.py:206 #, python-format msgid "The file \"%s\" exists and will be overwritten." msgstr "" -#: cola/cmds.py:1086 +#: cola/cmds.py:1087 msgid "The following files will be deleted:" msgstr "" -#: cola/widgets/status.py:1646 +#: cola/widgets/status.py:1647 msgid "The number of leading paths to strip" msgstr "" -#: cola/cmds.py:716 +#: cola/cmds.py:718 #, python-format msgid "The repository will be reset using \"git reset --hard %s\"" msgstr "" -#: cola/cmds.py:665 +#: cola/cmds.py:667 #, python-format msgid "The repository will be reset using \"git reset --keep %s\"" msgstr "" -#: cola/cmds.py:682 +#: cola/cmds.py:684 #, python-format msgid "The repository will be reset using \"git reset --merge %s\"" msgstr "" -#: cola/cmds.py:2365 +#: cola/cmds.py:2316 msgid "The revision expression cannot be empty." msgstr "" -#: cola/cmds.py:3029 +#: cola/widgets/stash.py:225 +msgid "The stash has not been renamed" +msgstr "" + +#: cola/cmds.py:2975 #, python-format msgid "" "The submodule will be added using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:3074 +#: cola/cmds.py:3020 #, python-format msgid "" "The submodule will be updated using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:736 +#: cola/cmds.py:738 #, python-format msgid "The worktree will be restored using \"git read-tree --reset -u %s\"" msgstr "" -#: cola/widgets/commitmsg.py:304 +#: cola/widgets/commitmsg.py:312 msgid "This cannot be undone. Clear commit message?" msgstr "" -#: cola/cmds.py:778 cola/widgets/commitmsg.py:458 +#: cola/cmds.py:780 cola/widgets/commitmsg.py:466 msgid "" "This commit has already been published.\n" "This operation will rewrite published history.\n" "You probably don't want to do this." msgstr "" -#: cola/widgets/diff.py:1158 +#: cola/widgets/diff.py:1232 msgid "" "This operation drops uncommitted changes.\n" "These changes cannot be recovered." msgstr "" -#: cola/cmds.py:2307 +#: cola/cmds.py:2258 msgid "" "This operation removes uncommitted edits from selected files.\n" "These changes cannot be recovered." msgstr "" -#: cola/cmds.py:2285 +#: cola/cmds.py:2236 msgid "" "This operation removes unstaged edits from selected files.\n" "These changes cannot be recovered." msgstr "" -#: cola/cmds.py:475 +#: cola/cmds.py:476 msgid "" "This operation will replace the selected unmerged files with content from the branch being merged using \"git checkout --theirs\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:513 +#: cola/cmds.py:514 msgid "" "This operation will replace the selected unmerged files with content from your current branch using \"git checkout --ours\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/widgets/main.py:1109 +#: cola/widgets/main.py:1122 msgid "" "This repository has unresolved conflicts after applying a patch.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1102 +#: cola/widgets/main.py:1115 msgid "" "This repository is currently being rebased.\n" "Resolve conflicts, commit changes, and run:\n" " Rebase > Continue" msgstr "" -#: cola/widgets/main.py:1115 +#: cola/widgets/main.py:1128 msgid "" "This repository is in the middle of a cherry-pick.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1121 +#: cola/widgets/main.py:1134 msgid "" "This repository is in the middle of a merge.\n" "Resolve conflicts and commit changes." @@ -3555,15 +3681,15 @@ msgstr "" msgid "To avoid applying removal lines ('-'), change them to context lines (' ')." msgstr "" -#: cola/sequenceeditor.py:342 +#: cola/sequenceeditor.py:338 msgid "Toggle Enabled" msgstr "" -#: cola/widgets/diff.py:776 +#: cola/widgets/diff.py:804 msgid "Toggle image diff" msgstr "" -#: cola/widgets/branch.py:63 +#: cola/widgets/branch.py:65 msgid "Toggle the branches filter" msgstr "" @@ -3571,51 +3697,51 @@ msgstr "" msgid "Toggle the paths filter" msgstr "" -#: cola/widgets/toolbar.py:317 +#: cola/widgets/toolbar.py:322 msgid "Toolbar Style:" msgstr "" -#: cola/widgets/cfgactions.py:228 cola/widgets/merge.py:47 +#: cola/widgets/cfgactions.py:226 cola/widgets/merge.py:45 msgid "Tracking Branch" msgstr "" -#: cola/widgets/createbranch.py:115 +#: cola/widgets/createbranch.py:113 msgid "Tracking branch" msgstr "" -#: cola/widgets/about.py:408 cola/widgets/about.py:434 -#: cola/widgets/about.py:445 +#: cola/widgets/about.py:391 cola/widgets/about.py:417 +#: cola/widgets/about.py:428 msgid "Traditional Chinese (Taiwan) translation" msgstr "" -#: cola/widgets/about.py:439 +#: cola/widgets/about.py:422 msgid "Translation" msgstr "" -#: cola/widgets/about.py:94 +#: cola/widgets/about.py:92 msgid "Translators" msgstr "" -#: cola/widgets/about.py:418 cola/widgets/about.py:423 -#: cola/widgets/about.py:438 +#: cola/widgets/about.py:401 cola/widgets/about.py:406 +#: cola/widgets/about.py:421 msgid "Turkish translation" msgstr "" -#: cola/widgets/clone.py:109 cola/widgets/editremotes.py:451 -#: cola/widgets/submodules.py:117 +#: cola/widgets/clone.py:107 cola/widgets/editremotes.py:449 +#: cola/widgets/submodules.py:116 msgid "URL" msgstr "" -#: cola/widgets/remote.py:463 +#: cola/widgets/remote.py:497 #, python-format msgid "URL: %s" msgstr "" -#: cola/widgets/about.py:415 +#: cola/widgets/about.py:398 msgid "Ukranian translation" msgstr "" -#: cola/cmds.py:2122 +#: cola/cmds.py:2073 msgid "Unable to rebase" msgstr "" @@ -3624,53 +3750,58 @@ msgstr "" msgid "Unable to set URL for \"%(name)s\" to \"%(url)s\"" msgstr "" -#: cola/widgets/diff.py:1327 +#: cola/widgets/diff.py:1401 #, python-format msgid "Unable to write patch to \"%s\". Check permissions?" msgstr "" -#: cola/widgets/main.py:735 +#: cola/widgets/main.py:748 msgid "Undo" msgstr "" -#: cola/cmds.py:783 cola/cmds.py:788 cola/cmds.py:791 cola/widgets/main.py:208 +#: cola/cmds.py:785 cola/cmds.py:790 cola/cmds.py:793 cola/widgets/main.py:207 msgid "Undo Last Commit" msgstr "" -#: cola/cmds.py:789 +#: cola/cmds.py:791 msgid "Undo last commit?" msgstr "" -#: cola/cmds.py:782 +#: cola/cmds.py:784 msgid "Undo the published commit?" msgstr "" -#: cola/models/browse.py:328 cola/widgets/status.py:157 -#: cola/widgets/status.py:640 +#: cola/models/browse.py:327 cola/widgets/status.py:157 +#: cola/widgets/status.py:641 msgid "Unmerged" msgstr "" -#: cola/cmds.py:2855 cola/widgets/action.py:61 cola/widgets/diff.py:985 +#: cola/cmds.py:2801 cola/widgets/action.py:61 cola/widgets/diff.py:1165 +#: cola/widgets/main.py:212 msgid "Unstage" msgstr "" -#: cola/widgets/main.py:203 cola/widgets/status.py:790 +#: cola/widgets/main.py:202 cola/widgets/status.py:791 msgid "Unstage All" msgstr "" -#: cola/widgets/diff.py:1061 +#: cola/widgets/diff.py:1017 msgid "Unstage Diff Hunk" msgstr "" -#: cola/widgets/status.py:823 cola/widgets/status.py:858 +#: cola/widgets/status.py:824 cola/widgets/status.py:859 msgid "Unstage Selected" msgstr "" -#: cola/widgets/diff.py:1058 +#: cola/widgets/diff.py:1015 msgid "Unstage Selected Lines" msgstr "" -#: cola/cmds.py:2867 +#: cola/widgets/action.py:61 +msgid "Unstage changes using \"git reset\"" +msgstr "" + +#: cola/cmds.py:2813 #, python-format msgid "Unstaging: %s" msgstr "" @@ -3679,85 +3810,84 @@ msgstr "" msgid "Untrack Selected" msgstr "" -#: cola/widgets/status.py:159 cola/widgets/status.py:646 +#: cola/widgets/status.py:159 cola/widgets/status.py:647 msgid "Untracked" msgstr "" -#: cola/cmds.py:1141 cola/cmds.py:2923 +#: cola/cmds.py:1142 cola/cmds.py:2869 #, python-format msgid "Untracking: %s" msgstr "" -#: cola/widgets/main.py:374 +#: cola/widgets/main.py:369 msgid "Update All Submodules..." msgstr "" -#: cola/widgets/createbranch.py:121 +#: cola/widgets/createbranch.py:119 msgid "Update Existing Branch:" msgstr "" -#: cola/cmds.py:3075 +#: cola/cmds.py:3021 msgid "Update Submodule" msgstr "" -#: cola/cmds.py:3072 +#: cola/cmds.py:3018 msgid "Update Submodule..." msgstr "" -#: cola/cmds.py:3111 +#: cola/cmds.py:3057 msgid "Update Submodules" msgstr "" -#: cola/cmds.py:3109 +#: cola/cmds.py:3055 msgid "Update all submodules?" msgstr "" -#: cola/cmds.py:2093 +#: cola/cmds.py:2044 msgid "Update stacked branches" msgstr "" -#: cola/cmds.py:2085 cola/cmds.py:2092 +#: cola/cmds.py:2036 cola/cmds.py:2043 msgid "Update stacked branches when rebasing?" msgstr "" -#: cola/cmds.py:3108 +#: cola/cmds.py:3054 msgid "Update submodules..." msgstr "" -#: cola/widgets/status.py:953 +#: cola/widgets/status.py:954 msgid "Update this submodule" msgstr "" -#: cola/cmds.py:3073 +#: cola/cmds.py:3019 msgid "Update this submodule?" msgstr "" -#: cola/widgets/branch.py:421 cola/widgets/createbranch.py:302 -#: cola/widgets/remote.py:135 +#: cola/widgets/branch.py:433 cola/widgets/createbranch.py:300 msgid "Updating" msgstr "" -#: cola/widgets/prefs.py:350 +#: cola/widgets/prefs.py:370 msgid "Use a block cursor in diff editors" msgstr "" -#: cola/widgets/prefs.py:154 +#: cola/widgets/prefs.py:177 msgid "Use gravatar.com to lookup icons for author emails" msgstr "" -#: cola/widgets/prefs.py:166 +#: cola/widgets/prefs.py:189 msgid "User Name" msgstr "" -#: cola/widgets/about.py:92 +#: cola/widgets/about.py:90 msgid "Version" msgstr "" -#: cola/widgets/dag.py:800 cola/widgets/main.py:845 cola/widgets/main.py:966 +#: cola/widgets/dag.py:866 cola/widgets/main.py:858 cola/widgets/main.py:979 msgid "View" msgstr "" -#: cola/widgets/browse.py:137 cola/widgets/status.py:278 +#: cola/widgets/browse.py:137 cola/widgets/status.py:279 msgid "View History..." msgstr "" @@ -3765,74 +3895,74 @@ msgstr "" msgid "View history for selected paths" msgstr "" -#: cola/widgets/merge.py:54 +#: cola/widgets/branch.py:224 cola/widgets/merge.py:52 msgid "Visualize" msgstr "" -#: cola/widgets/main.py:488 +#: cola/widgets/main.py:501 msgid "Visualize All Branches..." msgstr "" -#: cola/widgets/main.py:482 +#: cola/widgets/main.py:495 msgid "Visualize Current Branch..." msgstr "" -#: cola/widgets/createtag.py:73 +#: cola/widgets/createtag.py:71 msgid "Whether to sign the tag (git tag -s)" msgstr "" -#: cola/widgets/text.py:399 +#: cola/widgets/text.py:396 msgid "Whole Words" msgstr "" -#: cola/widgets/commitmsg.py:432 +#: cola/widgets/commitmsg.py:440 msgid "Would you like to stage and commit all modified files?" msgstr "" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "XOR" msgstr "" -#: cola/widgets/standard.py:1064 +#: cola/widgets/standard.py:1182 msgid "Yes" msgstr "" -#: cola/cmds.py:256 +#: cola/cmds.py:255 msgid "" "You are in the middle of a merge.\n" "Cannot amend while merging." msgstr "" -#: cola/cmds.py:2123 +#: cola/cmds.py:2074 msgid "You cannot rebase with uncommitted changes." msgstr "" -#: cola/widgets/merge.py:227 +#: cola/widgets/merge.py:225 msgid "You must specify a revision to merge." msgstr "" -#: cola/widgets/merge.py:217 +#: cola/widgets/merge.py:215 msgid "You must specify a revision to view." msgstr "" -#: cola/widgets/dag.py:710 cola/widgets/dag.py:1588 +#: cola/widgets/dag.py:776 cola/widgets/dag.py:1645 msgid "Zoom In" msgstr "" -#: cola/widgets/dag.py:706 cola/widgets/dag.py:1594 +#: cola/widgets/dag.py:772 cola/widgets/dag.py:1651 msgid "Zoom Out" msgstr "" -#: cola/widgets/dag.py:524 cola/widgets/dag.py:714 cola/widgets/dag.py:1596 -#: cola/widgets/diff.py:785 +#: cola/widgets/dag.py:590 cola/widgets/dag.py:780 cola/widgets/dag.py:1653 +#: cola/widgets/diff.py:813 msgid "Zoom to Fit" msgstr "" -#: cola/widgets/grep.py:112 +#: cola/widgets/grep.py:110 msgid "command-line arguments" msgstr "" -#: cola/widgets/main.py:932 cola/widgets/main.py:938 +#: cola/widgets/main.py:945 cola/widgets/main.py:951 msgid "error: unable to execute git" msgstr "" @@ -3841,45 +3971,41 @@ msgstr "" msgid "exit code %s" msgstr "" -#: cola/app.py:301 +#: cola/app.py:304 #, python-format msgid "fatal: \"%s\" is not a directory. Please specify a correct --repo ." msgstr "" -#: cola/widgets/main.py:928 +#: cola/widgets/main.py:941 #, python-format msgid "git cola version %s" msgstr "" -#: cola/widgets/startup.py:35 +#: cola/widgets/startup.py:34 msgid "git-cola" msgstr "" -#: cola/difftool.py:63 +#: cola/difftool.py:82 msgid "git-cola diff" msgstr "" -#: cola/widgets/submodules.py:81 +#: cola/widgets/submodules.py:80 msgid "git://git.example.com/repo.git" msgstr "" -#: cola/widgets/grep.py:132 +#: cola/widgets/grep.py:130 msgid "grep result..." msgstr "" -#: cola/widgets/about.py:486 +#: cola/widgets/about.py:469 msgid "hotkeys.html" msgstr "" -#: cola/widgets/submodules.py:85 +#: cola/widgets/submodules.py:84 msgid "path/to/submodule" msgstr "" -#: cola/cmds.py:2537 -msgid "unknown" -msgstr "" - -#: cola/widgets/createtag.py:63 +#: cola/widgets/createtag.py:61 msgid "vX.Y.Z" msgstr "" @@ -3888,13 +4014,17 @@ msgid "x 1" msgstr "" #: cola/hidpi.py:44 -msgid "x 1.5" +msgid "x 1.25" msgstr "" #: cola/hidpi.py:45 +msgid "x 1.5" +msgstr "" + +#: cola/hidpi.py:46 msgid "x 2" msgstr "" -#: cola/widgets/search.py:53 cola/widgets/search.py:58 +#: cola/widgets/search.py:52 cola/widgets/search.py:57 msgid "yyyy-MM-dd" msgstr "" diff --git a/cola/i18n/hu.po b/cola/i18n/hu.po index 55301a54..280748ee 100644 --- a/cola/i18n/hu.po +++ b/cola/i18n/hu.po @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1)\n" "X-Generator: Gtranslator 3.38.0\n" -#: cola/widgets/patch.py:86 +#: cola/widgets/diff.py:1680 msgid "" "\n" "

\n" @@ -36,7 +36,7 @@ msgstr "" "

\n" " " -#: cola/widgets/about.py:455 +#: cola/widgets/about.py:438 #, python-format msgid "" "\n" @@ -87,7 +87,7 @@ msgstr "" "\n" " " -#: cola/widgets/about.py:180 +#: cola/widgets/about.py:182 #, python-format msgid "" "\n" @@ -116,7 +116,7 @@ msgstr "" " \n" " " -#: cola/widgets/about.py:387 +#: cola/widgets/about.py:370 #, python-format msgid "" "\n" @@ -131,7 +131,7 @@ msgstr "" "
\n" " " -#: cola/widgets/status.py:1310 +#: cola/widgets/status.py:1311 #, python-format msgid "" "\n" @@ -156,7 +156,7 @@ msgstr "" " %(basename)s = fájl alapnév, kiterjesztés nélkül\n" " %(ext)s = fájl kiterjesztése\n" -#: cola/sequenceeditor.py:700 +#: cola/sequenceeditor.py:695 msgid "" "\n" "Commands\n" @@ -195,7 +195,7 @@ msgid "" "ctrl+d = launch difftool\n" msgstr "" -#: cola/widgets/finder.py:65 +#: cola/widgets/finder.py:64 msgid "" "\n" "Keyboard Shortcuts\n" @@ -223,45 +223,71 @@ msgstr "" "A felfelé és lefelé billentyűk módosítják a szövegelem-mezők közti\n" "fókuszt, valamint az eredményeket.\n" -#: cola/widgets/dag.py:894 +#: cola/widgets/prefs.py:133 +msgid "" +"\n" +"This option determines how the supplied commit message should be\n" +"cleaned up before committing.\n" +"\n" +"The can be strip, whitespace, verbatim, scissors or default.\n" +"\n" +"strip\n" +" Strip leading and trailing empty lines, trailing whitespace,\n" +" commentary and collapse consecutive empty lines.\n" +"\n" +"whitespace\n" +" Same as strip except #commentary is not removed.\n" +"\n" +"verbatim\n" +" Do not change the message at all.\n" +"\n" +"scissors\n" +" Same as whitespace except that everything from (and including) the line\n" +" found below is truncated, if the message is to be edited.\n" +" \"#\" can be customized with core.commentChar.\n" +"\n" +" # ------------------------ >8 ------------------------" +msgstr "" + +#: cola/widgets/dag.py:960 msgid " - DAG" msgstr " - DAG" -#: cola/widgets/recent.py:54 +#: cola/widgets/recent.py:52 msgid " commits ago" msgstr " véglegesítéssel ezelőtt" -#: cola/cmds.py:1197 +#: cola/cmds.py:1198 #, python-format msgid "\"%(branch)s\" has been deleted from \"%(remote)s\"." msgstr "A(z) „%(branch)s” ág törölve lett erről: „%(remote)s”" -#: cola/widgets/createbranch.py:316 +#: cola/widgets/createbranch.py:314 #, python-format msgid "\"%(command)s\" returned exit status \"%(status)d\"" msgstr "A(z) „%(command)s” ezzel a kilépési állapottal tért vissza: „%(status)d”" -#: cola/interaction.py:39 +#: cola/interaction.py:38 #, python-format msgid "\"%(command)s\" returned exit status %(status)d" msgstr "A(z) „%(command)s” ezzel a kilépési állapottal tért vissza: %(status)d" -#: cola/guicmds.py:157 +#: cola/guicmds.py:156 #, python-format msgid "\"%s\" already exists" msgstr "A(z) „%s” már létezik" -#: cola/widgets/clone.py:206 +#: cola/widgets/clone.py:204 #, python-format msgid "\"%s\" already exists, cola will create a new directory" msgstr "A(z) „%s” már létezik, ezért a cola új mappát hoz létre" -#: cola/cmds.py:2349 +#: cola/cmds.py:2300 #, python-format msgid "\"%s\" requires a selected file." msgstr "A(z) „%s” kijelölt fájlt igényel." -#: cola/cmds.py:2087 +#: cola/cmds.py:2038 msgid "" "\"git rebase --update-refs\" automatically force-updates any\n" "branches that point to commits that are being rebased.\n" @@ -271,7 +297,11 @@ msgid "" "Using this feature is helpful for \"stacked\" branch workflows." msgstr "" -#: cola/sequenceeditor.py:321 +#: cola/models/stash.py:145 +msgid "\"git stash drop\" did not return a ref to rename." +msgstr "" + +#: cola/sequenceeditor.py:318 msgid "#" msgstr "#" @@ -280,37 +310,37 @@ msgstr "#" msgid "%(project)s: %(branch)s - Browse" msgstr "%(project)s: %(branch)s – tallózás" -#: cola/widgets/dag.py:887 +#: cola/widgets/dag.py:953 #, python-format msgid "%(project)s: %(ref)s - DAG" msgstr "%(project)s: %(ref)s - DAG" -#: cola/models/browse.py:315 +#: cola/models/browse.py:314 #, python-format msgid "%d days ago" msgstr "%d napja" -#: cola/models/browse.py:314 +#: cola/models/browse.py:313 #, python-format msgid "%d hours ago" msgstr "%d órája" -#: cola/models/browse.py:307 cola/models/browse.py:311 +#: cola/models/browse.py:306 cola/models/browse.py:310 #, python-format msgid "%d minutes ago" msgstr "%d perce" -#: cola/cmds.py:376 +#: cola/cmds.py:377 #, python-format msgid "%d patch(es) applied." msgstr "%d folt alkalmazva." -#: cola/widgets/createbranch.py:281 +#: cola/widgets/createbranch.py:279 #, python-format msgid "%d skipped" msgstr "%d kihagyva" -#: cola/cmds.py:2580 +#: cola/cmds.py:2522 #, python-format msgid "" "%s appears to contain merge conflicts.\n" @@ -323,36 +353,36 @@ msgstr "" "Valószínűleg ki kellene hagyni ezt a fájlt.\n" "Biztosan kiszemelésre kerüljön?" -#: cola/widgets/startup.py:263 +#: cola/widgets/startup.py:262 #, python-format msgid "%s could not be opened. Remove from bookmarks?" msgstr "%s-t nem lehet megnyitni. Eltávolítja a könyvjelzők közül?" -#: cola/app.py:498 cola/widgets/bookmarks.py:482 +#: cola/app.py:501 cola/widgets/bookmarks.py:481 #, python-format msgid "%s is not a Git repository." msgstr "A(z) %s nem git tároló." -#: cola/cmds.py:1015 +#: cola/cmds.py:1016 #, python-format msgid "%s will be removed from your bookmarks." msgstr "A(z) %s el lesz távolítva a könyvjelzők közül." -#: cola/cmds.py:1028 +#: cola/cmds.py:1029 #, python-format msgid "%s will be removed from your recent repositories." msgstr "A(z) %s el lesz távolítva a legutóbbi tárolókból." -#: cola/cmds.py:1711 +#: cola/cmds.py:1663 #, python-format msgid "%s: No such file or directory." msgstr "%s: Nincs ilyen fájl vagy könyvtár." -#: cola/widgets/main.py:734 +#: cola/widgets/main.py:747 msgid "&Edit" msgstr "Sz&erkesztés" -#: cola/widgets/main.py:676 +#: cola/widgets/main.py:689 msgid "&File" msgstr "&Fájl" @@ -360,43 +390,43 @@ msgstr "&Fájl" msgid "(Amending)" msgstr "(Javítás)" -#: cola/widgets/compare.py:36 +#: cola/widgets/compare.py:35 msgid "*** Branch Point ***" msgstr "*** Elágazás ***" -#: cola/widgets/compare.py:37 +#: cola/widgets/compare.py:36 msgid "*** Sandbox ***" msgstr "*** Homokozó ***" -#: cola/widgets/diff.py:788 +#: cola/widgets/diff.py:816 msgid "100%" msgstr "100%" -#: cola/widgets/diff.py:789 +#: cola/widgets/diff.py:817 msgid "200%" msgstr "200%" -#: cola/widgets/diff.py:786 +#: cola/widgets/diff.py:814 msgid "25%" msgstr "25%" -#: cola/widgets/diff.py:790 +#: cola/widgets/diff.py:818 msgid "400%" msgstr "400%" -#: cola/widgets/diff.py:787 +#: cola/widgets/diff.py:815 msgid "50%" msgstr "50%" -#: cola/widgets/diff.py:791 +#: cola/widgets/diff.py:819 msgid "800%" msgstr "800%" -#: cola/widgets/finder.py:119 +#: cola/widgets/finder.py:118 msgid " ..." msgstr " …" -#: cola/cmds.py:1734 +#: cola/cmds.py:1686 msgid "" "A commit template has not been configured.\n" "Use \"git config\" to define \"commit.template\"\n" @@ -406,81 +436,76 @@ msgstr "" "A „git config” használatával hozható létre a „commit.template”,\n" "hogy az egy véglegesítési sablonra mutasson." -#: cola/cmds.py:1784 +#: cola/cmds.py:1735 #, python-format msgid "A hook must be provided at \"%s\"" msgstr "Egy hurkot kell létrehozni itt: „%s”" -#: cola/widgets/stash.py:236 -#, python-format -msgid "A stash named \"%s\" already exists" -msgstr "Már létezik egy ilyen nevű félretett változat: „%s”" - -#: cola/widgets/cfgactions.py:82 cola/widgets/main.py:622 +#: cola/widgets/cfgactions.py:81 cola/widgets/main.py:635 msgid "Abort" msgstr "Megszakítás" -#: cola/widgets/cfgactions.py:149 cola/widgets/cfgactions.py:155 +#: cola/widgets/cfgactions.py:148 cola/widgets/cfgactions.py:154 msgid "Abort Action" msgstr "Művelet megszakítása" -#: cola/cmds.py:132 +#: cola/cmds.py:131 msgid "Abort Applying Patch" msgstr "" -#: cola/cmds.py:126 +#: cola/cmds.py:125 msgid "Abort Applying Patch..." msgstr "" -#: cola/widgets/main.py:245 +#: cola/widgets/main.py:244 msgid "Abort Applying Patches..." msgstr "" -#: cola/cmds.py:162 +#: cola/cmds.py:161 msgid "Abort Cherry-Pick" msgstr "" -#: cola/cmds.py:156 cola/widgets/main.py:334 +#: cola/cmds.py:155 cola/widgets/main.py:329 msgid "Abort Cherry-Pick..." msgstr "" -#: cola/cmds.py:193 +#: cola/cmds.py:192 msgid "Abort Merge" msgstr "Beolvasztás megszakítása" -#: cola/cmds.py:186 cola/widgets/main.py:368 +#: cola/cmds.py:185 cola/widgets/main.py:363 msgid "Abort Merge..." msgstr "Beolvasztás megszakítása…" -#: cola/widgets/cfgactions.py:154 +#: cola/widgets/cfgactions.py:153 msgid "Abort the action?" msgstr "Megszakítja a műveletet?" -#: cola/widgets/main.py:250 +#: cola/widgets/main.py:245 msgid "Abort the current \"git am\" patch session" msgstr "" -#: cola/cmds.py:159 +#: cola/cmds.py:158 msgid "" "Aborting a cherry-pick can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:129 +#: cola/cmds.py:128 msgid "" "Aborting a patch can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:127 +#: cola/cmds.py:126 msgid "Aborting applying the current patch?" msgstr "" -#: cola/cmds.py:157 +#: cola/cmds.py:156 msgid "Aborting the current cherry-pick?" msgstr "" -#: cola/cmds.py:189 +#: cola/cmds.py:188 msgid "" "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." @@ -488,23 +513,23 @@ msgstr "" "A jelenlegi beolvasztás megszakítása *MINDEN* nem véglegesített módosítás elvesztését jelenti.\n" "A nem véglegesített módosítások helyreállítása nem lehetséges." -#: cola/cmds.py:187 +#: cola/cmds.py:186 msgid "Aborting the current merge?" msgstr "Megszakítja a jelenlegi beolvasztást?" -#: cola/widgets/about.py:91 cola/widgets/main.py:517 +#: cola/widgets/about.py:89 cola/widgets/main.py:530 msgid "About" msgstr "Névjegy" -#: cola/widgets/about.py:67 +#: cola/widgets/about.py:65 msgid "About git-cola" msgstr "A git-cola névjegye" -#: cola/widgets/bookmarks.py:217 cola/widgets/startup.py:340 +#: cola/widgets/bookmarks.py:216 cola/widgets/startup.py:339 msgid "Accept" msgstr "Elfogadás" -#: cola/sequenceeditor.py:159 +#: cola/sequenceeditor.py:157 msgid "" "Accept changes and rebase\n" "Shortcut: Ctrl+Enter" @@ -512,50 +537,50 @@ msgstr "" "Változások elfogadása és újraalapozás\n" "Gyorsbillentyű: Ctrl+Enter" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Action Name" msgstr "Művelet neve" -#: cola/sequenceeditor.py:528 cola/widgets/bookmarks.py:321 -#: cola/widgets/branch.py:217 cola/widgets/browse.py:374 -#: cola/widgets/commitmsg.py:99 cola/widgets/dag.py:315 -#: cola/widgets/filelist.py:110 cola/widgets/main.py:95 -#: cola/widgets/main.py:757 cola/widgets/startup.py:436 +#: cola/sequenceeditor.py:524 cola/widgets/bookmarks.py:320 +#: cola/widgets/branch.py:221 cola/widgets/browse.py:375 +#: cola/widgets/commitmsg.py:105 cola/widgets/dag.py:314 +#: cola/widgets/filelist.py:107 cola/widgets/main.py:93 +#: cola/widgets/main.py:770 cola/widgets/startup.py:435 msgid "Actions" msgstr "Műveletek" -#: cola/widgets/commitmsg.py:101 +#: cola/widgets/commitmsg.py:107 msgid "Actions..." msgstr "Műveletek…" -#: cola/widgets/bookmarks.py:71 cola/widgets/gitignore.py:64 -#: cola/widgets/patch.py:103 cola/widgets/patch.py:117 -#: cola/widgets/status.py:1381 +#: cola/widgets/bookmarks.py:70 cola/widgets/diff.py:1697 +#: cola/widgets/diff.py:1711 cola/widgets/gitignore.py:63 +#: cola/widgets/status.py:1382 msgid "Add" msgstr "Hozzáadás" -#: cola/widgets/bookmarks.py:470 +#: cola/widgets/bookmarks.py:469 msgid "Add Favorite" msgstr "Kedvenc hozzáadása" -#: cola/widgets/editremotes.py:374 +#: cola/widgets/editremotes.py:373 msgid "Add Remote" msgstr "Távoli hozzáadása" -#: cola/widgets/toolbar.py:315 +#: cola/widgets/toolbar.py:320 msgid "Add Separator" msgstr "Elválasztó hozzáadása" -#: cola/cmds.py:3030 cola/widgets/submodules.py:42 -#: cola/widgets/submodules.py:111 +#: cola/cmds.py:2976 cola/widgets/submodules.py:41 +#: cola/widgets/submodules.py:110 msgid "Add Submodule" msgstr "Részmodul hozzáadása" -#: cola/cmds.py:3027 cola/widgets/main.py:381 +#: cola/cmds.py:2973 cola/widgets/main.py:376 msgid "Add Submodule..." msgstr "Részmodul hozzáadása…" -#: cola/widgets/editremotes.py:62 +#: cola/widgets/editremotes.py:61 msgid "" "Add and remove remote repositories using the \n" "Add(+) and Delete(-) buttons on the left-hand side.\n" @@ -569,63 +594,63 @@ msgstr "" "A távoli tárolók átnevezhetők a listából való kijelöléssel\n" "majd az Enter lenyomásával vagy dupla kattintással." -#: cola/widgets/editremotes.py:81 +#: cola/widgets/editremotes.py:80 msgid "Add new remote git repository" msgstr "Új távoli git tároló hozzáadása" -#: cola/widgets/patch.py:103 +#: cola/widgets/diff.py:1697 msgid "Add patches (+)" msgstr "Foltok hozzáadása (+)" -#: cola/widgets/editremotes.py:433 +#: cola/widgets/editremotes.py:431 msgid "Add remote" msgstr "Távoli hozzáadása" -#: cola/cmds.py:3028 +#: cola/cmds.py:2974 msgid "Add this submodule?" msgstr "Hozzáadja ezt a részmodult?" -#: cola/widgets/gitignore.py:54 +#: cola/widgets/gitignore.py:53 msgid "Add to .gitignore" msgstr "Hozzáadás a .gitignore-hoz" -#: cola/widgets/status.py:286 +#: cola/widgets/status.py:287 msgid "Add to Git Annex" msgstr "Hozzáadás a Git Annexhez" -#: cola/widgets/status.py:290 +#: cola/widgets/status.py:291 msgid "Add to Git LFS" msgstr "Hozzáadás a Git LFS-hez" -#: cola/widgets/gitignore.py:28 +#: cola/widgets/gitignore.py:27 msgid "Add to exclusions" msgstr "Hozzáadás a kizárásokhoz" -#: cola/widgets/gitignore.py:55 +#: cola/widgets/gitignore.py:54 msgid "Add to local .git/info/exclude" msgstr "Hozzáadás a helyi .git/info/exclude-hoz" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Additions" msgstr "Kiegészítések" -#: cola/widgets/archive.py:134 +#: cola/widgets/archive.py:132 msgid "Advanced" msgstr "Speciális" -#: cola/widgets/main.py:522 +#: cola/widgets/main.py:535 msgid "Against Commit... (Diff Mode)" msgstr "" -#: cola/models/browse.py:33 +#: cola/models/browse.py:32 msgid "Age" msgstr "Kor" -#: cola/widgets/prefs.py:403 +#: cola/widgets/prefs.py:441 msgid "All Repositories" msgstr "Minden tároló" -#: cola/cmds.py:3110 +#: cola/cmds.py:3056 #, python-format msgid "" "All submodules will be updated using\n" @@ -634,35 +659,35 @@ msgstr "" "Az összes almodul frissítve lesz ezzel:\n" "„%s”" -#: cola/widgets/remote.py:195 +#: cola/widgets/remote.py:199 msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care" msgstr "Nem előrepörgetett frissítések engedélyezése. A kényszerítés a távoli tárolón a véglegesítések elvesztéséhez vezethet. Óvatosan érdemes használni." -#: cola/widgets/merge.py:61 +#: cola/widgets/merge.py:59 msgid "Always create a merge commit when enabled, even when the merge is a fast-forward update" msgstr "Engedélyezve mindig beolvasztással történik a véglegesítés, akkor is, ha a beolvasztás előrepörgetett frissítés" -#: cola/cmds.py:221 +#: cola/cmds.py:220 msgid "Amend" msgstr "Javítás" -#: cola/widgets/commitmsg.py:463 +#: cola/widgets/commitmsg.py:471 msgid "Amend Commit" msgstr "Véglegesítés javítása" -#: cola/widgets/commitmsg.py:110 cola/widgets/main.py:194 +#: cola/widgets/commitmsg.py:116 cola/widgets/main.py:193 msgid "Amend Last Commit" msgstr "Utolsó véglegesítés javítása" -#: cola/widgets/commitmsg.py:462 +#: cola/widgets/commitmsg.py:470 msgid "Amend the published commit?" msgstr "Javítja a közzétett véglegesítést?" -#: cola/widgets/main.py:1157 +#: cola/widgets/main.py:1170 msgid "Amending" msgstr "Javítás" -#: cola/widgets/cfgactions.py:151 +#: cola/widgets/cfgactions.py:150 msgid "" "An action is still running.\n" "Terminating it could result in data loss." @@ -670,7 +695,7 @@ msgstr "" "Egy művelet épp fut.\n" "A megszakítása adatvesztéshez vezethet." -#: cola/cmds.py:2804 +#: cola/cmds.py:2750 msgid "" "An unsigned, lightweight tag will be created instead.\n" "Create an unsigned tag?" @@ -678,56 +703,56 @@ msgstr "" "Ehelyett csak egy aláíratlan, könnyűsúlyú címke lesz csak létrehozva.\n" "Készüljön egy aláíratlan címke?" -#: cola/widgets/prefs.py:406 +#: cola/widgets/prefs.py:444 msgid "Appearance" msgstr "Megjelenés" -#: cola/widgets/diff.py:1230 +#: cola/widgets/diff.py:1304 msgid "Append Patch" msgstr "" -#: cola/widgets/diff.py:1299 +#: cola/widgets/diff.py:1373 msgid "Append Patch..." msgstr "" -#: cola/widgets/patch.py:112 cola/widgets/stash.py:48 cola/widgets/stash.py:107 -#: cola/widgets/toolbar.py:323 +#: cola/widgets/diff.py:1706 cola/widgets/stash.py:50 cola/widgets/stash.py:110 +#: cola/widgets/toolbar.py:328 msgid "Apply" msgstr "Alkalmaz" -#: cola/widgets/patch.py:75 +#: cola/widgets/diff.py:1669 msgid "Apply Patches" msgstr "Foltok alkalmazása" -#: cola/widgets/main.py:239 +#: cola/widgets/main.py:238 msgid "Apply Patches..." msgstr "Foltok alkalmazása…" -#: cola/widgets/stash.py:64 +#: cola/widgets/stash.py:66 msgid "Apply and drop the selected stash (git stash pop)" msgstr "Kijelölt félretett változat alkalmazása és eldobása (git stash pop)" -#: cola/widgets/stash.py:48 +#: cola/widgets/stash.py:50 msgid "Apply the selected stash" msgstr "Kijelölt félretett változat alkalmazása" -#: cola/widgets/main.py:1167 +#: cola/widgets/main.py:1180 msgid "Applying Patch" msgstr "" -#: cola/widgets/cfgactions.py:207 +#: cola/widgets/cfgactions.py:205 msgid "Arguments" msgstr "Argumentumok" -#: cola/qtutils.py:850 +#: cola/qtutils.py:887 msgid "Attach" msgstr "Csatolás" -#: cola/models/browse.py:33 cola/models/browse.py:72 cola/widgets/dag.py:506 +#: cola/models/browse.py:32 cola/models/browse.py:71 cola/widgets/dag.py:572 msgid "Author" msgstr "Szerző" -#: cola/widgets/about.py:93 +#: cola/widgets/about.py:91 msgid "Authors" msgstr "Szerzők" @@ -735,43 +760,43 @@ msgstr "Szerzők" msgid "Auto" msgstr "Automatikus" -#: cola/widgets/commitmsg.py:137 cola/widgets/prefs.py:259 +#: cola/widgets/commitmsg.py:143 cola/widgets/prefs.py:280 msgid "Auto-Wrap Lines" msgstr "Sorok automatikus tördelése" -#: cola/widgets/prefs.py:184 +#: cola/widgets/prefs.py:206 msgid "Autocomplete Paths" msgstr "Útvonalak automatikus kiegészítése" -#: cola/widgets/prefs.py:176 +#: cola/widgets/prefs.py:198 msgid "Automatically Load Commit Message Template" msgstr "Véglegesítő üzenetsablon automatikus betöltése" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Basic Regexp" msgstr "Egyszerű regexp" -#: cola/widgets/prefs.py:255 +#: cola/widgets/prefs.py:276 msgid "Blame Viewer" msgstr "Hibáztatás megjelenítő" -#: cola/widgets/browse.py:205 +#: cola/widgets/browse.py:206 msgid "Blame selected paths" msgstr "Kijelölt útvonalak hibáztatása" -#: cola/cmds.py:545 cola/widgets/status.py:282 +#: cola/cmds.py:546 cola/widgets/status.py:283 msgid "Blame..." msgstr "Hibáztatás…" -#: cola/widgets/prefs.py:347 +#: cola/widgets/prefs.py:367 msgid "Bold on dark headers instead of italic" msgstr "Félkövéren szedett és sötét fejlécek a dőlt helyett" -#: cola/widgets/main.py:806 cola/widgets/submodules.py:119 +#: cola/widgets/main.py:819 cola/widgets/submodules.py:118 msgid "Branch" msgstr "Elágazás" -#: cola/widgets/remote.py:600 +#: cola/widgets/remote.py:635 #, python-format msgid "" "Branch \"%(branch)s\" does not exist in \"%(remote)s\".\n" @@ -780,84 +805,84 @@ msgstr "" "A(z) „%(branch)s” nem létezik itt: „%(remote)s”.\n" "Új távoli ág lesz közzétéve." -#: cola/widgets/createbranch.py:258 +#: cola/widgets/createbranch.py:256 #, python-format msgid "Branch \"%s\" already exists." msgstr "A(z) „%s” ág már létezik." -#: cola/widgets/compare.py:44 +#: cola/widgets/compare.py:43 msgid "Branch Diff Viewer" msgstr "Ág-összehasonlító megjelenítő" -#: cola/widgets/createbranch.py:259 cola/widgets/createbranch.py:271 +#: cola/widgets/createbranch.py:257 cola/widgets/createbranch.py:269 msgid "Branch Exists" msgstr "Létező ág" -#: cola/widgets/createbranch.py:98 +#: cola/widgets/createbranch.py:96 msgid "Branch Name" msgstr "Ág neve" -#: cola/widgets/submodules.py:89 +#: cola/widgets/submodules.py:88 msgid "Branch name" msgstr "Ág neve" -#: cola/widgets/browse.py:89 cola/widgets/main.py:1097 +#: cola/widgets/browse.py:89 cola/widgets/main.py:1110 #, python-format msgid "Branch: %s" msgstr "Ág: %s" -#: cola/widgets/branch.py:85 cola/widgets/main.py:131 +#: cola/widgets/branch.py:87 cola/widgets/main.py:129 msgid "Branches" msgstr "Ágak" -#: cola/widgets/main.py:538 +#: cola/widgets/main.py:551 msgid "Branches..." msgstr "Ágak…" -#: cola/widgets/about.py:414 cola/widgets/about.py:417 -#: cola/widgets/about.py:437 +#: cola/widgets/about.py:397 cola/widgets/about.py:400 +#: cola/widgets/about.py:420 msgid "Brazilian translation" msgstr "Brazil fordítás" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse" msgstr "Tallózás" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse Commits..." msgstr "Véglegesítések tallózása…" -#: cola/widgets/main.py:499 +#: cola/widgets/main.py:512 msgid "Browse Current Branch..." msgstr "Jelenlegi ág tallózása…" -#: cola/widgets/main.py:505 +#: cola/widgets/main.py:518 msgid "Browse Other Branch..." msgstr "Egyéb ágak tallózása…" -#: cola/widgets/editremotes.py:437 cola/widgets/search.py:46 -#: cola/widgets/startup.py:65 cola/widgets/startup.py:285 +#: cola/widgets/editremotes.py:435 cola/widgets/search.py:45 +#: cola/widgets/startup.py:64 cola/widgets/startup.py:284 msgid "Browse..." msgstr "Tallózás…" -#: cola/widgets/main.py:89 +#: cola/widgets/main.py:87 msgid "Browser" msgstr "Böngésző" -#: cola/widgets/browse.py:589 +#: cola/widgets/browse.py:590 #, python-format msgid "Browsing %s" msgstr "%s tallózása" -#: cola/widgets/commitmsg.py:118 +#: cola/widgets/commitmsg.py:124 msgid "Bypass Commit Hooks" msgstr "Véglegesítési hurkok kikerülése" -#: cola/sequenceeditor.py:175 cola/widgets/standard.py:991 +#: cola/sequenceeditor.py:173 cola/widgets/standard.py:1058 msgid "Cancel" msgstr "Mégse" -#: cola/sequenceeditor.py:176 +#: cola/sequenceeditor.py:174 msgid "" "Cancel rebase\n" "Shortcut: Ctrl+Q" @@ -865,188 +890,200 @@ msgstr "" "Újraalapozás megszakítása\n" "Gyorsbillentyű: Ctrl+Q" -#: cola/cmds.py:254 +#: cola/cmds.py:253 msgid "Cannot Amend" msgstr "A javítás nem lehetséges" -#: cola/cmds.py:560 +#: cola/cmds.py:561 #, python-format msgid "Cannot exec \"%s\": please configure a blame viewer" msgstr "A(z) „%s” nem futtatható: állítson be egy hibáztatás megjelenítőt" -#: cola/cmds.py:3146 +#: cola/cmds.py:3092 #, python-format msgid "Cannot exec \"%s\": please configure a history browser" msgstr "A(z) „%s” nem futtatható: állítson be egy történetböngészőt" -#: cola/cmds.py:1583 +#: cola/cmds.py:1571 #, python-format msgid "Cannot exec \"%s\": please configure your editor" msgstr "A(z) „%s” nem futtatható: állítsa be a szerkesztőjét" -#: cola/models/browse.py:336 +#: cola/models/browse.py:335 msgid "Changed Upstream" msgstr "Módosítva a távoli tárolóban" -#: cola/widgets/prefs.py:186 +#: cola/widgets/prefs.py:208 msgid "Check Published Commits when Amending" msgstr "Közzétett véglegesítések ellenőrzése javítás alatt" -#: cola/widgets/commitmsg.py:130 +#: cola/widgets/commitmsg.py:136 msgid "Check Spelling" msgstr "Helyesírás-ellenőrzés" -#: cola/widgets/prefs.py:265 +#: cola/widgets/prefs.py:286 msgid "Check spelling" msgstr "Helyesírás-ellenőrzés" -#: cola/widgets/prefs.py:163 +#: cola/widgets/prefs.py:186 msgid "Check whether a commit has been published when amending" msgstr "Javítás közben ellenőrizze, hogy a véglegesítések közzé lettek-e téve" -#: cola/guicmds.py:62 cola/widgets/branch.py:222 +#: cola/guicmds.py:61 cola/widgets/branch.py:233 msgid "Checkout" msgstr "Átváltás" -#: cola/widgets/createbranch.py:130 +#: cola/widgets/createbranch.py:128 msgid "Checkout After Creation" msgstr "Átváltás a létrehozás után" -#: cola/guicmds.py:62 cola/widgets/dag.py:410 +#: cola/guicmds.py:61 cola/widgets/dag.py:409 msgid "Checkout Branch" msgstr "Ág átváltása" -#: cola/widgets/dag.py:414 +#: cola/widgets/dag.py:413 msgid "Checkout Detached HEAD" msgstr "Átváltás a leválasztott FEJ-re" -#: cola/cmds.py:480 cola/cmds.py:518 +#: cola/cmds.py:481 cola/cmds.py:519 msgid "Checkout Files" msgstr "" -#: cola/widgets/branch.py:226 +#: cola/widgets/branch.py:237 msgid "Checkout as new branch" msgstr "Átváltás új ágként" -#: cola/cmds.py:507 +#: cola/cmds.py:508 msgid "Checkout files from our branch (HEAD)" msgstr "" -#: cola/cmds.py:511 +#: cola/cmds.py:512 msgid "Checkout files from our branch?" msgstr "" -#: cola/cmds.py:469 +#: cola/cmds.py:470 msgid "Checkout files from their branch (MERGE_HEAD)" msgstr "" -#: cola/cmds.py:473 +#: cola/cmds.py:474 msgid "Checkout files from their branch?" msgstr "" -#: cola/widgets/main.py:576 +#: cola/widgets/main.py:589 msgid "Checkout..." msgstr "Átváltás…" -#: cola/widgets/dag.py:387 cola/widgets/search.py:79 +#: cola/widgets/dag.py:386 cola/widgets/search.py:78 msgid "Cherry Pick" msgstr "Mazsolázás" -#: cola/guicmds.py:73 +#: cola/guicmds.py:72 msgid "Cherry-Pick Commit" msgstr "Mazsolázó véglegesítés" -#: cola/widgets/main.py:328 +#: cola/widgets/main.py:323 msgid "Cherry-Pick..." msgstr "Mazsolázás…" -#: cola/cmds.py:584 +#: cola/cmds.py:585 msgid "Cherry-pick failed" msgstr "" -#: cola/widgets/main.py:1161 +#: cola/widgets/main.py:1174 msgid "Cherry-picking" msgstr "" -#: cola/widgets/diff.py:1247 +#: cola/widgets/diff.py:1321 msgid "Choose Patch..." msgstr "" -#: cola/widgets/search.py:319 +#: cola/widgets/search.py:318 msgid "Choose Paths" msgstr "Válasszon útvonalakat" -#: cola/widgets/grep.py:116 +#: cola/widgets/grep.py:114 msgid "Choose the \"git grep\" regular expression mode" msgstr "Válassza ki a „git grep” reguláris kifejezés módját" -#: cola/widgets/bookmarks.py:229 cola/widgets/startup.py:352 +#: cola/widgets/bookmarks.py:228 cola/widgets/startup.py:351 msgid "Clear Default Repository" msgstr "Alapértelmezett tároló tisztítása" -#: cola/widgets/commitmsg.py:305 +#: cola/widgets/commitmsg.py:313 msgid "Clear commit message" msgstr "Véglegesítő üzenet tisztítása" -#: cola/widgets/commitmsg.py:302 +#: cola/widgets/commitmsg.py:310 msgid "Clear commit message?" msgstr "Tisztítja a véglegesítő üzenetet?" -#: cola/widgets/commitmsg.py:62 +#: cola/widgets/commitmsg.py:63 msgid "Clear..." msgstr "Tisztítás…" -#: cola/widgets/clone.py:126 +#: cola/widgets/clone.py:124 msgid "Clone" msgstr "Klónozás" -#: cola/widgets/clone.py:62 cola/widgets/clone.py:104 +#: cola/widgets/clone.py:61 cola/widgets/clone.py:102 msgid "Clone Repository" msgstr "Tároló klónozása" -#: cola/widgets/main.py:465 cola/widgets/startup.py:58 +#: cola/widgets/main.py:478 cola/widgets/startup.py:57 msgid "Clone..." msgstr "Klónozás…" -#: cola/widgets/clone.py:62 +#: cola/widgets/clone.py:61 #, python-format msgid "Cloning repository at %s" msgstr "Tároló klónozása ide: %s" -#: cola/qtutils.py:757 cola/qtutils.py:807 cola/widgets/about.py:508 -#: cola/widgets/remote.py:328 cola/widgets/text.py:1094 +#: cola/qtutils.py:788 cola/qtutils.py:838 cola/widgets/about.py:491 +#: cola/widgets/remote.py:362 cola/widgets/text.py:1090 msgid "Close" msgstr "Bezárás" -#: cola/widgets/text.py:402 +#: cola/widgets/remote.py:222 +msgid "Close dialog when completed" +msgstr "" + +#: cola/widgets/remote.py:221 +msgid "Close on completion" +msgstr "" + +#: cola/widgets/text.py:399 msgid "Close the find bar" msgstr "" -#: cola/qtutils.py:623 +#: cola/qtutils.py:651 msgid "Close..." msgstr "Bezárás…" -#: cola/widgets/recent.py:71 +#: cola/widgets/recent.py:69 msgid "Collapse all" msgstr "Összes összecsukása" -#: cola/sequenceeditor.py:323 +#: cola/sequenceeditor.py:320 msgid "Command" msgstr "Parancs" -#: cola/widgets/main.py:163 cola/widgets/merge.py:74 +#: cola/widgets/main.py:161 cola/widgets/merge.py:72 msgid "Commit" msgstr "Véglegesítés" -#: cola/cmds.py:837 +#: cola/widgets/prefs.py:192 +msgid "Commit Message Cleanup" +msgstr "" + +#: cola/widgets/commitmsg.py:495 msgid "Commit failed" msgstr "Véglegesítés sikertelen" -#: cola/widgets/commitmsg.py:61 +#: cola/widgets/commitmsg.py:62 msgid "Commit staged changes" msgstr "Kiszemelt módosítások véglegesítése" -#: cola/widgets/commitmsg.py:93 +#: cola/widgets/commitmsg.py:94 msgid "" "Commit staged changes\n" "Shortcut: Ctrl+Enter" @@ -1054,361 +1091,365 @@ msgstr "" "Kiszemelt módosítások véglegesítése\n" "Gyorsbillentyű: Ctrl+Enter" -#: cola/widgets/commitmsg.py:564 +#: cola/widgets/commitmsg.py:590 msgid "Commit summary" msgstr "Véglegesítés összegzése" -#: cola/widgets/main.py:259 +#: cola/widgets/main.py:253 msgid "Commit the current state and continue applying patches" msgstr "" -#: cola/widgets/merge.py:70 +#: cola/widgets/merge.py:68 msgid "Commit the merge if there are no conflicts. Uncheck to leave the merge uncommitted" msgstr "Beolvasztás véglegesítése, ha nincsenek ütközések. Bejelöletlenül hagyva a beolvasztás nem lesz véglegesítve" -#: cola/widgets/commitmsg.py:58 cola/widgets/commitmsg.py:95 -#: cola/widgets/main.py:778 cola/widgets/main.py:779 +#: cola/widgets/commitmsg.py:59 cola/widgets/commitmsg.py:96 +#: cola/widgets/main.py:791 cola/widgets/main.py:792 msgid "Commit@@verb" msgstr "Véglegesítés" -#: cola/difftool.py:78 cola/widgets/compare.py:70 +#: cola/widgets/dag.py:487 +msgid "Commits authored by me" +msgstr "" + +#: cola/difftool.py:97 cola/widgets/compare.py:69 msgid "Compare" msgstr "Összehasonlítás" -#: cola/difftool.py:83 +#: cola/difftool.py:102 msgid "Compare All" msgstr "Mind összehasonlítása" -#: cola/widgets/toolbar.py:269 cola/widgets/toolbar.py:306 +#: cola/widgets/toolbar.py:274 cola/widgets/toolbar.py:311 msgid "Configure Toolbar" msgstr "Eszköztár beállítása" -#: cola/widgets/remote.py:214 +#: cola/widgets/remote.py:218 msgid "Configure the remote branch as the the new upstream" msgstr "A távoli ág beállítása új távoli tárolóként" -#: cola/widgets/main.py:170 +#: cola/widgets/main.py:168 msgid "Console" msgstr "Konzol" -#: cola/interaction.py:111 cola/widgets/main.py:610 +#: cola/interaction.py:109 cola/widgets/main.py:623 msgid "Continue" msgstr "Folytatás" -#: cola/widgets/main.py:255 +#: cola/widgets/main.py:252 msgid "Continue Applying Patches" msgstr "" -#: cola/widgets/bookmarks.py:248 cola/widgets/main.py:742 -#: cola/widgets/startup.py:371 +#: cola/widgets/bookmarks.py:247 cola/widgets/main.py:755 +#: cola/widgets/startup.py:370 msgid "Copy" msgstr "Másolás" -#: cola/widgets/status.py:268 +#: cola/widgets/status.py:269 msgid "Copy Basename to Clipboard" msgstr "Alapnév másolása a vágólapra" -#: cola/widgets/diff.py:208 +#: cola/widgets/diff.py:209 msgid "Copy Diff" msgstr "" -#: cola/widgets/status.py:745 +#: cola/widgets/status.py:746 msgid "Copy Leading Path to Clipboard" msgstr "Kezdő útvonal másolása a vágólapra" -#: cola/widgets/status.py:251 +#: cola/widgets/status.py:252 msgid "Copy Path to Clipboard" msgstr "Útvonal másolása a vágólapra" -#: cola/widgets/status.py:259 +#: cola/widgets/status.py:260 msgid "Copy Relative Path to Clipboard" msgstr "Relatív útvonal másolása a vágólapra" -#: cola/sequenceeditor.py:334 cola/widgets/dag.py:474 +#: cola/sequenceeditor.py:330 cola/widgets/dag.py:473 msgid "Copy SHA-1" msgstr "SHA-1 másolása" -#: cola/widgets/status.py:737 +#: cola/widgets/status.py:738 msgid "Copy..." msgstr "Másolás…" -#: cola/app.py:490 +#: cola/app.py:493 #, python-format msgid "Could not open %s." msgstr "Nem lehet megnyitni: %s." -#: cola/widgets/clone.py:191 cola/widgets/clone.py:193 +#: cola/widgets/clone.py:189 cola/widgets/clone.py:191 #, python-format msgid "Could not parse Git URL: \"%s\"" msgstr "Nem lehet feldolgozni a git URL-t: „%s”" -#: cola/app.py:500 +#: cola/app.py:503 msgid "Create" msgstr "Létrehozás" -#: cola/widgets/createbranch.py:86 cola/widgets/createbranch.py:135 -#: cola/widgets/createbranch.py:301 cola/widgets/dag.py:369 +#: cola/widgets/createbranch.py:84 cola/widgets/createbranch.py:133 +#: cola/widgets/createbranch.py:299 cola/widgets/dag.py:368 msgid "Create Branch" msgstr "Ág létrehozása" -#: cola/widgets/dag.py:373 +#: cola/widgets/dag.py:372 msgid "Create Patch" msgstr "Folt létrehozása" -#: cola/widgets/remote.py:606 +#: cola/widgets/remote.py:641 msgid "Create Remote Branch" msgstr "Távoli ág létrehozása" -#: cola/widgets/commitmsg.py:124 cola/widgets/merge.py:78 +#: cola/widgets/commitmsg.py:130 cola/widgets/merge.py:76 msgid "Create Signed Commit" msgstr "Aláírt véglegesítés létrehozása" -#: cola/widgets/createtag.py:55 cola/widgets/createtag.py:91 -#: cola/widgets/dag.py:377 +#: cola/widgets/createtag.py:53 cola/widgets/createtag.py:89 +#: cola/widgets/dag.py:376 msgid "Create Tag" msgstr "Címke létrehozása" -#: cola/widgets/main.py:544 +#: cola/widgets/main.py:557 msgid "Create Tag..." msgstr "Címke (tag) létrehozása…" -#: cola/cmds.py:2807 +#: cola/cmds.py:2753 msgid "Create Unsigned Tag" msgstr "Aláíratlan címke létrehozása" -#: cola/widgets/remote.py:188 +#: cola/widgets/remote.py:192 msgid "Create a merge commit even when the merge resolves as a fast-forward" msgstr "Beolvasztásos véglegesítést hoz létre akkor is, ha a beolvasztás előrepörgetett lenne" -#: cola/widgets/remote.py:605 +#: cola/widgets/remote.py:640 msgid "Create a new remote branch?" msgstr "Létrehozza az új távoli ágat?" -#: cola/app.py:499 +#: cola/app.py:502 msgid "Create a new repository at that location?" msgstr "Létrehozza a tárolót ezen a helyen?" -#: cola/widgets/submodules.py:100 +#: cola/widgets/submodules.py:99 msgid "Create a shallow clone with history truncated to the specified number of revisions. 0 performs a full clone." msgstr "Felszínes klón létrehozása a történet megadott számú revízióra csonkolásával. A 0 teljes klónt hoz létre." -#: cola/widgets/main.py:551 +#: cola/widgets/main.py:564 msgid "Create..." msgstr "Létrehozás…" -#: cola/cmds.py:2843 +#: cola/cmds.py:2789 #, python-format msgid "Created a new tag named \"%s\"" msgstr "„%s” nevű címke létrehozva" -#: cola/widgets/prefs.py:266 +#: cola/widgets/prefs.py:287 msgid "Ctrl+MouseWheel to Zoom" msgstr "" -#: cola/widgets/prefs.py:404 +#: cola/widgets/prefs.py:442 msgid "Current Repository" msgstr "Jelenlegi tároló" -#: cola/widgets/status.py:1371 +#: cola/widgets/status.py:1372 msgid "Custom Copy Actions" msgstr "Egyéni másolási műveletek" -#: cola/widgets/status.py:273 +#: cola/widgets/status.py:274 msgid "Customize..." msgstr "Testreszabás…" -#: cola/widgets/main.py:740 +#: cola/widgets/main.py:753 msgid "Cut" msgstr "Kivágás" -#: cola/widgets/about.py:411 cola/widgets/about.py:442 +#: cola/widgets/about.py:394 cola/widgets/about.py:425 msgid "Czech translation" msgstr "Cseh fordítás" -#: cola/widgets/main.py:592 +#: cola/widgets/main.py:605 msgid "DAG..." msgstr "DAG…" -#: cola/icons.py:55 +#: cola/icons.py:54 msgid "Dark Theme" msgstr "Sötét téma" -#: cola/widgets/dag.py:506 +#: cola/widgets/dag.py:572 msgid "Date, Time" msgstr "Dátum és idő" -#: cola/icons.py:54 cola/themes.py:637 +#: cola/icons.py:53 cola/themes.py:643 msgid "Default" msgstr "Alapértelmezett" -#: cola/widgets/prefs.py:126 +#: cola/widgets/prefs.py:124 msgid "" "Default directory when exporting patches.\n" "Relative paths are relative to the current repository.\n" "Absolute path are used as-is." msgstr "" -#: cola/cmds.py:925 cola/guicmds.py:26 cola/guicmds.py:35 -#: cola/widgets/bookmarks.py:75 cola/widgets/bookmarks.py:251 -#: cola/widgets/main.py:746 cola/widgets/startup.py:373 +#: cola/cmds.py:923 cola/guicmds.py:25 cola/guicmds.py:34 +#: cola/widgets/bookmarks.py:74 cola/widgets/bookmarks.py:250 +#: cola/widgets/main.py:759 cola/widgets/startup.py:372 msgid "Delete" msgstr "Törlés" -#: cola/cmds.py:1088 +#: cola/cmds.py:1089 #, python-format msgid "Delete %d file(s)?" msgstr "Törli a(z) %d fájlt?" -#: cola/cmds.py:1016 +#: cola/cmds.py:1017 msgid "Delete Bookmark" msgstr "Könyvjelző törlése" -#: cola/cmds.py:1014 +#: cola/cmds.py:1015 msgid "Delete Bookmark?" msgstr "Törli a könyvjelzőt?" -#: cola/cmds.py:1114 cola/cmds.py:1117 cola/guicmds.py:26 -#: cola/widgets/branch.py:268 +#: cola/cmds.py:1115 cola/cmds.py:1118 cola/guicmds.py:25 +#: cola/widgets/branch.py:277 msgid "Delete Branch" msgstr "Ág törlése" -#: cola/cmds.py:1089 +#: cola/cmds.py:1090 msgid "Delete Files" msgstr "Fájlok törlése" -#: cola/widgets/status.py:311 +#: cola/widgets/status.py:312 msgid "Delete Files..." msgstr "Fájlok törlése…" -#: cola/cmds.py:1085 +#: cola/cmds.py:1086 msgid "Delete Files?" msgstr "Törli a fájlokat?" -#: cola/cmds.py:922 +#: cola/cmds.py:920 msgid "Delete Remote" msgstr "Távoli törlése" -#: cola/guicmds.py:35 cola/widgets/branch.py:270 +#: cola/guicmds.py:34 cola/widgets/branch.py:279 msgid "Delete Remote Branch" msgstr "Távoli ág törlése" -#: cola/widgets/main.py:564 +#: cola/widgets/main.py:577 msgid "Delete Remote Branch..." msgstr "Távoli ág törlése…" -#: cola/widgets/toolbar.py:271 +#: cola/widgets/toolbar.py:276 msgid "Delete Toolbar" msgstr "Eszköztár törlése" -#: cola/cmds.py:1115 +#: cola/cmds.py:1116 #, python-format msgid "Delete branch \"%s\"?" msgstr "Törli az ágat: „%s”?" -#: cola/widgets/editremotes.py:88 +#: cola/widgets/editremotes.py:87 msgid "Delete remote" msgstr "Távoli törlése" -#: cola/cmds.py:924 +#: cola/cmds.py:922 #, python-format msgid "Delete remote \"%s\"" msgstr "„%s” távoli törlése" -#: cola/cmds.py:923 +#: cola/cmds.py:921 msgid "Delete remote?" msgstr "Törli a távolit?" -#: cola/widgets/main.py:558 +#: cola/widgets/main.py:571 msgid "Delete..." msgstr "Törlés…" -#: cola/cmds.py:1067 +#: cola/cmds.py:1068 #, python-format msgid "Deleting \"%s\" failed" msgstr "„%s” törlése sikertelen" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Deletions" msgstr "Törlések" -#: cola/widgets/submodules.py:120 +#: cola/widgets/submodules.py:119 msgid "Depth" msgstr "Mélység" -#: cola/qtutils.py:811 cola/qtutils.py:852 +#: cola/qtutils.py:842 cola/qtutils.py:889 msgid "Detach" msgstr "Leválasztás" -#: cola/widgets/prefs.py:181 +#: cola/widgets/prefs.py:203 msgid "Detect Conflict Markers" msgstr "Ütközésjelölők észlelése" -#: cola/widgets/prefs.py:151 +#: cola/widgets/prefs.py:174 msgid "Detect conflict markers in unmerged files" msgstr "Ütközésjelölők észlelése a nem beolvasztott fájlokban" -#: cola/widgets/about.py:271 cola/widgets/about.py:274 -#: cola/widgets/about.py:277 cola/widgets/about.py:278 -#: cola/widgets/about.py:279 cola/widgets/about.py:280 -#: cola/widgets/about.py:281 cola/widgets/about.py:282 -#: cola/widgets/about.py:283 cola/widgets/about.py:284 -#: cola/widgets/about.py:285 cola/widgets/about.py:286 -#: cola/widgets/about.py:287 cola/widgets/about.py:288 -#: cola/widgets/about.py:289 cola/widgets/about.py:290 -#: cola/widgets/about.py:291 cola/widgets/about.py:292 -#: cola/widgets/about.py:293 cola/widgets/about.py:294 -#: cola/widgets/about.py:295 cola/widgets/about.py:296 -#: cola/widgets/about.py:297 cola/widgets/about.py:298 -#: cola/widgets/about.py:299 cola/widgets/about.py:300 -#: cola/widgets/about.py:301 cola/widgets/about.py:302 -#: cola/widgets/about.py:303 cola/widgets/about.py:304 -#: cola/widgets/about.py:305 cola/widgets/about.py:306 -#: cola/widgets/about.py:307 cola/widgets/about.py:308 -#: cola/widgets/about.py:309 cola/widgets/about.py:310 -#: cola/widgets/about.py:311 cola/widgets/about.py:312 -#: cola/widgets/about.py:313 cola/widgets/about.py:314 -#: cola/widgets/about.py:315 cola/widgets/about.py:316 -#: cola/widgets/about.py:317 cola/widgets/about.py:318 -#: cola/widgets/about.py:319 cola/widgets/about.py:320 -#: cola/widgets/about.py:321 cola/widgets/about.py:322 -#: cola/widgets/about.py:323 cola/widgets/about.py:324 -#: cola/widgets/about.py:325 cola/widgets/about.py:326 -#: cola/widgets/about.py:327 cola/widgets/about.py:328 -#: cola/widgets/about.py:329 cola/widgets/about.py:330 -#: cola/widgets/about.py:331 cola/widgets/about.py:332 -#: cola/widgets/about.py:333 cola/widgets/about.py:334 -#: cola/widgets/about.py:335 cola/widgets/about.py:336 -#: cola/widgets/about.py:337 cola/widgets/about.py:338 -#: cola/widgets/about.py:339 cola/widgets/about.py:340 -#: cola/widgets/about.py:341 cola/widgets/about.py:342 -#: cola/widgets/about.py:343 cola/widgets/about.py:344 -#: cola/widgets/about.py:345 cola/widgets/about.py:346 -#: cola/widgets/about.py:347 cola/widgets/about.py:348 -#: cola/widgets/about.py:349 cola/widgets/about.py:350 -#: cola/widgets/about.py:351 cola/widgets/about.py:352 -#: cola/widgets/about.py:353 cola/widgets/about.py:354 -#: cola/widgets/about.py:355 cola/widgets/about.py:356 -#: cola/widgets/about.py:357 cola/widgets/about.py:358 -#: cola/widgets/about.py:359 cola/widgets/about.py:360 -#: cola/widgets/about.py:361 cola/widgets/about.py:362 -#: cola/widgets/about.py:363 cola/widgets/about.py:364 -#: cola/widgets/about.py:365 cola/widgets/about.py:366 -#: cola/widgets/about.py:367 cola/widgets/about.py:368 -#: cola/widgets/about.py:369 cola/widgets/about.py:370 -#: cola/widgets/about.py:371 cola/widgets/about.py:372 -#: cola/widgets/about.py:373 cola/widgets/about.py:374 -#: cola/widgets/about.py:375 cola/widgets/about.py:376 -#: cola/widgets/about.py:377 cola/widgets/about.py:378 -#: cola/widgets/about.py:379 cola/widgets/about.py:380 +#: cola/widgets/about.py:254 cola/widgets/about.py:257 +#: cola/widgets/about.py:260 cola/widgets/about.py:261 +#: cola/widgets/about.py:262 cola/widgets/about.py:263 +#: cola/widgets/about.py:264 cola/widgets/about.py:265 +#: cola/widgets/about.py:266 cola/widgets/about.py:267 +#: cola/widgets/about.py:268 cola/widgets/about.py:269 +#: cola/widgets/about.py:270 cola/widgets/about.py:271 +#: cola/widgets/about.py:272 cola/widgets/about.py:273 +#: cola/widgets/about.py:274 cola/widgets/about.py:275 +#: cola/widgets/about.py:276 cola/widgets/about.py:277 +#: cola/widgets/about.py:278 cola/widgets/about.py:279 +#: cola/widgets/about.py:280 cola/widgets/about.py:281 +#: cola/widgets/about.py:282 cola/widgets/about.py:283 +#: cola/widgets/about.py:284 cola/widgets/about.py:285 +#: cola/widgets/about.py:286 cola/widgets/about.py:287 +#: cola/widgets/about.py:288 cola/widgets/about.py:289 +#: cola/widgets/about.py:290 cola/widgets/about.py:291 +#: cola/widgets/about.py:292 cola/widgets/about.py:293 +#: cola/widgets/about.py:294 cola/widgets/about.py:295 +#: cola/widgets/about.py:296 cola/widgets/about.py:297 +#: cola/widgets/about.py:298 cola/widgets/about.py:299 +#: cola/widgets/about.py:300 cola/widgets/about.py:301 +#: cola/widgets/about.py:302 cola/widgets/about.py:303 +#: cola/widgets/about.py:304 cola/widgets/about.py:305 +#: cola/widgets/about.py:306 cola/widgets/about.py:307 +#: cola/widgets/about.py:308 cola/widgets/about.py:309 +#: cola/widgets/about.py:310 cola/widgets/about.py:311 +#: cola/widgets/about.py:312 cola/widgets/about.py:313 +#: cola/widgets/about.py:314 cola/widgets/about.py:315 +#: cola/widgets/about.py:316 cola/widgets/about.py:317 +#: cola/widgets/about.py:318 cola/widgets/about.py:319 +#: cola/widgets/about.py:320 cola/widgets/about.py:321 +#: cola/widgets/about.py:322 cola/widgets/about.py:323 +#: cola/widgets/about.py:324 cola/widgets/about.py:325 +#: cola/widgets/about.py:326 cola/widgets/about.py:327 +#: cola/widgets/about.py:328 cola/widgets/about.py:329 +#: cola/widgets/about.py:330 cola/widgets/about.py:331 +#: cola/widgets/about.py:332 cola/widgets/about.py:333 +#: cola/widgets/about.py:334 cola/widgets/about.py:335 +#: cola/widgets/about.py:336 cola/widgets/about.py:337 +#: cola/widgets/about.py:338 cola/widgets/about.py:339 +#: cola/widgets/about.py:340 cola/widgets/about.py:341 +#: cola/widgets/about.py:342 cola/widgets/about.py:343 +#: cola/widgets/about.py:344 cola/widgets/about.py:345 +#: cola/widgets/about.py:346 cola/widgets/about.py:347 +#: cola/widgets/about.py:348 cola/widgets/about.py:349 +#: cola/widgets/about.py:350 cola/widgets/about.py:351 +#: cola/widgets/about.py:352 cola/widgets/about.py:353 +#: cola/widgets/about.py:354 cola/widgets/about.py:355 +#: cola/widgets/about.py:356 cola/widgets/about.py:357 +#: cola/widgets/about.py:358 cola/widgets/about.py:359 +#: cola/widgets/about.py:360 cola/widgets/about.py:361 +#: cola/widgets/about.py:362 cola/widgets/about.py:363 msgid "Developer" msgstr "Fejlesztő" -#: cola/guicmds.py:185 cola/widgets/dag.py:764 cola/widgets/diff.py:781 -#: cola/widgets/main.py:177 cola/widgets/main.py:797 +#: cola/guicmds.py:184 cola/widgets/dag.py:830 cola/widgets/diff.py:809 +#: cola/widgets/main.py:175 cola/widgets/main.py:810 msgid "Diff" msgstr "Összehasonlítás" -#: cola/guicmds.py:185 +#: cola/guicmds.py:184 msgid "Diff Against Commit" msgstr "" @@ -1416,35 +1457,35 @@ msgstr "" msgid "Diff Against Predecessor..." msgstr "Összehasonlítás az előddel…" -#: cola/widgets/main.py:1159 +#: cola/widgets/main.py:1172 msgid "Diff Mode" msgstr "" -#: cola/widgets/diff.py:772 cola/widgets/diff.py:796 +#: cola/widgets/diff.py:800 cola/widgets/diff.py:824 msgid "Diff Options" msgstr "Összehasonlítási lehetőségek" -#: cola/widgets/prefs.py:256 +#: cola/widgets/prefs.py:277 msgid "Diff Tool" msgstr "Összehasonlító eszköz" -#: cola/widgets/dag.py:364 +#: cola/widgets/dag.py:363 msgid "Diff selected -> this" msgstr "Kijelölt összehasonlítása → ezzel" -#: cola/widgets/dag.py:358 +#: cola/widgets/dag.py:357 msgid "Diff this -> selected" msgstr "Ez összehasonlítása → a kijelölttel" -#: cola/widgets/main.py:218 +#: cola/widgets/main.py:217 msgid "Diffstat" msgstr "Összehasonlítási statisztika" -#: cola/cmds.py:3262 +#: cola/difftool.py:324 msgid "Difftool" msgstr "Összehasonlító eszköz" -#: cola/widgets/clone.py:207 +#: cola/widgets/clone.py:205 msgid "Directory Exists" msgstr "Könyvtár létezik" @@ -1452,84 +1493,88 @@ msgstr "Könyvtár létezik" msgid "Disable" msgstr "Letiltás" -#: cola/widgets/prefs.py:180 +#: cola/widgets/prefs.py:202 msgid "Display Untracked Files" msgstr "Nem követett fájlok megjelenítése" -#: cola/cmds.py:2094 +#: cola/widgets/remote.py:176 +msgid "Display remote messages in a separate dialog" +msgstr "" + +#: cola/cmds.py:2045 msgid "Do not update stacked branches" msgstr "" -#: cola/widgets/main.py:471 +#: cola/widgets/main.py:484 msgid "Documentation" msgstr "Dokumentáció" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop" msgstr "Eldobás" -#: cola/widgets/stash.py:258 +#: cola/widgets/stash.py:276 msgid "Drop Stash" msgstr "Félretett változat eldobása" -#: cola/widgets/stash.py:255 +#: cola/widgets/stash.py:273 msgid "Drop Stash?" msgstr "Eldobja a félrerakott változatot?" -#: cola/widgets/stash.py:257 +#: cola/widgets/stash.py:275 #, python-format msgid "Drop the \"%s\" stash?" msgstr "Eldobja a(z) „%s” félretett változatot?" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop the selected stash" msgstr "Kijelölt félretett változat eldobása" -#: cola/qtutils.py:764 cola/sequenceeditor.py:357 cola/widgets/grep.py:102 +#: cola/qtutils.py:795 cola/sequenceeditor.py:353 cola/widgets/grep.py:100 msgid "Edit" msgstr "Szerkesztés" -#: cola/widgets/diff.py:1019 +#: cola/widgets/diff.py:1058 msgid "Edit Diff Hunk to Revert..." msgstr "" -#: cola/widgets/diff.py:1017 +#: cola/widgets/diff.py:1056 msgid "Edit Diff Hunk to Stage..." msgstr "" -#: cola/widgets/diff.py:1062 +#: cola/widgets/diff.py:1124 msgid "Edit Diff Hunk to Unstage..." msgstr "" -#: cola/cmds.py:2166 +#: cola/cmds.py:2117 msgid "Edit Rebase" msgstr "Újraalapozás szerkesztése" -#: cola/widgets/editremotes.py:36 +#: cola/widgets/editremotes.py:35 msgid "Edit Remotes" msgstr "Távolik szerkesztése" -#: cola/widgets/main.py:298 +#: cola/widgets/main.py:293 msgid "Edit Remotes..." msgstr "Távolik szerkesztése…" -#: cola/widgets/diff.py:1014 +#: cola/widgets/diff.py:1053 msgid "Edit Selected Lines to Revert..." msgstr "" -#: cola/widgets/diff.py:1012 +#: cola/widgets/diff.py:1051 msgid "Edit Selected Lines to Stage..." msgstr "" -#: cola/widgets/diff.py:1059 +#: cola/widgets/diff.py:1122 msgid "Edit Selected Lines to Unstage..." msgstr "" -#: cola/widgets/editremotes.py:44 +#: cola/widgets/editremotes.py:43 msgid "Edit remotes by selecting them from the list" msgstr "Távoli szerkesztése a listából való kijelöléssel" -#: cola/widgets/browse.py:197 cola/widgets/common.py:39 +#: cola/widgets/browse.py:198 cola/widgets/common.py:38 msgid "Edit selected paths" msgstr "Kijelölt útvonalak szerkesztése" @@ -1545,11 +1590,11 @@ msgstr "" msgid "Edit the following patch, which will then be applied to the worktree to revert the changes:" msgstr "" -#: cola/widgets/main.py:604 +#: cola/widgets/main.py:617 msgid "Edit..." msgstr "Szerkesztés…" -#: cola/widgets/prefs.py:253 +#: cola/widgets/prefs.py:274 msgid "Editor" msgstr "Szerkesztő" @@ -1558,153 +1603,158 @@ msgstr "Szerkesztő" msgid "Editor returned %s exit code. Not applying patch." msgstr "" -#: cola/widgets/prefs.py:167 +#: cola/widgets/prefs.py:190 msgid "Email Address" msgstr "E-mail cím" -#: cola/widgets/about.py:258 cola/widgets/about.py:401 +#: cola/widgets/about.py:241 cola/widgets/about.py:384 msgid "Email contributor" msgstr "E-mail közreműködő" -#: cola/widgets/prefs.py:182 +#: cola/widgets/prefs.py:204 msgid "Enable Gravatar Icons" msgstr "" -#: cola/widgets/prefs.py:160 +#: cola/widgets/prefs.py:183 msgid "Enable path autocompletion in tools" msgstr "Útvonalak automatikus kiegészítésének engedélyezése az eszközökben" -#: cola/widgets/diff.py:768 +#: cola/widgets/diff.py:796 msgid "Enable word wrapping" msgstr "" -#: cola/sequenceeditor.py:322 +#: cola/sequenceeditor.py:319 msgid "Enabled" msgstr "Engedélyezett" -#: cola/guicmds.py:333 cola/widgets/branch.py:445 +#: cola/guicmds.py:332 cola/widgets/branch.py:478 msgid "Enter New Branch Name" msgstr "Adja meg az új ág nevét" -#: cola/guicmds.py:147 +#: cola/guicmds.py:146 msgid "Enter a name for the new bare repo" msgstr "Adja meg az új csupasz tároló nevét" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Enter a name for the stash" msgstr "Adjon meg egy nevet a félrerakáshoz" -#: cola/cmds.py:146 cola/cmds.py:176 cola/cmds.py:207 cola/cmds.py:283 -#: cola/cmds.py:292 cola/cmds.py:307 cola/cmds.py:317 cola/cmds.py:460 -#: cola/cmds.py:496 cola/cmds.py:534 cola/cmds.py:633 cola/cmds.py:751 -#: cola/cmds.py:1067 cola/cmds.py:1164 cola/cmds.py:2005 cola/cmds.py:2394 -#: cola/cmds.py:2637 cola/cmds.py:2643 cola/cmds.py:2651 cola/cmds.py:2872 -#: cola/cmds.py:2890 cola/cmds.py:3180 cola/gitcmds.py:984 cola/guicmds.py:157 -#: cola/models/stash.py:70 cola/models/stash.py:87 cola/models/stash.py:108 -#: cola/widgets/bookmarks.py:482 cola/widgets/branch.py:777 +#: cola/widgets/stash.py:216 +msgid "Enter a new name for the stash" +msgstr "" + +#: cola/cmds.py:145 cola/cmds.py:175 cola/cmds.py:206 cola/cmds.py:284 +#: cola/cmds.py:293 cola/cmds.py:308 cola/cmds.py:318 cola/cmds.py:461 +#: cola/cmds.py:497 cola/cmds.py:535 cola/cmds.py:635 cola/cmds.py:753 +#: cola/cmds.py:1068 cola/cmds.py:1165 cola/cmds.py:1956 cola/cmds.py:2345 +#: cola/cmds.py:2579 cola/cmds.py:2585 cola/cmds.py:2593 cola/cmds.py:2818 +#: cola/cmds.py:2836 cola/cmds.py:3125 cola/gitcmds.py:994 cola/guicmds.py:156 +#: cola/models/stash.py:70 cola/models/stash.py:90 cola/models/stash.py:112 +#: cola/models/stash.py:138 cola/widgets/bookmarks.py:481 +#: cola/widgets/branch.py:829 msgid "Error" msgstr "Hiba" -#: cola/widgets/clone.py:191 +#: cola/widgets/clone.py:189 msgid "Error Cloning" msgstr "Hiba a klónozáskor" -#: cola/widgets/createbranch.py:314 +#: cola/widgets/createbranch.py:312 msgid "Error Creating Branch" msgstr "Hiba az ág létrehozásakor" -#: cola/app.py:502 cola/guicmds.py:101 +#: cola/app.py:505 cola/guicmds.py:100 msgid "Error Creating Repository" msgstr "Hiba a tároló létrehozásakor" -#: cola/cmds.py:1202 +#: cola/cmds.py:1206 msgid "Error Deleting Remote Branch" msgstr "Hiba a távoli ág törlésekor" -#: cola/cmds.py:1585 +#: cola/cmds.py:1573 msgid "Error Editing File" msgstr "Hiba a fájl szerkesztésekor" -#: cola/cmds.py:559 +#: cola/cmds.py:560 msgid "Error Launching Blame Viewer" msgstr "Hiba a gyanúsító megjelenítő indítása közben" -#: cola/cmds.py:3145 +#: cola/cmds.py:3091 msgid "Error Launching History Browser" msgstr "Hiba a történetböngésző indításakor" -#: cola/app.py:489 +#: cola/app.py:492 msgid "Error Opening Repository" msgstr "Hiba a tároló megnyitásakor" -#: cola/widgets/browse.py:566 +#: cola/models/stash.py:144 +msgid "Error Renaming Stash" +msgstr "" + +#: cola/widgets/browse.py:567 msgid "Error Saving File" msgstr "" -#: cola/cmds.py:914 +#: cola/cmds.py:912 #, python-format msgid "Error creating remote \"%s\"" msgstr "Hiba a(z) „%s” távoli létrehozásakor" -#: cola/models/stash.py:197 +#: cola/models/stash.py:233 msgid "Error creating stash" msgstr "Hiba a félretett változat létrehozásakor" -#: cola/cmds.py:1126 +#: cola/cmds.py:1127 #, python-format msgid "Error deleting branch \"%s\"" msgstr "Hiba az ág törlésekor: „%s”" -#: cola/cmds.py:932 +#: cola/cmds.py:930 #, python-format msgid "Error deleting remote \"%s\"" msgstr "Hiba a(z) „%s” távoli törlésekor" -#: cola/cmds.py:956 +#: cola/cmds.py:955 #, python-format msgid "Error renaming \"%(name)s\" to \"%(new_name)s\"" msgstr "Hiba az átnevezéskor: „%(name)s” → „%(new_name)s”" -#: cola/cmds.py:1771 +#: cola/cmds.py:1722 msgid "Error running prepare-commitmsg hook" msgstr "Hiba a prepare-commitmsg hurok futtatásakor" -#: cola/cmds.py:3043 cola/cmds.py:3089 +#: cola/cmds.py:2989 cola/cmds.py:3035 #, python-format msgid "Error updating submodule %s" msgstr "Hiba a(z) %s almodul frissítésekor" -#: cola/cmds.py:3125 +#: cola/cmds.py:3071 msgid "Error updating submodules" msgstr "Hiba az almodulok frissítésekor" -#: cola/widgets/diff.py:1326 +#: cola/widgets/diff.py:1400 msgid "Error writing patch" msgstr "" -#: cola/cmds.py:1710 +#: cola/cmds.py:1662 msgid "Error: Cannot find commit template" msgstr "Hiba: Nem található véglegesítési üzenetsablon" -#: cola/widgets/stash.py:235 -msgid "Error: Stash exists" -msgstr "Hiba: A félretett változat már létezik" - -#: cola/cmds.py:1732 +#: cola/cmds.py:1684 msgid "Error: Unconfigured commit template" msgstr "Hiba: Nincs beállítva véglegesítési sablon" -#: cola/widgets/clone.py:53 +#: cola/widgets/clone.py:52 #, python-format msgid "Error: could not clone \"%s\"" msgstr "Hiba: A(z) „%s” nem klónozható" -#: cola/cmds.py:2835 +#: cola/cmds.py:2781 #, python-format msgid "Error: could not create tag \"%s\"" msgstr "Hiba: A(z) „%s” címke nem hozható létre" -#: cola/widgets/branch.py:421 +#: cola/widgets/branch.py:433 #, python-format msgid "Executing action %s" msgstr "Művelet végrehajtása: %s" @@ -1713,112 +1763,116 @@ msgstr "Művelet végrehajtása: %s" msgid "Exit \"Diff\" mode" msgstr "" -#: cola/widgets/action.py:67 +#: cola/widgets/action.py:81 msgid "Exit Diff" msgstr "" -#: cola/widgets/main.py:528 +#: cola/widgets/main.py:541 msgid "Exit Diff Mode" msgstr "" -#: cola/widgets/action.py:68 +#: cola/widgets/action.py:81 msgid "Exit Diff mode" msgstr "" -#: cola/widgets/recent.py:67 +#: cola/widgets/recent.py:65 msgid "Expand all" msgstr "Összes kibontása" -#: cola/widgets/diff.py:1223 +#: cola/widgets/diff.py:1297 msgid "Export Patch" msgstr "" -#: cola/guicmds.py:168 cola/widgets/search.py:75 +#: cola/guicmds.py:167 cola/widgets/search.py:74 msgid "Export Patches" msgstr "Foltok exportálása" -#: cola/widgets/main.py:273 +#: cola/widgets/main.py:268 msgid "Export Patches..." msgstr "Foltok exportálása…" -#: cola/widgets/main.py:533 +#: cola/widgets/main.py:546 msgid "Expression..." msgstr "Kifejezés…" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Extended Regexp" msgstr "Bővített regexp" -#: cola/widgets/commitmsg.py:612 +#: cola/widgets/commitmsg.py:638 msgid "Extended description..." msgstr "Bővített leírás…" -#: cola/cmds.py:387 +#: cola/cmds.py:388 msgid "Failed to commit and continue applying patches" msgstr "" -#: cola/cmds.py:403 +#: cola/cmds.py:404 msgid "Failed to continue applying patches after skipping the current patch" msgstr "" -#: cola/widgets/createbranch.py:124 +#: cola/widgets/createbranch.py:122 msgid "Fast Forward Only" msgstr "Csak előrepörgetés" -#: cola/widgets/remote.py:177 +#: cola/widgets/remote.py:181 msgid "Fast-forward only" msgstr "Csak előrepörgetés" -#: cola/widgets/bookmarks.py:91 +#: cola/widgets/bookmarks.py:90 msgid "Favorite repositories" msgstr "Kedvenc tárolók" -#: cola/widgets/main.py:111 +#: cola/widgets/main.py:109 msgid "Favorites" msgstr "Kedvencek" -#: cola/widgets/remote.py:673 +#: cola/widgets/remote.py:735 msgid "Fetch" msgstr "Letöltés" -#: cola/widgets/createbranch.py:127 +#: cola/widgets/createbranch.py:125 msgid "Fetch Tracking Branch" msgstr "Követett ág letöltése" -#: cola/widgets/action.py:63 cola/widgets/main.py:387 +#: cola/widgets/action.py:67 cola/widgets/main.py:384 +msgid "Fetch from one or more remotes using \"git fetch\"" +msgstr "" + +#: cola/widgets/action.py:65 cola/widgets/main.py:383 msgid "Fetch..." msgstr "Letöltés…" -#: cola/widgets/main.py:588 +#: cola/widgets/main.py:601 msgid "File Browser..." msgstr "Fájlböngésző…" -#: cola/widgets/compare.py:75 +#: cola/widgets/compare.py:74 msgid "File Differences" msgstr "Fájlok különbségei" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 msgid "File Saved" msgstr "Fájl mentve" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 #, python-format msgid "File saved to \"%s\"" msgstr "Fájl mentve: „%s”" -#: cola/fsmonitor.py:517 +#: cola/fsmonitor.py:528 msgid "File system change monitoring: disabled because \"cola.inotify\" is false.\n" msgstr "A fájlrendszer változásainak figyelése: letiltva, mivel a „cola.inotify” hamis.\n" -#: cola/fsmonitor.py:534 +#: cola/fsmonitor.py:545 msgid "File system change monitoring: disabled because libc does not support the inotify system calls.\n" msgstr "A fájlrendszer változásainak figyelése: letiltva, mivel a libc nem támogatja az inotify rendszerhívásait.\n" -#: cola/fsmonitor.py:528 +#: cola/fsmonitor.py:539 msgid "File system change monitoring: disabled because pywin32 is not installed.\n" msgstr "A fájlrendszer változásainak figyelése: letiltva, mivel a pywin32 nincs telepítve.\n" -#: cola/fsmonitor.py:181 +#: cola/fsmonitor.py:184 msgid "" "File system change monitoring: disabled because the limit on the total number of inotify watches was reached. You may be able to increase the limit on the number of watches by running:\n" "\n" @@ -1828,296 +1882,304 @@ msgstr "" "\n" " echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n" -#: cola/fsmonitor.py:142 +#: cola/fsmonitor.py:145 msgid "File system change monitoring: enabled.\n" msgstr "A fájlrendszer változásainak figyelése: engedélyezve\n" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Filename" msgstr "Fájlnév" -#: cola/widgets/dag.py:755 +#: cola/widgets/dag.py:821 msgid "Files" msgstr "Fájlok" -#: cola/widgets/branch.py:785 +#: cola/widgets/branch.py:837 msgid "Filter branches..." msgstr "Ágak szűrése…" -#: cola/widgets/status.py:1333 +#: cola/widgets/status.py:1334 msgid "Filter paths..." msgstr "Útvonalak szűrése…" -#: cola/widgets/finder.py:113 cola/widgets/main.py:312 +#: cola/widgets/finder.py:112 cola/widgets/main.py:307 msgid "Find Files" msgstr "Fájlok keresése" -#: cola/widgets/text.py:388 +#: cola/widgets/text.py:385 msgid "Find in diff" msgstr "" -#: cola/widgets/text.py:425 +#: cola/widgets/text.py:422 msgid "Find next item" msgstr "" -#: cola/widgets/text.py:431 +#: cola/widgets/text.py:428 msgid "Find previous item" msgstr "" -#: cola/widgets/text.py:395 +#: cola/widgets/text.py:392 msgid "Find the next occurrence of the phrase" msgstr "" -#: cola/widgets/text.py:391 +#: cola/widgets/text.py:388 msgid "Find the previous occurrence of the phrase" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Fixed String" msgstr "Rögzített szöveg" -#: cola/widgets/prefs.py:251 +#: cola/widgets/prefs.py:270 msgid "Fixed-Width Font" msgstr "Rögzített szélességű betűkészlet" -#: cola/sequenceeditor.py:362 +#: cola/sequenceeditor.py:358 msgid "Fixup" msgstr "Gyorsjavítás" -#: cola/widgets/commitmsg.py:148 +#: cola/widgets/commitmsg.py:154 msgid "Fixup Previous Commit" msgstr "Előző véglegesítés gyorsjavítása" -#: cola/themes.py:672 +#: cola/themes.py:684 msgid "Flat dark blue" msgstr "Lapos sötétkék" -#: cola/themes.py:693 +#: cola/themes.py:705 msgid "Flat dark green" msgstr "Lapos sötétzöld" -#: cola/themes.py:686 +#: cola/themes.py:698 msgid "Flat dark grey" msgstr "Lapos sötétszürke" -#: cola/themes.py:679 +#: cola/themes.py:691 msgid "Flat dark red" msgstr "Lapos sötétvörös" -#: cola/themes.py:644 +#: cola/themes.py:656 msgid "Flat light blue" msgstr "Lapos világoskék" -#: cola/themes.py:665 +#: cola/themes.py:677 msgid "Flat light green" msgstr "Lapos világoszöld" -#: cola/themes.py:658 +#: cola/themes.py:670 msgid "Flat light grey" msgstr "Lapos világosszürke" -#: cola/themes.py:651 +#: cola/themes.py:663 msgid "Flat light red" msgstr "Lapos világos vörös" -#: cola/widgets/startup.py:73 +#: cola/widgets/startup.py:72 msgid "Folder" msgstr "Mappa" -#: cola/widgets/toolbar.py:177 +#: cola/widgets/toolbar.py:181 msgid "Follow System Style" msgstr "" -#: cola/widgets/prefs.py:252 +#: cola/widgets/prefs.py:271 msgid "Font Size" msgstr "Betűméret" -#: cola/widgets/remote.py:193 +#: cola/widgets/remote.py:197 msgid "Force" msgstr "Kényszerítés" -#: cola/widgets/remote.py:617 +#: cola/widgets/remote.py:652 msgid "Force Fetch" msgstr "Letöltés kényszerítése" -#: cola/widgets/remote.py:614 +#: cola/widgets/remote.py:649 msgid "Force Fetch?" msgstr "Kényszeríti a letöltést?" -#: cola/widgets/remote.py:625 +#: cola/widgets/remote.py:660 msgid "Force Push" msgstr "Felküldés kényszerítése" -#: cola/widgets/remote.py:619 +#: cola/widgets/remote.py:654 msgid "Force Push?" msgstr "Kényszeríti a felküldést?" -#: cola/widgets/remote.py:616 +#: cola/widgets/remote.py:651 #, python-format msgid "Force fetching from %s?" msgstr "Kényszeríti a letöltést innen: %s?" -#: cola/widgets/remote.py:624 +#: cola/widgets/remote.py:659 #, python-format msgid "Force push to %s?" msgstr "Kényszeríti a felküldést ide: %s?" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Format String" msgstr "Formázó karakterlánc" -#: cola/widgets/about.py:430 cola/widgets/about.py:431 +#: cola/widgets/about.py:413 cola/widgets/about.py:414 msgid "French translation" msgstr "Francia fordítás" -#: cola/widgets/merge.py:80 +#: cola/widgets/merge.py:78 msgid "GPG-sign the merge commit" msgstr "A beolvasztási véglegesítés GPG-aláírása" -#: cola/widgets/prefs.py:344 +#: cola/widgets/prefs.py:364 msgid "GUI theme" msgstr "Felhasználói felület témája" -#: cola/widgets/editremotes.py:318 +#: cola/widgets/editremotes.py:317 #, python-format msgid "Gathering info for \"%s\"..." msgstr "Információk gyűjtése erről: „%s”…" -#: cola/widgets/about.py:420 cola/widgets/about.py:428 -#: cola/widgets/about.py:429 +#: cola/widgets/about.py:403 cola/widgets/about.py:411 +#: cola/widgets/about.py:412 msgid "German translation" msgstr "Német fordítás" -#: cola/widgets/main.py:511 +#: cola/widgets/main.py:524 msgid "Get Commit Message Template" msgstr "Véglegesítő üzenetsablon lekérdezése" -#: cola/widgets/dag.py:520 +#: cola/widgets/dag.py:586 msgid "Go Down" msgstr "Lefelé" -#: cola/widgets/dag.py:516 +#: cola/widgets/dag.py:582 msgid "Go Up" msgstr "Felfelé" -#: cola/widgets/dag.py:467 cola/widgets/filelist.py:42 +#: cola/widgets/dag.py:466 cola/widgets/filelist.py:39 msgid "Grab File..." msgstr "Fájl megfogása…" -#: cola/widgets/dag.py:782 +#: cola/widgets/dag.py:848 msgid "Graph" msgstr "Grafikon" -#: cola/widgets/main.py:358 +#: cola/widgets/main.py:353 msgid "Grep" msgstr "Grep" -#: cola/widgets/remote.py:662 +#: cola/widgets/remote.py:707 msgid "Have you rebased/pulled lately?" msgstr "Újraalapozott vagy lekért nemrégiben?" -#: cola/sequenceeditor.py:110 cola/sequenceeditor.py:171 -#: cola/widgets/finder.py:138 cola/widgets/main.py:854 +#: cola/sequenceeditor.py:108 cola/sequenceeditor.py:169 +#: cola/widgets/finder.py:137 cola/widgets/main.py:867 msgid "Help" msgstr "Súgó" -#: cola/widgets/status.py:1322 +#: cola/widgets/status.py:1323 msgid "Help - Custom Copy Actions" msgstr "Súgó – Egyéni másolási műveletek" -#: cola/widgets/finder.py:79 +#: cola/widgets/finder.py:78 msgid "Help - Find Files" msgstr "Súgó – Fájlok keresése" -#: cola/sequenceeditor.py:737 +#: cola/sequenceeditor.py:732 msgid "Help - git-cola-sequence-editor" msgstr "Súgó – git-cola-sequence-editor" -#: cola/widgets/prefs.py:346 +#: cola/widgets/prefs.py:366 msgid "High DPI" msgstr "Magas DPI" -#: cola/gitcmds.py:876 +#: cola/gitcmds.py:886 msgid "Hint: The \"Actions > Abort Cherry-Pick\" menu action can be used to cancel the current cherry-pick." msgstr "" -#: cola/widgets/prefs.py:254 +#: cola/widgets/prefs.py:275 msgid "History Browser" msgstr "Történetböngésző" -#: cola/widgets/about.py:427 cola/widgets/about.py:441 +#: cola/widgets/about.py:410 cola/widgets/about.py:424 msgid "Hungarian translation" msgstr "Magyar fordítás" -#: cola/widgets/toolbar.py:178 +#: cola/widgets/toolbar.py:182 msgid "Icon Only" msgstr "" -#: cola/widgets/prefs.py:345 +#: cola/widgets/prefs.py:365 msgid "Icon theme" msgstr "Ikontéma" -#: cola/widgets/diff.py:758 +#: cola/widgets/diff.py:787 msgid "Ignore all whitespace" msgstr "Üres helyek mellőzése" -#: cola/widgets/diff.py:755 +#: cola/widgets/diff.py:785 msgid "Ignore changes in amount of whitespace" msgstr "Üres helyek mennyiségváltozásának mellőzése" -#: cola/widgets/diff.py:751 +#: cola/widgets/diff.py:782 msgid "Ignore changes in whitespace at EOL" msgstr "Sorvégi üres helyek változásának mellőzése" -#: cola/widgets/gitignore.py:46 +#: cola/widgets/gitignore.py:45 msgid "Ignore custom pattern" msgstr "Egyéni minta mellőzése" -#: cola/widgets/gitignore.py:44 +#: cola/widgets/gitignore.py:43 msgid "Ignore exact filename" msgstr "Pontos fájlnév mellőzése" -#: cola/widgets/gitignore.py:32 +#: cola/widgets/gitignore.py:31 msgid "Ignore filename or pattern" msgstr "Fájlnév vagy minta mellőzése" -#: cola/widgets/status.py:933 +#: cola/widgets/dag.py:498 +msgid "Ignore merge commits" +msgstr "" + +#: cola/widgets/status.py:934 msgid "Ignore..." msgstr "Mellőz…" -#: cola/widgets/remote.py:203 +#: cola/widgets/remote.py:207 msgid "Include tags " msgstr "Címkéket is" -#: cola/widgets/prefs.py:349 +#: cola/widgets/prefs.py:369 msgid "Indent Status paths" msgstr "Státuszútvonalak behúzása" -#: cola/widgets/about.py:419 cola/widgets/about.py:426 +#: cola/widgets/about.py:402 cola/widgets/about.py:409 msgid "Indonesian translation" msgstr "Indonéz fordítás" -#: cola/widgets/main.py:643 +#: cola/widgets/main.py:656 msgid "Initialize Git Annex" msgstr "Git Annex előkészítése" -#: cola/widgets/main.py:647 +#: cola/widgets/main.py:660 msgid "Initialize Git LFS" msgstr "Git LFS előkészítése" -#: cola/widgets/clone.py:116 +#: cola/widgets/clone.py:114 msgid "Inititalize submodules" msgstr "Almodulok előkészítése" -#: cola/widgets/prefs.py:260 +#: cola/widgets/prefs.py:281 msgid "Insert spaces instead of tabs" msgstr "Szóközök a tabulátorok helyett" -#: cola/cmds.py:2130 +#: cola/widgets/action.py:73 cola/widgets/main.py:402 +msgid "Integrate changes using \"git pull\"" +msgstr "" + +#: cola/cmds.py:2081 msgid "Interactive Rebase" msgstr "Interaktív újraalapozás" -#: cola/cmds.py:2364 +#: cola/cmds.py:2315 msgid "Invalid Revision" msgstr "Érvénytelen revízió" @@ -2125,40 +2187,40 @@ msgstr "Érvénytelen revízió" msgid "It is not necessary to update the hunk header lines as they will be regenerated automatically." msgstr "" -#: cola/widgets/about.py:421 cola/widgets/about.py:424 +#: cola/widgets/about.py:404 cola/widgets/about.py:407 msgid "Japanese translation" msgstr "Japán fordítás" -#: cola/widgets/prefs.py:262 +#: cola/widgets/prefs.py:283 msgid "Keep *.orig Merge Backups" msgstr "Beolvasztási *.orig biztonsági tartalék megtartása" -#: cola/widgets/stash.py:71 +#: cola/widgets/stash.py:73 msgid "Keep Index" msgstr "Jegyzék megtartása" -#: cola/widgets/main.py:477 +#: cola/widgets/main.py:490 msgid "Keyboard Shortcuts" msgstr "Gyorsbillentyűk" -#: cola/cmds.py:1608 cola/sequenceeditor.py:165 cola/sequenceeditor.py:338 -#: cola/widgets/dag.py:395 cola/widgets/filelist.py:34 +#: cola/difftool.py:27 cola/sequenceeditor.py:163 cola/sequenceeditor.py:334 +#: cola/widgets/dag.py:394 cola/widgets/filelist.py:31 msgid "Launch Diff Tool" msgstr "Összehasonlító eszköz indítása" -#: cola/widgets/dag.py:402 +#: cola/widgets/dag.py:401 msgid "Launch Directory Diff Tool" msgstr "Könyvtár-összehasonlító eszköz indítása" -#: cola/cmds.py:1541 cola/cmds.py:1679 cola/widgets/filelist.py:38 +#: cola/cmds.py:1529 cola/cmds.py:1631 cola/widgets/filelist.py:35 msgid "Launch Editor" msgstr "Szerkesztő indítása" -#: cola/cmds.py:1644 +#: cola/cmds.py:1596 msgid "Launch Terminal" msgstr "Terminál indítása" -#: cola/sequenceeditor.py:166 +#: cola/sequenceeditor.py:164 msgid "" "Launch external diff tool\n" "Shortcut: Ctrl+D" @@ -2166,8 +2228,8 @@ msgstr "" "Külső összehasonlító eszköz indítása\n" "Gyorsbillentyű: Ctrl+D" -#: cola/widgets/diff.py:1005 cola/widgets/diff.py:1051 -#: cola/widgets/status.py:852 cola/widgets/status.py:948 +#: cola/widgets/diff.py:1044 cola/widgets/diff.py:1106 +#: cola/widgets/status.py:853 cola/widgets/status.py:949 msgid "Launch git-cola" msgstr "git-cola indítása" @@ -2179,7 +2241,7 @@ msgstr "git-difftool indítása az előző verzión" msgid "Launch git-difftool on the current path" msgstr "git-difftool indítása a jelenlegi útvonalon" -#: cola/icons.py:56 +#: cola/icons.py:55 msgid "Light Theme" msgstr "Világos téma" @@ -2188,167 +2250,183 @@ msgstr "Világos téma" msgid "Lines starting with '%s' will be ignored." msgstr "" -#: cola/widgets/startup.py:74 +#: cola/widgets/startup.py:73 msgid "List" msgstr "Lista" -#: cola/guicmds.py:267 +#: cola/guicmds.py:266 msgid "Load Commit Message" msgstr "Véglegesítő üzenet betöltése" -#: cola/widgets/main.py:339 +#: cola/widgets/main.py:334 msgid "Load Commit Message..." msgstr "Véglegesítő üzenet betöltése…" -#: cola/widgets/commitmsg.py:144 +#: cola/widgets/commitmsg.py:150 msgid "Load Previous Commit Message" msgstr "Előző véglegesítő üzenet betöltése" -#: cola/widgets/diff.py:264 +#: cola/widgets/diff.py:265 msgid "Loading..." msgstr "Betöltés…" -#: cola/widgets/branch.py:169 cola/widgets/branch.py:240 -#: cola/widgets/branch.py:281 cola/widgets/compare.py:38 -#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/branch.py:173 cola/widgets/branch.py:250 +#: cola/widgets/branch.py:290 cola/widgets/compare.py:37 +#: cola/widgets/compare.py:52 cola/widgets/compare.py:57 msgid "Local" msgstr "Helyi" -#: cola/widgets/cfgactions.py:227 cola/widgets/merge.py:46 -#: cola/widgets/remote.py:138 +#: cola/widgets/cfgactions.py:225 cola/widgets/merge.py:44 +#: cola/widgets/remote.py:136 msgid "Local Branch" msgstr "Helyi ág" -#: cola/widgets/createbranch.py:114 +#: cola/widgets/createbranch.py:112 msgid "Local branch" msgstr "Helyi ág" -#: cola/widgets/dag.py:788 cola/widgets/main.py:651 +#: cola/widgets/dag.py:854 cola/widgets/main.py:664 msgid "Lock Layout" msgstr "Elrendezés zárolása" -#: cola/widgets/dag.py:750 +#: cola/widgets/dag.py:816 msgid "Log" msgstr "Napló" -#: cola/widgets/prefs.py:170 +#: cola/widgets/prefs.py:191 msgid "Log Date Format" msgstr "" -#: cola/widgets/about.py:268 +#: cola/themes.py:769 +msgid "MacOS Aqua dark" +msgstr "" + +#: cola/themes.py:765 +msgid "MacOS Aqua light" +msgstr "" + +#: cola/themes.py:781 +msgid "MacOS Vibrant dark" +msgstr "" + +#: cola/themes.py:775 +msgid "MacOS Vibrant light" +msgstr "" + +#: cola/widgets/about.py:251 msgid "Maintainer (since 2007) and developer" msgstr "Karbantartó (2007 óta) és fejlesztő" -#: cola/widgets/text.py:398 +#: cola/widgets/text.py:395 msgid "Match Case" msgstr "" -#: cola/widgets/merge.py:88 +#: cola/widgets/merge.py:86 msgid "Merge" msgstr "Beolvasztás" -#: cola/widgets/merge.py:162 +#: cola/widgets/merge.py:160 #, python-format msgid "Merge \"%(revision)s\" into \"%(branch)s\"" msgstr "„%(revision)s” beolvasztása az ágba: „%(branch)s”" -#: cola/widgets/prefs.py:257 +#: cola/widgets/prefs.py:278 msgid "Merge Tool" msgstr "Beolvasztó eszköz" -#: cola/widgets/prefs.py:171 +#: cola/widgets/prefs.py:193 msgid "Merge Verbosity" msgstr "Beolvasztás beszédessége" -#: cola/cmds.py:1829 +#: cola/cmds.py:1780 msgid "Merge failed. Conflict resolution is required." msgstr "A beolvasztás sikertelen. Fel kell oldani az ütközéseket." -#: cola/widgets/merge.py:167 +#: cola/widgets/merge.py:165 #, python-format msgid "Merge into \"%s\"" msgstr "Beolvasztás a következőbe: „%s”" -#: cola/widgets/branch.py:231 +#: cola/widgets/branch.py:242 msgid "Merge into current branch" msgstr "Beolvasztás a jelenlegi ágba" -#: cola/widgets/main.py:363 +#: cola/widgets/main.py:358 msgid "Merge..." msgstr "Beolvasztás…" -#: cola/widgets/main.py:1163 +#: cola/widgets/main.py:1176 msgid "Merging" msgstr "Beolvasztás" -#: cola/models/browse.py:33 cola/widgets/createtag.py:78 +#: cola/models/browse.py:32 cola/widgets/createtag.py:76 msgid "Message" msgstr "Üzenet" -#: cola/widgets/commitmsg.py:417 +#: cola/widgets/commitmsg.py:425 msgid "Missing Commit Message" msgstr "Hiányzó véglegesítési üzenet" -#: cola/widgets/createbranch.py:252 +#: cola/widgets/createbranch.py:250 msgid "Missing Data" msgstr "Hiányzó adat" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Missing Name" msgstr "Hiányzó név" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Missing Revision" msgstr "Hiányzó revízió" -#: cola/cmds.py:2801 +#: cola/cmds.py:2747 msgid "Missing Tag Message" msgstr "Hiányzó címkeüzenet" -#: cola/models/browse.py:332 cola/widgets/status.py:158 -#: cola/widgets/status.py:631 +#: cola/models/browse.py:331 cola/widgets/status.py:158 +#: cola/widgets/status.py:632 msgid "Modified" msgstr "Módosított" -#: cola/widgets/commitmsg.py:506 +#: cola/widgets/commitmsg.py:532 msgid "More..." msgstr "További…" -#: cola/widgets/standard.py:243 cola/widgets/status.py:233 +#: cola/widgets/standard.py:242 cola/widgets/status.py:234 msgid "Move Down" msgstr "Mozgatás lefelé" -#: cola/widgets/standard.py:235 cola/widgets/status.py:225 +#: cola/widgets/standard.py:234 cola/widgets/status.py:226 msgid "Move Up" msgstr "Mozgatás felfelé" -#: cola/widgets/status.py:300 +#: cola/widgets/status.py:301 msgid "Move files to trash" msgstr "Fájlok kukába dobása" -#: cola/models/browse.py:33 cola/widgets/bookmarks.py:467 -#: cola/widgets/createtag.py:61 cola/widgets/editremotes.py:450 -#: cola/widgets/status.py:1452 cola/widgets/toolbar.py:312 +#: cola/models/browse.py:32 cola/widgets/bookmarks.py:466 +#: cola/widgets/createtag.py:59 cola/widgets/editremotes.py:448 +#: cola/widgets/status.py:1453 cola/widgets/toolbar.py:317 msgid "Name" msgstr "Név" -#: cola/widgets/editremotes.py:434 +#: cola/widgets/editremotes.py:432 msgid "Name for the new remote" msgstr "Az új távoli neve" -#: cola/guicmds.py:148 cola/widgets/main.py:285 +#: cola/guicmds.py:147 cola/widgets/main.py:280 msgid "New Bare Repository..." msgstr "Új csupasz tároló…" -#: cola/guicmds.py:87 cola/widgets/main.py:280 +#: cola/guicmds.py:86 cola/widgets/main.py:275 msgid "New Repository..." msgstr "Új tároló…" -#: cola/widgets/main.py:983 +#: cola/widgets/main.py:996 msgid "New Toolbar" msgstr "Eszköztár hozzáadása" -#: cola/widgets/startup.py:53 +#: cola/widgets/startup.py:52 msgid "New..." msgstr "Új…" @@ -2356,15 +2434,19 @@ msgstr "Új…" msgid "Next File" msgstr "Következő fájl" -#: cola/widgets/createbranch.py:123 cola/widgets/standard.py:1065 +#: cola/widgets/createbranch.py:121 cola/widgets/standard.py:1183 msgid "No" msgstr "Nem" -#: cola/widgets/merge.py:217 cola/widgets/merge.py:227 +#: cola/widgets/merge.py:215 cola/widgets/merge.py:225 msgid "No Revision Specified" msgstr "Nincs revízió megadva" -#: cola/widgets/commitmsg.py:427 +#: cola/widgets/stash.py:225 +msgid "No change made" +msgstr "" + +#: cola/widgets/commitmsg.py:435 msgid "" "No changes to commit.\n" "\n" @@ -2374,27 +2456,27 @@ msgstr "" "\n" "Legalább egy fájl ki kell szemelni, hogy véglegesíteni lehessen." -#: cola/widgets/selectcommits.py:118 +#: cola/widgets/selectcommits.py:117 msgid "No commits exist in this branch." msgstr "Nincsenek véglegesítések ebben az ágban." -#: cola/widgets/merge.py:65 +#: cola/widgets/merge.py:63 msgid "No fast forward" msgstr "Nincs előrepörgetés" -#: cola/widgets/remote.py:186 +#: cola/widgets/remote.py:190 msgid "No fast-forward" msgstr "Nincs előrepörgetés" -#: cola/widgets/remote.py:577 +#: cola/widgets/remote.py:612 msgid "No repository selected." msgstr "Nincs tároló kiválasztva." -#: cola/widgets/remote.py:615 +#: cola/widgets/remote.py:650 msgid "Non-fast-forward fetch overwrites local history!" msgstr "A nem előrepörgetett letöltés felülírja a helyi történetet!" -#: cola/widgets/remote.py:621 +#: cola/widgets/remote.py:656 msgid "" "Non-fast-forward push overwrites published history!\n" "(Did you pull first?)" @@ -2402,7 +2484,7 @@ msgstr "" "A nem előrepörgetett felküldés felülírja a közzétett történetet!\n" "(Csinált előtte lekérést?)" -#: cola/widgets/commitmsg.py:444 +#: cola/widgets/commitmsg.py:452 msgid "Nothing to commit" msgstr "Nincs véglegesíthető változás" @@ -2410,79 +2492,79 @@ msgstr "Nincs véglegesíthető változás" msgid "Nothing to do" msgstr "Nincs teendő" -#: cola/widgets/prefs.py:172 +#: cola/widgets/prefs.py:194 msgid "Number of Diff Context Lines" msgstr "A diff környezeti sorok száma" -#: cola/widgets/bookmarks.py:79 cola/widgets/bookmarks.py:213 -#: cola/widgets/startup.py:336 +#: cola/widgets/bookmarks.py:78 cola/widgets/bookmarks.py:212 +#: cola/widgets/startup.py:335 msgid "Open" msgstr "Megnyitás" -#: cola/widgets/text.py:230 +#: cola/widgets/text.py:228 #, python-format msgid "Open \"%s\"" msgstr "" -#: cola/cmds.py:1857 +#: cola/cmds.py:1808 msgid "Open Directory" msgstr "" -#: cola/guicmds.py:205 cola/guicmds.py:214 cola/widgets/editremotes.py:473 -#: cola/widgets/startup.py:55 cola/widgets/startup.py:215 +#: cola/guicmds.py:204 cola/guicmds.py:213 cola/widgets/editremotes.py:471 +#: cola/widgets/startup.py:54 cola/widgets/startup.py:214 msgid "Open Git Repository" msgstr "Git tároló megnyitása" -#: cola/widgets/submodules.py:49 +#: cola/widgets/submodules.py:48 msgid "Open Parent" msgstr "Szülő megnyitása" -#: cola/cmds.py:1877 +#: cola/cmds.py:1828 msgid "Open Parent Directory" msgstr "Szülő könyvtár megnyitása" -#: cola/widgets/main.py:679 +#: cola/widgets/main.py:692 msgid "Open Recent" msgstr "Legutóbbiak megnyitása" -#: cola/cmds.py:1840 +#: cola/cmds.py:1791 msgid "Open Using Default Application" msgstr "Megnyitás az alapértelmezett alkalmazással" -#: cola/cmds.py:1890 +#: cola/cmds.py:1841 msgid "Open Worktree" msgstr "" -#: cola/widgets/bookmarks.py:221 cola/widgets/startup.py:344 +#: cola/widgets/bookmarks.py:220 cola/widgets/startup.py:343 msgid "Open in New Window" msgstr "Megnyitás új ablakban" -#: cola/widgets/main.py:408 +#: cola/widgets/main.py:415 msgid "Open in New Window..." msgstr "Megnyitás új ablakban…" -#: cola/widgets/main.py:402 +#: cola/widgets/main.py:409 msgid "Open..." msgstr "Megnyitás…" -#: cola/widgets/branch.py:345 +#: cola/widgets/branch.py:354 msgid "Other branches" msgstr "Egyéb ágak" -#: cola/widgets/archive.py:210 +#: cola/widgets/archive.py:208 msgid "Overwrite" msgstr "Felülírás" -#: cola/widgets/archive.py:209 +#: cola/widgets/archive.py:207 #, python-format msgid "Overwrite \"%s\"?" msgstr "Felülírja: „%s”?" -#: cola/widgets/archive.py:207 +#: cola/widgets/archive.py:205 msgid "Overwrite File?" msgstr "Felülírja a fájlt?" -#: cola/widgets/grep.py:144 +#: cola/widgets/grep.py:142 msgid "" "Parse arguments using a shell.\n" "Queries with spaces will require \"double quotes\"." @@ -2490,63 +2572,67 @@ msgstr "" "Argumentumok feldolgozása parancsértelmezővel.\n" "A szóközökkel rendelkező lekérdezéseket \"dupla idézőjelekkel\" kell levédeni." -#: cola/models/browse.py:330 +#: cola/models/browse.py:329 msgid "Partially Staged" msgstr "Részlegesen kiszemelve" -#: cola/widgets/main.py:744 +#: cola/widgets/main.py:757 msgid "Paste" msgstr "Beillesztés" -#: cola/cmds.py:363 +#: cola/cmds.py:364 msgid "Patch failed to apply" msgstr "" -#: cola/cmds.py:375 +#: cola/cmds.py:376 msgid "Patch(es) Applied" msgstr "Alkalmazott folt(ok)" -#: cola/widgets/diff.py:1219 cola/widgets/main.py:695 +#: cola/widgets/diff.py:1293 cola/widgets/main.py:708 msgid "Patches" msgstr "" -#: cola/widgets/prefs.py:173 +#: cola/widgets/prefs.py:195 msgid "Patches Directory" msgstr "" -#: cola/widgets/bookmarks.py:468 cola/widgets/submodules.py:118 +#: cola/widgets/bookmarks.py:467 cola/widgets/submodules.py:117 msgid "Path" msgstr "Útvonal" -#: cola/widgets/clone.py:112 +#: cola/widgets/clone.py:110 msgid "Path or URL to clone (Env. $VARS okay)" msgstr "Klónozandó útvonal vagy URL ($VARS környezeti változó rendben)" -#: cola/sequenceeditor.py:346 +#: cola/sequenceeditor.py:342 msgid "Pick" msgstr "Kiválasztás" -#: cola/widgets/diff.py:781 +#: cola/widgets/dag.py:490 +msgid "Pickaxe search for changes containing text" +msgstr "" + +#: cola/widgets/diff.py:809 msgid "Pixel XOR" msgstr "Pixel alapú logikai kizáró vagy" -#: cola/widgets/createbranch.py:253 +#: cola/widgets/createbranch.py:251 msgid "Please provide both a branch name and revision expression." msgstr "Adjon meg ágnevet és revíziókifejezést is." -#: cola/cmds.py:2348 +#: cola/cmds.py:2299 msgid "Please select a file" msgstr "Jelöljön ki egy fájlt" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Please specify a name for the new tag." msgstr "Adjon meg egy nevet az új címke számára." -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Please specify a revision to tag." msgstr "Jelöljön ki egy megcímkézendő revíziót." -#: cola/widgets/commitmsg.py:410 +#: cola/widgets/commitmsg.py:418 msgid "" "Please supply a commit message.\n" "\n" @@ -2564,31 +2650,31 @@ msgstr "" "- Második sor: Üres\n" "- A többi sor: Leírás arról, hogy miért jó ez a változtatás.\n" -#: cola/cmds.py:653 +#: cola/cmds.py:655 msgid "Point the current branch head to a new commit?" msgstr "A jelenlegi ág fejét az új véglegesítésre állítja?" -#: cola/widgets/about.py:416 +#: cola/widgets/about.py:399 msgid "Polish translation" msgstr "Lengyel fordítás" -#: cola/widgets/stash.py:63 cola/widgets/stash.py:111 cola/widgets/stash.py:115 +#: cola/widgets/stash.py:65 cola/widgets/stash.py:114 cola/widgets/stash.py:118 msgid "Pop" msgstr "Alkalmazás és eldobás" -#: cola/widgets/main.py:293 cola/widgets/prefs.py:395 +#: cola/widgets/main.py:288 cola/widgets/prefs.py:433 msgid "Preferences" msgstr "Beállítások" -#: cola/widgets/archive.py:129 +#: cola/widgets/archive.py:127 msgid "Prefix" msgstr "Előtag" -#: cola/widgets/main.py:345 +#: cola/widgets/main.py:340 msgid "Prepare Commit Message" msgstr "Véglegesítési üzenet előkészítése" -#: cola/widgets/prefs.py:157 +#: cola/widgets/prefs.py:180 msgid "Prevent \"Stage\" from staging all files when nothing is selected" msgstr "Az összes fájl kiszemelésének megakadályozása a „kiszemelés” számára, ha semmi sincs kijelölve" @@ -2596,216 +2682,228 @@ msgstr "Az összes fájl kiszemelésének megakadályozása a „kiszemelés” msgid "Previous File" msgstr "Előző fájl" -#: cola/widgets/remote.py:171 +#: cola/widgets/remote.py:169 msgid "Prompt on creation" msgstr "Kérdés létrehozáskor" -#: cola/widgets/remote.py:172 +#: cola/widgets/remote.py:170 msgid "Prompt when pushing creates new remote branches" msgstr "Kérdés, ha a felküldés új távoli ágat hozna létre" -#: cola/widgets/remote.py:208 +#: cola/widgets/remote.py:212 msgid "Prune " msgstr "Tisztogatás" -#: cola/widgets/bookmarks.py:255 cola/widgets/startup.py:376 +#: cola/widgets/bookmarks.py:254 cola/widgets/startup.py:375 msgid "Prune Missing Entries" msgstr "Hiányzó bejegyzések tisztogatása" -#: cola/widgets/branch.py:247 cola/widgets/remote.py:728 +#: cola/widgets/branch.py:256 cola/widgets/remote.py:783 msgid "Pull" msgstr "Lekérés" -#: cola/widgets/action.py:65 cola/widgets/main.py:397 +#: cola/widgets/action.py:73 cola/widgets/main.py:401 msgid "Pull..." msgstr "Lekérés…" -#: cola/widgets/branch.py:253 cola/widgets/remote.py:593 -#: cola/widgets/remote.py:698 +#: cola/widgets/branch.py:262 cola/widgets/remote.py:628 +#: cola/widgets/remote.py:758 msgid "Push" msgstr "Felküldés" -#: cola/widgets/action.py:64 cola/widgets/main.py:392 +#: cola/widgets/action.py:70 cola/widgets/main.py:393 +msgid "Push to one or more remotes using \"git push\"" +msgstr "" + +#: cola/widgets/action.py:70 cola/widgets/main.py:392 msgid "Push..." msgstr "Felküldés…" -#: cola/guicmds.py:252 +#: cola/guicmds.py:251 msgid "Quick Open Repository" msgstr "" -#: cola/widgets/main.py:660 +#: cola/widgets/main.py:673 msgid "Quick Open..." msgstr "" -#: cola/widgets/main.py:355 +#: cola/widgets/main.py:350 msgid "Quit" msgstr "Kilépés" -#: cola/cmds.py:2144 cola/cmds.py:2180 cola/cmds.py:2181 cola/cmds.py:2194 -#: cola/cmds.py:2195 cola/sequenceeditor.py:158 cola/sequenceeditor.py:199 -#: cola/widgets/main.py:822 cola/widgets/remote.py:211 +#: cola/cmds.py:2095 cola/cmds.py:2131 cola/cmds.py:2132 cola/cmds.py:2145 +#: cola/cmds.py:2146 cola/sequenceeditor.py:156 cola/sequenceeditor.py:197 +#: cola/widgets/main.py:835 cola/widgets/remote.py:215 msgid "Rebase" msgstr "Újraalapozás" -#: cola/cmds.py:2143 +#: cola/cmds.py:2094 #, python-format msgid "Rebase onto %s" msgstr "Újraalapozás erre: %s" -#: cola/cmds.py:2156 +#: cola/cmds.py:2107 msgid "Rebase stopped" msgstr "Újraalapozás leállítva" -#: cola/widgets/remote.py:210 +#: cola/widgets/remote.py:214 msgid "Rebase the current branch instead of merging" msgstr "Újraalapozás – beolvasztás helyett – a jelenlegi ágra" -#: cola/widgets/dag.py:419 +#: cola/widgets/dag.py:418 msgid "Rebase to this commit" msgstr "" -#: cola/widgets/main.py:1165 +#: cola/widgets/main.py:1178 msgid "Rebasing" msgstr "Újraalapozás" -#: cola/widgets/main.py:120 +#: cola/widgets/main.py:118 msgid "Recent" msgstr "Legutóbbiak" -#: cola/widgets/bookmarks.py:93 +#: cola/widgets/bookmarks.py:92 msgid "Recent repositories" msgstr "Legutóbbi tárolók" -#: cola/widgets/prefs.py:258 +#: cola/widgets/prefs.py:279 msgid "Recent repository count" msgstr "Legutóbbi tárolók száma" -#: cola/widgets/recent.py:46 +#: cola/widgets/recent.py:44 msgid "Recently Modified Files" msgstr "Legutóbb módosított fájlok" -#: cola/widgets/main.py:320 +#: cola/widgets/main.py:315 msgid "Recently Modified Files..." msgstr "Legutóbb módosított fájlok…" -#: cola/widgets/stash.py:256 +#: cola/widgets/stash.py:274 msgid "Recovering a dropped stash is not possible." msgstr "Az eldobott félretett változatok helyreállítása nem lehetséges." -#: cola/widgets/createbranch.py:283 +#: cola/widgets/createbranch.py:281 msgid "Recovering lost commits may not be easy." msgstr "Az elveszett véglegesítések helyreállítása nem biztos, hogy egyszerű." -#: cola/widgets/main.py:737 +#: cola/widgets/main.py:750 msgid "Redo" msgstr "Mégis" -#: cola/widgets/clone.py:121 +#: cola/widgets/clone.py:119 msgid "Reduce commit history to minimum" msgstr "Véglegesítési üzenetek történetének minimalizálása" -#: cola/widgets/submodules.py:121 +#: cola/widgets/submodules.py:120 msgid "Reference Repository" msgstr "Hivatkozó tároló" -#: cola/widgets/submodules.py:105 +#: cola/widgets/submodules.py:104 msgid "Reference URL" msgstr "Hivatkozás URL" -#: cola/widgets/submodules.py:106 +#: cola/widgets/submodules.py:105 msgid "Reference repository to use when cloning (optional)" msgstr "Klónozáskor alkalmazott hivatkozó tároló (választható)" -#: cola/cmds.py:2222 cola/qtutils.py:770 cola/widgets/action.py:62 -#: cola/widgets/dag.py:792 cola/widgets/editremotes.py:85 -#: cola/widgets/grep.py:105 cola/widgets/recent.py:116 -#: cola/widgets/submodules.py:45 +#: cola/cmds.py:2173 cola/qtutils.py:801 cola/widgets/action.py:63 +#: cola/widgets/dag.py:858 cola/widgets/editremotes.py:84 +#: cola/widgets/grep.py:103 cola/widgets/recent.py:114 +#: cola/widgets/submodules.py:44 msgid "Refresh" msgstr "Frissítés" -#: cola/widgets/remote.py:179 +#: cola/widgets/remote.py:183 msgid "Refuse to merge unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward" msgstr "A beolvasztás visszautasítása, kivéve, ha a jelenlegi FEJ már friss, vagy a beolvasztást előrepörgetéssel lehet végezni" -#: cola/widgets/branch.py:173 cola/widgets/branch.py:225 -#: cola/widgets/branch.py:269 cola/widgets/branch.py:470 -#: cola/widgets/compare.py:54 cola/widgets/compare.py:59 -#: cola/widgets/remote.py:147 +#: cola/widgets/branch.py:177 cola/widgets/branch.py:236 +#: cola/widgets/branch.py:278 cola/widgets/branch.py:513 +#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/remote.py:145 msgid "Remote" msgstr "Távoli" -#: cola/widgets/remote.py:162 +#: cola/widgets/remote.py:160 msgid "Remote Branch" msgstr "Távoli ág" -#: cola/cmds.py:1196 +#: cola/cmds.py:1197 msgid "Remote Branch Deleted" msgstr "Távoli ág törölve" -#: cola/widgets/editremotes.py:49 +#: cola/widgets/log.py:99 +msgid "Remote Messages" +msgstr "" + +#: cola/widgets/editremotes.py:48 msgid "Remote git repositories - double-click to rename" msgstr "Távoli git tárolók – dupla kattintás az átnevezéshez" -#: cola/cmds.py:1029 cola/widgets/patch.py:107 cola/widgets/patch.py:122 -#: cola/widgets/startup.py:265 cola/widgets/status.py:1382 +#: cola/cmds.py:1030 cola/widgets/diff.py:1701 cola/widgets/diff.py:1716 +#: cola/widgets/startup.py:264 cola/widgets/status.py:1383 msgid "Remove" msgstr "Eltávolítás" -#: cola/cmds.py:1027 +#: cola/cmds.py:1028 #, python-format msgid "Remove %s from the recent list?" msgstr "Eltávolítja a legutóbbiak listájáról: %s?" -#: cola/widgets/toolbar.py:316 +#: cola/widgets/toolbar.py:321 msgid "Remove Element" msgstr "Elem eltávolítása" -#: cola/widgets/remote.py:206 +#: cola/widgets/remote.py:210 msgid "Remove remote-tracking branches that no longer exist on the remote" msgstr "Távoli követett ágak eltávolítása, melyek már nem léteznek a távolin" -#: cola/widgets/patch.py:109 +#: cola/widgets/diff.py:1703 msgid "Remove selected (Delete)" msgstr "Kijelöltek eltávolítása (Törlés)" -#: cola/widgets/bookmarks.py:258 cola/widgets/startup.py:379 +#: cola/widgets/bookmarks.py:257 cola/widgets/startup.py:378 msgid "Remove stale entries for repositories that no longer exist" msgstr "Már nem létező elavult bejegyzések eltávolítása a tárolóból" -#: cola/guicmds.py:333 cola/widgets/browse.py:159 +#: cola/guicmds.py:332 cola/widgets/browse.py:159 cola/widgets/stash.py:44 msgid "Rename" msgstr "Átnevezés" -#: cola/cmds.py:1153 +#: cola/cmds.py:1154 #, python-format msgid "Rename \"%s\"" msgstr "„%s” átnevezése" -#: cola/widgets/branch.py:259 +#: cola/widgets/branch.py:268 msgid "Rename Branch" msgstr "Ág átnevezése" -#: cola/widgets/main.py:570 +#: cola/widgets/main.py:583 msgid "Rename Branch..." msgstr "Ág átnevezése…" -#: cola/guicmds.py:330 +#: cola/guicmds.py:329 msgid "Rename Existing Branch" msgstr "Létező ág átnevezése" -#: cola/cmds.py:944 +#: cola/cmds.py:942 msgid "Rename Remote" msgstr "Távoli átnevezése" -#: cola/widgets/bookmarks.py:233 cola/widgets/startup.py:356 +#: cola/widgets/bookmarks.py:232 cola/widgets/startup.py:355 msgid "Rename Repository" msgstr "Tároló átnevezése" -#: cola/widgets/branch.py:445 +#: cola/widgets/stash.py:218 +msgid "Rename Stash" +msgstr "" + +#: cola/widgets/branch.py:478 msgid "Rename branch" msgstr "Ág átnevezése" -#: cola/cmds.py:945 +#: cola/cmds.py:943 #, python-format msgid "Rename remote \"%(current)s\" to \"%(new)s\"?" msgstr "Átnevezi a(z) „%(current)s” távolit erre: „%(new)s”?" @@ -2814,179 +2912,183 @@ msgstr "Átnevezi a(z) „%(current)s” távolit erre: „%(new)s”?" msgid "Rename selected paths" msgstr "Kijelölt útvonalak átnevezése" -#: cola/app.py:497 cola/widgets/startup.py:262 +#: cola/widgets/stash.py:45 +msgid "Rename the selected stash" +msgstr "" + +#: cola/app.py:500 cola/widgets/startup.py:261 msgid "Repository Not Found" msgstr "Tároló nem található" -#: cola/widgets/browse.py:87 cola/widgets/main.py:1095 +#: cola/widgets/browse.py:87 cola/widgets/main.py:1108 #, python-format msgid "Repository: %s" msgstr "Tároló: %s" -#: cola/guicmds.py:351 cola/widgets/createbranch.py:125 cola/widgets/dag.py:331 -#: cola/widgets/editremotes.py:58 cola/widgets/main.py:832 +#: cola/guicmds.py:350 cola/widgets/createbranch.py:123 cola/widgets/dag.py:330 +#: cola/widgets/editremotes.py:57 cola/widgets/main.py:845 msgid "Reset" msgstr "Visszaállítás" -#: cola/widgets/createbranch.py:286 +#: cola/widgets/createbranch.py:284 #, python-format msgid "Reset \"%(branch)s\" to \"%(revision)s\"?" msgstr "Visszaállítja a(z) „%(branch)s” ágat erre: „%(revision)s”?" -#: cola/guicmds.py:359 +#: cola/guicmds.py:358 msgid "Reset All (Keep Unstaged Changes)" msgstr "Minden visszaállítása (elengedett módosítások megtartása)" -#: cola/cmds.py:655 cola/cmds.py:706 cola/guicmds.py:342 -#: cola/widgets/createbranch.py:295 +#: cola/cmds.py:657 cola/cmds.py:708 cola/guicmds.py:341 +#: cola/widgets/createbranch.py:293 msgid "Reset Branch" msgstr "Ág visszaállítása" -#: cola/cmds.py:703 cola/guicmds.py:341 cola/widgets/dag.py:425 -#: cola/widgets/main.py:419 +#: cola/cmds.py:705 cola/guicmds.py:340 cola/widgets/dag.py:424 +#: cola/widgets/main.py:431 msgid "Reset Branch (Soft)" msgstr "Ág visszaállítása (nyugodt)" -#: cola/cmds.py:652 cola/guicmds.py:350 cola/widgets/dag.py:431 -#: cola/widgets/main.py:426 +#: cola/cmds.py:654 cola/guicmds.py:349 cola/widgets/dag.py:430 +#: cola/widgets/main.py:439 msgid "Reset Branch and Stage (Mixed)" msgstr "Ág visszaállítása és kiszemelés (kevert)" -#: cola/widgets/createbranch.py:292 +#: cola/widgets/createbranch.py:290 msgid "Reset Branch?" msgstr "Visszaállítja az ágat?" -#: cola/widgets/main.py:655 +#: cola/widgets/main.py:668 msgid "Reset Layout" msgstr "Elrendezés visszaállítása" -#: cola/cmds.py:687 +#: cola/cmds.py:689 msgid "Reset Worktree and Reset All?" msgstr "Visszaállítja a munkafát és mindent visszaállít?" -#: cola/cmds.py:672 cola/cmds.py:689 cola/cmds.py:723 cola/guicmds.py:360 -#: cola/guicmds.py:373 cola/guicmds.py:382 +#: cola/cmds.py:674 cola/cmds.py:691 cola/cmds.py:725 cola/guicmds.py:359 +#: cola/guicmds.py:372 cola/guicmds.py:381 msgid "Reset and Restore" msgstr "Visszaállítás és helyreállítás" -#: cola/cmds.py:704 +#: cola/cmds.py:706 msgid "Reset branch?" msgstr "Visszaállítja az ágat?" -#: cola/widgets/createbranch.py:266 +#: cola/widgets/createbranch.py:264 #, python-format msgid "Resetting \"%(branch)s\" to \"%(revision)s\" will lose commits." msgstr "A(z) „%(branch)s” visszaállítása a(z) „%(revision)s” revízióra a véglegesítések elvesztéséhez vezet." -#: cola/widgets/prefs.py:264 +#: cola/widgets/prefs.py:285 msgid "Resize File Browser columns" msgstr "" -#: cola/widgets/prefs.py:374 +#: cola/widgets/prefs.py:412 msgid "Restart the application after changing appearance settings." msgstr "A megjelenési beállítások módosítása után indítsa újra az alkalmazást." -#: cola/cmds.py:757 cola/cmds.py:760 cola/guicmds.py:390 cola/guicmds.py:391 -#: cola/widgets/dag.py:461 cola/widgets/main.py:457 +#: cola/cmds.py:759 cola/cmds.py:762 cola/guicmds.py:389 cola/guicmds.py:390 +#: cola/widgets/dag.py:460 cola/widgets/main.py:471 msgid "Restore Worktree" msgstr "Munkafa helyreállítása" -#: cola/cmds.py:720 cola/guicmds.py:381 cola/widgets/dag.py:454 -#: cola/widgets/main.py:450 +#: cola/cmds.py:722 cola/guicmds.py:380 cola/widgets/dag.py:453 +#: cola/widgets/main.py:463 msgid "Restore Worktree and Reset All (Hard)" msgstr "Munkafa helyreállítása és minden visszaállítása (teljes)" -#: cola/cmds.py:669 cola/widgets/main.py:434 +#: cola/cmds.py:671 cola/widgets/main.py:447 msgid "Restore Worktree and Reset All (Keep Unstaged Changes)" msgstr "Munkafa helyreállítása és minden visszaállítása (elengedett módosítások megtartása)" -#: cola/widgets/dag.py:438 +#: cola/widgets/dag.py:437 msgid "Restore Worktree and Reset All (Keep Unstaged Edits)" msgstr "Munkafa helyreállítása és minden visszaállítása (elengedett szerkesztések megtartása)" -#: cola/cmds.py:686 cola/guicmds.py:372 cola/widgets/dag.py:446 -#: cola/widgets/main.py:442 +#: cola/cmds.py:688 cola/guicmds.py:371 cola/widgets/dag.py:445 +#: cola/widgets/main.py:455 msgid "Restore Worktree and Reset All (Merge)" msgstr "Munkafa helyreállítása és minden visszaállítása (beolvasztás)" -#: cola/cmds.py:721 +#: cola/cmds.py:723 msgid "Restore Worktree and Reset All?" msgstr "Helyreállítja a munkát és mindent visszaállít?" -#: cola/cmds.py:758 +#: cola/cmds.py:760 #, python-format msgid "Restore Worktree to %s?" msgstr "Helyreállítja a munkafát erre: %s?" -#: cola/cmds.py:670 +#: cola/cmds.py:672 msgid "Restore worktree, reset, and preserve unstaged edits?" msgstr "Helyreállítja a munkafát, visszaállít és megőrzi az elengedett szerkesztéseket?" -#: cola/widgets/dag.py:390 +#: cola/widgets/dag.py:389 msgid "Revert" msgstr "Visszavonás" -#: cola/widgets/diff.py:1153 +#: cola/widgets/diff.py:1227 msgid "Revert Diff Hunk" msgstr "Összehasonlítási egység visszavonása" -#: cola/widgets/diff.py:1018 +#: cola/widgets/diff.py:1057 msgid "Revert Diff Hunk..." msgstr "Összehasonlítási egység visszavonása…" -#: cola/widgets/diff.py:1152 +#: cola/widgets/diff.py:1226 msgid "Revert Diff Hunk?" msgstr "Visszavonja az összehasonlítási egységeket?" -#: cola/widgets/diff.py:1150 +#: cola/widgets/diff.py:1224 msgid "Revert Selected Lines" msgstr "Kijelölt sorok visszavonása" -#: cola/widgets/diff.py:1013 +#: cola/widgets/diff.py:1052 msgid "Revert Selected Lines..." msgstr "Kijelölt sorok visszavonása…" -#: cola/widgets/diff.py:1149 +#: cola/widgets/diff.py:1223 msgid "Revert Selected Lines?" msgstr "Visszavonja a kijelölt sorokat?" -#: cola/cmds.py:2311 +#: cola/cmds.py:2262 msgid "Revert Uncommitted Changes" msgstr "Nem véglegesített módosítások visszavonása" -#: cola/cmds.py:2305 +#: cola/cmds.py:2256 msgid "Revert Uncommitted Changes?" msgstr "Visszavonja a nem véglegesített módosításokat?" -#: cola/cmds.py:2298 +#: cola/cmds.py:2249 msgid "Revert Uncommitted Edits..." msgstr "Nem véglegesített szerkesztések visszavonása…" -#: cola/cmds.py:2289 +#: cola/cmds.py:2240 msgid "Revert Unstaged Changes" msgstr "Elengedett módosítások visszavonása" -#: cola/cmds.py:2283 +#: cola/cmds.py:2234 msgid "Revert Unstaged Changes?" msgstr "Visszavonja az elengedett módosításokat?" -#: cola/cmds.py:2275 +#: cola/cmds.py:2226 msgid "Revert Unstaged Edits..." msgstr "Elengedett szerkesztések visszavonása…" -#: cola/cmds.py:598 +#: cola/cmds.py:599 msgid "Revert failed" msgstr "" -#: cola/cmds.py:2310 cola/widgets/diff.py:1161 +#: cola/cmds.py:2261 cola/widgets/diff.py:1235 msgid "Revert the uncommitted changes?" msgstr "Visszavonja a nem véglegesített módosításokat?" -#: cola/cmds.py:2288 +#: cola/cmds.py:2239 msgid "Revert the unstaged changes?" msgstr "Visszavonja az elengedett módosításokat?" -#: cola/widgets/browse.py:189 +#: cola/widgets/browse.py:190 msgid "Revert uncommitted changes to selected paths" msgstr "Nem véglegesített módosítások visszavonása a kijelölt útvonalakon" @@ -2994,243 +3096,247 @@ msgstr "Nem véglegesített módosítások visszavonása a kijelölt útvonalako msgid "Revert unstaged changes to selected paths" msgstr "Elengedett módosítások visszavonása a kijelölt útvonalakon" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Review" msgstr "Áttekintés" -#: cola/widgets/main.py:583 +#: cola/widgets/main.py:596 msgid "Review..." msgstr "Áttekintés…" -#: cola/widgets/cfgactions.py:233 cola/widgets/createtag.py:84 +#: cola/widgets/cfgactions.py:231 cola/widgets/createtag.py:82 msgid "Revision" msgstr "Revízió" -#: cola/widgets/selectcommits.py:62 +#: cola/widgets/selectcommits.py:61 msgid "Revision Expression:" msgstr "Revízió kifejezés:" -#: cola/widgets/merge.py:39 cola/widgets/merge.py:42 +#: cola/widgets/merge.py:37 cola/widgets/merge.py:40 msgid "Revision to Merge" msgstr "Beolvasztani kívánt revízió" -#: cola/sequenceeditor.py:351 +#: cola/sequenceeditor.py:347 msgid "Reword" msgstr "Átfogalmazás" -#: cola/cmds.py:776 cola/widgets/commitmsg.py:456 +#: cola/cmds.py:778 cola/widgets/commitmsg.py:464 msgid "Rewrite Published Commit?" msgstr "Újraírja a közzétett véglegesítést?" -#: cola/widgets/log.py:31 +#: cola/widgets/log.py:31 cola/widgets/log.py:133 msgid "Right-click links to open:" msgstr "" -#: cola/interaction.py:127 cola/widgets/cfgactions.py:245 +#: cola/interaction.py:125 cola/widgets/cfgactions.py:243 msgid "Run" msgstr "Futtatás" -#: cola/cmds.py:2341 +#: cola/cmds.py:2292 #, python-format msgid "Run \"%s\"?" msgstr "Futtatja ezt: „%s”?" -#: cola/interaction.py:124 +#: cola/interaction.py:122 #, python-format msgid "Run %s?" msgstr "Futtatja ezt: %s?" -#: cola/interaction.py:125 +#: cola/interaction.py:123 #, python-format msgid "Run the \"%s\" command?" msgstr "Futtatja a(z) „%s” parancsot?" -#: cola/cmds.py:2380 +#: cola/cmds.py:2331 #, python-format msgid "Running command: %s" msgstr "Parancs futtatása: %s" -#: cola/widgets/about.py:422 +#: cola/widgets/about.py:405 msgid "Russian translation" msgstr "Orosz fordítás" -#: cola/sequenceeditor.py:324 +#: cola/sequenceeditor.py:321 msgid "SHA-1" msgstr "SHA-1" -#: cola/widgets/prefs.py:183 +#: cola/widgets/prefs.py:205 msgid "Safe Mode" msgstr "Biztonságos mód" -#: cola/cmds.py:2167 cola/widgets/archive.py:126 cola/widgets/browse.py:609 -#: cola/widgets/editremotes.py:54 cola/widgets/stash.py:52 -#: cola/widgets/status.py:1388 +#: cola/cmds.py:2118 cola/widgets/archive.py:124 cola/widgets/browse.py:610 +#: cola/widgets/editremotes.py:53 cola/widgets/stash.py:54 +#: cola/widgets/status.py:1389 msgid "Save" msgstr "Mentés" -#: cola/widgets/archive.py:113 +#: cola/widgets/archive.py:111 msgid "Save Archive" msgstr "Mentés archívumként" -#: cola/widgets/dag.py:382 cola/widgets/main.py:351 +#: cola/widgets/dag.py:381 cola/widgets/main.py:346 msgid "Save As Tarball/Zip..." msgstr "Mentés tar-archívumként/zipként…" -#: cola/widgets/prefs.py:263 +#: cola/widgets/prefs.py:284 msgid "Save GUI Settings" msgstr "Felhasználói felület beállításainak mentése" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Save Stash" msgstr "Félretett változat mentése" -#: cola/widgets/stash.py:53 +#: cola/widgets/stash.py:55 msgid "Save modified state to new stash" msgstr "A módosított állapot mentése új félretett változatként" -#: cola/widgets/browse.py:570 +#: cola/widgets/browse.py:571 #, python-format msgid "Saved \"%(filename)s\" from \"%(ref)s\" to \"%(destination)s\"" msgstr "A(z) „%(ref)s” a(z) „%(filename)s” helyről ide lett mentve: „%(destination)s”" -#: cola/widgets/bookmarks.py:83 cola/widgets/grep.py:98 -#: cola/widgets/search.py:42 cola/widgets/search.py:62 +#: cola/widgets/bookmarks.py:82 cola/widgets/grep.py:96 +#: cola/widgets/search.py:41 cola/widgets/search.py:61 msgid "Search" msgstr "Keresés" -#: cola/widgets/search.py:226 +#: cola/widgets/search.py:225 msgid "Search Authors" msgstr "Szerzők keresése" -#: cola/widgets/search.py:224 +#: cola/widgets/search.py:223 msgid "Search Commit Messages" msgstr "Véglegesítési üzenetek keresése" -#: cola/widgets/search.py:227 +#: cola/widgets/search.py:226 msgid "Search Committers" msgstr "Véglegesítők keresése" -#: cola/widgets/search.py:228 +#: cola/widgets/search.py:227 msgid "Search Date Range" msgstr "Dátumintervallum keresése" -#: cola/widgets/search.py:225 +#: cola/widgets/search.py:224 msgid "Search Diffs" msgstr "Összehasonlítások keresése" -#: cola/widgets/search.py:222 +#: cola/widgets/search.py:221 msgid "Search by Expression" msgstr "Keresés kifejezésre" -#: cola/widgets/search.py:223 +#: cola/widgets/search.py:222 msgid "Search by Path" msgstr "Keresés útvonal alapján" -#: cola/widgets/grep.py:124 +#: cola/widgets/dag.py:494 +msgid "Search commit messages" +msgstr "" + +#: cola/widgets/grep.py:122 msgid "Search for a fixed string" msgstr "Keresés rögzített szövegre" -#: cola/widgets/diff.py:519 cola/widgets/diff.py:1514 +#: cola/widgets/diff.py:526 cola/widgets/diff.py:1576 msgid "Search in Diff" msgstr "" -#: cola/guicmds.py:253 cola/widgets/bookmarks.py:62 +#: cola/guicmds.py:252 cola/widgets/bookmarks.py:61 msgid "Search repositories by name..." msgstr "" -#: cola/widgets/grep.py:122 +#: cola/widgets/grep.py:120 msgid "Search using a POSIX basic regular expression" msgstr "Keresés POSIX alapszintű reguláris kifejezéssel" -#: cola/widgets/grep.py:123 +#: cola/widgets/grep.py:121 msgid "Search using a POSIX extended regular expression" msgstr "Keresés POSIX bővített reguláris kifejezéssel" -#: cola/widgets/main.py:493 +#: cola/widgets/main.py:506 msgid "Search..." msgstr "Keresés…" -#: cola/widgets/selectcommits.py:67 +#: cola/widgets/selectcommits.py:66 msgid "Search:" msgstr "" -#: cola/guicmds.py:330 cola/widgets/selectcommits.py:74 +#: cola/guicmds.py:329 cola/widgets/selectcommits.py:73 msgid "Select" msgstr "Kijelölés" -#: cola/widgets/main.py:750 +#: cola/widgets/main.py:763 msgid "Select All" msgstr "Összes kijelölése" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Select Branch to Review" msgstr "Ág kijelölése áttekintéshez" -#: cola/widgets/dag.py:1610 +#: cola/widgets/dag.py:1667 msgid "Select Child" msgstr "Gyermek kijelölése" -#: cola/widgets/commitmsg.py:512 +#: cola/widgets/commitmsg.py:538 msgid "Select Commit" msgstr "Véglegesítés kijelölése" -#: cola/guicmds.py:137 +#: cola/guicmds.py:136 msgid "Select Directory..." msgstr "Könyvtár kijelölése…" -#: cola/cmds.py:2129 +#: cola/cmds.py:2080 msgid "Select New Upstream" msgstr "Új távoli tároló kijelölése" -#: cola/widgets/dag.py:1614 +#: cola/widgets/dag.py:1671 msgid "Select Newest Child" msgstr "Legújabb gyermek kijelölése" -#: cola/widgets/dag.py:1604 +#: cola/widgets/dag.py:1661 msgid "Select Oldest Parent" msgstr "Legöregebb szülő kijelölése" -#: cola/widgets/dag.py:1599 +#: cola/widgets/dag.py:1656 msgid "Select Parent" msgstr "Szülő kijelölése" -#: cola/widgets/browse.py:525 +#: cola/widgets/browse.py:526 msgid "Select Previous Version" msgstr "Előző verzió kijelölése" -#: cola/widgets/clone.py:197 +#: cola/widgets/clone.py:195 msgid "Select a parent directory for the new clone" msgstr "Válasszon szülő mappát az új klón számára" -#: cola/widgets/standard.py:756 cola/widgets/standard.py:779 +#: cola/widgets/standard.py:826 cola/widgets/standard.py:848 msgid "Select directory" msgstr "" -#: cola/widgets/selectcommits.py:162 +#: cola/widgets/selectcommits.py:161 msgid "Select output dir" msgstr "Kimeneti könyvtár kijelölése" -#: cola/widgets/selectcommits.py:183 +#: cola/widgets/selectcommits.py:182 msgid "Select output directory" msgstr "Kimeneti könyvtár kijelölése" -#: cola/widgets/patch.py:175 +#: cola/widgets/diff.py:1769 msgid "Select patch file(s)..." msgstr "Foltfájl(ok) kijelölése…" -#: cola/widgets/editremotes.py:437 +#: cola/widgets/editremotes.py:435 msgid "Select repository" msgstr "Tároló kijelölése" -#: cola/widgets/bookmarks.py:225 cola/widgets/startup.py:348 +#: cola/widgets/bookmarks.py:224 cola/widgets/startup.py:347 msgid "Set Default Repository" msgstr "Alapértelmezett tároló beállítása" -#: cola/widgets/branch.py:282 +#: cola/widgets/branch.py:291 msgid "Set Upstream Branch" msgstr "Távoli tároló ág beállítása" -#: cola/widgets/branch.py:72 +#: cola/widgets/branch.py:74 msgid "" "Set the sort order for branches and tags.\n" "Toggle between date-based and version-name-based sorting." @@ -3238,52 +3344,56 @@ msgstr "" "Az ágak és címkék rendezési sorrendjének beállítása.\n" "Váltás a dátum alapú és a verziónév alapú rendezési sorrend között." -#: cola/widgets/remote.py:213 +#: cola/widgets/remote.py:217 msgid "Set upstream" msgstr "Beállítás távoli tárolóként" -#: cola/widgets/prefs.py:405 +#: cola/widgets/prefs.py:443 msgid "Settings" msgstr "Beállítások" -#: cola/widgets/grep.py:142 +#: cola/widgets/grep.py:140 msgid "Shell arguments" msgstr "Parancsértelmező argumentumai" -#: cola/sequenceeditor.py:375 +#: cola/sequenceeditor.py:371 msgid "Shift Down" msgstr "Mozgatás lefelé" -#: cola/sequenceeditor.py:379 +#: cola/sequenceeditor.py:375 msgid "Shift Up" msgstr "Mozgatás felfelé" -#: cola/widgets/about.py:499 +#: cola/widgets/about.py:482 msgid "Shortcuts" msgstr "Gyorsbillentyűk" -#: cola/widgets/prefs.py:179 +#: cola/widgets/prefs.py:201 msgid "Show Diffstat After Merge" msgstr "Diffstat megjelenítése a beolvasztás után" -#: cola/widgets/prefs.py:178 +#: cola/widgets/prefs.py:200 msgid "Show Full Paths in the Window Title" msgstr "Teljes útvonal megjelenítése az ablakok címsorában" -#: cola/sequenceeditor.py:106 cola/widgets/finder.py:187 -#: cola/widgets/status.py:1384 +#: cola/sequenceeditor.py:104 cola/widgets/finder.py:186 +#: cola/widgets/status.py:1385 msgid "Show Help" msgstr "Súgó megjelenítse" -#: cola/widgets/filelist.py:30 +#: cola/widgets/filelist.py:27 msgid "Show History" msgstr "Történet megjelenítése" -#: cola/widgets/prefs.py:348 +#: cola/widgets/prefs.py:368 msgid "Show file counts in Status titles" msgstr "Fájlok számának megjelentése az állapotcímekben" -#: cola/sequenceeditor.py:171 cola/widgets/finder.py:138 +#: cola/widgets/diff.py:794 +msgid "Show filenames" +msgstr "" + +#: cola/sequenceeditor.py:169 cola/widgets/finder.py:137 msgid "" "Show help\n" "Shortcut: ?" @@ -3291,137 +3401,145 @@ msgstr "" "Súgó megjelenítése\n" "Gyorsbillentyű: ?" -#: cola/widgets/diff.py:765 +#: cola/widgets/diff.py:792 msgid "Show line numbers" msgstr "Sorok számának megjelenítése" -#: cola/widgets/diff.py:761 +#: cola/widgets/remote.py:175 +msgid "Show remote messages" +msgstr "" + +#: cola/widgets/diff.py:789 msgid "Show whole surrounding functions of changes" msgstr "A módosításokat érintő funkciók teljes környezetének megjelenítése" -#: cola/widgets/recent.py:58 +#: cola/widgets/recent.py:56 msgid "Showing changes since" msgstr "Változások megjelenítése ekkortól:" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "Side by side" msgstr "Egymás mellett" -#: cola/cmds.py:2512 +#: cola/cmds.py:2463 msgid "Sign Off" msgstr "Aláírás" -#: cola/widgets/createtag.py:71 +#: cola/widgets/createtag.py:69 msgid "Sign Tag" msgstr "Címke aláírása" -#: cola/widgets/commitmsg.py:55 +#: cola/widgets/commitmsg.py:56 msgid "Sign off on this commit" msgstr "A véglegesítés aláírása" -#: cola/widgets/about.py:412 cola/widgets/about.py:425 +#: cola/widgets/about.py:395 cola/widgets/about.py:408 msgid "Simplified Chinese translation" msgstr "Egyszerűsített kínai fordítás" -#: cola/cmds.py:2587 +#: cola/cmds.py:2529 msgid "Skip" msgstr "Kihagyás" -#: cola/widgets/main.py:264 cola/widgets/main.py:617 +#: cola/widgets/main.py:260 cola/widgets/main.py:630 msgid "Skip Current Patch" msgstr "Jelenlegi folt kihagyása" -#: cola/widgets/main.py:267 +#: cola/widgets/main.py:261 msgid "Skip applying the current patch and continue applying patches" msgstr "" -#: cola/widgets/prefs.py:261 +#: cola/widgets/prefs.py:282 msgid "Sort bookmarks alphabetically" msgstr "Könyvjelzők rendezése ábécésorrendben" -#: cola/widgets/about.py:413 cola/widgets/about.py:436 -#: cola/widgets/about.py:440 +#: cola/widgets/about.py:396 cola/widgets/about.py:419 +#: cola/widgets/about.py:423 msgid "Spanish translation" msgstr "Spanyol fordítás" -#: cola/widgets/createtag.py:88 +#: cola/widgets/createtag.py:86 msgid "Specifies the SHA-1 to tag" msgstr "Megadja a címke SHA-1 értékét" -#: cola/widgets/createtag.py:81 +#: cola/widgets/createtag.py:79 msgid "Specifies the tag message" msgstr "Megadja a címkeüzenetet" -#: cola/widgets/createtag.py:65 +#: cola/widgets/createtag.py:63 msgid "Specifies the tag name" msgstr "Megadja a címke nevét" -#: cola/widgets/spellcheck.py:46 +#: cola/widgets/spellcheck.py:45 msgid "Spelling Suggestions" msgstr "Helyesírási javaslatok" -#: cola/sequenceeditor.py:369 cola/widgets/merge.py:58 +#: cola/sequenceeditor.py:365 cola/widgets/merge.py:56 msgid "Squash" msgstr "Összevonás" -#: cola/widgets/merge.py:57 +#: cola/widgets/merge.py:55 msgid "Squash the merged commits into a single commit" msgstr "Az beolvasztott véglegesítések összevonása egyetlen véglegesítésbe" -#: cola/cmds.py:2598 cola/widgets/action.py:60 cola/widgets/diff.py:982 +#: cola/cmds.py:2540 cola/widgets/action.py:58 cola/widgets/diff.py:1168 msgid "Stage" msgstr "Kiszemelés" -#: cola/cmds.py:2753 +#: cola/cmds.py:2699 msgid "Stage / Unstage" msgstr "Kiszemelés/elengedés" -#: cola/cmds.py:2735 +#: cola/cmds.py:2681 msgid "Stage / Unstage All" msgstr "Összes kiszemelése/elengedése" -#: cola/widgets/diff.py:1016 +#: cola/widgets/diff.py:1055 msgid "Stage Diff Hunk" msgstr "Összehasonlítási egység kiszemelése" -#: cola/cmds.py:2691 +#: cola/cmds.py:2633 msgid "Stage Modified" msgstr "Módosítottak kiszemelése" -#: cola/cmds.py:2724 +#: cola/cmds.py:2670 msgid "Stage Modified and Untracked" msgstr "Módosítottak és nem követettek kiszemelése" -#: cola/widgets/status.py:872 cola/widgets/status.py:894 -#: cola/widgets/status.py:962 +#: cola/widgets/status.py:873 cola/widgets/status.py:895 +#: cola/widgets/status.py:963 msgid "Stage Selected" msgstr "Kijelöltek kiszemelése" -#: cola/widgets/diff.py:1011 +#: cola/widgets/diff.py:1050 msgid "Stage Selected Lines" msgstr "Kijelölt sorok kiszemelése" -#: cola/cmds.py:2702 +#: cola/cmds.py:2644 msgid "Stage Unmerged" msgstr "Nem beolvasztottak kiszemelése" -#: cola/cmds.py:2713 +#: cola/cmds.py:2655 msgid "Stage Untracked" msgstr "Nem követett változások kiszemelése" -#: cola/widgets/commitmsg.py:438 +#: cola/widgets/commitmsg.py:446 msgid "Stage and Commit" msgstr "Kiszemelés és véglegesítés" -#: cola/widgets/commitmsg.py:435 +#: cola/widgets/commitmsg.py:443 msgid "Stage and commit?" msgstr "Kiszemeli és véglegesíti?" -#: cola/cmds.py:2586 +#: cola/widgets/action.py:58 +msgid "Stage changes using \"git add\"" +msgstr "" + +#: cola/cmds.py:2528 msgid "Stage conflicts" msgstr "Ütközések kiszemelése" -#: cola/cmds.py:2577 +#: cola/cmds.py:2519 msgid "Stage conflicts?" msgstr "Kiszemeli az ütközéseket?" @@ -3429,45 +3547,45 @@ msgstr "Kiszemeli az ütközéseket?" msgid "Stage/unstage selected paths for commit" msgstr "A kijelölt útvonalak kijelölése/elengedése véglegesítésre" -#: cola/models/browse.py:334 cola/widgets/status.py:156 -#: cola/widgets/status.py:620 +#: cola/models/browse.py:333 cola/widgets/status.py:156 +#: cola/widgets/status.py:621 msgid "Staged" msgstr "Kiszemelve" -#: cola/cmds.py:2605 +#: cola/cmds.py:2547 #, python-format msgid "Staging: %s" msgstr "Kiszemelés: %s" -#: cola/widgets/main.py:597 +#: cola/widgets/main.py:610 msgid "Start Interactive Rebase..." msgstr "Interaktív újraalapozás indítása…" -#: cola/widgets/createbranch.py:107 +#: cola/widgets/createbranch.py:105 msgid "Starting Revision" msgstr "A következő revíziótól" -#: cola/widgets/stash.py:40 +#: cola/widgets/stash.py:36 msgid "Stash" msgstr "Félrerakás" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash Index" msgstr "Félrerakási jegyzék" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash staged changes only" msgstr "Csak a kiszemelt módosítások félrerakása" -#: cola/widgets/stash.py:73 +#: cola/widgets/stash.py:75 msgid "Stash unstaged changes only, keeping staged changes" msgstr "Csak az elengedett módosítások félrerakása, a kiszemelt módosítások megtartása" -#: cola/widgets/action.py:66 cola/widgets/main.py:414 +#: cola/widgets/action.py:76 cola/widgets/main.py:422 msgid "Stash..." msgstr "Félrerakás…" -#: cola/models/browse.py:33 cola/widgets/main.py:102 +#: cola/models/browse.py:32 cola/widgets/main.py:100 msgid "Status" msgstr "Állapot" @@ -3475,128 +3593,136 @@ msgstr "Állapot" msgid "Stop tracking paths" msgstr "Útvonalak követésének leállítása" -#: cola/widgets/submodules.py:82 +#: cola/widgets/submodules.py:81 msgid "Submodule URL (can be relative, ex: ../repo.git)" msgstr "Részmodul URL (lehet relatív is, pl.: ../tároló.git)" -#: cola/widgets/submodules.py:90 +#: cola/widgets/submodules.py:89 msgid "Submodule branch to track (optional)" msgstr "Követett részmodul ág (választható)" -#: cola/widgets/submodules.py:86 +#: cola/widgets/submodules.py:85 msgid "Submodule path within the current repository (optional)" msgstr "Részmodul útvonala a jelenlegi tárolóban (választható)" -#: cola/widgets/main.py:143 cola/widgets/submodules.py:32 +#: cola/widgets/main.py:141 cola/widgets/submodules.py:31 msgid "Submodules" msgstr "Almodulok" -#: cola/widgets/prefs.py:174 +#: cola/widgets/prefs.py:196 msgid "Summarize Merge Commits" msgstr "A beolvasztási véglegesítések összegzése" -#: cola/sequenceeditor.py:325 cola/widgets/dag.py:506 +#: cola/sequenceeditor.py:322 cola/widgets/dag.py:572 msgid "Summary" msgstr "Összegzés" -#: cola/widgets/prefs.py:168 +#: cola/widgets/prefs.py:273 msgid "Tab Width" msgstr "Tabulátorszélesség" -#: cola/widgets/cfgactions.py:229 cola/widgets/createbranch.py:116 -#: cola/widgets/merge.py:48 +#: cola/widgets/cfgactions.py:227 cola/widgets/createbranch.py:114 +#: cola/widgets/merge.py:46 msgid "Tag" msgstr "Címke" -#: cola/cmds.py:2842 +#: cola/cmds.py:2788 msgid "Tag Created" msgstr "Címke létrehozva" -#: cola/widgets/createtag.py:80 +#: cola/widgets/createtag.py:78 msgid "Tag message..." msgstr "Címkeüzenet…" -#: cola/cmds.py:2802 +#: cola/cmds.py:2748 msgid "Tag-signing was requested but the tag message is empty." msgstr "Címkealáírás lett kérve, de a címkeüzenet üres." -#: cola/widgets/branch.py:179 cola/widgets/branch.py:238 +#: cola/widgets/branch.py:183 cola/widgets/branch.py:248 msgid "Tags" msgstr "Címkék" -#: cola/widgets/toolbar.py:180 +#: cola/widgets/action.py:78 cola/widgets/main.py:423 +msgid "Temporarily stash away uncommitted changes using \"git stash\"" +msgstr "" + +#: cola/widgets/toolbar.py:184 msgid "Text Beside Icon" msgstr "" -#: cola/widgets/toolbar.py:179 +#: cola/widgets/toolbar.py:183 msgid "Text Only" msgstr "" -#: cola/widgets/toolbar.py:181 +#: cola/widgets/toolbar.py:185 msgid "Text Under Icon" msgstr "" -#: cola/widgets/prefs.py:169 +#: cola/widgets/prefs.py:272 msgid "Text Width" msgstr "Szövegszélesség" -#: cola/cmds.py:1116 +#: cola/cmds.py:1117 msgid "The branch will be no longer available." msgstr "Az ág nem lesz többé elérhető." -#: cola/cmds.py:648 +#: cola/cmds.py:650 #, python-format msgid "The branch will be reset using \"git reset --mixed %s\"" msgstr "Az ág visszaállítása ezzel a paranccsal: „git reset --mixed %s”" -#: cola/cmds.py:699 cola/cmds.py:790 +#: cola/cmds.py:701 cola/cmds.py:792 #, python-format msgid "The branch will be reset using \"git reset --soft %s\"" msgstr "Az ág visszaállítása ezzel a paranccsal: „git reset --soft %s”" -#: cola/widgets/commitmsg.py:303 +#: cola/widgets/commitmsg.py:311 msgid "The commit message will be cleared." msgstr "A véglegesítési üzenet meg lett tisztítva." -#: cola/widgets/prefs.py:146 +#: cola/widgets/prefs.py:169 msgid "" "The date-time format used when displaying dates in Git DAG.\n" "This value is passed to git log --date=" msgstr "" -#: cola/widgets/archive.py:208 +#: cola/widgets/archive.py:206 #, python-format msgid "The file \"%s\" exists and will be overwritten." msgstr "A(z) „%s” fájl létezik és felül lesz írva." -#: cola/cmds.py:1086 +#: cola/cmds.py:1087 msgid "The following files will be deleted:" msgstr "A következő fájlok törölve lesznek:" -#: cola/widgets/status.py:1646 +#: cola/widgets/status.py:1647 msgid "The number of leading paths to strip" msgstr "" -#: cola/cmds.py:716 +#: cola/cmds.py:718 #, python-format msgid "The repository will be reset using \"git reset --hard %s\"" msgstr "A tároló vissza lesz állítva ezzel a paranccsal: „git reset --hard %s”" -#: cola/cmds.py:665 +#: cola/cmds.py:667 #, python-format msgid "The repository will be reset using \"git reset --keep %s\"" msgstr "A tároló vissza lesz állítva ezzel a paranccsal: „git reset --keep %s”" -#: cola/cmds.py:682 +#: cola/cmds.py:684 #, python-format msgid "The repository will be reset using \"git reset --merge %s\"" msgstr "A tároló vissza lesz állítva ezzel a paranccsal: „git reset --merge %s”" -#: cola/cmds.py:2365 +#: cola/cmds.py:2316 msgid "The revision expression cannot be empty." msgstr "A revíziókifejezés nem lehet üres." -#: cola/cmds.py:3029 +#: cola/widgets/stash.py:225 +msgid "The stash has not been renamed" +msgstr "" + +#: cola/cmds.py:2975 #, python-format msgid "" "The submodule will be added using\n" @@ -3605,7 +3731,7 @@ msgstr "" "A részmodul így lesz hozzáadva:\n" "„%s”" -#: cola/cmds.py:3074 +#: cola/cmds.py:3020 #, python-format msgid "" "The submodule will be updated using\n" @@ -3614,16 +3740,16 @@ msgstr "" "Az almodul frissítve lesz ezzel:\n" "„%s”" -#: cola/cmds.py:736 +#: cola/cmds.py:738 #, python-format msgid "The worktree will be restored using \"git read-tree --reset -u %s\"" msgstr "A munkafa helyre lesz állítva ezzel a paranccsal: „git read-tree --reset -u %s”" -#: cola/widgets/commitmsg.py:304 +#: cola/widgets/commitmsg.py:312 msgid "This cannot be undone. Clear commit message?" msgstr "Ez nem vonható vissza. Megtisztítja a véglegesítési üzenetet?" -#: cola/cmds.py:778 cola/widgets/commitmsg.py:458 +#: cola/cmds.py:780 cola/widgets/commitmsg.py:466 msgid "" "This commit has already been published.\n" "This operation will rewrite published history.\n" @@ -3633,7 +3759,7 @@ msgstr "" "Ez a művelet felülírja a közzétett történetet.\n" "Valószínűleg nem ezt akarja tenni." -#: cola/widgets/diff.py:1158 +#: cola/widgets/diff.py:1232 msgid "" "This operation drops uncommitted changes.\n" "These changes cannot be recovered." @@ -3641,7 +3767,7 @@ msgstr "" "Ez a művelet kidobja a nem véglegesített módosításokat.\n" "Ezek a módosítások nem állíthatók vissza." -#: cola/cmds.py:2307 +#: cola/cmds.py:2258 msgid "" "This operation removes uncommitted edits from selected files.\n" "These changes cannot be recovered." @@ -3649,7 +3775,7 @@ msgstr "" "Ez a művelet eltávolítja a nem véglegesített szerkesztések a kijelölt fájlokban.\n" "Ezek a módosítások nem állíthatók vissza." -#: cola/cmds.py:2285 +#: cola/cmds.py:2236 msgid "" "This operation removes unstaged edits from selected files.\n" "These changes cannot be recovered." @@ -3657,27 +3783,27 @@ msgstr "" "Ez a művelet eltávolítja az elengedett szerkesztéseket a kijelölt fájlokon.\n" "Ezek a módosítások nem állíthatók vissza." -#: cola/cmds.py:475 +#: cola/cmds.py:476 msgid "" "This operation will replace the selected unmerged files with content from the branch being merged using \"git checkout --theirs\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:513 +#: cola/cmds.py:514 msgid "" "This operation will replace the selected unmerged files with content from your current branch using \"git checkout --ours\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/widgets/main.py:1109 +#: cola/widgets/main.py:1122 msgid "" "This repository has unresolved conflicts after applying a patch.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1102 +#: cola/widgets/main.py:1115 msgid "" "This repository is currently being rebased.\n" "Resolve conflicts, commit changes, and run:\n" @@ -3687,13 +3813,13 @@ msgstr "" "Oldja fel az ütközéseket, véglegesítse a módosításokat és futtassa:\n" " Újralapozás > Folytatás" -#: cola/widgets/main.py:1115 +#: cola/widgets/main.py:1128 msgid "" "This repository is in the middle of a cherry-pick.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1121 +#: cola/widgets/main.py:1134 msgid "" "This repository is in the middle of a merge.\n" "Resolve conflicts and commit changes." @@ -3713,15 +3839,15 @@ msgstr "" msgid "To avoid applying removal lines ('-'), change them to context lines (' ')." msgstr "" -#: cola/sequenceeditor.py:342 +#: cola/sequenceeditor.py:338 msgid "Toggle Enabled" msgstr "Engedélyezés átváltása" -#: cola/widgets/diff.py:776 +#: cola/widgets/diff.py:804 msgid "Toggle image diff" msgstr "Képösszehasonlítás átváltása" -#: cola/widgets/branch.py:63 +#: cola/widgets/branch.py:65 msgid "Toggle the branches filter" msgstr "Elágazásszűrő átváltása" @@ -3729,51 +3855,51 @@ msgstr "Elágazásszűrő átváltása" msgid "Toggle the paths filter" msgstr "Útvonalszűrő átváltása" -#: cola/widgets/toolbar.py:317 +#: cola/widgets/toolbar.py:322 msgid "Toolbar Style:" msgstr "" -#: cola/widgets/cfgactions.py:228 cola/widgets/merge.py:47 +#: cola/widgets/cfgactions.py:226 cola/widgets/merge.py:45 msgid "Tracking Branch" msgstr "Követett ág" -#: cola/widgets/createbranch.py:115 +#: cola/widgets/createbranch.py:113 msgid "Tracking branch" msgstr "Követett ágak" -#: cola/widgets/about.py:408 cola/widgets/about.py:434 -#: cola/widgets/about.py:445 +#: cola/widgets/about.py:391 cola/widgets/about.py:417 +#: cola/widgets/about.py:428 msgid "Traditional Chinese (Taiwan) translation" msgstr "Tradicionális kínai (Tajvan) fordítás" -#: cola/widgets/about.py:439 +#: cola/widgets/about.py:422 msgid "Translation" msgstr "Fordítás" -#: cola/widgets/about.py:94 +#: cola/widgets/about.py:92 msgid "Translators" msgstr "Fordítók" -#: cola/widgets/about.py:418 cola/widgets/about.py:423 -#: cola/widgets/about.py:438 +#: cola/widgets/about.py:401 cola/widgets/about.py:406 +#: cola/widgets/about.py:421 msgid "Turkish translation" msgstr "Török fordítás" -#: cola/widgets/clone.py:109 cola/widgets/editremotes.py:451 -#: cola/widgets/submodules.py:117 +#: cola/widgets/clone.py:107 cola/widgets/editremotes.py:449 +#: cola/widgets/submodules.py:116 msgid "URL" msgstr "URL" -#: cola/widgets/remote.py:463 +#: cola/widgets/remote.py:497 #, python-format msgid "URL: %s" msgstr "URL: %s" -#: cola/widgets/about.py:415 +#: cola/widgets/about.py:398 msgid "Ukranian translation" msgstr "Ukrán fordítás" -#: cola/cmds.py:2122 +#: cola/cmds.py:2073 msgid "Unable to rebase" msgstr "Nem lehet újraalapozni" @@ -3782,53 +3908,58 @@ msgstr "Nem lehet újraalapozni" msgid "Unable to set URL for \"%(name)s\" to \"%(url)s\"" msgstr "Nem állítható be URL a(z) „%(name)s” számára: „%(url)s”" -#: cola/widgets/diff.py:1327 +#: cola/widgets/diff.py:1401 #, python-format msgid "Unable to write patch to \"%s\". Check permissions?" msgstr "" -#: cola/widgets/main.py:735 +#: cola/widgets/main.py:748 msgid "Undo" msgstr "Visszavonás" -#: cola/cmds.py:783 cola/cmds.py:788 cola/cmds.py:791 cola/widgets/main.py:208 +#: cola/cmds.py:785 cola/cmds.py:790 cola/cmds.py:793 cola/widgets/main.py:207 msgid "Undo Last Commit" msgstr "Utolsó véglegesítés visszavonása" -#: cola/cmds.py:789 +#: cola/cmds.py:791 msgid "Undo last commit?" msgstr "Visszavonja az utolsó véglegesítést?" -#: cola/cmds.py:782 +#: cola/cmds.py:784 msgid "Undo the published commit?" msgstr "Visszavonja a már közzétett véglegesítést?" -#: cola/models/browse.py:328 cola/widgets/status.py:157 -#: cola/widgets/status.py:640 +#: cola/models/browse.py:327 cola/widgets/status.py:157 +#: cola/widgets/status.py:641 msgid "Unmerged" msgstr "Nem beolvasztottak" -#: cola/cmds.py:2855 cola/widgets/action.py:61 cola/widgets/diff.py:985 +#: cola/cmds.py:2801 cola/widgets/action.py:61 cola/widgets/diff.py:1165 +#: cola/widgets/main.py:212 msgid "Unstage" msgstr "Elengedés" -#: cola/widgets/main.py:203 cola/widgets/status.py:790 +#: cola/widgets/main.py:202 cola/widgets/status.py:791 msgid "Unstage All" msgstr "Összes elengedése" -#: cola/widgets/diff.py:1061 +#: cola/widgets/diff.py:1017 msgid "Unstage Diff Hunk" msgstr "Összehasonlítási egység elengedése" -#: cola/widgets/status.py:823 cola/widgets/status.py:858 +#: cola/widgets/status.py:824 cola/widgets/status.py:859 msgid "Unstage Selected" msgstr "Kijelöltek elengedése" -#: cola/widgets/diff.py:1058 +#: cola/widgets/diff.py:1015 msgid "Unstage Selected Lines" msgstr "Kijelölt sorok elengedése" -#: cola/cmds.py:2867 +#: cola/widgets/action.py:61 +msgid "Unstage changes using \"git reset\"" +msgstr "" + +#: cola/cmds.py:2813 #, python-format msgid "Unstaging: %s" msgstr "Elengedés: %s" @@ -3837,85 +3968,84 @@ msgstr "Elengedés: %s" msgid "Untrack Selected" msgstr "Kijelöltek követésének törlése" -#: cola/widgets/status.py:159 cola/widgets/status.py:646 +#: cola/widgets/status.py:159 cola/widgets/status.py:647 msgid "Untracked" msgstr "Nem követett" -#: cola/cmds.py:1141 cola/cmds.py:2923 +#: cola/cmds.py:1142 cola/cmds.py:2869 #, python-format msgid "Untracking: %s" msgstr "Követés törlése: %s" -#: cola/widgets/main.py:374 +#: cola/widgets/main.py:369 msgid "Update All Submodules..." msgstr "Összes almodul frissítése…" -#: cola/widgets/createbranch.py:121 +#: cola/widgets/createbranch.py:119 msgid "Update Existing Branch:" msgstr "Létező ág frissítése:" -#: cola/cmds.py:3075 +#: cola/cmds.py:3021 msgid "Update Submodule" msgstr "Almodul frissítése" -#: cola/cmds.py:3072 +#: cola/cmds.py:3018 msgid "Update Submodule..." msgstr "Almodul frissítése…" -#: cola/cmds.py:3111 +#: cola/cmds.py:3057 msgid "Update Submodules" msgstr "Almodulok frissítése" -#: cola/cmds.py:3109 +#: cola/cmds.py:3055 msgid "Update all submodules?" msgstr "Frissíti az összes almodult?" -#: cola/cmds.py:2093 +#: cola/cmds.py:2044 msgid "Update stacked branches" msgstr "" -#: cola/cmds.py:2085 cola/cmds.py:2092 +#: cola/cmds.py:2036 cola/cmds.py:2043 msgid "Update stacked branches when rebasing?" msgstr "" -#: cola/cmds.py:3108 +#: cola/cmds.py:3054 msgid "Update submodules..." msgstr "Almodulok frissítése…" -#: cola/widgets/status.py:953 +#: cola/widgets/status.py:954 msgid "Update this submodule" msgstr "Ezen almodul frissítése" -#: cola/cmds.py:3073 +#: cola/cmds.py:3019 msgid "Update this submodule?" msgstr "Frissíti ezt az almodult?" -#: cola/widgets/branch.py:421 cola/widgets/createbranch.py:302 -#: cola/widgets/remote.py:135 +#: cola/widgets/branch.py:433 cola/widgets/createbranch.py:300 msgid "Updating" msgstr "Frissítés" -#: cola/widgets/prefs.py:350 +#: cola/widgets/prefs.py:370 msgid "Use a block cursor in diff editors" msgstr "" -#: cola/widgets/prefs.py:154 +#: cola/widgets/prefs.py:177 msgid "Use gravatar.com to lookup icons for author emails" msgstr "" -#: cola/widgets/prefs.py:166 +#: cola/widgets/prefs.py:189 msgid "User Name" msgstr "Felhasználónév" -#: cola/widgets/about.py:92 +#: cola/widgets/about.py:90 msgid "Version" msgstr "Verzió" -#: cola/widgets/dag.py:800 cola/widgets/main.py:845 cola/widgets/main.py:966 +#: cola/widgets/dag.py:866 cola/widgets/main.py:858 cola/widgets/main.py:979 msgid "View" msgstr "Nézet" -#: cola/widgets/browse.py:137 cola/widgets/status.py:278 +#: cola/widgets/browse.py:137 cola/widgets/status.py:279 msgid "View History..." msgstr "Történet megjelenítése…" @@ -3923,39 +4053,39 @@ msgstr "Történet megjelenítése…" msgid "View history for selected paths" msgstr "A kijelölt útvonal történetének megjelenítése" -#: cola/widgets/merge.py:54 +#: cola/widgets/branch.py:224 cola/widgets/merge.py:52 msgid "Visualize" msgstr "Vizualizálás" -#: cola/widgets/main.py:488 +#: cola/widgets/main.py:501 msgid "Visualize All Branches..." msgstr "Összes ág vizualizálása…" -#: cola/widgets/main.py:482 +#: cola/widgets/main.py:495 msgid "Visualize Current Branch..." msgstr "Jelenlegi ág vizualizálása…" -#: cola/widgets/createtag.py:73 +#: cola/widgets/createtag.py:71 msgid "Whether to sign the tag (git tag -s)" msgstr "Aláírásra kerüljön-e a címke (git tag -s)" -#: cola/widgets/text.py:399 +#: cola/widgets/text.py:396 msgid "Whole Words" msgstr "" -#: cola/widgets/commitmsg.py:432 +#: cola/widgets/commitmsg.py:440 msgid "Would you like to stage and commit all modified files?" msgstr "Valóban kiszemeli és véglegesíti az összes módosított fájlt?" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "XOR" msgstr "Logikai kizáró vagy" -#: cola/widgets/standard.py:1064 +#: cola/widgets/standard.py:1182 msgid "Yes" msgstr "Igen" -#: cola/cmds.py:256 +#: cola/cmds.py:255 msgid "" "You are in the middle of a merge.\n" "Cannot amend while merging." @@ -3963,36 +4093,36 @@ msgstr "" "Egy beolvasztás közepén van.\n" "Nem lehet javítani beolvasztás közben." -#: cola/cmds.py:2123 +#: cola/cmds.py:2074 msgid "You cannot rebase with uncommitted changes." msgstr "Nem lehet újraalapozni nem véglegesített módosításokkal." -#: cola/widgets/merge.py:227 +#: cola/widgets/merge.py:225 msgid "You must specify a revision to merge." msgstr "Meg kell adni egy revíziót a beolvasztáshoz." -#: cola/widgets/merge.py:217 +#: cola/widgets/merge.py:215 msgid "You must specify a revision to view." msgstr "Meg kell adni egy revíziót a megjelenítéshez." -#: cola/widgets/dag.py:710 cola/widgets/dag.py:1588 +#: cola/widgets/dag.py:776 cola/widgets/dag.py:1645 msgid "Zoom In" msgstr "Nagyítás" -#: cola/widgets/dag.py:706 cola/widgets/dag.py:1594 +#: cola/widgets/dag.py:772 cola/widgets/dag.py:1651 msgid "Zoom Out" msgstr "Kicsinyítés" -#: cola/widgets/dag.py:524 cola/widgets/dag.py:714 cola/widgets/dag.py:1596 -#: cola/widgets/diff.py:785 +#: cola/widgets/dag.py:590 cola/widgets/dag.py:780 cola/widgets/dag.py:1653 +#: cola/widgets/diff.py:813 msgid "Zoom to Fit" msgstr "Nagyítás, hogy elférjen" -#: cola/widgets/grep.py:112 +#: cola/widgets/grep.py:110 msgid "command-line arguments" msgstr "parancssori argumentumok" -#: cola/widgets/main.py:932 cola/widgets/main.py:938 +#: cola/widgets/main.py:945 cola/widgets/main.py:951 msgid "error: unable to execute git" msgstr "hiba: a git nem hajtható végre" @@ -4001,45 +4131,41 @@ msgstr "hiba: a git nem hajtható végre" msgid "exit code %s" msgstr "%s kilépési kód" -#: cola/app.py:301 +#: cola/app.py:304 #, python-format msgid "fatal: \"%s\" is not a directory. Please specify a correct --repo ." msgstr "végzetes: „%s” nem könyvtár. Adjon meg egy helyes útvonalat: --repo ." -#: cola/widgets/main.py:928 +#: cola/widgets/main.py:941 #, python-format msgid "git cola version %s" msgstr "git cola %s verzió" -#: cola/widgets/startup.py:35 +#: cola/widgets/startup.py:34 msgid "git-cola" msgstr "git-cola" -#: cola/difftool.py:63 +#: cola/difftool.py:82 msgid "git-cola diff" msgstr "git-cola diff" -#: cola/widgets/submodules.py:81 +#: cola/widgets/submodules.py:80 msgid "git://git.example.com/repo.git" msgstr "git://git.példa.com/tároló.git" -#: cola/widgets/grep.py:132 +#: cola/widgets/grep.py:130 msgid "grep result..." msgstr "grep eredmény…" -#: cola/widgets/about.py:486 +#: cola/widgets/about.py:469 msgid "hotkeys.html" msgstr "hotkeys.html" -#: cola/widgets/submodules.py:85 +#: cola/widgets/submodules.py:84 msgid "path/to/submodule" msgstr "útvonal/a/részmodulhoz" -#: cola/cmds.py:2537 -msgid "unknown" -msgstr "ismeretlen" - -#: cola/widgets/createtag.py:63 +#: cola/widgets/createtag.py:61 msgid "vX.Y.Z" msgstr "vX.Y.Z" @@ -4048,14 +4174,18 @@ msgid "x 1" msgstr "×1" #: cola/hidpi.py:44 +msgid "x 1.25" +msgstr "" + +#: cola/hidpi.py:45 msgid "x 1.5" msgstr "×1,5" -#: cola/hidpi.py:45 +#: cola/hidpi.py:46 msgid "x 2" msgstr "×2" -#: cola/widgets/search.py:53 cola/widgets/search.py:58 +#: cola/widgets/search.py:52 cola/widgets/search.py:57 msgid "yyyy-MM-dd" msgstr "yyyy-MM-dd" @@ -4130,9 +4260,16 @@ msgstr "yyyy-MM-dd" #~ "ctrl+q = mégse és az újraalapozás megszakítása\n" #~ "ctrl+d = összehasonlító eszköz indítása\n" +#, python-format +#~ msgid "A stash named \"%s\" already exists" +#~ msgstr "Már létezik egy ilyen nevű félretett változat: „%s”" + #~ msgid "Delete selected branch?" #~ msgstr "Törli a kijelölt ágat?" +#~ msgid "Error: Stash exists" +#~ msgstr "Hiba: A félretett változat már létezik" + #~ msgid "Hide Details.." #~ msgstr "Részletek elrejtése…" @@ -4186,3 +4323,6 @@ msgstr "yyyy-MM-dd" #~ msgid "title" #~ msgstr "cím" + +#~ msgid "unknown" +#~ msgstr "ismeretlen" diff --git a/cola/i18n/id_ID.po b/cola/i18n/id_ID.po index 8a8c2f82..9923c13d 100644 --- a/cola/i18n/id_ID.po +++ b/cola/i18n/id_ID.po @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=ASCII\n" "Content-Transfer-Encoding: 8bit\n" -#: cola/widgets/patch.py:86 +#: cola/widgets/diff.py:1680 msgid "" "\n" "

\n" @@ -32,7 +32,7 @@ msgstr "" "

\n" " " -#: cola/widgets/about.py:455 +#: cola/widgets/about.py:438 #, python-format msgid "" "\n" @@ -61,7 +61,7 @@ msgid "" " " msgstr "" -#: cola/widgets/about.py:180 +#: cola/widgets/about.py:182 #, python-format msgid "" "\n" @@ -78,7 +78,7 @@ msgid "" " " msgstr "" -#: cola/widgets/about.py:387 +#: cola/widgets/about.py:370 #, python-format msgid "" "\n" @@ -88,7 +88,7 @@ msgid "" " " msgstr "" -#: cola/widgets/status.py:1310 +#: cola/widgets/status.py:1311 #, python-format msgid "" "\n" @@ -103,7 +103,7 @@ msgid "" " %(ext)s = file extension\n" msgstr "" -#: cola/sequenceeditor.py:700 +#: cola/sequenceeditor.py:695 msgid "" "\n" "Commands\n" @@ -142,7 +142,7 @@ msgid "" "ctrl+d = launch difftool\n" msgstr "" -#: cola/widgets/finder.py:65 +#: cola/widgets/finder.py:64 msgid "" "\n" "Keyboard Shortcuts\n" @@ -158,45 +158,71 @@ msgid "" "and the results.\n" msgstr "" -#: cola/widgets/dag.py:894 +#: cola/widgets/prefs.py:133 +msgid "" +"\n" +"This option determines how the supplied commit message should be\n" +"cleaned up before committing.\n" +"\n" +"The can be strip, whitespace, verbatim, scissors or default.\n" +"\n" +"strip\n" +" Strip leading and trailing empty lines, trailing whitespace,\n" +" commentary and collapse consecutive empty lines.\n" +"\n" +"whitespace\n" +" Same as strip except #commentary is not removed.\n" +"\n" +"verbatim\n" +" Do not change the message at all.\n" +"\n" +"scissors\n" +" Same as whitespace except that everything from (and including) the line\n" +" found below is truncated, if the message is to be edited.\n" +" \"#\" can be customized with core.commentChar.\n" +"\n" +" # ------------------------ >8 ------------------------" +msgstr "" + +#: cola/widgets/dag.py:960 msgid " - DAG" msgstr " - DAG" -#: cola/widgets/recent.py:54 +#: cola/widgets/recent.py:52 msgid " commits ago" msgstr " commit yang lalu" -#: cola/cmds.py:1197 +#: cola/cmds.py:1198 #, python-format msgid "\"%(branch)s\" has been deleted from \"%(remote)s\"." msgstr "\"%(branch)s\" telah dihapus dari \"%(remote)s\"." -#: cola/widgets/createbranch.py:316 +#: cola/widgets/createbranch.py:314 #, python-format msgid "\"%(command)s\" returned exit status \"%(status)d\"" msgstr "\"%(command)s\" menghasilkan exit status \"%(status)d\"" -#: cola/interaction.py:39 +#: cola/interaction.py:38 #, python-format msgid "\"%(command)s\" returned exit status %(status)d" msgstr "\"%(command)s\" keluar dengan status %(status)d" -#: cola/guicmds.py:157 +#: cola/guicmds.py:156 #, fuzzy, python-format msgid "\"%s\" already exists" msgstr "Cabang \"%s\" sudah ada." -#: cola/widgets/clone.py:206 +#: cola/widgets/clone.py:204 #, python-format msgid "\"%s\" already exists, cola will create a new directory" msgstr "\"%s\" sudah ada, cola akan membuat direktori baru" -#: cola/cmds.py:2349 +#: cola/cmds.py:2300 #, python-format msgid "\"%s\" requires a selected file." msgstr "\"%s\" berkas terpilih diperlukan." -#: cola/cmds.py:2087 +#: cola/cmds.py:2038 msgid "" "\"git rebase --update-refs\" automatically force-updates any\n" "branches that point to commits that are being rebased.\n" @@ -206,7 +232,11 @@ msgid "" "Using this feature is helpful for \"stacked\" branch workflows." msgstr "" -#: cola/sequenceeditor.py:321 +#: cola/models/stash.py:145 +msgid "\"git stash drop\" did not return a ref to rename." +msgstr "" + +#: cola/sequenceeditor.py:318 msgid "#" msgstr "" @@ -215,37 +245,37 @@ msgstr "" msgid "%(project)s: %(branch)s - Browse" msgstr "%(project)s: %(branch)s - Jelajah" -#: cola/widgets/dag.py:887 +#: cola/widgets/dag.py:953 #, python-format msgid "%(project)s: %(ref)s - DAG" msgstr "" -#: cola/models/browse.py:315 +#: cola/models/browse.py:314 #, python-format msgid "%d days ago" msgstr "%d hari lalu" -#: cola/models/browse.py:314 +#: cola/models/browse.py:313 #, python-format msgid "%d hours ago" msgstr "%d jam lalu" -#: cola/models/browse.py:307 cola/models/browse.py:311 +#: cola/models/browse.py:306 cola/models/browse.py:310 #, python-format msgid "%d minutes ago" msgstr "%d menit lalu" -#: cola/cmds.py:376 +#: cola/cmds.py:377 #, python-format msgid "%d patch(es) applied." msgstr "%d patch diterapkan." -#: cola/widgets/createbranch.py:281 +#: cola/widgets/createbranch.py:279 #, python-format msgid "%d skipped" msgstr "%d dilewati" -#: cola/cmds.py:2580 +#: cola/cmds.py:2522 #, python-format msgid "" "%s appears to contain merge conflicts.\n" @@ -254,36 +284,36 @@ msgid "" "Stage it anyways?" msgstr "" -#: cola/widgets/startup.py:263 +#: cola/widgets/startup.py:262 #, python-format msgid "%s could not be opened. Remove from bookmarks?" msgstr "" -#: cola/app.py:498 cola/widgets/bookmarks.py:482 +#: cola/app.py:501 cola/widgets/bookmarks.py:481 #, fuzzy, python-format msgid "%s is not a Git repository." msgstr "Masukkan Repositori Git" -#: cola/cmds.py:1015 +#: cola/cmds.py:1016 #, python-format msgid "%s will be removed from your bookmarks." msgstr "" -#: cola/cmds.py:1028 +#: cola/cmds.py:1029 #, python-format msgid "%s will be removed from your recent repositories." msgstr "" -#: cola/cmds.py:1711 +#: cola/cmds.py:1663 #, python-format msgid "%s: No such file or directory." msgstr "%s: Berkas atau direktori tidak ada." -#: cola/widgets/main.py:734 +#: cola/widgets/main.py:747 msgid "&Edit" msgstr "Sunting" -#: cola/widgets/main.py:676 +#: cola/widgets/main.py:689 msgid "&File" msgstr "Berkas" @@ -291,43 +321,43 @@ msgstr "Berkas" msgid "(Amending)" msgstr "(Mengubah)" -#: cola/widgets/compare.py:36 +#: cola/widgets/compare.py:35 msgid "*** Branch Point ***" msgstr "*** Poin Cabang ***" -#: cola/widgets/compare.py:37 +#: cola/widgets/compare.py:36 msgid "*** Sandbox ***" msgstr "*** Bak Pasir ***" -#: cola/widgets/diff.py:788 +#: cola/widgets/diff.py:816 msgid "100%" msgstr "" -#: cola/widgets/diff.py:789 +#: cola/widgets/diff.py:817 msgid "200%" msgstr "" -#: cola/widgets/diff.py:786 +#: cola/widgets/diff.py:814 msgid "25%" msgstr "" -#: cola/widgets/diff.py:790 +#: cola/widgets/diff.py:818 msgid "400%" msgstr "" -#: cola/widgets/diff.py:787 +#: cola/widgets/diff.py:815 msgid "50%" msgstr "" -#: cola/widgets/diff.py:791 +#: cola/widgets/diff.py:819 msgid "800%" msgstr "" -#: cola/widgets/finder.py:119 +#: cola/widgets/finder.py:118 msgid " ..." msgstr "" -#: cola/cmds.py:1734 +#: cola/cmds.py:1686 msgid "" "A commit template has not been configured.\n" "Use \"git config\" to define \"commit.template\"\n" @@ -337,81 +367,76 @@ msgstr "" "Gunakan \"git config\" untuk menentukan \"commit.template\"\n" "agar mengarah ke templat commit." -#: cola/cmds.py:1784 +#: cola/cmds.py:1735 #, python-format msgid "A hook must be provided at \"%s\"" msgstr "" -#: cola/widgets/stash.py:236 -#, python-format -msgid "A stash named \"%s\" already exists" -msgstr "Stash dengan nama \"%s\" sudah ada" - -#: cola/widgets/cfgactions.py:82 cola/widgets/main.py:622 +#: cola/widgets/cfgactions.py:81 cola/widgets/main.py:635 msgid "Abort" msgstr "Batal" -#: cola/widgets/cfgactions.py:149 cola/widgets/cfgactions.py:155 +#: cola/widgets/cfgactions.py:148 cola/widgets/cfgactions.py:154 msgid "Abort Action" msgstr "Batalkan Aksi" -#: cola/cmds.py:132 +#: cola/cmds.py:131 msgid "Abort Applying Patch" msgstr "" -#: cola/cmds.py:126 +#: cola/cmds.py:125 msgid "Abort Applying Patch..." msgstr "" -#: cola/widgets/main.py:245 +#: cola/widgets/main.py:244 msgid "Abort Applying Patches..." msgstr "" -#: cola/cmds.py:162 +#: cola/cmds.py:161 msgid "Abort Cherry-Pick" msgstr "" -#: cola/cmds.py:156 cola/widgets/main.py:334 +#: cola/cmds.py:155 cola/widgets/main.py:329 msgid "Abort Cherry-Pick..." msgstr "" -#: cola/cmds.py:193 +#: cola/cmds.py:192 msgid "Abort Merge" msgstr "Batalkan Merge" -#: cola/cmds.py:186 cola/widgets/main.py:368 +#: cola/cmds.py:185 cola/widgets/main.py:363 msgid "Abort Merge..." msgstr "Batalkan Penggabungan..." -#: cola/widgets/cfgactions.py:154 +#: cola/widgets/cfgactions.py:153 msgid "Abort the action?" msgstr "Batalkan aksi?" -#: cola/widgets/main.py:250 +#: cola/widgets/main.py:245 msgid "Abort the current \"git am\" patch session" msgstr "" -#: cola/cmds.py:159 +#: cola/cmds.py:158 msgid "" "Aborting a cherry-pick can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:129 +#: cola/cmds.py:128 msgid "" "Aborting a patch can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:127 +#: cola/cmds.py:126 msgid "Aborting applying the current patch?" msgstr "" -#: cola/cmds.py:157 +#: cola/cmds.py:156 msgid "Aborting the current cherry-pick?" msgstr "" -#: cola/cmds.py:189 +#: cola/cmds.py:188 msgid "" "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." @@ -419,23 +444,23 @@ msgstr "" "Membatalkan merge saat ini akan menghilangkan *SEMUA* perubahan commit.\n" "Mengembalikan perubahan yang belum dicommit tidak dimungkinkan." -#: cola/cmds.py:187 +#: cola/cmds.py:186 msgid "Aborting the current merge?" msgstr "Batalkan merge saat ini?" -#: cola/widgets/about.py:91 cola/widgets/main.py:517 +#: cola/widgets/about.py:89 cola/widgets/main.py:530 msgid "About" msgstr "Tentang" -#: cola/widgets/about.py:67 +#: cola/widgets/about.py:65 msgid "About git-cola" msgstr "Tentang git-cola" -#: cola/widgets/bookmarks.py:217 cola/widgets/startup.py:340 +#: cola/widgets/bookmarks.py:216 cola/widgets/startup.py:339 msgid "Accept" msgstr "" -#: cola/sequenceeditor.py:159 +#: cola/sequenceeditor.py:157 #, fuzzy msgid "" "Accept changes and rebase\n" @@ -444,52 +469,52 @@ msgstr "" "Commit perubahan stage\n" "Pintasan: Ctrl+Enter" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 #, fuzzy msgid "Action Name" msgstr "Aksi" -#: cola/sequenceeditor.py:528 cola/widgets/bookmarks.py:321 -#: cola/widgets/branch.py:217 cola/widgets/browse.py:374 -#: cola/widgets/commitmsg.py:99 cola/widgets/dag.py:315 -#: cola/widgets/filelist.py:110 cola/widgets/main.py:95 -#: cola/widgets/main.py:757 cola/widgets/startup.py:436 +#: cola/sequenceeditor.py:524 cola/widgets/bookmarks.py:320 +#: cola/widgets/branch.py:221 cola/widgets/browse.py:375 +#: cola/widgets/commitmsg.py:105 cola/widgets/dag.py:314 +#: cola/widgets/filelist.py:107 cola/widgets/main.py:93 +#: cola/widgets/main.py:770 cola/widgets/startup.py:435 msgid "Actions" msgstr "Aksi" -#: cola/widgets/commitmsg.py:101 +#: cola/widgets/commitmsg.py:107 msgid "Actions..." msgstr "Aksi..." -#: cola/widgets/bookmarks.py:71 cola/widgets/gitignore.py:64 -#: cola/widgets/patch.py:103 cola/widgets/patch.py:117 -#: cola/widgets/status.py:1381 +#: cola/widgets/bookmarks.py:70 cola/widgets/diff.py:1697 +#: cola/widgets/diff.py:1711 cola/widgets/gitignore.py:63 +#: cola/widgets/status.py:1382 msgid "Add" msgstr "Tambah" -#: cola/widgets/bookmarks.py:470 +#: cola/widgets/bookmarks.py:469 #, fuzzy msgid "Add Favorite" msgstr "Tambahkan Hulu" -#: cola/widgets/editremotes.py:374 +#: cola/widgets/editremotes.py:373 msgid "Add Remote" msgstr "Tambahkan Hulu" -#: cola/widgets/toolbar.py:315 +#: cola/widgets/toolbar.py:320 msgid "Add Separator" msgstr "" -#: cola/cmds.py:3030 cola/widgets/submodules.py:42 -#: cola/widgets/submodules.py:111 +#: cola/cmds.py:2976 cola/widgets/submodules.py:41 +#: cola/widgets/submodules.py:110 msgid "Add Submodule" msgstr "" -#: cola/cmds.py:3027 cola/widgets/main.py:381 +#: cola/cmds.py:2973 cola/widgets/main.py:376 msgid "Add Submodule..." msgstr "" -#: cola/widgets/editremotes.py:62 +#: cola/widgets/editremotes.py:61 msgid "" "Add and remove remote repositories using the \n" "Add(+) and Delete(-) buttons on the left-hand side.\n" @@ -502,99 +527,99 @@ msgstr "" "Hulu dapat diganti nama dengan memilih salah satu dari \n" "daftar dan tekan \"enter\", atau dobel-klik." -#: cola/widgets/editremotes.py:81 +#: cola/widgets/editremotes.py:80 msgid "Add new remote git repository" msgstr "Tambahkan repositori git hulu" -#: cola/widgets/patch.py:103 +#: cola/widgets/diff.py:1697 msgid "Add patches (+)" msgstr "Tambahkan patch (+)" -#: cola/widgets/editremotes.py:433 +#: cola/widgets/editremotes.py:431 msgid "Add remote" msgstr "Tambahkan hulu" -#: cola/cmds.py:3028 +#: cola/cmds.py:2974 msgid "Add this submodule?" msgstr "" -#: cola/widgets/gitignore.py:54 +#: cola/widgets/gitignore.py:53 msgid "Add to .gitignore" msgstr "Tambahkan ke .gitignore" -#: cola/widgets/status.py:286 +#: cola/widgets/status.py:287 #, fuzzy msgid "Add to Git Annex" msgstr "Tambahkan ke .gitignore" -#: cola/widgets/status.py:290 +#: cola/widgets/status.py:291 msgid "Add to Git LFS" msgstr "" -#: cola/widgets/gitignore.py:28 +#: cola/widgets/gitignore.py:27 msgid "Add to exclusions" msgstr "" -#: cola/widgets/gitignore.py:55 +#: cola/widgets/gitignore.py:54 msgid "Add to local .git/info/exclude" msgstr "" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Additions" msgstr "Penambahan" -#: cola/widgets/archive.py:134 +#: cola/widgets/archive.py:132 msgid "Advanced" msgstr "Mahir" -#: cola/widgets/main.py:522 +#: cola/widgets/main.py:535 msgid "Against Commit... (Diff Mode)" msgstr "" -#: cola/models/browse.py:33 +#: cola/models/browse.py:32 msgid "Age" msgstr "Usia" -#: cola/widgets/prefs.py:403 +#: cola/widgets/prefs.py:441 msgid "All Repositories" msgstr "Semua Repositori" -#: cola/cmds.py:3110 +#: cola/cmds.py:3056 #, python-format msgid "" "All submodules will be updated using\n" "\"%s\"" msgstr "" -#: cola/widgets/remote.py:195 +#: cola/widgets/remote.py:199 msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care" msgstr "" -#: cola/widgets/merge.py:61 +#: cola/widgets/merge.py:59 msgid "Always create a merge commit when enabled, even when the merge is a fast-forward update" msgstr "" -#: cola/cmds.py:221 +#: cola/cmds.py:220 msgid "Amend" msgstr "Ubah" -#: cola/widgets/commitmsg.py:463 +#: cola/widgets/commitmsg.py:471 msgid "Amend Commit" msgstr "Ubah Commit" -#: cola/widgets/commitmsg.py:110 cola/widgets/main.py:194 +#: cola/widgets/commitmsg.py:116 cola/widgets/main.py:193 msgid "Amend Last Commit" msgstr "Ubah Commit Terakhir" -#: cola/widgets/commitmsg.py:462 +#: cola/widgets/commitmsg.py:470 msgid "Amend the published commit?" msgstr "Ubah penerbitan commit?" -#: cola/widgets/main.py:1157 +#: cola/widgets/main.py:1170 msgid "Amending" msgstr "Mengubah" -#: cola/widgets/cfgactions.py:151 +#: cola/widgets/cfgactions.py:150 msgid "" "An action is still running.\n" "Terminating it could result in data loss." @@ -602,7 +627,7 @@ msgstr "" "Aksi ini masih berjalan.\n" "Mengakhiri ini dapat menghilangkan data." -#: cola/cmds.py:2804 +#: cola/cmds.py:2750 msgid "" "An unsigned, lightweight tag will be created instead.\n" "Create an unsigned tag?" @@ -610,57 +635,57 @@ msgstr "" "Tak bertanda, tag ringan akan dibuat.\n" "Buat tag tak bertanda?" -#: cola/widgets/prefs.py:406 +#: cola/widgets/prefs.py:444 msgid "Appearance" msgstr "" -#: cola/widgets/diff.py:1230 +#: cola/widgets/diff.py:1304 msgid "Append Patch" msgstr "" -#: cola/widgets/diff.py:1299 +#: cola/widgets/diff.py:1373 msgid "Append Patch..." msgstr "" -#: cola/widgets/patch.py:112 cola/widgets/stash.py:48 cola/widgets/stash.py:107 -#: cola/widgets/toolbar.py:323 +#: cola/widgets/diff.py:1706 cola/widgets/stash.py:50 cola/widgets/stash.py:110 +#: cola/widgets/toolbar.py:328 msgid "Apply" msgstr "Terapkan" -#: cola/widgets/patch.py:75 +#: cola/widgets/diff.py:1669 msgid "Apply Patches" msgstr "Terapkan Patch" -#: cola/widgets/main.py:239 +#: cola/widgets/main.py:238 msgid "Apply Patches..." msgstr "Terapkan Patch..." -#: cola/widgets/stash.py:64 +#: cola/widgets/stash.py:66 #, fuzzy msgid "Apply and drop the selected stash (git stash pop)" msgstr "Terapkan stash terpilih" -#: cola/widgets/stash.py:48 +#: cola/widgets/stash.py:50 msgid "Apply the selected stash" msgstr "Terapkan stash terpilih" -#: cola/widgets/main.py:1167 +#: cola/widgets/main.py:1180 msgid "Applying Patch" msgstr "" -#: cola/widgets/cfgactions.py:207 +#: cola/widgets/cfgactions.py:205 msgid "Arguments" msgstr "Argumen" -#: cola/qtutils.py:850 +#: cola/qtutils.py:887 msgid "Attach" msgstr "Lampirkan" -#: cola/models/browse.py:33 cola/models/browse.py:72 cola/widgets/dag.py:506 +#: cola/models/browse.py:32 cola/models/browse.py:71 cola/widgets/dag.py:572 msgid "Author" msgstr "Penulis" -#: cola/widgets/about.py:93 +#: cola/widgets/about.py:91 #, fuzzy msgid "Authors" msgstr "Penulis" @@ -669,46 +694,46 @@ msgstr "Penulis" msgid "Auto" msgstr "" -#: cola/widgets/commitmsg.py:137 cola/widgets/prefs.py:259 +#: cola/widgets/commitmsg.py:143 cola/widgets/prefs.py:280 msgid "Auto-Wrap Lines" msgstr "Auto-Wrap Baris" -#: cola/widgets/prefs.py:184 +#: cola/widgets/prefs.py:206 msgid "Autocomplete Paths" msgstr "" -#: cola/widgets/prefs.py:176 +#: cola/widgets/prefs.py:198 msgid "Automatically Load Commit Message Template" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Basic Regexp" msgstr "Regexp Dasar" -#: cola/widgets/prefs.py:255 +#: cola/widgets/prefs.py:276 #, fuzzy msgid "Blame Viewer" msgstr "Penampil Diff Cabang" -#: cola/widgets/browse.py:205 +#: cola/widgets/browse.py:206 #, fuzzy msgid "Blame selected paths" msgstr "Sunting lokasi terpilih" -#: cola/cmds.py:545 cola/widgets/status.py:282 +#: cola/cmds.py:546 cola/widgets/status.py:283 #, fuzzy msgid "Blame..." msgstr "Tutup..." -#: cola/widgets/prefs.py:347 +#: cola/widgets/prefs.py:367 msgid "Bold on dark headers instead of italic" msgstr "" -#: cola/widgets/main.py:806 cola/widgets/submodules.py:119 +#: cola/widgets/main.py:819 cola/widgets/submodules.py:118 msgid "Branch" msgstr "Cabang" -#: cola/widgets/remote.py:600 +#: cola/widgets/remote.py:635 #, python-format msgid "" "Branch \"%(branch)s\" does not exist in \"%(remote)s\".\n" @@ -717,85 +742,85 @@ msgstr "" "Cabang \"%(branch)s\" tidak ada di \"%(remote)s\".\n" "Cabang hulu baru akan di publikasikan." -#: cola/widgets/createbranch.py:258 +#: cola/widgets/createbranch.py:256 #, python-format msgid "Branch \"%s\" already exists." msgstr "Cabang \"%s\" sudah ada." -#: cola/widgets/compare.py:44 +#: cola/widgets/compare.py:43 msgid "Branch Diff Viewer" msgstr "Penampil Diff Cabang" -#: cola/widgets/createbranch.py:259 cola/widgets/createbranch.py:271 +#: cola/widgets/createbranch.py:257 cola/widgets/createbranch.py:269 msgid "Branch Exists" msgstr "Cabang Sudah Ada" -#: cola/widgets/createbranch.py:98 +#: cola/widgets/createbranch.py:96 msgid "Branch Name" msgstr "Nama Cabang" -#: cola/widgets/submodules.py:89 +#: cola/widgets/submodules.py:88 msgid "Branch name" msgstr "" -#: cola/widgets/browse.py:89 cola/widgets/main.py:1097 +#: cola/widgets/browse.py:89 cola/widgets/main.py:1110 #, python-format msgid "Branch: %s" msgstr "Cabang: %s" -#: cola/widgets/branch.py:85 cola/widgets/main.py:131 +#: cola/widgets/branch.py:87 cola/widgets/main.py:129 #, fuzzy msgid "Branches" msgstr "Cabang" -#: cola/widgets/main.py:538 +#: cola/widgets/main.py:551 msgid "Branches..." msgstr "Cabang..." -#: cola/widgets/about.py:414 cola/widgets/about.py:417 -#: cola/widgets/about.py:437 +#: cola/widgets/about.py:397 cola/widgets/about.py:400 +#: cola/widgets/about.py:420 msgid "Brazilian translation" msgstr "" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse" msgstr "Ramban" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse Commits..." msgstr "Ramban Commit..." -#: cola/widgets/main.py:499 +#: cola/widgets/main.py:512 msgid "Browse Current Branch..." msgstr "Jelajah Cabang Saat ini..." -#: cola/widgets/main.py:505 +#: cola/widgets/main.py:518 msgid "Browse Other Branch..." msgstr "Jelajah Cabang Lain..." -#: cola/widgets/editremotes.py:437 cola/widgets/search.py:46 -#: cola/widgets/startup.py:65 cola/widgets/startup.py:285 +#: cola/widgets/editremotes.py:435 cola/widgets/search.py:45 +#: cola/widgets/startup.py:64 cola/widgets/startup.py:284 msgid "Browse..." msgstr "Jelajah..." -#: cola/widgets/main.py:89 +#: cola/widgets/main.py:87 msgid "Browser" msgstr "Jelajah" -#: cola/widgets/browse.py:589 +#: cola/widgets/browse.py:590 #, python-format msgid "Browsing %s" msgstr "Ramban %s" -#: cola/widgets/commitmsg.py:118 +#: cola/widgets/commitmsg.py:124 msgid "Bypass Commit Hooks" msgstr "" -#: cola/sequenceeditor.py:175 cola/widgets/standard.py:991 +#: cola/sequenceeditor.py:173 cola/widgets/standard.py:1058 msgid "Cancel" msgstr "Batalkan" -#: cola/sequenceeditor.py:176 +#: cola/sequenceeditor.py:174 #, fuzzy msgid "" "Cancel rebase\n" @@ -804,198 +829,210 @@ msgstr "" "Commit perubahan stage\n" "Pintasan: Ctrl+Enter" -#: cola/cmds.py:254 +#: cola/cmds.py:253 msgid "Cannot Amend" msgstr "Tidak dapat diubah" -#: cola/cmds.py:560 +#: cola/cmds.py:561 #, fuzzy, python-format msgid "Cannot exec \"%s\": please configure a blame viewer" msgstr "Tidak dapat mengeksekusi \"%s\": silahkan konfigurasi editor Anda" -#: cola/cmds.py:3146 +#: cola/cmds.py:3092 #, python-format msgid "Cannot exec \"%s\": please configure a history browser" msgstr "Tidak dapat menjalankan \"%s\": silahkan konfigurasi peramban histori" -#: cola/cmds.py:1583 +#: cola/cmds.py:1571 #, python-format msgid "Cannot exec \"%s\": please configure your editor" msgstr "Tidak dapat mengeksekusi \"%s\": silahkan konfigurasi editor Anda" -#: cola/models/browse.py:336 +#: cola/models/browse.py:335 msgid "Changed Upstream" msgstr "Ubah Upstream" -#: cola/widgets/prefs.py:186 +#: cola/widgets/prefs.py:208 msgid "Check Published Commits when Amending" msgstr "" -#: cola/widgets/commitmsg.py:130 +#: cola/widgets/commitmsg.py:136 msgid "Check Spelling" msgstr "Periksa Ejaan" -#: cola/widgets/prefs.py:265 +#: cola/widgets/prefs.py:286 #, fuzzy msgid "Check spelling" msgstr "Periksa Ejaan" -#: cola/widgets/prefs.py:163 +#: cola/widgets/prefs.py:186 msgid "Check whether a commit has been published when amending" msgstr "" -#: cola/guicmds.py:62 cola/widgets/branch.py:222 +#: cola/guicmds.py:61 cola/widgets/branch.py:233 msgid "Checkout" msgstr "Checkout" -#: cola/widgets/createbranch.py:130 +#: cola/widgets/createbranch.py:128 msgid "Checkout After Creation" msgstr "Checkout Setelah Dibuat" -#: cola/guicmds.py:62 cola/widgets/dag.py:410 +#: cola/guicmds.py:61 cola/widgets/dag.py:409 msgid "Checkout Branch" msgstr "Checkout Cabang" -#: cola/widgets/dag.py:414 +#: cola/widgets/dag.py:413 #, fuzzy msgid "Checkout Detached HEAD" msgstr "Checkout Cabang" -#: cola/cmds.py:480 cola/cmds.py:518 +#: cola/cmds.py:481 cola/cmds.py:519 msgid "Checkout Files" msgstr "" -#: cola/widgets/branch.py:226 +#: cola/widgets/branch.py:237 #, fuzzy msgid "Checkout as new branch" msgstr "Checkout Cabang" -#: cola/cmds.py:507 +#: cola/cmds.py:508 msgid "Checkout files from our branch (HEAD)" msgstr "" -#: cola/cmds.py:511 +#: cola/cmds.py:512 msgid "Checkout files from our branch?" msgstr "" -#: cola/cmds.py:469 +#: cola/cmds.py:470 msgid "Checkout files from their branch (MERGE_HEAD)" msgstr "" -#: cola/cmds.py:473 +#: cola/cmds.py:474 msgid "Checkout files from their branch?" msgstr "" -#: cola/widgets/main.py:576 +#: cola/widgets/main.py:589 msgid "Checkout..." msgstr "Checkout..." -#: cola/widgets/dag.py:387 cola/widgets/search.py:79 +#: cola/widgets/dag.py:386 cola/widgets/search.py:78 msgid "Cherry Pick" msgstr "Cherry Pick" -#: cola/guicmds.py:73 +#: cola/guicmds.py:72 msgid "Cherry-Pick Commit" msgstr "Commit Cherry-Pick" -#: cola/widgets/main.py:328 +#: cola/widgets/main.py:323 msgid "Cherry-Pick..." msgstr "Cherry-Pick..." -#: cola/cmds.py:584 +#: cola/cmds.py:585 msgid "Cherry-pick failed" msgstr "" -#: cola/widgets/main.py:1161 +#: cola/widgets/main.py:1174 msgid "Cherry-picking" msgstr "" -#: cola/widgets/diff.py:1247 +#: cola/widgets/diff.py:1321 msgid "Choose Patch..." msgstr "" -#: cola/widgets/search.py:319 +#: cola/widgets/search.py:318 msgid "Choose Paths" msgstr "Pilih Lokasi" -#: cola/widgets/grep.py:116 +#: cola/widgets/grep.py:114 msgid "Choose the \"git grep\" regular expression mode" msgstr "Pilih mode ekspresi reguler \"git grep\"" -#: cola/widgets/bookmarks.py:229 cola/widgets/startup.py:352 +#: cola/widgets/bookmarks.py:228 cola/widgets/startup.py:351 #, fuzzy msgid "Clear Default Repository" msgstr "Repositori Saat Ini" -#: cola/widgets/commitmsg.py:305 +#: cola/widgets/commitmsg.py:313 #, fuzzy msgid "Clear commit message" msgstr "Cari Pesan Commit" -#: cola/widgets/commitmsg.py:302 +#: cola/widgets/commitmsg.py:310 #, fuzzy msgid "Clear commit message?" msgstr "Cari Pesan Commit" -#: cola/widgets/commitmsg.py:62 +#: cola/widgets/commitmsg.py:63 #, fuzzy msgid "Clear..." msgstr "Tutup..." -#: cola/widgets/clone.py:126 +#: cola/widgets/clone.py:124 #, fuzzy msgid "Clone" msgstr "Clon...." -#: cola/widgets/clone.py:62 cola/widgets/clone.py:104 +#: cola/widgets/clone.py:61 cola/widgets/clone.py:102 #, fuzzy msgid "Clone Repository" msgstr "Repositori Saat Ini" -#: cola/widgets/main.py:465 cola/widgets/startup.py:58 +#: cola/widgets/main.py:478 cola/widgets/startup.py:57 msgid "Clone..." msgstr "Clon...." -#: cola/widgets/clone.py:62 +#: cola/widgets/clone.py:61 #, fuzzy, python-format msgid "Cloning repository at %s" msgstr "Repositori: %s" -#: cola/qtutils.py:757 cola/qtutils.py:807 cola/widgets/about.py:508 -#: cola/widgets/remote.py:328 cola/widgets/text.py:1094 +#: cola/qtutils.py:788 cola/qtutils.py:838 cola/widgets/about.py:491 +#: cola/widgets/remote.py:362 cola/widgets/text.py:1090 msgid "Close" msgstr "Tutup" -#: cola/widgets/text.py:402 +#: cola/widgets/remote.py:222 +msgid "Close dialog when completed" +msgstr "" + +#: cola/widgets/remote.py:221 +msgid "Close on completion" +msgstr "" + +#: cola/widgets/text.py:399 msgid "Close the find bar" msgstr "" -#: cola/qtutils.py:623 +#: cola/qtutils.py:651 msgid "Close..." msgstr "Tutup..." -#: cola/widgets/recent.py:71 +#: cola/widgets/recent.py:69 msgid "Collapse all" msgstr "Gulung semua" -#: cola/sequenceeditor.py:323 +#: cola/sequenceeditor.py:320 #, fuzzy msgid "Command" msgstr "Commit" -#: cola/widgets/main.py:163 cola/widgets/merge.py:74 +#: cola/widgets/main.py:161 cola/widgets/merge.py:72 msgid "Commit" msgstr "Commit" -#: cola/cmds.py:837 +#: cola/widgets/prefs.py:192 +msgid "Commit Message Cleanup" +msgstr "" + +#: cola/widgets/commitmsg.py:495 msgid "Commit failed" msgstr "Commit gagal" -#: cola/widgets/commitmsg.py:61 +#: cola/widgets/commitmsg.py:62 msgid "Commit staged changes" msgstr "Commit perubahan stage" -#: cola/widgets/commitmsg.py:93 +#: cola/widgets/commitmsg.py:94 msgid "" "Commit staged changes\n" "Shortcut: Ctrl+Enter" @@ -1003,371 +1040,375 @@ msgstr "" "Commit perubahan stage\n" "Pintasan: Ctrl+Enter" -#: cola/widgets/commitmsg.py:564 +#: cola/widgets/commitmsg.py:590 msgid "Commit summary" msgstr "Ringkasan commit" -#: cola/widgets/main.py:259 +#: cola/widgets/main.py:253 msgid "Commit the current state and continue applying patches" msgstr "" -#: cola/widgets/merge.py:70 +#: cola/widgets/merge.py:68 msgid "Commit the merge if there are no conflicts. Uncheck to leave the merge uncommitted" msgstr "" -#: cola/widgets/commitmsg.py:58 cola/widgets/commitmsg.py:95 -#: cola/widgets/main.py:778 cola/widgets/main.py:779 +#: cola/widgets/commitmsg.py:59 cola/widgets/commitmsg.py:96 +#: cola/widgets/main.py:791 cola/widgets/main.py:792 msgid "Commit@@verb" msgstr "Commit@@verb" -#: cola/difftool.py:78 cola/widgets/compare.py:70 +#: cola/widgets/dag.py:487 +msgid "Commits authored by me" +msgstr "" + +#: cola/difftool.py:97 cola/widgets/compare.py:69 msgid "Compare" msgstr "Bandingkan" -#: cola/difftool.py:83 +#: cola/difftool.py:102 #, fuzzy msgid "Compare All" msgstr "Bandingkan" -#: cola/widgets/toolbar.py:269 cola/widgets/toolbar.py:306 +#: cola/widgets/toolbar.py:274 cola/widgets/toolbar.py:311 msgid "Configure Toolbar" msgstr "" -#: cola/widgets/remote.py:214 +#: cola/widgets/remote.py:218 msgid "Configure the remote branch as the the new upstream" msgstr "" -#: cola/widgets/main.py:170 +#: cola/widgets/main.py:168 msgid "Console" msgstr "Konsol" -#: cola/interaction.py:111 cola/widgets/main.py:610 +#: cola/interaction.py:109 cola/widgets/main.py:623 msgid "Continue" msgstr "Lanjutkan" -#: cola/widgets/main.py:255 +#: cola/widgets/main.py:252 msgid "Continue Applying Patches" msgstr "" -#: cola/widgets/bookmarks.py:248 cola/widgets/main.py:742 -#: cola/widgets/startup.py:371 +#: cola/widgets/bookmarks.py:247 cola/widgets/main.py:755 +#: cola/widgets/startup.py:370 msgid "Copy" msgstr "Salin" -#: cola/widgets/status.py:268 +#: cola/widgets/status.py:269 #, fuzzy msgid "Copy Basename to Clipboard" msgstr "Salin Lokasi ke Papan klip" -#: cola/widgets/diff.py:208 +#: cola/widgets/diff.py:209 msgid "Copy Diff" msgstr "" -#: cola/widgets/status.py:745 +#: cola/widgets/status.py:746 #, fuzzy msgid "Copy Leading Path to Clipboard" msgstr "Salin Lokasi ke Papan klip" -#: cola/widgets/status.py:251 +#: cola/widgets/status.py:252 msgid "Copy Path to Clipboard" msgstr "Salin Lokasi ke Papan klip" -#: cola/widgets/status.py:259 +#: cola/widgets/status.py:260 #, fuzzy msgid "Copy Relative Path to Clipboard" msgstr "Salin Lokasi ke Papan klip" -#: cola/sequenceeditor.py:334 cola/widgets/dag.py:474 +#: cola/sequenceeditor.py:330 cola/widgets/dag.py:473 msgid "Copy SHA-1" msgstr "Salin SHA-1" -#: cola/widgets/status.py:737 +#: cola/widgets/status.py:738 #, fuzzy msgid "Copy..." msgstr "Salin" -#: cola/app.py:490 +#: cola/app.py:493 #, python-format msgid "Could not open %s." msgstr "" -#: cola/widgets/clone.py:191 cola/widgets/clone.py:193 +#: cola/widgets/clone.py:189 cola/widgets/clone.py:191 #, python-format msgid "Could not parse Git URL: \"%s\"" msgstr "Tidak dapat mengurai URL Git: \"%s\"" -#: cola/app.py:500 +#: cola/app.py:503 msgid "Create" msgstr "" -#: cola/widgets/createbranch.py:86 cola/widgets/createbranch.py:135 -#: cola/widgets/createbranch.py:301 cola/widgets/dag.py:369 +#: cola/widgets/createbranch.py:84 cola/widgets/createbranch.py:133 +#: cola/widgets/createbranch.py:299 cola/widgets/dag.py:368 msgid "Create Branch" msgstr "Buat Cabang" -#: cola/widgets/dag.py:373 +#: cola/widgets/dag.py:372 msgid "Create Patch" msgstr "Buat Patch" -#: cola/widgets/remote.py:606 +#: cola/widgets/remote.py:641 msgid "Create Remote Branch" msgstr "Buat Cabang Hulu" -#: cola/widgets/commitmsg.py:124 cola/widgets/merge.py:78 +#: cola/widgets/commitmsg.py:130 cola/widgets/merge.py:76 #, fuzzy msgid "Create Signed Commit" msgstr "Buat commit: %s" -#: cola/widgets/createtag.py:55 cola/widgets/createtag.py:91 -#: cola/widgets/dag.py:377 +#: cola/widgets/createtag.py:53 cola/widgets/createtag.py:89 +#: cola/widgets/dag.py:376 msgid "Create Tag" msgstr "Buat Tag" -#: cola/widgets/main.py:544 +#: cola/widgets/main.py:557 msgid "Create Tag..." msgstr "Buat Tag..." -#: cola/cmds.py:2807 +#: cola/cmds.py:2753 msgid "Create Unsigned Tag" msgstr "Buat Tag tak Bertanda" -#: cola/widgets/remote.py:188 +#: cola/widgets/remote.py:192 msgid "Create a merge commit even when the merge resolves as a fast-forward" msgstr "" -#: cola/widgets/remote.py:605 +#: cola/widgets/remote.py:640 msgid "Create a new remote branch?" msgstr "Buat cabang baru di hulu?" -#: cola/app.py:499 +#: cola/app.py:502 msgid "Create a new repository at that location?" msgstr "" -#: cola/widgets/submodules.py:100 +#: cola/widgets/submodules.py:99 msgid "Create a shallow clone with history truncated to the specified number of revisions. 0 performs a full clone." msgstr "" -#: cola/widgets/main.py:551 +#: cola/widgets/main.py:564 msgid "Create..." msgstr "Buat..." -#: cola/cmds.py:2843 +#: cola/cmds.py:2789 #, python-format msgid "Created a new tag named \"%s\"" msgstr "Buat tag baru bernama \"%s\"" -#: cola/widgets/prefs.py:266 +#: cola/widgets/prefs.py:287 msgid "Ctrl+MouseWheel to Zoom" msgstr "" -#: cola/widgets/prefs.py:404 +#: cola/widgets/prefs.py:442 msgid "Current Repository" msgstr "Repositori Saat Ini" -#: cola/widgets/status.py:1371 +#: cola/widgets/status.py:1372 msgid "Custom Copy Actions" msgstr "" -#: cola/widgets/status.py:273 +#: cola/widgets/status.py:274 #, fuzzy msgid "Customize..." msgstr "Tutup..." -#: cola/widgets/main.py:740 +#: cola/widgets/main.py:753 msgid "Cut" msgstr "" -#: cola/widgets/about.py:411 cola/widgets/about.py:442 +#: cola/widgets/about.py:394 cola/widgets/about.py:425 msgid "Czech translation" msgstr "" -#: cola/widgets/main.py:592 +#: cola/widgets/main.py:605 msgid "DAG..." msgstr "DAG..." -#: cola/icons.py:55 +#: cola/icons.py:54 msgid "Dark Theme" msgstr "" -#: cola/widgets/dag.py:506 +#: cola/widgets/dag.py:572 msgid "Date, Time" msgstr "Tanggal, Waktu" -#: cola/icons.py:54 cola/themes.py:637 +#: cola/icons.py:53 cola/themes.py:643 msgid "Default" msgstr "" -#: cola/widgets/prefs.py:126 +#: cola/widgets/prefs.py:124 msgid "" "Default directory when exporting patches.\n" "Relative paths are relative to the current repository.\n" "Absolute path are used as-is." msgstr "" -#: cola/cmds.py:925 cola/guicmds.py:26 cola/guicmds.py:35 -#: cola/widgets/bookmarks.py:75 cola/widgets/bookmarks.py:251 -#: cola/widgets/main.py:746 cola/widgets/startup.py:373 +#: cola/cmds.py:923 cola/guicmds.py:25 cola/guicmds.py:34 +#: cola/widgets/bookmarks.py:74 cola/widgets/bookmarks.py:250 +#: cola/widgets/main.py:759 cola/widgets/startup.py:372 msgid "Delete" msgstr "Hapus" -#: cola/cmds.py:1088 +#: cola/cmds.py:1089 #, python-format msgid "Delete %d file(s)?" msgstr "Hapus %d berkas?" -#: cola/cmds.py:1016 +#: cola/cmds.py:1017 #, fuzzy msgid "Delete Bookmark" msgstr "Markah" -#: cola/cmds.py:1014 +#: cola/cmds.py:1015 #, fuzzy msgid "Delete Bookmark?" msgstr "Markah" -#: cola/cmds.py:1114 cola/cmds.py:1117 cola/guicmds.py:26 -#: cola/widgets/branch.py:268 +#: cola/cmds.py:1115 cola/cmds.py:1118 cola/guicmds.py:25 +#: cola/widgets/branch.py:277 msgid "Delete Branch" msgstr "Hapus Cabang" -#: cola/cmds.py:1089 +#: cola/cmds.py:1090 msgid "Delete Files" msgstr "Hapus Berkas" -#: cola/widgets/status.py:311 +#: cola/widgets/status.py:312 msgid "Delete Files..." msgstr "Hapus Berkas...?" -#: cola/cmds.py:1085 +#: cola/cmds.py:1086 msgid "Delete Files?" msgstr "Hapus Berkas?" -#: cola/cmds.py:922 +#: cola/cmds.py:920 msgid "Delete Remote" msgstr "Hapus Hulu" -#: cola/guicmds.py:35 cola/widgets/branch.py:270 +#: cola/guicmds.py:34 cola/widgets/branch.py:279 msgid "Delete Remote Branch" msgstr "Hapus Cabang Hulu" -#: cola/widgets/main.py:564 +#: cola/widgets/main.py:577 msgid "Delete Remote Branch..." msgstr "Hapus Cabang Hulu..." -#: cola/widgets/toolbar.py:271 +#: cola/widgets/toolbar.py:276 #, fuzzy msgid "Delete Toolbar" msgstr "Markah" -#: cola/cmds.py:1115 +#: cola/cmds.py:1116 #, python-format msgid "Delete branch \"%s\"?" msgstr "" -#: cola/widgets/editremotes.py:88 +#: cola/widgets/editremotes.py:87 msgid "Delete remote" msgstr "Hapus hulu" -#: cola/cmds.py:924 +#: cola/cmds.py:922 #, python-format msgid "Delete remote \"%s\"" msgstr "Hapus hulu \"%s\"" -#: cola/cmds.py:923 +#: cola/cmds.py:921 msgid "Delete remote?" msgstr "Hapus hulu?" -#: cola/widgets/main.py:558 +#: cola/widgets/main.py:571 msgid "Delete..." msgstr "Hapus..." -#: cola/cmds.py:1067 +#: cola/cmds.py:1068 #, python-format msgid "Deleting \"%s\" failed" msgstr "Gagal menghapus \"%s\"" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Deletions" msgstr "Penghapusan" -#: cola/widgets/submodules.py:120 +#: cola/widgets/submodules.py:119 msgid "Depth" msgstr "" -#: cola/qtutils.py:811 cola/qtutils.py:852 +#: cola/qtutils.py:842 cola/qtutils.py:889 msgid "Detach" msgstr "Lepaskan" -#: cola/widgets/prefs.py:181 +#: cola/widgets/prefs.py:203 msgid "Detect Conflict Markers" msgstr "" -#: cola/widgets/prefs.py:151 +#: cola/widgets/prefs.py:174 msgid "Detect conflict markers in unmerged files" msgstr "" -#: cola/widgets/about.py:271 cola/widgets/about.py:274 -#: cola/widgets/about.py:277 cola/widgets/about.py:278 -#: cola/widgets/about.py:279 cola/widgets/about.py:280 -#: cola/widgets/about.py:281 cola/widgets/about.py:282 -#: cola/widgets/about.py:283 cola/widgets/about.py:284 -#: cola/widgets/about.py:285 cola/widgets/about.py:286 -#: cola/widgets/about.py:287 cola/widgets/about.py:288 -#: cola/widgets/about.py:289 cola/widgets/about.py:290 -#: cola/widgets/about.py:291 cola/widgets/about.py:292 -#: cola/widgets/about.py:293 cola/widgets/about.py:294 -#: cola/widgets/about.py:295 cola/widgets/about.py:296 -#: cola/widgets/about.py:297 cola/widgets/about.py:298 -#: cola/widgets/about.py:299 cola/widgets/about.py:300 -#: cola/widgets/about.py:301 cola/widgets/about.py:302 -#: cola/widgets/about.py:303 cola/widgets/about.py:304 -#: cola/widgets/about.py:305 cola/widgets/about.py:306 -#: cola/widgets/about.py:307 cola/widgets/about.py:308 -#: cola/widgets/about.py:309 cola/widgets/about.py:310 -#: cola/widgets/about.py:311 cola/widgets/about.py:312 -#: cola/widgets/about.py:313 cola/widgets/about.py:314 -#: cola/widgets/about.py:315 cola/widgets/about.py:316 -#: cola/widgets/about.py:317 cola/widgets/about.py:318 -#: cola/widgets/about.py:319 cola/widgets/about.py:320 -#: cola/widgets/about.py:321 cola/widgets/about.py:322 -#: cola/widgets/about.py:323 cola/widgets/about.py:324 -#: cola/widgets/about.py:325 cola/widgets/about.py:326 -#: cola/widgets/about.py:327 cola/widgets/about.py:328 -#: cola/widgets/about.py:329 cola/widgets/about.py:330 -#: cola/widgets/about.py:331 cola/widgets/about.py:332 -#: cola/widgets/about.py:333 cola/widgets/about.py:334 -#: cola/widgets/about.py:335 cola/widgets/about.py:336 -#: cola/widgets/about.py:337 cola/widgets/about.py:338 -#: cola/widgets/about.py:339 cola/widgets/about.py:340 -#: cola/widgets/about.py:341 cola/widgets/about.py:342 -#: cola/widgets/about.py:343 cola/widgets/about.py:344 -#: cola/widgets/about.py:345 cola/widgets/about.py:346 -#: cola/widgets/about.py:347 cola/widgets/about.py:348 -#: cola/widgets/about.py:349 cola/widgets/about.py:350 -#: cola/widgets/about.py:351 cola/widgets/about.py:352 -#: cola/widgets/about.py:353 cola/widgets/about.py:354 -#: cola/widgets/about.py:355 cola/widgets/about.py:356 -#: cola/widgets/about.py:357 cola/widgets/about.py:358 -#: cola/widgets/about.py:359 cola/widgets/about.py:360 -#: cola/widgets/about.py:361 cola/widgets/about.py:362 -#: cola/widgets/about.py:363 cola/widgets/about.py:364 -#: cola/widgets/about.py:365 cola/widgets/about.py:366 -#: cola/widgets/about.py:367 cola/widgets/about.py:368 -#: cola/widgets/about.py:369 cola/widgets/about.py:370 -#: cola/widgets/about.py:371 cola/widgets/about.py:372 -#: cola/widgets/about.py:373 cola/widgets/about.py:374 -#: cola/widgets/about.py:375 cola/widgets/about.py:376 -#: cola/widgets/about.py:377 cola/widgets/about.py:378 -#: cola/widgets/about.py:379 cola/widgets/about.py:380 +#: cola/widgets/about.py:254 cola/widgets/about.py:257 +#: cola/widgets/about.py:260 cola/widgets/about.py:261 +#: cola/widgets/about.py:262 cola/widgets/about.py:263 +#: cola/widgets/about.py:264 cola/widgets/about.py:265 +#: cola/widgets/about.py:266 cola/widgets/about.py:267 +#: cola/widgets/about.py:268 cola/widgets/about.py:269 +#: cola/widgets/about.py:270 cola/widgets/about.py:271 +#: cola/widgets/about.py:272 cola/widgets/about.py:273 +#: cola/widgets/about.py:274 cola/widgets/about.py:275 +#: cola/widgets/about.py:276 cola/widgets/about.py:277 +#: cola/widgets/about.py:278 cola/widgets/about.py:279 +#: cola/widgets/about.py:280 cola/widgets/about.py:281 +#: cola/widgets/about.py:282 cola/widgets/about.py:283 +#: cola/widgets/about.py:284 cola/widgets/about.py:285 +#: cola/widgets/about.py:286 cola/widgets/about.py:287 +#: cola/widgets/about.py:288 cola/widgets/about.py:289 +#: cola/widgets/about.py:290 cola/widgets/about.py:291 +#: cola/widgets/about.py:292 cola/widgets/about.py:293 +#: cola/widgets/about.py:294 cola/widgets/about.py:295 +#: cola/widgets/about.py:296 cola/widgets/about.py:297 +#: cola/widgets/about.py:298 cola/widgets/about.py:299 +#: cola/widgets/about.py:300 cola/widgets/about.py:301 +#: cola/widgets/about.py:302 cola/widgets/about.py:303 +#: cola/widgets/about.py:304 cola/widgets/about.py:305 +#: cola/widgets/about.py:306 cola/widgets/about.py:307 +#: cola/widgets/about.py:308 cola/widgets/about.py:309 +#: cola/widgets/about.py:310 cola/widgets/about.py:311 +#: cola/widgets/about.py:312 cola/widgets/about.py:313 +#: cola/widgets/about.py:314 cola/widgets/about.py:315 +#: cola/widgets/about.py:316 cola/widgets/about.py:317 +#: cola/widgets/about.py:318 cola/widgets/about.py:319 +#: cola/widgets/about.py:320 cola/widgets/about.py:321 +#: cola/widgets/about.py:322 cola/widgets/about.py:323 +#: cola/widgets/about.py:324 cola/widgets/about.py:325 +#: cola/widgets/about.py:326 cola/widgets/about.py:327 +#: cola/widgets/about.py:328 cola/widgets/about.py:329 +#: cola/widgets/about.py:330 cola/widgets/about.py:331 +#: cola/widgets/about.py:332 cola/widgets/about.py:333 +#: cola/widgets/about.py:334 cola/widgets/about.py:335 +#: cola/widgets/about.py:336 cola/widgets/about.py:337 +#: cola/widgets/about.py:338 cola/widgets/about.py:339 +#: cola/widgets/about.py:340 cola/widgets/about.py:341 +#: cola/widgets/about.py:342 cola/widgets/about.py:343 +#: cola/widgets/about.py:344 cola/widgets/about.py:345 +#: cola/widgets/about.py:346 cola/widgets/about.py:347 +#: cola/widgets/about.py:348 cola/widgets/about.py:349 +#: cola/widgets/about.py:350 cola/widgets/about.py:351 +#: cola/widgets/about.py:352 cola/widgets/about.py:353 +#: cola/widgets/about.py:354 cola/widgets/about.py:355 +#: cola/widgets/about.py:356 cola/widgets/about.py:357 +#: cola/widgets/about.py:358 cola/widgets/about.py:359 +#: cola/widgets/about.py:360 cola/widgets/about.py:361 +#: cola/widgets/about.py:362 cola/widgets/about.py:363 msgid "Developer" msgstr "" -#: cola/guicmds.py:185 cola/widgets/dag.py:764 cola/widgets/diff.py:781 -#: cola/widgets/main.py:177 cola/widgets/main.py:797 +#: cola/guicmds.py:184 cola/widgets/dag.py:830 cola/widgets/diff.py:809 +#: cola/widgets/main.py:175 cola/widgets/main.py:810 msgid "Diff" msgstr "Diff" -#: cola/guicmds.py:185 +#: cola/guicmds.py:184 msgid "Diff Against Commit" msgstr "" @@ -1375,36 +1416,36 @@ msgstr "" msgid "Diff Against Predecessor..." msgstr "Diff Pada Predessor..." -#: cola/widgets/main.py:1159 +#: cola/widgets/main.py:1172 msgid "Diff Mode" msgstr "" -#: cola/widgets/diff.py:772 cola/widgets/diff.py:796 +#: cola/widgets/diff.py:800 cola/widgets/diff.py:824 msgid "Diff Options" msgstr "Pilihan Diff" -#: cola/widgets/prefs.py:256 +#: cola/widgets/prefs.py:277 msgid "Diff Tool" msgstr "Alat Diff" -#: cola/widgets/dag.py:364 +#: cola/widgets/dag.py:363 msgid "Diff selected -> this" msgstr "Diff terpilih -> ini" -#: cola/widgets/dag.py:358 +#: cola/widgets/dag.py:357 msgid "Diff this -> selected" msgstr "Diff ini -> terpilih" -#: cola/widgets/main.py:218 +#: cola/widgets/main.py:217 msgid "Diffstat" msgstr "Diffstat" -#: cola/cmds.py:3262 +#: cola/difftool.py:324 #, fuzzy msgid "Difftool" msgstr "Alat Diff" -#: cola/widgets/clone.py:207 +#: cola/widgets/clone.py:205 msgid "Directory Exists" msgstr "Direktori Sudah Ada" @@ -1412,85 +1453,89 @@ msgstr "Direktori Sudah Ada" msgid "Disable" msgstr "" -#: cola/widgets/prefs.py:180 +#: cola/widgets/prefs.py:202 msgid "Display Untracked Files" msgstr "Tampilkan Berkas Tak Terlacak" -#: cola/cmds.py:2094 +#: cola/widgets/remote.py:176 +msgid "Display remote messages in a separate dialog" +msgstr "" + +#: cola/cmds.py:2045 msgid "Do not update stacked branches" msgstr "" -#: cola/widgets/main.py:471 +#: cola/widgets/main.py:484 msgid "Documentation" msgstr "Dokumentasi" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop" msgstr "Buang" -#: cola/widgets/stash.py:258 +#: cola/widgets/stash.py:276 msgid "Drop Stash" msgstr "Buang Stash" -#: cola/widgets/stash.py:255 +#: cola/widgets/stash.py:273 msgid "Drop Stash?" msgstr "Buang Stash?" -#: cola/widgets/stash.py:257 +#: cola/widgets/stash.py:275 #, python-format msgid "Drop the \"%s\" stash?" msgstr "Buang stash \"%s\"?" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop the selected stash" msgstr "Buang stash terpilih" -#: cola/qtutils.py:764 cola/sequenceeditor.py:357 cola/widgets/grep.py:102 +#: cola/qtutils.py:795 cola/sequenceeditor.py:353 cola/widgets/grep.py:100 #, fuzzy msgid "Edit" msgstr "Sunting" -#: cola/widgets/diff.py:1019 +#: cola/widgets/diff.py:1058 msgid "Edit Diff Hunk to Revert..." msgstr "" -#: cola/widgets/diff.py:1017 +#: cola/widgets/diff.py:1056 msgid "Edit Diff Hunk to Stage..." msgstr "" -#: cola/widgets/diff.py:1062 +#: cola/widgets/diff.py:1124 msgid "Edit Diff Hunk to Unstage..." msgstr "" -#: cola/cmds.py:2166 +#: cola/cmds.py:2117 msgid "Edit Rebase" msgstr "Sunting Rebase" -#: cola/widgets/editremotes.py:36 +#: cola/widgets/editremotes.py:35 msgid "Edit Remotes" msgstr "Sunting Hulu" -#: cola/widgets/main.py:298 +#: cola/widgets/main.py:293 msgid "Edit Remotes..." msgstr "Sunting Hulu..." -#: cola/widgets/diff.py:1014 +#: cola/widgets/diff.py:1053 msgid "Edit Selected Lines to Revert..." msgstr "" -#: cola/widgets/diff.py:1012 +#: cola/widgets/diff.py:1051 msgid "Edit Selected Lines to Stage..." msgstr "" -#: cola/widgets/diff.py:1059 +#: cola/widgets/diff.py:1122 msgid "Edit Selected Lines to Unstage..." msgstr "" -#: cola/widgets/editremotes.py:44 +#: cola/widgets/editremotes.py:43 msgid "Edit remotes by selecting them from the list" msgstr "" -#: cola/widgets/browse.py:197 cola/widgets/common.py:39 +#: cola/widgets/browse.py:198 cola/widgets/common.py:38 msgid "Edit selected paths" msgstr "Sunting lokasi terpilih" @@ -1506,11 +1551,11 @@ msgstr "" msgid "Edit the following patch, which will then be applied to the worktree to revert the changes:" msgstr "" -#: cola/widgets/main.py:604 +#: cola/widgets/main.py:617 msgid "Edit..." msgstr "Sunting..." -#: cola/widgets/prefs.py:253 +#: cola/widgets/prefs.py:274 msgid "Editor" msgstr "Penyunting" @@ -1519,158 +1564,163 @@ msgstr "Penyunting" msgid "Editor returned %s exit code. Not applying patch." msgstr "" -#: cola/widgets/prefs.py:167 +#: cola/widgets/prefs.py:190 msgid "Email Address" msgstr "Alamat Email" -#: cola/widgets/about.py:258 cola/widgets/about.py:401 +#: cola/widgets/about.py:241 cola/widgets/about.py:384 msgid "Email contributor" msgstr "" -#: cola/widgets/prefs.py:182 +#: cola/widgets/prefs.py:204 msgid "Enable Gravatar Icons" msgstr "" -#: cola/widgets/prefs.py:160 +#: cola/widgets/prefs.py:183 msgid "Enable path autocompletion in tools" msgstr "" -#: cola/widgets/diff.py:768 +#: cola/widgets/diff.py:796 msgid "Enable word wrapping" msgstr "" -#: cola/sequenceeditor.py:322 +#: cola/sequenceeditor.py:319 msgid "Enabled" msgstr "" -#: cola/guicmds.py:333 cola/widgets/branch.py:445 +#: cola/guicmds.py:332 cola/widgets/branch.py:478 #, fuzzy msgid "Enter New Branch Name" msgstr "Nama Cabang" -#: cola/guicmds.py:147 +#: cola/guicmds.py:146 #, fuzzy msgid "Enter a name for the new bare repo" msgstr "Masukkan nama untuk stash" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Enter a name for the stash" msgstr "Masukkan nama untuk stash" -#: cola/cmds.py:146 cola/cmds.py:176 cola/cmds.py:207 cola/cmds.py:283 -#: cola/cmds.py:292 cola/cmds.py:307 cola/cmds.py:317 cola/cmds.py:460 -#: cola/cmds.py:496 cola/cmds.py:534 cola/cmds.py:633 cola/cmds.py:751 -#: cola/cmds.py:1067 cola/cmds.py:1164 cola/cmds.py:2005 cola/cmds.py:2394 -#: cola/cmds.py:2637 cola/cmds.py:2643 cola/cmds.py:2651 cola/cmds.py:2872 -#: cola/cmds.py:2890 cola/cmds.py:3180 cola/gitcmds.py:984 cola/guicmds.py:157 -#: cola/models/stash.py:70 cola/models/stash.py:87 cola/models/stash.py:108 -#: cola/widgets/bookmarks.py:482 cola/widgets/branch.py:777 +#: cola/widgets/stash.py:216 +msgid "Enter a new name for the stash" +msgstr "" + +#: cola/cmds.py:145 cola/cmds.py:175 cola/cmds.py:206 cola/cmds.py:284 +#: cola/cmds.py:293 cola/cmds.py:308 cola/cmds.py:318 cola/cmds.py:461 +#: cola/cmds.py:497 cola/cmds.py:535 cola/cmds.py:635 cola/cmds.py:753 +#: cola/cmds.py:1068 cola/cmds.py:1165 cola/cmds.py:1956 cola/cmds.py:2345 +#: cola/cmds.py:2579 cola/cmds.py:2585 cola/cmds.py:2593 cola/cmds.py:2818 +#: cola/cmds.py:2836 cola/cmds.py:3125 cola/gitcmds.py:994 cola/guicmds.py:156 +#: cola/models/stash.py:70 cola/models/stash.py:90 cola/models/stash.py:112 +#: cola/models/stash.py:138 cola/widgets/bookmarks.py:481 +#: cola/widgets/branch.py:829 msgid "Error" msgstr "Error" -#: cola/widgets/clone.py:191 +#: cola/widgets/clone.py:189 msgid "Error Cloning" msgstr "Error Kloning" -#: cola/widgets/createbranch.py:314 +#: cola/widgets/createbranch.py:312 msgid "Error Creating Branch" msgstr "Erroe Membuat Cabang" -#: cola/app.py:502 cola/guicmds.py:101 +#: cola/app.py:505 cola/guicmds.py:100 msgid "Error Creating Repository" msgstr "Error Membuat Repositori" -#: cola/cmds.py:1202 +#: cola/cmds.py:1206 msgid "Error Deleting Remote Branch" msgstr "Error menghapus Cabang Hulu" -#: cola/cmds.py:1585 +#: cola/cmds.py:1573 msgid "Error Editing File" msgstr "Error Menyunting Berkas" -#: cola/cmds.py:559 +#: cola/cmds.py:560 #, fuzzy msgid "Error Launching Blame Viewer" msgstr "Errot Menjalankan Peramban Histori" -#: cola/cmds.py:3145 +#: cola/cmds.py:3091 msgid "Error Launching History Browser" msgstr "Errot Menjalankan Peramban Histori" -#: cola/app.py:489 +#: cola/app.py:492 msgid "Error Opening Repository" msgstr "" -#: cola/widgets/browse.py:566 +#: cola/models/stash.py:144 +msgid "Error Renaming Stash" +msgstr "" + +#: cola/widgets/browse.py:567 msgid "Error Saving File" msgstr "" -#: cola/cmds.py:914 +#: cola/cmds.py:912 #, python-format msgid "Error creating remote \"%s\"" msgstr "Error membuat hulu \"%s\"" -#: cola/models/stash.py:197 +#: cola/models/stash.py:233 #, fuzzy msgid "Error creating stash" msgstr "Erroe Membuat Cabang" -#: cola/cmds.py:1126 +#: cola/cmds.py:1127 #, python-format msgid "Error deleting branch \"%s\"" msgstr "" -#: cola/cmds.py:932 +#: cola/cmds.py:930 #, python-format msgid "Error deleting remote \"%s\"" msgstr "Error menghapus hulu \"%s\"" -#: cola/cmds.py:956 +#: cola/cmds.py:955 #, fuzzy, python-format msgid "Error renaming \"%(name)s\" to \"%(new_name)s\"" msgstr "Menandai \"%(revision)s\" sebagai \"%(name)s\"" -#: cola/cmds.py:1771 +#: cola/cmds.py:1722 msgid "Error running prepare-commitmsg hook" msgstr "" -#: cola/cmds.py:3043 cola/cmds.py:3089 +#: cola/cmds.py:2989 cola/cmds.py:3035 #, fuzzy, python-format msgid "Error updating submodule %s" msgstr "Error membuat hulu \"%s\"" -#: cola/cmds.py:3125 +#: cola/cmds.py:3071 #, fuzzy msgid "Error updating submodules" msgstr "Error Menyunting Berkas" -#: cola/widgets/diff.py:1326 +#: cola/widgets/diff.py:1400 msgid "Error writing patch" msgstr "" -#: cola/cmds.py:1710 +#: cola/cmds.py:1662 msgid "Error: Cannot find commit template" msgstr "Error: Tidak dapat melakukan commit templat" -#: cola/widgets/stash.py:235 -msgid "Error: Stash exists" -msgstr "Error: Stash sudah ada" - -#: cola/cmds.py:1732 +#: cola/cmds.py:1684 msgid "Error: Unconfigured commit template" msgstr "Error: Commit templat belum dikonfigurasi" -#: cola/widgets/clone.py:53 +#: cola/widgets/clone.py:52 #, python-format msgid "Error: could not clone \"%s\"" msgstr "Error: tidak bisa kloning \"%s\"" -#: cola/cmds.py:2835 +#: cola/cmds.py:2781 #, python-format msgid "Error: could not create tag \"%s\"" msgstr "Error: tidak dapat membuat tag \"%s\"" -#: cola/widgets/branch.py:421 +#: cola/widgets/branch.py:433 #, python-format msgid "Executing action %s" msgstr "" @@ -1679,419 +1729,431 @@ msgstr "" msgid "Exit \"Diff\" mode" msgstr "" -#: cola/widgets/action.py:67 +#: cola/widgets/action.py:81 msgid "Exit Diff" msgstr "" -#: cola/widgets/main.py:528 +#: cola/widgets/main.py:541 msgid "Exit Diff Mode" msgstr "" -#: cola/widgets/action.py:68 +#: cola/widgets/action.py:81 msgid "Exit Diff mode" msgstr "" -#: cola/widgets/recent.py:67 +#: cola/widgets/recent.py:65 msgid "Expand all" msgstr "Bentangkan semua" -#: cola/widgets/diff.py:1223 +#: cola/widgets/diff.py:1297 msgid "Export Patch" msgstr "" -#: cola/guicmds.py:168 cola/widgets/search.py:75 +#: cola/guicmds.py:167 cola/widgets/search.py:74 msgid "Export Patches" msgstr "Ekspor Patch" -#: cola/widgets/main.py:273 +#: cola/widgets/main.py:268 msgid "Export Patches..." msgstr "Ekspor Patch..." -#: cola/widgets/main.py:533 +#: cola/widgets/main.py:546 msgid "Expression..." msgstr "Ekspresi..." -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Extended Regexp" msgstr "Regexp Perluasan" -#: cola/widgets/commitmsg.py:612 +#: cola/widgets/commitmsg.py:638 msgid "Extended description..." msgstr "Perluaskan penjelasan..." -#: cola/cmds.py:387 +#: cola/cmds.py:388 msgid "Failed to commit and continue applying patches" msgstr "" -#: cola/cmds.py:403 +#: cola/cmds.py:404 msgid "Failed to continue applying patches after skipping the current patch" msgstr "" -#: cola/widgets/createbranch.py:124 +#: cola/widgets/createbranch.py:122 msgid "Fast Forward Only" msgstr "Hanya Fast Forward" -#: cola/widgets/remote.py:177 +#: cola/widgets/remote.py:181 #, fuzzy msgid "Fast-forward only" msgstr "Hanya Fast Forward" -#: cola/widgets/bookmarks.py:91 +#: cola/widgets/bookmarks.py:90 #, fuzzy msgid "Favorite repositories" msgstr "Semua Repositori" -#: cola/widgets/main.py:111 +#: cola/widgets/main.py:109 msgid "Favorites" msgstr "" -#: cola/widgets/remote.py:673 +#: cola/widgets/remote.py:735 #, fuzzy msgid "Fetch" msgstr "Ambil..." -#: cola/widgets/createbranch.py:127 +#: cola/widgets/createbranch.py:125 msgid "Fetch Tracking Branch" msgstr "Fetch Cabang Terlacak" -#: cola/widgets/action.py:63 cola/widgets/main.py:387 +#: cola/widgets/action.py:67 cola/widgets/main.py:384 +msgid "Fetch from one or more remotes using \"git fetch\"" +msgstr "" + +#: cola/widgets/action.py:65 cola/widgets/main.py:383 msgid "Fetch..." msgstr "Ambil..." -#: cola/widgets/main.py:588 +#: cola/widgets/main.py:601 msgid "File Browser..." msgstr "Jelajah Berkas..." -#: cola/widgets/compare.py:75 +#: cola/widgets/compare.py:74 msgid "File Differences" msgstr "Perbedaan Berkas" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 msgid "File Saved" msgstr "Berkas Tersimpan" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 #, python-format msgid "File saved to \"%s\"" msgstr "Berkas disimpan di \"%s\"" -#: cola/fsmonitor.py:517 +#: cola/fsmonitor.py:528 #, fuzzy msgid "File system change monitoring: disabled because \"cola.inotify\" is false.\n" msgstr "inotify dinonaktifkan karena \"cola.inotify\" ialah false\n" -#: cola/fsmonitor.py:534 +#: cola/fsmonitor.py:545 msgid "File system change monitoring: disabled because libc does not support the inotify system calls.\n" msgstr "" -#: cola/fsmonitor.py:528 +#: cola/fsmonitor.py:539 msgid "File system change monitoring: disabled because pywin32 is not installed.\n" msgstr "" -#: cola/fsmonitor.py:181 +#: cola/fsmonitor.py:184 msgid "" "File system change monitoring: disabled because the limit on the total number of inotify watches was reached. You may be able to increase the limit on the number of watches by running:\n" "\n" " echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n" msgstr "" -#: cola/fsmonitor.py:142 +#: cola/fsmonitor.py:145 #, fuzzy msgid "File system change monitoring: enabled.\n" msgstr "Pemberitahuan berkas diaktifkan.\n" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Filename" msgstr "Namaberkas" -#: cola/widgets/dag.py:755 +#: cola/widgets/dag.py:821 msgid "Files" msgstr "Berkas" -#: cola/widgets/branch.py:785 +#: cola/widgets/branch.py:837 #, fuzzy msgid "Filter branches..." msgstr "Ambil..." -#: cola/widgets/status.py:1333 +#: cola/widgets/status.py:1334 #, fuzzy msgid "Filter paths..." msgstr "Ambil..." -#: cola/widgets/finder.py:113 cola/widgets/main.py:312 +#: cola/widgets/finder.py:112 cola/widgets/main.py:307 #, fuzzy msgid "Find Files" msgstr "Berkas" -#: cola/widgets/text.py:388 +#: cola/widgets/text.py:385 msgid "Find in diff" msgstr "" -#: cola/widgets/text.py:425 +#: cola/widgets/text.py:422 msgid "Find next item" msgstr "" -#: cola/widgets/text.py:431 +#: cola/widgets/text.py:428 msgid "Find previous item" msgstr "" -#: cola/widgets/text.py:395 +#: cola/widgets/text.py:392 msgid "Find the next occurrence of the phrase" msgstr "" -#: cola/widgets/text.py:391 +#: cola/widgets/text.py:388 msgid "Find the previous occurrence of the phrase" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Fixed String" msgstr "String Tetap" -#: cola/widgets/prefs.py:251 +#: cola/widgets/prefs.py:270 msgid "Fixed-Width Font" msgstr "Lebar-Tetap Font" -#: cola/sequenceeditor.py:362 +#: cola/sequenceeditor.py:358 msgid "Fixup" msgstr "" -#: cola/widgets/commitmsg.py:148 +#: cola/widgets/commitmsg.py:154 msgid "Fixup Previous Commit" msgstr "Perbaiki Commit Sebelumnya" -#: cola/themes.py:672 +#: cola/themes.py:684 msgid "Flat dark blue" msgstr "" -#: cola/themes.py:693 +#: cola/themes.py:705 msgid "Flat dark green" msgstr "" -#: cola/themes.py:686 +#: cola/themes.py:698 msgid "Flat dark grey" msgstr "" -#: cola/themes.py:679 +#: cola/themes.py:691 msgid "Flat dark red" msgstr "" -#: cola/themes.py:644 +#: cola/themes.py:656 msgid "Flat light blue" msgstr "" -#: cola/themes.py:665 +#: cola/themes.py:677 msgid "Flat light green" msgstr "" -#: cola/themes.py:658 +#: cola/themes.py:670 msgid "Flat light grey" msgstr "" -#: cola/themes.py:651 +#: cola/themes.py:663 msgid "Flat light red" msgstr "" -#: cola/widgets/startup.py:73 +#: cola/widgets/startup.py:72 msgid "Folder" msgstr "" -#: cola/widgets/toolbar.py:177 +#: cola/widgets/toolbar.py:181 msgid "Follow System Style" msgstr "" -#: cola/widgets/prefs.py:252 +#: cola/widgets/prefs.py:271 msgid "Font Size" msgstr "Ukuran Font" -#: cola/widgets/remote.py:193 +#: cola/widgets/remote.py:197 #, fuzzy msgid "Force" msgstr "Paksa Push" -#: cola/widgets/remote.py:617 +#: cola/widgets/remote.py:652 msgid "Force Fetch" msgstr "Paksa Fetch" -#: cola/widgets/remote.py:614 +#: cola/widgets/remote.py:649 msgid "Force Fetch?" msgstr "Paksa Fetch?" -#: cola/widgets/remote.py:625 +#: cola/widgets/remote.py:660 msgid "Force Push" msgstr "Paksa Push" -#: cola/widgets/remote.py:619 +#: cola/widgets/remote.py:654 msgid "Force Push?" msgstr "Paksa Push?" -#: cola/widgets/remote.py:616 +#: cola/widgets/remote.py:651 #, python-format msgid "Force fetching from %s?" msgstr "Paksa fetch dari %s?" -#: cola/widgets/remote.py:624 +#: cola/widgets/remote.py:659 #, python-format msgid "Force push to %s?" msgstr "Paksa push ke %s?" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 #, fuzzy msgid "Format String" msgstr "String Tetap" -#: cola/widgets/about.py:430 cola/widgets/about.py:431 +#: cola/widgets/about.py:413 cola/widgets/about.py:414 msgid "French translation" msgstr "" -#: cola/widgets/merge.py:80 +#: cola/widgets/merge.py:78 msgid "GPG-sign the merge commit" msgstr "" -#: cola/widgets/prefs.py:344 +#: cola/widgets/prefs.py:364 msgid "GUI theme" msgstr "" -#: cola/widgets/editremotes.py:318 +#: cola/widgets/editremotes.py:317 #, python-format msgid "Gathering info for \"%s\"..." msgstr "Mengumpulkan info untuk \"%s\"..." -#: cola/widgets/about.py:420 cola/widgets/about.py:428 -#: cola/widgets/about.py:429 +#: cola/widgets/about.py:403 cola/widgets/about.py:411 +#: cola/widgets/about.py:412 msgid "German translation" msgstr "" -#: cola/widgets/main.py:511 +#: cola/widgets/main.py:524 msgid "Get Commit Message Template" msgstr "Ambil Templat Pesan Commit" -#: cola/widgets/dag.py:520 +#: cola/widgets/dag.py:586 msgid "Go Down" msgstr "Ke Bawah" -#: cola/widgets/dag.py:516 +#: cola/widgets/dag.py:582 msgid "Go Up" msgstr "Ke Atas" -#: cola/widgets/dag.py:467 cola/widgets/filelist.py:42 +#: cola/widgets/dag.py:466 cola/widgets/filelist.py:39 msgid "Grab File..." msgstr "Ambil Berkas..." -#: cola/widgets/dag.py:782 +#: cola/widgets/dag.py:848 msgid "Graph" msgstr "Grafik" -#: cola/widgets/main.py:358 +#: cola/widgets/main.py:353 msgid "Grep" msgstr "Grep" -#: cola/widgets/remote.py:662 +#: cola/widgets/remote.py:707 msgid "Have you rebased/pulled lately?" msgstr "Sudahkan Anda rebase/tarik baru-baru ini?" -#: cola/sequenceeditor.py:110 cola/sequenceeditor.py:171 -#: cola/widgets/finder.py:138 cola/widgets/main.py:854 +#: cola/sequenceeditor.py:108 cola/sequenceeditor.py:169 +#: cola/widgets/finder.py:137 cola/widgets/main.py:867 msgid "Help" msgstr "Bantuan" -#: cola/widgets/status.py:1322 +#: cola/widgets/status.py:1323 msgid "Help - Custom Copy Actions" msgstr "" -#: cola/widgets/finder.py:79 +#: cola/widgets/finder.py:78 msgid "Help - Find Files" msgstr "" -#: cola/sequenceeditor.py:737 +#: cola/sequenceeditor.py:732 msgid "Help - git-cola-sequence-editor" msgstr "" -#: cola/widgets/prefs.py:346 +#: cola/widgets/prefs.py:366 msgid "High DPI" msgstr "" -#: cola/gitcmds.py:876 +#: cola/gitcmds.py:886 msgid "Hint: The \"Actions > Abort Cherry-Pick\" menu action can be used to cancel the current cherry-pick." msgstr "" -#: cola/widgets/prefs.py:254 +#: cola/widgets/prefs.py:275 msgid "History Browser" msgstr "Penjelajah Histori" -#: cola/widgets/about.py:427 cola/widgets/about.py:441 +#: cola/widgets/about.py:410 cola/widgets/about.py:424 msgid "Hungarian translation" msgstr "" -#: cola/widgets/toolbar.py:178 +#: cola/widgets/toolbar.py:182 msgid "Icon Only" msgstr "" -#: cola/widgets/prefs.py:345 +#: cola/widgets/prefs.py:365 msgid "Icon theme" msgstr "" -#: cola/widgets/diff.py:758 +#: cola/widgets/diff.py:787 msgid "Ignore all whitespace" msgstr "Abaikan semua spasi" -#: cola/widgets/diff.py:755 +#: cola/widgets/diff.py:785 msgid "Ignore changes in amount of whitespace" msgstr "Abaikan perubahan jumlah spasi" -#: cola/widgets/diff.py:751 +#: cola/widgets/diff.py:782 msgid "Ignore changes in whitespace at EOL" msgstr "Abaikan perubahan spasi pada EOL" -#: cola/widgets/gitignore.py:46 +#: cola/widgets/gitignore.py:45 msgid "Ignore custom pattern" msgstr "" -#: cola/widgets/gitignore.py:44 +#: cola/widgets/gitignore.py:43 #, fuzzy msgid "Ignore exact filename" msgstr "Abaikan semua spasi" -#: cola/widgets/gitignore.py:32 +#: cola/widgets/gitignore.py:31 msgid "Ignore filename or pattern" msgstr "" -#: cola/widgets/status.py:933 +#: cola/widgets/dag.py:498 +msgid "Ignore merge commits" +msgstr "" + +#: cola/widgets/status.py:934 msgid "Ignore..." msgstr "" -#: cola/widgets/remote.py:203 +#: cola/widgets/remote.py:207 msgid "Include tags " msgstr "Sertakan tag " -#: cola/widgets/prefs.py:349 +#: cola/widgets/prefs.py:369 msgid "Indent Status paths" msgstr "" -#: cola/widgets/about.py:419 cola/widgets/about.py:426 +#: cola/widgets/about.py:402 cola/widgets/about.py:409 msgid "Indonesian translation" msgstr "" -#: cola/widgets/main.py:643 +#: cola/widgets/main.py:656 msgid "Initialize Git Annex" msgstr "" -#: cola/widgets/main.py:647 +#: cola/widgets/main.py:660 msgid "Initialize Git LFS" msgstr "" -#: cola/widgets/clone.py:116 +#: cola/widgets/clone.py:114 msgid "Inititalize submodules" msgstr "" -#: cola/widgets/prefs.py:260 +#: cola/widgets/prefs.py:281 msgid "Insert spaces instead of tabs" msgstr "" -#: cola/cmds.py:2130 +#: cola/widgets/action.py:73 cola/widgets/main.py:402 +msgid "Integrate changes using \"git pull\"" +msgstr "" + +#: cola/cmds.py:2081 msgid "Interactive Rebase" msgstr "rebase Interaktif" -#: cola/cmds.py:2364 +#: cola/cmds.py:2315 msgid "Invalid Revision" msgstr "Revisi Salah" @@ -2099,48 +2161,48 @@ msgstr "Revisi Salah" msgid "It is not necessary to update the hunk header lines as they will be regenerated automatically." msgstr "" -#: cola/widgets/about.py:421 cola/widgets/about.py:424 +#: cola/widgets/about.py:404 cola/widgets/about.py:407 msgid "Japanese translation" msgstr "" -#: cola/widgets/prefs.py:262 +#: cola/widgets/prefs.py:283 msgid "Keep *.orig Merge Backups" msgstr "Biarkan *.orig Merge Backup" -#: cola/widgets/stash.py:71 +#: cola/widgets/stash.py:73 msgid "Keep Index" msgstr "Pertahankan Index" -#: cola/widgets/main.py:477 +#: cola/widgets/main.py:490 msgid "Keyboard Shortcuts" msgstr "Pintasan Papan Tik" -#: cola/cmds.py:1608 cola/sequenceeditor.py:165 cola/sequenceeditor.py:338 -#: cola/widgets/dag.py:395 cola/widgets/filelist.py:34 +#: cola/difftool.py:27 cola/sequenceeditor.py:163 cola/sequenceeditor.py:334 +#: cola/widgets/dag.py:394 cola/widgets/filelist.py:31 msgid "Launch Diff Tool" msgstr "Jalankan Alat Diff" -#: cola/widgets/dag.py:402 +#: cola/widgets/dag.py:401 #, fuzzy msgid "Launch Directory Diff Tool" msgstr "Jalankan Alat Diff" -#: cola/cmds.py:1541 cola/cmds.py:1679 cola/widgets/filelist.py:38 +#: cola/cmds.py:1529 cola/cmds.py:1631 cola/widgets/filelist.py:35 msgid "Launch Editor" msgstr "Jalankan Penyunting" -#: cola/cmds.py:1644 +#: cola/cmds.py:1596 msgid "Launch Terminal" msgstr "Jalankan Terminal" -#: cola/sequenceeditor.py:166 +#: cola/sequenceeditor.py:164 msgid "" "Launch external diff tool\n" "Shortcut: Ctrl+D" msgstr "" -#: cola/widgets/diff.py:1005 cola/widgets/diff.py:1051 -#: cola/widgets/status.py:852 cola/widgets/status.py:948 +#: cola/widgets/diff.py:1044 cola/widgets/diff.py:1106 +#: cola/widgets/status.py:853 cola/widgets/status.py:949 msgid "Launch git-cola" msgstr "Jalankan git-cola" @@ -2154,7 +2216,7 @@ msgstr "Jalankan git-difftool pada versi sebelumnya." msgid "Launch git-difftool on the current path" msgstr "Jalankan git-difftool pada lokasi saat ini." -#: cola/icons.py:56 +#: cola/icons.py:55 msgid "Light Theme" msgstr "" @@ -2163,169 +2225,185 @@ msgstr "" msgid "Lines starting with '%s' will be ignored." msgstr "" -#: cola/widgets/startup.py:74 +#: cola/widgets/startup.py:73 msgid "List" msgstr "" -#: cola/guicmds.py:267 +#: cola/guicmds.py:266 msgid "Load Commit Message" msgstr "Muat Pesan Commit" -#: cola/widgets/main.py:339 +#: cola/widgets/main.py:334 msgid "Load Commit Message..." msgstr "Muat Pesan Commit..." -#: cola/widgets/commitmsg.py:144 +#: cola/widgets/commitmsg.py:150 msgid "Load Previous Commit Message" msgstr "Muat Pesan Commit Sebelumnya" -#: cola/widgets/diff.py:264 +#: cola/widgets/diff.py:265 msgid "Loading..." msgstr "Memuat..." -#: cola/widgets/branch.py:169 cola/widgets/branch.py:240 -#: cola/widgets/branch.py:281 cola/widgets/compare.py:38 -#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/branch.py:173 cola/widgets/branch.py:250 +#: cola/widgets/branch.py:290 cola/widgets/compare.py:37 +#: cola/widgets/compare.py:52 cola/widgets/compare.py:57 msgid "Local" msgstr "Lokal" -#: cola/widgets/cfgactions.py:227 cola/widgets/merge.py:46 -#: cola/widgets/remote.py:138 +#: cola/widgets/cfgactions.py:225 cola/widgets/merge.py:44 +#: cola/widgets/remote.py:136 msgid "Local Branch" msgstr "Cabang Lokal" -#: cola/widgets/createbranch.py:114 +#: cola/widgets/createbranch.py:112 msgid "Local branch" msgstr "Cabang Lokal" -#: cola/widgets/dag.py:788 cola/widgets/main.py:651 +#: cola/widgets/dag.py:854 cola/widgets/main.py:664 msgid "Lock Layout" msgstr "Kunci Tata Letak" -#: cola/widgets/dag.py:750 +#: cola/widgets/dag.py:816 msgid "Log" msgstr "Log" -#: cola/widgets/prefs.py:170 +#: cola/widgets/prefs.py:191 msgid "Log Date Format" msgstr "" -#: cola/widgets/about.py:268 +#: cola/themes.py:769 +msgid "MacOS Aqua dark" +msgstr "" + +#: cola/themes.py:765 +msgid "MacOS Aqua light" +msgstr "" + +#: cola/themes.py:781 +msgid "MacOS Vibrant dark" +msgstr "" + +#: cola/themes.py:775 +msgid "MacOS Vibrant light" +msgstr "" + +#: cola/widgets/about.py:251 msgid "Maintainer (since 2007) and developer" msgstr "" -#: cola/widgets/text.py:398 +#: cola/widgets/text.py:395 msgid "Match Case" msgstr "" -#: cola/widgets/merge.py:88 +#: cola/widgets/merge.py:86 msgid "Merge" msgstr "Merge" -#: cola/widgets/merge.py:162 +#: cola/widgets/merge.py:160 #, python-format msgid "Merge \"%(revision)s\" into \"%(branch)s\"" msgstr "Merge \"%(revision)s\" ke \"%(branch)s\"" -#: cola/widgets/prefs.py:257 +#: cola/widgets/prefs.py:278 msgid "Merge Tool" msgstr "Alat Merger" -#: cola/widgets/prefs.py:171 +#: cola/widgets/prefs.py:193 msgid "Merge Verbosity" msgstr "Verbositas Merge" -#: cola/cmds.py:1829 +#: cola/cmds.py:1780 msgid "Merge failed. Conflict resolution is required." msgstr "" -#: cola/widgets/merge.py:167 +#: cola/widgets/merge.py:165 #, python-format msgid "Merge into \"%s\"" msgstr "Merge ke \"%s\"" -#: cola/widgets/branch.py:231 +#: cola/widgets/branch.py:242 #, fuzzy msgid "Merge into current branch" msgstr "Jelajah Cabang Saat ini..." -#: cola/widgets/main.py:363 +#: cola/widgets/main.py:358 msgid "Merge..." msgstr "Gabung..." -#: cola/widgets/main.py:1163 +#: cola/widgets/main.py:1176 msgid "Merging" msgstr "Menggabungkan" -#: cola/models/browse.py:33 cola/widgets/createtag.py:78 +#: cola/models/browse.py:32 cola/widgets/createtag.py:76 msgid "Message" msgstr "Pesan" -#: cola/widgets/commitmsg.py:417 +#: cola/widgets/commitmsg.py:425 msgid "Missing Commit Message" msgstr "Pesan Commit Tidak Ada" -#: cola/widgets/createbranch.py:252 +#: cola/widgets/createbranch.py:250 msgid "Missing Data" msgstr "Data Hilang" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Missing Name" msgstr "Nama Tidak Ditemukan" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Missing Revision" msgstr "Revisi Tidak Ditemukan" -#: cola/cmds.py:2801 +#: cola/cmds.py:2747 msgid "Missing Tag Message" msgstr "Pesan Tag Tidak Ditemukan" -#: cola/models/browse.py:332 cola/widgets/status.py:158 -#: cola/widgets/status.py:631 +#: cola/models/browse.py:331 cola/widgets/status.py:158 +#: cola/widgets/status.py:632 msgid "Modified" msgstr "Berubah" -#: cola/widgets/commitmsg.py:506 +#: cola/widgets/commitmsg.py:532 msgid "More..." msgstr "Lanjut..." -#: cola/widgets/standard.py:243 cola/widgets/status.py:233 +#: cola/widgets/standard.py:242 cola/widgets/status.py:234 msgid "Move Down" msgstr "Pindah Ke Bawah" -#: cola/widgets/standard.py:235 cola/widgets/status.py:225 +#: cola/widgets/standard.py:234 cola/widgets/status.py:226 msgid "Move Up" msgstr "Pindah Ke Atas" -#: cola/widgets/status.py:300 +#: cola/widgets/status.py:301 msgid "Move files to trash" msgstr "" -#: cola/models/browse.py:33 cola/widgets/bookmarks.py:467 -#: cola/widgets/createtag.py:61 cola/widgets/editremotes.py:450 -#: cola/widgets/status.py:1452 cola/widgets/toolbar.py:312 +#: cola/models/browse.py:32 cola/widgets/bookmarks.py:466 +#: cola/widgets/createtag.py:59 cola/widgets/editremotes.py:448 +#: cola/widgets/status.py:1453 cola/widgets/toolbar.py:317 msgid "Name" msgstr "Nama" -#: cola/widgets/editremotes.py:434 +#: cola/widgets/editremotes.py:432 msgid "Name for the new remote" msgstr "Nama untuk hulu baru" -#: cola/guicmds.py:148 cola/widgets/main.py:285 +#: cola/guicmds.py:147 cola/widgets/main.py:280 #, fuzzy msgid "New Bare Repository..." msgstr "Repositori Baru..." -#: cola/guicmds.py:87 cola/widgets/main.py:280 +#: cola/guicmds.py:86 cola/widgets/main.py:275 msgid "New Repository..." msgstr "Repositori Baru..." -#: cola/widgets/main.py:983 +#: cola/widgets/main.py:996 msgid "New Toolbar" msgstr "" -#: cola/widgets/startup.py:53 +#: cola/widgets/startup.py:52 msgid "New..." msgstr "Baru..." @@ -2334,15 +2412,19 @@ msgstr "Baru..." msgid "Next File" msgstr "Pilih Berkas" -#: cola/widgets/createbranch.py:123 cola/widgets/standard.py:1065 +#: cola/widgets/createbranch.py:121 cola/widgets/standard.py:1183 msgid "No" msgstr "Tidak" -#: cola/widgets/merge.py:217 cola/widgets/merge.py:227 +#: cola/widgets/merge.py:215 cola/widgets/merge.py:225 msgid "No Revision Specified" msgstr "Revisi tidak Ditentukan" -#: cola/widgets/commitmsg.py:427 +#: cola/widgets/stash.py:225 +msgid "No change made" +msgstr "" + +#: cola/widgets/commitmsg.py:435 msgid "" "No changes to commit.\n" "\n" @@ -2352,29 +2434,29 @@ msgstr "" "\n" "Anda harus menstag setidaknya 1 berkas sebelum Anda commit." -#: cola/widgets/selectcommits.py:118 +#: cola/widgets/selectcommits.py:117 msgid "No commits exist in this branch." msgstr "Tidak ada commit di cabang ini." -#: cola/widgets/merge.py:65 +#: cola/widgets/merge.py:63 #, fuzzy msgid "No fast forward" msgstr "Hanya Fast Forward" -#: cola/widgets/remote.py:186 +#: cola/widgets/remote.py:190 #, fuzzy msgid "No fast-forward" msgstr "Hanya Fast Forward" -#: cola/widgets/remote.py:577 +#: cola/widgets/remote.py:612 msgid "No repository selected." msgstr "Tidak ada repositori terpilih" -#: cola/widgets/remote.py:615 +#: cola/widgets/remote.py:650 msgid "Non-fast-forward fetch overwrites local history!" msgstr "Nonfast-forward fetch menimpa histori lokal!" -#: cola/widgets/remote.py:621 +#: cola/widgets/remote.py:656 msgid "" "Non-fast-forward push overwrites published history!\n" "(Did you pull first?)" @@ -2382,7 +2464,7 @@ msgstr "" "Non-fast-forward push menimpa histori terpublikasi!\n" "(Apakah sudah ditarik sebelumnya?)" -#: cola/widgets/commitmsg.py:444 +#: cola/widgets/commitmsg.py:452 msgid "Nothing to commit" msgstr "Tidak ada yang dicommit" @@ -2390,81 +2472,81 @@ msgstr "Tidak ada yang dicommit" msgid "Nothing to do" msgstr "Tak ada yang perlu dilakukan" -#: cola/widgets/prefs.py:172 +#: cola/widgets/prefs.py:194 msgid "Number of Diff Context Lines" msgstr "Jumlah Baris Context Diff" -#: cola/widgets/bookmarks.py:79 cola/widgets/bookmarks.py:213 -#: cola/widgets/startup.py:336 +#: cola/widgets/bookmarks.py:78 cola/widgets/bookmarks.py:212 +#: cola/widgets/startup.py:335 msgid "Open" msgstr "Buka" -#: cola/widgets/text.py:230 +#: cola/widgets/text.py:228 #, python-format msgid "Open \"%s\"" msgstr "" -#: cola/cmds.py:1857 +#: cola/cmds.py:1808 msgid "Open Directory" msgstr "" -#: cola/guicmds.py:205 cola/guicmds.py:214 cola/widgets/editremotes.py:473 -#: cola/widgets/startup.py:55 cola/widgets/startup.py:215 +#: cola/guicmds.py:204 cola/guicmds.py:213 cola/widgets/editremotes.py:471 +#: cola/widgets/startup.py:54 cola/widgets/startup.py:214 msgid "Open Git Repository" msgstr "Bukan Repositori Git" -#: cola/widgets/submodules.py:49 +#: cola/widgets/submodules.py:48 #, fuzzy msgid "Open Parent" msgstr "Buka yang Terkini" -#: cola/cmds.py:1877 +#: cola/cmds.py:1828 msgid "Open Parent Directory" msgstr "Bukan Direktori di Atasnya" -#: cola/widgets/main.py:679 +#: cola/widgets/main.py:692 msgid "Open Recent" msgstr "Buka yang Terkini" -#: cola/cmds.py:1840 +#: cola/cmds.py:1791 msgid "Open Using Default Application" msgstr "Buka dengan Aplikasi Bawaan" -#: cola/cmds.py:1890 +#: cola/cmds.py:1841 msgid "Open Worktree" msgstr "" -#: cola/widgets/bookmarks.py:221 cola/widgets/startup.py:344 +#: cola/widgets/bookmarks.py:220 cola/widgets/startup.py:343 msgid "Open in New Window" msgstr "Bukan di Jendela Baru" -#: cola/widgets/main.py:408 +#: cola/widgets/main.py:415 msgid "Open in New Window..." msgstr "Buka di Jendela Baru..." -#: cola/widgets/main.py:402 +#: cola/widgets/main.py:409 msgid "Open..." msgstr "Buka..." -#: cola/widgets/branch.py:345 +#: cola/widgets/branch.py:354 #, fuzzy msgid "Other branches" msgstr "Ambil..." -#: cola/widgets/archive.py:210 +#: cola/widgets/archive.py:208 msgid "Overwrite" msgstr "Timpa" -#: cola/widgets/archive.py:209 +#: cola/widgets/archive.py:207 #, python-format msgid "Overwrite \"%s\"?" msgstr "Timpa \"%s\"" -#: cola/widgets/archive.py:207 +#: cola/widgets/archive.py:205 msgid "Overwrite File?" msgstr "Timpa Berkas?" -#: cola/widgets/grep.py:144 +#: cola/widgets/grep.py:142 msgid "" "Parse arguments using a shell.\n" "Queries with spaces will require \"double quotes\"." @@ -2472,63 +2554,67 @@ msgstr "" "Uraikan argumen menggunakan sebuah shell.\n" "Queri dengan spasi memerlukan \"tanda kutip dua\"." -#: cola/models/browse.py:330 +#: cola/models/browse.py:329 msgid "Partially Staged" msgstr "Sebagian Stagged" -#: cola/widgets/main.py:744 +#: cola/widgets/main.py:757 msgid "Paste" msgstr "" -#: cola/cmds.py:363 +#: cola/cmds.py:364 msgid "Patch failed to apply" msgstr "" -#: cola/cmds.py:375 +#: cola/cmds.py:376 msgid "Patch(es) Applied" msgstr "Patch Diterapkan" -#: cola/widgets/diff.py:1219 cola/widgets/main.py:695 +#: cola/widgets/diff.py:1293 cola/widgets/main.py:708 msgid "Patches" msgstr "" -#: cola/widgets/prefs.py:173 +#: cola/widgets/prefs.py:195 msgid "Patches Directory" msgstr "" -#: cola/widgets/bookmarks.py:468 cola/widgets/submodules.py:118 +#: cola/widgets/bookmarks.py:467 cola/widgets/submodules.py:117 msgid "Path" msgstr "" -#: cola/widgets/clone.py:112 +#: cola/widgets/clone.py:110 msgid "Path or URL to clone (Env. $VARS okay)" msgstr "Lokasi atau URL untuk kloning (Env. $VARS oke)" -#: cola/sequenceeditor.py:346 +#: cola/sequenceeditor.py:342 msgid "Pick" msgstr "" -#: cola/widgets/diff.py:781 +#: cola/widgets/dag.py:490 +msgid "Pickaxe search for changes containing text" +msgstr "" + +#: cola/widgets/diff.py:809 msgid "Pixel XOR" msgstr "" -#: cola/widgets/createbranch.py:253 +#: cola/widgets/createbranch.py:251 msgid "Please provide both a branch name and revision expression." msgstr "Silahkan tentukan nama cabang dan ekspresi revisi." -#: cola/cmds.py:2348 +#: cola/cmds.py:2299 msgid "Please select a file" msgstr "Silahkan pilih berkas" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Please specify a name for the new tag." msgstr "Silahkan tentukan nama untuk tag baru." -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Please specify a revision to tag." msgstr "Tentukan revisi untuk di-tag" -#: cola/widgets/commitmsg.py:410 +#: cola/widgets/commitmsg.py:418 msgid "" "Please supply a commit message.\n" "\n" @@ -2546,32 +2632,32 @@ msgstr "" "- Baris kedua: Kosong\n" "- Baris selanjutnya : Jelaskan mengapa perubahan ini bagus.\n" -#: cola/cmds.py:653 +#: cola/cmds.py:655 msgid "Point the current branch head to a new commit?" msgstr "" -#: cola/widgets/about.py:416 +#: cola/widgets/about.py:399 msgid "Polish translation" msgstr "" -#: cola/widgets/stash.py:63 cola/widgets/stash.py:111 cola/widgets/stash.py:115 +#: cola/widgets/stash.py:65 cola/widgets/stash.py:114 cola/widgets/stash.py:118 msgid "Pop" msgstr "" -#: cola/widgets/main.py:293 cola/widgets/prefs.py:395 +#: cola/widgets/main.py:288 cola/widgets/prefs.py:433 msgid "Preferences" msgstr "Preferensi" -#: cola/widgets/archive.py:129 +#: cola/widgets/archive.py:127 msgid "Prefix" msgstr "Awalan" -#: cola/widgets/main.py:345 +#: cola/widgets/main.py:340 #, fuzzy msgid "Prepare Commit Message" msgstr "Cari Pesan Commit" -#: cola/widgets/prefs.py:157 +#: cola/widgets/prefs.py:180 msgid "Prevent \"Stage\" from staging all files when nothing is selected" msgstr "" @@ -2579,228 +2665,240 @@ msgstr "" msgid "Previous File" msgstr "" -#: cola/widgets/remote.py:171 +#: cola/widgets/remote.py:169 msgid "Prompt on creation" msgstr "" -#: cola/widgets/remote.py:172 +#: cola/widgets/remote.py:170 #, fuzzy msgid "Prompt when pushing creates new remote branches" msgstr "Buat cabang baru di hulu?" -#: cola/widgets/remote.py:208 +#: cola/widgets/remote.py:212 msgid "Prune " msgstr "" -#: cola/widgets/bookmarks.py:255 cola/widgets/startup.py:376 +#: cola/widgets/bookmarks.py:254 cola/widgets/startup.py:375 msgid "Prune Missing Entries" msgstr "" -#: cola/widgets/branch.py:247 cola/widgets/remote.py:728 +#: cola/widgets/branch.py:256 cola/widgets/remote.py:783 #, fuzzy msgid "Pull" msgstr "Tarik..." -#: cola/widgets/action.py:65 cola/widgets/main.py:397 +#: cola/widgets/action.py:73 cola/widgets/main.py:401 msgid "Pull..." msgstr "Tarik..." -#: cola/widgets/branch.py:253 cola/widgets/remote.py:593 -#: cola/widgets/remote.py:698 +#: cola/widgets/branch.py:262 cola/widgets/remote.py:628 +#: cola/widgets/remote.py:758 msgid "Push" msgstr "Push" -#: cola/widgets/action.py:64 cola/widgets/main.py:392 +#: cola/widgets/action.py:70 cola/widgets/main.py:393 +msgid "Push to one or more remotes using \"git push\"" +msgstr "" + +#: cola/widgets/action.py:70 cola/widgets/main.py:392 msgid "Push..." msgstr "Tekan..." -#: cola/guicmds.py:252 +#: cola/guicmds.py:251 msgid "Quick Open Repository" msgstr "" -#: cola/widgets/main.py:660 +#: cola/widgets/main.py:673 msgid "Quick Open..." msgstr "" -#: cola/widgets/main.py:355 +#: cola/widgets/main.py:350 msgid "Quit" msgstr "Tutup" -#: cola/cmds.py:2144 cola/cmds.py:2180 cola/cmds.py:2181 cola/cmds.py:2194 -#: cola/cmds.py:2195 cola/sequenceeditor.py:158 cola/sequenceeditor.py:199 -#: cola/widgets/main.py:822 cola/widgets/remote.py:211 +#: cola/cmds.py:2095 cola/cmds.py:2131 cola/cmds.py:2132 cola/cmds.py:2145 +#: cola/cmds.py:2146 cola/sequenceeditor.py:156 cola/sequenceeditor.py:197 +#: cola/widgets/main.py:835 cola/widgets/remote.py:215 msgid "Rebase" msgstr "Rebase" -#: cola/cmds.py:2143 +#: cola/cmds.py:2094 #, python-format msgid "Rebase onto %s" msgstr "Rebase ke %s" -#: cola/cmds.py:2156 +#: cola/cmds.py:2107 #, fuzzy msgid "Rebase stopped" msgstr "Rebase" -#: cola/widgets/remote.py:210 +#: cola/widgets/remote.py:214 msgid "Rebase the current branch instead of merging" msgstr "" -#: cola/widgets/dag.py:419 +#: cola/widgets/dag.py:418 msgid "Rebase to this commit" msgstr "" -#: cola/widgets/main.py:1165 +#: cola/widgets/main.py:1178 msgid "Rebasing" msgstr "Me-rebase" -#: cola/widgets/main.py:120 +#: cola/widgets/main.py:118 #, fuzzy msgid "Recent" msgstr "Reset" -#: cola/widgets/bookmarks.py:93 +#: cola/widgets/bookmarks.py:92 #, fuzzy msgid "Recent repositories" msgstr "Semua Repositori" -#: cola/widgets/prefs.py:258 +#: cola/widgets/prefs.py:279 #, fuzzy msgid "Recent repository count" msgstr "Semua Repositori" -#: cola/widgets/recent.py:46 +#: cola/widgets/recent.py:44 msgid "Recently Modified Files" msgstr "Berkas yang Baru Dimodifikasi" -#: cola/widgets/main.py:320 +#: cola/widgets/main.py:315 msgid "Recently Modified Files..." msgstr "Berkas Baru Dimodifikasi..." -#: cola/widgets/stash.py:256 +#: cola/widgets/stash.py:274 msgid "Recovering a dropped stash is not possible." msgstr "Tidak mungkin mengembalikan stash yang dibuang." -#: cola/widgets/createbranch.py:283 +#: cola/widgets/createbranch.py:281 msgid "Recovering lost commits may not be easy." msgstr "Mengembalikan commit yang hilang tidak akan mudah." -#: cola/widgets/main.py:737 +#: cola/widgets/main.py:750 msgid "Redo" msgstr "" -#: cola/widgets/clone.py:121 +#: cola/widgets/clone.py:119 msgid "Reduce commit history to minimum" msgstr "" -#: cola/widgets/submodules.py:121 +#: cola/widgets/submodules.py:120 msgid "Reference Repository" msgstr "" -#: cola/widgets/submodules.py:105 +#: cola/widgets/submodules.py:104 msgid "Reference URL" msgstr "" -#: cola/widgets/submodules.py:106 +#: cola/widgets/submodules.py:105 msgid "Reference repository to use when cloning (optional)" msgstr "" -#: cola/cmds.py:2222 cola/qtutils.py:770 cola/widgets/action.py:62 -#: cola/widgets/dag.py:792 cola/widgets/editremotes.py:85 -#: cola/widgets/grep.py:105 cola/widgets/recent.py:116 -#: cola/widgets/submodules.py:45 +#: cola/cmds.py:2173 cola/qtutils.py:801 cola/widgets/action.py:63 +#: cola/widgets/dag.py:858 cola/widgets/editremotes.py:84 +#: cola/widgets/grep.py:103 cola/widgets/recent.py:114 +#: cola/widgets/submodules.py:44 msgid "Refresh" msgstr "Segarkan" -#: cola/widgets/remote.py:179 +#: cola/widgets/remote.py:183 msgid "Refuse to merge unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward" msgstr "" -#: cola/widgets/branch.py:173 cola/widgets/branch.py:225 -#: cola/widgets/branch.py:269 cola/widgets/branch.py:470 -#: cola/widgets/compare.py:54 cola/widgets/compare.py:59 -#: cola/widgets/remote.py:147 +#: cola/widgets/branch.py:177 cola/widgets/branch.py:236 +#: cola/widgets/branch.py:278 cola/widgets/branch.py:513 +#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/remote.py:145 msgid "Remote" msgstr "Hulu" -#: cola/widgets/remote.py:162 +#: cola/widgets/remote.py:160 msgid "Remote Branch" msgstr "Cabang Hulu" -#: cola/cmds.py:1196 +#: cola/cmds.py:1197 msgid "Remote Branch Deleted" msgstr "Cabang Hulu Dihapus" -#: cola/widgets/editremotes.py:49 +#: cola/widgets/log.py:99 +msgid "Remote Messages" +msgstr "" + +#: cola/widgets/editremotes.py:48 msgid "Remote git repositories - double-click to rename" msgstr "Repositori hulu git - dobel-klik untuk mengganti nama" -#: cola/cmds.py:1029 cola/widgets/patch.py:107 cola/widgets/patch.py:122 -#: cola/widgets/startup.py:265 cola/widgets/status.py:1382 +#: cola/cmds.py:1030 cola/widgets/diff.py:1701 cola/widgets/diff.py:1716 +#: cola/widgets/startup.py:264 cola/widgets/status.py:1383 msgid "Remove" msgstr "Hapus" -#: cola/cmds.py:1027 +#: cola/cmds.py:1028 #, python-format msgid "Remove %s from the recent list?" msgstr "" -#: cola/widgets/toolbar.py:316 +#: cola/widgets/toolbar.py:321 #, fuzzy msgid "Remove Element" msgstr "Hapus" -#: cola/widgets/remote.py:206 +#: cola/widgets/remote.py:210 msgid "Remove remote-tracking branches that no longer exist on the remote" msgstr "" -#: cola/widgets/patch.py:109 +#: cola/widgets/diff.py:1703 msgid "Remove selected (Delete)" msgstr "Hapus yang terpilih (Hapus)" -#: cola/widgets/bookmarks.py:258 cola/widgets/startup.py:379 +#: cola/widgets/bookmarks.py:257 cola/widgets/startup.py:378 msgid "Remove stale entries for repositories that no longer exist" msgstr "" -#: cola/guicmds.py:333 cola/widgets/browse.py:159 +#: cola/guicmds.py:332 cola/widgets/browse.py:159 cola/widgets/stash.py:44 msgid "Rename" msgstr "Ganti nama" -#: cola/cmds.py:1153 +#: cola/cmds.py:1154 #, fuzzy, python-format msgid "Rename \"%s\"" msgstr "Ganti nama" -#: cola/widgets/branch.py:259 +#: cola/widgets/branch.py:268 #, fuzzy msgid "Rename Branch" msgstr "Cabang Hulu" -#: cola/widgets/main.py:570 +#: cola/widgets/main.py:583 #, fuzzy msgid "Rename Branch..." msgstr "Cabang Hulu" -#: cola/guicmds.py:330 +#: cola/guicmds.py:329 #, fuzzy msgid "Rename Existing Branch" msgstr "Perbarui Cabang yang Ada:" -#: cola/cmds.py:944 +#: cola/cmds.py:942 msgid "Rename Remote" msgstr "Ganti Nama Hulu" -#: cola/widgets/bookmarks.py:233 cola/widgets/startup.py:356 +#: cola/widgets/bookmarks.py:232 cola/widgets/startup.py:355 #, fuzzy msgid "Rename Repository" msgstr "Repositori Saat Ini" -#: cola/widgets/branch.py:445 +#: cola/widgets/stash.py:218 +msgid "Rename Stash" +msgstr "" + +#: cola/widgets/branch.py:478 #, fuzzy msgid "Rename branch" msgstr "Cabang Hulu" -#: cola/cmds.py:945 +#: cola/cmds.py:943 #, python-format msgid "Rename remote \"%(current)s\" to \"%(new)s\"?" msgstr "Ganti nama hulu \"%(current)s\" ke \"%(new)s\"?" @@ -2810,180 +2908,184 @@ msgstr "Ganti nama hulu \"%(current)s\" ke \"%(new)s\"?" msgid "Rename selected paths" msgstr "Sunting lokasi terpilih" -#: cola/app.py:497 cola/widgets/startup.py:262 +#: cola/widgets/stash.py:45 +msgid "Rename the selected stash" +msgstr "" + +#: cola/app.py:500 cola/widgets/startup.py:261 msgid "Repository Not Found" msgstr "" -#: cola/widgets/browse.py:87 cola/widgets/main.py:1095 +#: cola/widgets/browse.py:87 cola/widgets/main.py:1108 #, python-format msgid "Repository: %s" msgstr "Repositori: %s" -#: cola/guicmds.py:351 cola/widgets/createbranch.py:125 cola/widgets/dag.py:331 -#: cola/widgets/editremotes.py:58 cola/widgets/main.py:832 +#: cola/guicmds.py:350 cola/widgets/createbranch.py:123 cola/widgets/dag.py:330 +#: cola/widgets/editremotes.py:57 cola/widgets/main.py:845 msgid "Reset" msgstr "Reset" -#: cola/widgets/createbranch.py:286 +#: cola/widgets/createbranch.py:284 #, python-format msgid "Reset \"%(branch)s\" to \"%(revision)s\"?" msgstr "Atur Ulang \"%(branch)s\" ke \"%(revision)s\"?" -#: cola/guicmds.py:359 +#: cola/guicmds.py:358 msgid "Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/cmds.py:655 cola/cmds.py:706 cola/guicmds.py:342 -#: cola/widgets/createbranch.py:295 +#: cola/cmds.py:657 cola/cmds.py:708 cola/guicmds.py:341 +#: cola/widgets/createbranch.py:293 msgid "Reset Branch" msgstr "Atur Ulang Cabang" -#: cola/cmds.py:703 cola/guicmds.py:341 cola/widgets/dag.py:425 -#: cola/widgets/main.py:419 +#: cola/cmds.py:705 cola/guicmds.py:340 cola/widgets/dag.py:424 +#: cola/widgets/main.py:431 msgid "Reset Branch (Soft)" msgstr "" -#: cola/cmds.py:652 cola/guicmds.py:350 cola/widgets/dag.py:431 -#: cola/widgets/main.py:426 +#: cola/cmds.py:654 cola/guicmds.py:349 cola/widgets/dag.py:430 +#: cola/widgets/main.py:439 msgid "Reset Branch and Stage (Mixed)" msgstr "" -#: cola/widgets/createbranch.py:292 +#: cola/widgets/createbranch.py:290 msgid "Reset Branch?" msgstr "Atur Ulang Cabang?" -#: cola/widgets/main.py:655 +#: cola/widgets/main.py:668 msgid "Reset Layout" msgstr "" -#: cola/cmds.py:687 +#: cola/cmds.py:689 msgid "Reset Worktree and Reset All?" msgstr "" -#: cola/cmds.py:672 cola/cmds.py:689 cola/cmds.py:723 cola/guicmds.py:360 -#: cola/guicmds.py:373 cola/guicmds.py:382 +#: cola/cmds.py:674 cola/cmds.py:691 cola/cmds.py:725 cola/guicmds.py:359 +#: cola/guicmds.py:372 cola/guicmds.py:381 msgid "Reset and Restore" msgstr "" -#: cola/cmds.py:704 +#: cola/cmds.py:706 msgid "Reset branch?" msgstr "" -#: cola/widgets/createbranch.py:266 +#: cola/widgets/createbranch.py:264 #, python-format msgid "Resetting \"%(branch)s\" to \"%(revision)s\" will lose commits." msgstr "Mengatur ulang \"%(branch)s\" ke \"%(revision)s\" akan menghilangkan commit." -#: cola/widgets/prefs.py:264 +#: cola/widgets/prefs.py:285 msgid "Resize File Browser columns" msgstr "" -#: cola/widgets/prefs.py:374 +#: cola/widgets/prefs.py:412 msgid "Restart the application after changing appearance settings." msgstr "" -#: cola/cmds.py:757 cola/cmds.py:760 cola/guicmds.py:390 cola/guicmds.py:391 -#: cola/widgets/dag.py:461 cola/widgets/main.py:457 +#: cola/cmds.py:759 cola/cmds.py:762 cola/guicmds.py:389 cola/guicmds.py:390 +#: cola/widgets/dag.py:460 cola/widgets/main.py:471 msgid "Restore Worktree" msgstr "" -#: cola/cmds.py:720 cola/guicmds.py:381 cola/widgets/dag.py:454 -#: cola/widgets/main.py:450 +#: cola/cmds.py:722 cola/guicmds.py:380 cola/widgets/dag.py:453 +#: cola/widgets/main.py:463 msgid "Restore Worktree and Reset All (Hard)" msgstr "" -#: cola/cmds.py:669 cola/widgets/main.py:434 +#: cola/cmds.py:671 cola/widgets/main.py:447 msgid "Restore Worktree and Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/widgets/dag.py:438 +#: cola/widgets/dag.py:437 msgid "Restore Worktree and Reset All (Keep Unstaged Edits)" msgstr "" -#: cola/cmds.py:686 cola/guicmds.py:372 cola/widgets/dag.py:446 -#: cola/widgets/main.py:442 +#: cola/cmds.py:688 cola/guicmds.py:371 cola/widgets/dag.py:445 +#: cola/widgets/main.py:455 msgid "Restore Worktree and Reset All (Merge)" msgstr "" -#: cola/cmds.py:721 +#: cola/cmds.py:723 msgid "Restore Worktree and Reset All?" msgstr "" -#: cola/cmds.py:758 +#: cola/cmds.py:760 #, python-format msgid "Restore Worktree to %s?" msgstr "" -#: cola/cmds.py:670 +#: cola/cmds.py:672 msgid "Restore worktree, reset, and preserve unstaged edits?" msgstr "" -#: cola/widgets/dag.py:390 +#: cola/widgets/dag.py:389 msgid "Revert" msgstr "" -#: cola/widgets/diff.py:1153 +#: cola/widgets/diff.py:1227 msgid "Revert Diff Hunk" msgstr "Kembalikan Area Diff" -#: cola/widgets/diff.py:1018 +#: cola/widgets/diff.py:1057 msgid "Revert Diff Hunk..." msgstr "Kembalikan Area Diff..." -#: cola/widgets/diff.py:1152 +#: cola/widgets/diff.py:1226 msgid "Revert Diff Hunk?" msgstr "Kembalikan Area Diff?" -#: cola/widgets/diff.py:1150 +#: cola/widgets/diff.py:1224 msgid "Revert Selected Lines" msgstr "Kembalikan Baris Terpilih" -#: cola/widgets/diff.py:1013 +#: cola/widgets/diff.py:1052 msgid "Revert Selected Lines..." msgstr "Kembalikan Baris Terpilih..." -#: cola/widgets/diff.py:1149 +#: cola/widgets/diff.py:1223 msgid "Revert Selected Lines?" msgstr "Kembalikan Baris Terpilih?" -#: cola/cmds.py:2311 +#: cola/cmds.py:2262 msgid "Revert Uncommitted Changes" msgstr "Kembalikan Perubahan Tak Tercommit" -#: cola/cmds.py:2305 +#: cola/cmds.py:2256 msgid "Revert Uncommitted Changes?" msgstr "Kembalikan Perubahan Tak Tercommit?" -#: cola/cmds.py:2298 +#: cola/cmds.py:2249 #, fuzzy msgid "Revert Uncommitted Edits..." msgstr "Kembalikan Suntingan Belum dicommmit..." -#: cola/cmds.py:2289 +#: cola/cmds.py:2240 msgid "Revert Unstaged Changes" msgstr "Kembalikan Perubahan Belum Distag" -#: cola/cmds.py:2283 +#: cola/cmds.py:2234 msgid "Revert Unstaged Changes?" msgstr "Kembalikan Perubahan Belum Distag?" -#: cola/cmds.py:2275 +#: cola/cmds.py:2226 msgid "Revert Unstaged Edits..." msgstr "Kembalikan Suntingan tak distag..." -#: cola/cmds.py:598 +#: cola/cmds.py:599 msgid "Revert failed" msgstr "" -#: cola/cmds.py:2310 cola/widgets/diff.py:1161 +#: cola/cmds.py:2261 cola/widgets/diff.py:1235 msgid "Revert the uncommitted changes?" msgstr "Kembalikan perubahan tak tercommit?" -#: cola/cmds.py:2288 +#: cola/cmds.py:2239 msgid "Revert the unstaged changes?" msgstr "Kembalikan perubahan belum distag?" -#: cola/widgets/browse.py:189 +#: cola/widgets/browse.py:190 #, fuzzy msgid "Revert uncommitted changes to selected paths" msgstr "Kembalikan perubahan ke lokasi terpilih." @@ -2993,443 +3095,459 @@ msgstr "Kembalikan perubahan ke lokasi terpilih." msgid "Revert unstaged changes to selected paths" msgstr "Kembalikan perubahan ke lokasi terpilih." -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Review" msgstr "Tinjau" -#: cola/widgets/main.py:583 +#: cola/widgets/main.py:596 msgid "Review..." msgstr "Pratampil..." -#: cola/widgets/cfgactions.py:233 cola/widgets/createtag.py:84 +#: cola/widgets/cfgactions.py:231 cola/widgets/createtag.py:82 msgid "Revision" msgstr "Revisi" -#: cola/widgets/selectcommits.py:62 +#: cola/widgets/selectcommits.py:61 msgid "Revision Expression:" msgstr "Ekspresi Revisi:" -#: cola/widgets/merge.py:39 cola/widgets/merge.py:42 +#: cola/widgets/merge.py:37 cola/widgets/merge.py:40 msgid "Revision to Merge" msgstr "Revisi untuk Dimerge" -#: cola/sequenceeditor.py:351 +#: cola/sequenceeditor.py:347 msgid "Reword" msgstr "" -#: cola/cmds.py:776 cola/widgets/commitmsg.py:456 +#: cola/cmds.py:778 cola/widgets/commitmsg.py:464 msgid "Rewrite Published Commit?" msgstr "Tulis Ulang Penerbit Commit?" -#: cola/widgets/log.py:31 +#: cola/widgets/log.py:31 cola/widgets/log.py:133 msgid "Right-click links to open:" msgstr "" -#: cola/interaction.py:127 cola/widgets/cfgactions.py:245 +#: cola/interaction.py:125 cola/widgets/cfgactions.py:243 msgid "Run" msgstr "Jalankan" -#: cola/cmds.py:2341 +#: cola/cmds.py:2292 #, python-format msgid "Run \"%s\"?" msgstr "Jalankan \"%s\"?" -#: cola/interaction.py:124 +#: cola/interaction.py:122 #, python-format msgid "Run %s?" msgstr "Jalankan %s?" -#: cola/interaction.py:125 +#: cola/interaction.py:123 #, python-format msgid "Run the \"%s\" command?" msgstr "Jalankan perintah \"%s\"?" -#: cola/cmds.py:2380 +#: cola/cmds.py:2331 #, python-format msgid "Running command: %s" msgstr "Menjalankan perintah: %s" -#: cola/widgets/about.py:422 +#: cola/widgets/about.py:405 msgid "Russian translation" msgstr "" -#: cola/sequenceeditor.py:324 +#: cola/sequenceeditor.py:321 #, fuzzy msgid "SHA-1" msgstr "Salin SHA-1" -#: cola/widgets/prefs.py:183 +#: cola/widgets/prefs.py:205 #, fuzzy msgid "Safe Mode" msgstr "Stage Berubah" -#: cola/cmds.py:2167 cola/widgets/archive.py:126 cola/widgets/browse.py:609 -#: cola/widgets/editremotes.py:54 cola/widgets/stash.py:52 -#: cola/widgets/status.py:1388 +#: cola/cmds.py:2118 cola/widgets/archive.py:124 cola/widgets/browse.py:610 +#: cola/widgets/editremotes.py:53 cola/widgets/stash.py:54 +#: cola/widgets/status.py:1389 msgid "Save" msgstr "Simpan" -#: cola/widgets/archive.py:113 +#: cola/widgets/archive.py:111 msgid "Save Archive" msgstr "Simpan Arsip" -#: cola/widgets/dag.py:382 cola/widgets/main.py:351 +#: cola/widgets/dag.py:381 cola/widgets/main.py:346 msgid "Save As Tarball/Zip..." msgstr "Simpan Sebagai Tarball/Zip.." -#: cola/widgets/prefs.py:263 +#: cola/widgets/prefs.py:284 msgid "Save GUI Settings" msgstr "Simpan Pengaturan GUI" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Save Stash" msgstr "Simpan Stash" -#: cola/widgets/stash.py:53 +#: cola/widgets/stash.py:55 msgid "Save modified state to new stash" msgstr "Simpan perubahan ke stash baru" -#: cola/widgets/browse.py:570 +#: cola/widgets/browse.py:571 #, python-format msgid "Saved \"%(filename)s\" from \"%(ref)s\" to \"%(destination)s\"" msgstr "Simpan \"%(filename)s\" dari \"%(ref)s\" ke \"%(destination)s\"" -#: cola/widgets/bookmarks.py:83 cola/widgets/grep.py:98 -#: cola/widgets/search.py:42 cola/widgets/search.py:62 +#: cola/widgets/bookmarks.py:82 cola/widgets/grep.py:96 +#: cola/widgets/search.py:41 cola/widgets/search.py:61 msgid "Search" msgstr "Cari" -#: cola/widgets/search.py:226 +#: cola/widgets/search.py:225 msgid "Search Authors" msgstr "Cari Penulis" -#: cola/widgets/search.py:224 +#: cola/widgets/search.py:223 msgid "Search Commit Messages" msgstr "Cari Pesan Commit" -#: cola/widgets/search.py:227 +#: cola/widgets/search.py:226 msgid "Search Committers" msgstr "Cari Commiter" -#: cola/widgets/search.py:228 +#: cola/widgets/search.py:227 msgid "Search Date Range" msgstr "Cari Rentang Tanggal" -#: cola/widgets/search.py:225 +#: cola/widgets/search.py:224 msgid "Search Diffs" msgstr "Cari Diff" -#: cola/widgets/search.py:222 +#: cola/widgets/search.py:221 msgid "Search by Expression" msgstr "Cari berdasarkan Ekspresi" -#: cola/widgets/search.py:223 +#: cola/widgets/search.py:222 msgid "Search by Path" msgstr "Cari berdasarkan Lokasi" -#: cola/widgets/grep.py:124 +#: cola/widgets/dag.py:494 +msgid "Search commit messages" +msgstr "" + +#: cola/widgets/grep.py:122 msgid "Search for a fixed string" msgstr "Cari teks tetap" -#: cola/widgets/diff.py:519 cola/widgets/diff.py:1514 +#: cola/widgets/diff.py:526 cola/widgets/diff.py:1576 msgid "Search in Diff" msgstr "" -#: cola/guicmds.py:253 cola/widgets/bookmarks.py:62 +#: cola/guicmds.py:252 cola/widgets/bookmarks.py:61 msgid "Search repositories by name..." msgstr "" -#: cola/widgets/grep.py:122 +#: cola/widgets/grep.py:120 msgid "Search using a POSIX basic regular expression" msgstr "Cari menggunakan ekspresi reguler POSIX dasar" -#: cola/widgets/grep.py:123 +#: cola/widgets/grep.py:121 msgid "Search using a POSIX extended regular expression" msgstr "Cari menggunakan ekspresi reguler POSIX perluasan" -#: cola/widgets/main.py:493 +#: cola/widgets/main.py:506 msgid "Search..." msgstr "Cari..." -#: cola/widgets/selectcommits.py:67 +#: cola/widgets/selectcommits.py:66 msgid "Search:" msgstr "" -#: cola/guicmds.py:330 cola/widgets/selectcommits.py:74 +#: cola/guicmds.py:329 cola/widgets/selectcommits.py:73 msgid "Select" msgstr "Pilih" -#: cola/widgets/main.py:750 +#: cola/widgets/main.py:763 msgid "Select All" msgstr "Pilih Semua" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Select Branch to Review" msgstr "Pilih Cabang untuk Ditinjau" -#: cola/widgets/dag.py:1610 +#: cola/widgets/dag.py:1667 msgid "Select Child" msgstr "Pilih Anakan" -#: cola/widgets/commitmsg.py:512 +#: cola/widgets/commitmsg.py:538 msgid "Select Commit" msgstr "Pilih Commit" -#: cola/guicmds.py:137 +#: cola/guicmds.py:136 #, fuzzy msgid "Select Directory..." msgstr "Pilih Repository..." -#: cola/cmds.py:2129 +#: cola/cmds.py:2080 msgid "Select New Upstream" msgstr "Pilih Upstream Baru" -#: cola/widgets/dag.py:1614 +#: cola/widgets/dag.py:1671 msgid "Select Newest Child" msgstr "Pilih Anakan Terbaru" -#: cola/widgets/dag.py:1604 +#: cola/widgets/dag.py:1661 msgid "Select Oldest Parent" msgstr "Pilih Indukan Tertua" -#: cola/widgets/dag.py:1599 +#: cola/widgets/dag.py:1656 msgid "Select Parent" msgstr "Pilih Indukan" -#: cola/widgets/browse.py:525 +#: cola/widgets/browse.py:526 msgid "Select Previous Version" msgstr "Pilih Versi Sebelumnya" -#: cola/widgets/clone.py:197 +#: cola/widgets/clone.py:195 msgid "Select a parent directory for the new clone" msgstr "Pilih direktori di atasnya untuk klon baru" -#: cola/widgets/standard.py:756 cola/widgets/standard.py:779 +#: cola/widgets/standard.py:826 cola/widgets/standard.py:848 msgid "Select directory" msgstr "" -#: cola/widgets/selectcommits.py:162 +#: cola/widgets/selectcommits.py:161 #, fuzzy msgid "Select output dir" msgstr "Pilih Commit" -#: cola/widgets/selectcommits.py:183 +#: cola/widgets/selectcommits.py:182 #, fuzzy msgid "Select output directory" msgstr "Pilih Repository..." -#: cola/widgets/patch.py:175 +#: cola/widgets/diff.py:1769 #, fuzzy msgid "Select patch file(s)..." msgstr "Pilih berkas patch..." -#: cola/widgets/editremotes.py:437 +#: cola/widgets/editremotes.py:435 #, fuzzy msgid "Select repository" msgstr "Pilih Repository..." -#: cola/widgets/bookmarks.py:225 cola/widgets/startup.py:348 +#: cola/widgets/bookmarks.py:224 cola/widgets/startup.py:347 #, fuzzy msgid "Set Default Repository" msgstr "Pilih Repository..." -#: cola/widgets/branch.py:282 +#: cola/widgets/branch.py:291 #, fuzzy msgid "Set Upstream Branch" msgstr "Pilih Upstream Baru" -#: cola/widgets/branch.py:72 +#: cola/widgets/branch.py:74 msgid "" "Set the sort order for branches and tags.\n" "Toggle between date-based and version-name-based sorting." msgstr "" -#: cola/widgets/remote.py:213 +#: cola/widgets/remote.py:217 #, fuzzy msgid "Set upstream" msgstr "Pilih Upstream Baru" -#: cola/widgets/prefs.py:405 +#: cola/widgets/prefs.py:443 msgid "Settings" msgstr "Pengaturan" -#: cola/widgets/grep.py:142 +#: cola/widgets/grep.py:140 msgid "Shell arguments" msgstr "Argumen shell" -#: cola/sequenceeditor.py:375 +#: cola/sequenceeditor.py:371 msgid "Shift Down" msgstr "" -#: cola/sequenceeditor.py:379 +#: cola/sequenceeditor.py:375 msgid "Shift Up" msgstr "" -#: cola/widgets/about.py:499 +#: cola/widgets/about.py:482 msgid "Shortcuts" msgstr "Pintasan" -#: cola/widgets/prefs.py:179 +#: cola/widgets/prefs.py:201 msgid "Show Diffstat After Merge" msgstr "Tampilkan Diffstat setelah Merge" -#: cola/widgets/prefs.py:178 +#: cola/widgets/prefs.py:200 msgid "Show Full Paths in the Window Title" msgstr "" -#: cola/sequenceeditor.py:106 cola/widgets/finder.py:187 -#: cola/widgets/status.py:1384 +#: cola/sequenceeditor.py:104 cola/widgets/finder.py:186 +#: cola/widgets/status.py:1385 #, fuzzy msgid "Show Help" msgstr "Bantuan" -#: cola/widgets/filelist.py:30 +#: cola/widgets/filelist.py:27 msgid "Show History" msgstr "Tunjukan sejarah" -#: cola/widgets/prefs.py:348 +#: cola/widgets/prefs.py:368 msgid "Show file counts in Status titles" msgstr "" -#: cola/sequenceeditor.py:171 cola/widgets/finder.py:138 +#: cola/widgets/diff.py:794 +msgid "Show filenames" +msgstr "" + +#: cola/sequenceeditor.py:169 cola/widgets/finder.py:137 msgid "" "Show help\n" "Shortcut: ?" msgstr "" -#: cola/widgets/diff.py:765 +#: cola/widgets/diff.py:792 msgid "Show line numbers" msgstr "" -#: cola/widgets/diff.py:761 +#: cola/widgets/remote.py:175 +msgid "Show remote messages" +msgstr "" + +#: cola/widgets/diff.py:789 msgid "Show whole surrounding functions of changes" msgstr "Tampilkan seluruh sekitar fungsi perubahan" -#: cola/widgets/recent.py:58 +#: cola/widgets/recent.py:56 msgid "Showing changes since" msgstr "Menampilkan perubahan sejak" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "Side by side" msgstr "" -#: cola/cmds.py:2512 +#: cola/cmds.py:2463 msgid "Sign Off" msgstr "Sign Off" -#: cola/widgets/createtag.py:71 +#: cola/widgets/createtag.py:69 msgid "Sign Tag" msgstr "Tandai Tag" -#: cola/widgets/commitmsg.py:55 +#: cola/widgets/commitmsg.py:56 msgid "Sign off on this commit" msgstr "Tanda tangani commit ini" -#: cola/widgets/about.py:412 cola/widgets/about.py:425 +#: cola/widgets/about.py:395 cola/widgets/about.py:408 msgid "Simplified Chinese translation" msgstr "" -#: cola/cmds.py:2587 +#: cola/cmds.py:2529 msgid "Skip" msgstr "" -#: cola/widgets/main.py:264 cola/widgets/main.py:617 +#: cola/widgets/main.py:260 cola/widgets/main.py:630 msgid "Skip Current Patch" msgstr "Lewati Cabang Saat Ini" -#: cola/widgets/main.py:267 +#: cola/widgets/main.py:261 msgid "Skip applying the current patch and continue applying patches" msgstr "" -#: cola/widgets/prefs.py:261 +#: cola/widgets/prefs.py:282 msgid "Sort bookmarks alphabetically" msgstr "" -#: cola/widgets/about.py:413 cola/widgets/about.py:436 -#: cola/widgets/about.py:440 +#: cola/widgets/about.py:396 cola/widgets/about.py:419 +#: cola/widgets/about.py:423 msgid "Spanish translation" msgstr "" -#: cola/widgets/createtag.py:88 +#: cola/widgets/createtag.py:86 msgid "Specifies the SHA-1 to tag" msgstr "Tentukan SHA-1 untuk di-tag" -#: cola/widgets/createtag.py:81 +#: cola/widgets/createtag.py:79 msgid "Specifies the tag message" msgstr "Tentukan pesan tag" -#: cola/widgets/createtag.py:65 +#: cola/widgets/createtag.py:63 msgid "Specifies the tag name" msgstr "Tentukan nama tag" -#: cola/widgets/spellcheck.py:46 +#: cola/widgets/spellcheck.py:45 msgid "Spelling Suggestions" msgstr "Saran Ejaan" -#: cola/sequenceeditor.py:369 cola/widgets/merge.py:58 +#: cola/sequenceeditor.py:365 cola/widgets/merge.py:56 msgid "Squash" msgstr "Squash" -#: cola/widgets/merge.py:57 +#: cola/widgets/merge.py:55 msgid "Squash the merged commits into a single commit" msgstr "" -#: cola/cmds.py:2598 cola/widgets/action.py:60 cola/widgets/diff.py:982 +#: cola/cmds.py:2540 cola/widgets/action.py:58 cola/widgets/diff.py:1168 msgid "Stage" msgstr "Stage" -#: cola/cmds.py:2753 +#: cola/cmds.py:2699 msgid "Stage / Unstage" msgstr "Stage / Unstage" -#: cola/cmds.py:2735 +#: cola/cmds.py:2681 msgid "Stage / Unstage All" msgstr "" -#: cola/widgets/diff.py:1016 +#: cola/widgets/diff.py:1055 msgid "Stage Diff Hunk" msgstr "Stage Area Diff" -#: cola/cmds.py:2691 +#: cola/cmds.py:2633 msgid "Stage Modified" msgstr "Stage Berubah" -#: cola/cmds.py:2724 +#: cola/cmds.py:2670 msgid "Stage Modified and Untracked" msgstr "" -#: cola/widgets/status.py:872 cola/widgets/status.py:894 -#: cola/widgets/status.py:962 +#: cola/widgets/status.py:873 cola/widgets/status.py:895 +#: cola/widgets/status.py:963 msgid "Stage Selected" msgstr "Stage Terpilih" -#: cola/widgets/diff.py:1011 +#: cola/widgets/diff.py:1050 #, fuzzy msgid "Stage Selected Lines" msgstr "Stage Batis &Terpilih" -#: cola/cmds.py:2702 +#: cola/cmds.py:2644 msgid "Stage Unmerged" msgstr "Stage Tak Termerge" -#: cola/cmds.py:2713 +#: cola/cmds.py:2655 msgid "Stage Untracked" msgstr "Stage Tak Terlacak" -#: cola/widgets/commitmsg.py:438 +#: cola/widgets/commitmsg.py:446 msgid "Stage and Commit" msgstr "Stage dan Commit" -#: cola/widgets/commitmsg.py:435 +#: cola/widgets/commitmsg.py:443 msgid "Stage and commit?" msgstr "Stage dan commit?" -#: cola/cmds.py:2586 +#: cola/widgets/action.py:58 +msgid "Stage changes using \"git add\"" +msgstr "" + +#: cola/cmds.py:2528 #, fuzzy msgid "Stage conflicts" msgstr "Stage dan commit?" -#: cola/cmds.py:2577 +#: cola/cmds.py:2519 #, fuzzy msgid "Stage conflicts?" msgstr "Stage dan commit?" @@ -3439,48 +3557,48 @@ msgstr "Stage dan commit?" msgid "Stage/unstage selected paths for commit" msgstr "Stage lokasi terpilih untuk commit" -#: cola/models/browse.py:334 cola/widgets/status.py:156 -#: cola/widgets/status.py:620 +#: cola/models/browse.py:333 cola/widgets/status.py:156 +#: cola/widgets/status.py:621 msgid "Staged" msgstr "Stagged" -#: cola/cmds.py:2605 +#: cola/cmds.py:2547 #, python-format msgid "Staging: %s" msgstr "Staging: %s" -#: cola/widgets/main.py:597 +#: cola/widgets/main.py:610 msgid "Start Interactive Rebase..." msgstr "Mulai Rebase Interaktif..." -#: cola/widgets/createbranch.py:107 +#: cola/widgets/createbranch.py:105 msgid "Starting Revision" msgstr "Memulai Revisi" -#: cola/widgets/stash.py:40 +#: cola/widgets/stash.py:36 msgid "Stash" msgstr "Stash" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 #, fuzzy msgid "Stash Index" msgstr "Stash" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 #, fuzzy msgid "Stash staged changes only" msgstr "Commit perubahan stage" -#: cola/widgets/stash.py:73 +#: cola/widgets/stash.py:75 #, fuzzy msgid "Stash unstaged changes only, keeping staged changes" msgstr "Kembalikan perubahan ke lokasi terpilih." -#: cola/widgets/action.py:66 cola/widgets/main.py:414 +#: cola/widgets/action.py:76 cola/widgets/main.py:422 msgid "Stash..." msgstr "Stash..." -#: cola/models/browse.py:33 cola/widgets/main.py:102 +#: cola/models/browse.py:32 cola/widgets/main.py:100 msgid "Status" msgstr "Status" @@ -3488,152 +3606,160 @@ msgstr "Status" msgid "Stop tracking paths" msgstr "Hentikan melacak lokasi" -#: cola/widgets/submodules.py:82 +#: cola/widgets/submodules.py:81 msgid "Submodule URL (can be relative, ex: ../repo.git)" msgstr "" -#: cola/widgets/submodules.py:90 +#: cola/widgets/submodules.py:89 msgid "Submodule branch to track (optional)" msgstr "" -#: cola/widgets/submodules.py:86 +#: cola/widgets/submodules.py:85 msgid "Submodule path within the current repository (optional)" msgstr "" -#: cola/widgets/main.py:143 cola/widgets/submodules.py:32 +#: cola/widgets/main.py:141 cola/widgets/submodules.py:31 msgid "Submodules" msgstr "" -#: cola/widgets/prefs.py:174 +#: cola/widgets/prefs.py:196 msgid "Summarize Merge Commits" msgstr "Ringkasan Merge Commit" -#: cola/sequenceeditor.py:325 cola/widgets/dag.py:506 +#: cola/sequenceeditor.py:322 cola/widgets/dag.py:572 msgid "Summary" msgstr "Ringkasan" -#: cola/widgets/prefs.py:168 +#: cola/widgets/prefs.py:273 msgid "Tab Width" msgstr "Lebar Tab" -#: cola/widgets/cfgactions.py:229 cola/widgets/createbranch.py:116 -#: cola/widgets/merge.py:48 +#: cola/widgets/cfgactions.py:227 cola/widgets/createbranch.py:114 +#: cola/widgets/merge.py:46 msgid "Tag" msgstr "Tag" -#: cola/cmds.py:2842 +#: cola/cmds.py:2788 msgid "Tag Created" msgstr "Tag Telah Dibuat" -#: cola/widgets/createtag.py:80 +#: cola/widgets/createtag.py:78 msgid "Tag message..." msgstr "Pesan tag..." -#: cola/cmds.py:2802 +#: cola/cmds.py:2748 msgid "Tag-signing was requested but the tag message is empty." msgstr "Penandaan tag diperlukan tetapi pesan tag kosong." -#: cola/widgets/branch.py:179 cola/widgets/branch.py:238 +#: cola/widgets/branch.py:183 cola/widgets/branch.py:248 msgid "Tags" msgstr "" -#: cola/widgets/toolbar.py:180 +#: cola/widgets/action.py:78 cola/widgets/main.py:423 +msgid "Temporarily stash away uncommitted changes using \"git stash\"" +msgstr "" + +#: cola/widgets/toolbar.py:184 msgid "Text Beside Icon" msgstr "" -#: cola/widgets/toolbar.py:179 +#: cola/widgets/toolbar.py:183 msgid "Text Only" msgstr "" -#: cola/widgets/toolbar.py:181 +#: cola/widgets/toolbar.py:185 msgid "Text Under Icon" msgstr "" -#: cola/widgets/prefs.py:169 +#: cola/widgets/prefs.py:272 msgid "Text Width" msgstr "Lebar Teks" -#: cola/cmds.py:1116 +#: cola/cmds.py:1117 msgid "The branch will be no longer available." msgstr "" -#: cola/cmds.py:648 +#: cola/cmds.py:650 #, python-format msgid "The branch will be reset using \"git reset --mixed %s\"" msgstr "" -#: cola/cmds.py:699 cola/cmds.py:790 +#: cola/cmds.py:701 cola/cmds.py:792 #, python-format msgid "The branch will be reset using \"git reset --soft %s\"" msgstr "" -#: cola/widgets/commitmsg.py:303 +#: cola/widgets/commitmsg.py:311 #, fuzzy msgid "The commit message will be cleared." msgstr "Berkas berikut akan dihapus:" -#: cola/widgets/prefs.py:146 +#: cola/widgets/prefs.py:169 msgid "" "The date-time format used when displaying dates in Git DAG.\n" "This value is passed to git log --date=" msgstr "" -#: cola/widgets/archive.py:208 +#: cola/widgets/archive.py:206 #, python-format msgid "The file \"%s\" exists and will be overwritten." msgstr "Berkas \"%s\" sudah ada dan akan ditimpa." -#: cola/cmds.py:1086 +#: cola/cmds.py:1087 msgid "The following files will be deleted:" msgstr "Berkas berikut akan dihapus:" -#: cola/widgets/status.py:1646 +#: cola/widgets/status.py:1647 msgid "The number of leading paths to strip" msgstr "" -#: cola/cmds.py:716 +#: cola/cmds.py:718 #, python-format msgid "The repository will be reset using \"git reset --hard %s\"" msgstr "" -#: cola/cmds.py:665 +#: cola/cmds.py:667 #, python-format msgid "The repository will be reset using \"git reset --keep %s\"" msgstr "" -#: cola/cmds.py:682 +#: cola/cmds.py:684 #, python-format msgid "The repository will be reset using \"git reset --merge %s\"" msgstr "" -#: cola/cmds.py:2365 +#: cola/cmds.py:2316 msgid "The revision expression cannot be empty." msgstr "Ekspresi revisi tidak boleh kosong." -#: cola/cmds.py:3029 +#: cola/widgets/stash.py:225 +msgid "The stash has not been renamed" +msgstr "" + +#: cola/cmds.py:2975 #, python-format msgid "" "The submodule will be added using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:3074 +#: cola/cmds.py:3020 #, python-format msgid "" "The submodule will be updated using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:736 +#: cola/cmds.py:738 #, python-format msgid "The worktree will be restored using \"git read-tree --reset -u %s\"" msgstr "" -#: cola/widgets/commitmsg.py:304 +#: cola/widgets/commitmsg.py:312 msgid "This cannot be undone. Clear commit message?" msgstr "" -#: cola/cmds.py:778 cola/widgets/commitmsg.py:458 +#: cola/cmds.py:780 cola/widgets/commitmsg.py:466 msgid "" "This commit has already been published.\n" "This operation will rewrite published history.\n" @@ -3643,7 +3769,7 @@ msgstr "" "Operasi ini akan menulis ulang sejarah publikasi.\n" "Mungkin Anda tidak ingin melakukan ini." -#: cola/widgets/diff.py:1158 +#: cola/widgets/diff.py:1232 #, fuzzy msgid "" "This operation drops uncommitted changes.\n" @@ -3652,7 +3778,7 @@ msgstr "" "Operasi ini akan menghilangkan perubahan tak tercommit.\n" "Perubahan ini tidak dapat direkoveri." -#: cola/cmds.py:2307 +#: cola/cmds.py:2258 msgid "" "This operation removes uncommitted edits from selected files.\n" "These changes cannot be recovered." @@ -3660,7 +3786,7 @@ msgstr "" "Operasi ini akan menghilangkan perubahan tak tercommit.\n" "Perubahan ini tidak dapat direkoveri." -#: cola/cmds.py:2285 +#: cola/cmds.py:2236 msgid "" "This operation removes unstaged edits from selected files.\n" "These changes cannot be recovered." @@ -3668,27 +3794,27 @@ msgstr "" "Operasi ini membuang perubahan belum distag.\n" "Perubahan ini tidak dapat dikembalikan" -#: cola/cmds.py:475 +#: cola/cmds.py:476 msgid "" "This operation will replace the selected unmerged files with content from the branch being merged using \"git checkout --theirs\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:513 +#: cola/cmds.py:514 msgid "" "This operation will replace the selected unmerged files with content from your current branch using \"git checkout --ours\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/widgets/main.py:1109 +#: cola/widgets/main.py:1122 msgid "" "This repository has unresolved conflicts after applying a patch.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1102 +#: cola/widgets/main.py:1115 msgid "" "This repository is currently being rebased.\n" "Resolve conflicts, commit changes, and run:\n" @@ -3698,13 +3824,13 @@ msgstr "" "Perbaiki konflik, commitkan perubahan, dan jalankan:\n" " Rebase > Lanjutkan" -#: cola/widgets/main.py:1115 +#: cola/widgets/main.py:1128 msgid "" "This repository is in the middle of a cherry-pick.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1121 +#: cola/widgets/main.py:1134 msgid "" "This repository is in the middle of a merge.\n" "Resolve conflicts and commit changes." @@ -3724,15 +3850,15 @@ msgstr "" msgid "To avoid applying removal lines ('-'), change them to context lines (' ')." msgstr "" -#: cola/sequenceeditor.py:342 +#: cola/sequenceeditor.py:338 msgid "Toggle Enabled" msgstr "" -#: cola/widgets/diff.py:776 +#: cola/widgets/diff.py:804 msgid "Toggle image diff" msgstr "" -#: cola/widgets/branch.py:63 +#: cola/widgets/branch.py:65 msgid "Toggle the branches filter" msgstr "" @@ -3740,51 +3866,51 @@ msgstr "" msgid "Toggle the paths filter" msgstr "" -#: cola/widgets/toolbar.py:317 +#: cola/widgets/toolbar.py:322 msgid "Toolbar Style:" msgstr "" -#: cola/widgets/cfgactions.py:228 cola/widgets/merge.py:47 +#: cola/widgets/cfgactions.py:226 cola/widgets/merge.py:45 msgid "Tracking Branch" msgstr "Melacak Cabang" -#: cola/widgets/createbranch.py:115 +#: cola/widgets/createbranch.py:113 msgid "Tracking branch" msgstr "Melacak cabang" -#: cola/widgets/about.py:408 cola/widgets/about.py:434 -#: cola/widgets/about.py:445 +#: cola/widgets/about.py:391 cola/widgets/about.py:417 +#: cola/widgets/about.py:428 msgid "Traditional Chinese (Taiwan) translation" msgstr "" -#: cola/widgets/about.py:439 +#: cola/widgets/about.py:422 msgid "Translation" msgstr "" -#: cola/widgets/about.py:94 +#: cola/widgets/about.py:92 msgid "Translators" msgstr "" -#: cola/widgets/about.py:418 cola/widgets/about.py:423 -#: cola/widgets/about.py:438 +#: cola/widgets/about.py:401 cola/widgets/about.py:406 +#: cola/widgets/about.py:421 msgid "Turkish translation" msgstr "" -#: cola/widgets/clone.py:109 cola/widgets/editremotes.py:451 -#: cola/widgets/submodules.py:117 +#: cola/widgets/clone.py:107 cola/widgets/editremotes.py:449 +#: cola/widgets/submodules.py:116 msgid "URL" msgstr "URL" -#: cola/widgets/remote.py:463 +#: cola/widgets/remote.py:497 #, python-format msgid "URL: %s" msgstr "URL: %s" -#: cola/widgets/about.py:415 +#: cola/widgets/about.py:398 msgid "Ukranian translation" msgstr "" -#: cola/cmds.py:2122 +#: cola/cmds.py:2073 msgid "Unable to rebase" msgstr "" @@ -3793,54 +3919,59 @@ msgstr "" msgid "Unable to set URL for \"%(name)s\" to \"%(url)s\"" msgstr "" -#: cola/widgets/diff.py:1327 +#: cola/widgets/diff.py:1401 #, python-format msgid "Unable to write patch to \"%s\". Check permissions?" msgstr "" -#: cola/widgets/main.py:735 +#: cola/widgets/main.py:748 msgid "Undo" msgstr "" -#: cola/cmds.py:783 cola/cmds.py:788 cola/cmds.py:791 cola/widgets/main.py:208 +#: cola/cmds.py:785 cola/cmds.py:790 cola/cmds.py:793 cola/widgets/main.py:207 msgid "Undo Last Commit" msgstr "" -#: cola/cmds.py:789 +#: cola/cmds.py:791 msgid "Undo last commit?" msgstr "" -#: cola/cmds.py:782 +#: cola/cmds.py:784 msgid "Undo the published commit?" msgstr "" -#: cola/models/browse.py:328 cola/widgets/status.py:157 -#: cola/widgets/status.py:640 +#: cola/models/browse.py:327 cola/widgets/status.py:157 +#: cola/widgets/status.py:641 msgid "Unmerged" msgstr "Tak termerjer" -#: cola/cmds.py:2855 cola/widgets/action.py:61 cola/widgets/diff.py:985 +#: cola/cmds.py:2801 cola/widgets/action.py:61 cola/widgets/diff.py:1165 +#: cola/widgets/main.py:212 msgid "Unstage" msgstr "Unstage" -#: cola/widgets/main.py:203 cola/widgets/status.py:790 +#: cola/widgets/main.py:202 cola/widgets/status.py:791 msgid "Unstage All" msgstr "Unstage Semua" -#: cola/widgets/diff.py:1061 +#: cola/widgets/diff.py:1017 msgid "Unstage Diff Hunk" msgstr "Unstage Area Diff" -#: cola/widgets/status.py:823 cola/widgets/status.py:858 +#: cola/widgets/status.py:824 cola/widgets/status.py:859 msgid "Unstage Selected" msgstr "Unstage Terpilih" -#: cola/widgets/diff.py:1058 +#: cola/widgets/diff.py:1015 #, fuzzy msgid "Unstage Selected Lines" msgstr "Unstage Baris &Terpilih" -#: cola/cmds.py:2867 +#: cola/widgets/action.py:61 +msgid "Unstage changes using \"git reset\"" +msgstr "" + +#: cola/cmds.py:2813 #, python-format msgid "Unstaging: %s" msgstr "Unstaging: %s" @@ -3849,86 +3980,85 @@ msgstr "Unstaging: %s" msgid "Untrack Selected" msgstr "Jangan Lacak Terpilih" -#: cola/widgets/status.py:159 cola/widgets/status.py:646 +#: cola/widgets/status.py:159 cola/widgets/status.py:647 msgid "Untracked" msgstr "Tak Terlacak" -#: cola/cmds.py:1141 cola/cmds.py:2923 +#: cola/cmds.py:1142 cola/cmds.py:2869 #, python-format msgid "Untracking: %s" msgstr "Untracking: %s" -#: cola/widgets/main.py:374 +#: cola/widgets/main.py:369 msgid "Update All Submodules..." msgstr "" -#: cola/widgets/createbranch.py:121 +#: cola/widgets/createbranch.py:119 msgid "Update Existing Branch:" msgstr "Perbarui Cabang yang Ada:" -#: cola/cmds.py:3075 +#: cola/cmds.py:3021 msgid "Update Submodule" msgstr "" -#: cola/cmds.py:3072 +#: cola/cmds.py:3018 msgid "Update Submodule..." msgstr "" -#: cola/cmds.py:3111 +#: cola/cmds.py:3057 msgid "Update Submodules" msgstr "" -#: cola/cmds.py:3109 +#: cola/cmds.py:3055 msgid "Update all submodules?" msgstr "" -#: cola/cmds.py:2093 +#: cola/cmds.py:2044 msgid "Update stacked branches" msgstr "" -#: cola/cmds.py:2085 cola/cmds.py:2092 +#: cola/cmds.py:2036 cola/cmds.py:2043 msgid "Update stacked branches when rebasing?" msgstr "" -#: cola/cmds.py:3108 +#: cola/cmds.py:3054 msgid "Update submodules..." msgstr "" -#: cola/widgets/status.py:953 +#: cola/widgets/status.py:954 msgid "Update this submodule" msgstr "" -#: cola/cmds.py:3073 +#: cola/cmds.py:3019 msgid "Update this submodule?" msgstr "" -#: cola/widgets/branch.py:421 cola/widgets/createbranch.py:302 -#: cola/widgets/remote.py:135 +#: cola/widgets/branch.py:433 cola/widgets/createbranch.py:300 msgid "Updating" msgstr "Sedang memperbarui" -#: cola/widgets/prefs.py:350 +#: cola/widgets/prefs.py:370 msgid "Use a block cursor in diff editors" msgstr "" -#: cola/widgets/prefs.py:154 +#: cola/widgets/prefs.py:177 msgid "Use gravatar.com to lookup icons for author emails" msgstr "" -#: cola/widgets/prefs.py:166 +#: cola/widgets/prefs.py:189 msgid "User Name" msgstr "Nama Pengguna" -#: cola/widgets/about.py:92 +#: cola/widgets/about.py:90 #, fuzzy msgid "Version" msgstr "Revisi" -#: cola/widgets/dag.py:800 cola/widgets/main.py:845 cola/widgets/main.py:966 +#: cola/widgets/dag.py:866 cola/widgets/main.py:858 cola/widgets/main.py:979 msgid "View" msgstr "Tampil" -#: cola/widgets/browse.py:137 cola/widgets/status.py:278 +#: cola/widgets/browse.py:137 cola/widgets/status.py:279 msgid "View History..." msgstr "Tampilkan Histori..." @@ -3937,39 +4067,39 @@ msgstr "Tampilkan Histori..." msgid "View history for selected paths" msgstr "Tampilkan histori untuk lokasi terpilih" -#: cola/widgets/merge.py:54 +#: cola/widgets/branch.py:224 cola/widgets/merge.py:52 msgid "Visualize" msgstr "Visualisasikan" -#: cola/widgets/main.py:488 +#: cola/widgets/main.py:501 msgid "Visualize All Branches..." msgstr "Visualisasikan Semua Cabang..." -#: cola/widgets/main.py:482 +#: cola/widgets/main.py:495 msgid "Visualize Current Branch..." msgstr "Visualisasikan Cabang Saat ini..." -#: cola/widgets/createtag.py:73 +#: cola/widgets/createtag.py:71 msgid "Whether to sign the tag (git tag -s)" msgstr "Kalau menandai tag (git tag -s)" -#: cola/widgets/text.py:399 +#: cola/widgets/text.py:396 msgid "Whole Words" msgstr "" -#: cola/widgets/commitmsg.py:432 +#: cola/widgets/commitmsg.py:440 msgid "Would you like to stage and commit all modified files?" msgstr "Apakah Anda ingin menstage dan commit semua berkas yang berubah?" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "XOR" msgstr "" -#: cola/widgets/standard.py:1064 +#: cola/widgets/standard.py:1182 msgid "Yes" msgstr "" -#: cola/cmds.py:256 +#: cola/cmds.py:255 msgid "" "You are in the middle of a merge.\n" "Cannot amend while merging." @@ -3977,37 +4107,37 @@ msgstr "" "Anda sedang melakukan merjer.\n" "Tidak dapat mengubah ketika merjer" -#: cola/cmds.py:2123 +#: cola/cmds.py:2074 #, fuzzy msgid "You cannot rebase with uncommitted changes." msgstr "Kembalikan perubahan tak tercommit?" -#: cola/widgets/merge.py:227 +#: cola/widgets/merge.py:225 msgid "You must specify a revision to merge." msgstr "Anda harus tentukan revisi untuk dimerge." -#: cola/widgets/merge.py:217 +#: cola/widgets/merge.py:215 msgid "You must specify a revision to view." msgstr "Anda harus tentukan revisi untuk ditampilkan." -#: cola/widgets/dag.py:710 cola/widgets/dag.py:1588 +#: cola/widgets/dag.py:776 cola/widgets/dag.py:1645 msgid "Zoom In" msgstr "Perbesar" -#: cola/widgets/dag.py:706 cola/widgets/dag.py:1594 +#: cola/widgets/dag.py:772 cola/widgets/dag.py:1651 msgid "Zoom Out" msgstr "Perkecil" -#: cola/widgets/dag.py:524 cola/widgets/dag.py:714 cola/widgets/dag.py:1596 -#: cola/widgets/diff.py:785 +#: cola/widgets/dag.py:590 cola/widgets/dag.py:780 cola/widgets/dag.py:1653 +#: cola/widgets/diff.py:813 msgid "Zoom to Fit" msgstr "Zoom agar Sesuai" -#: cola/widgets/grep.py:112 +#: cola/widgets/grep.py:110 msgid "command-line arguments" msgstr "argumen baris-perintah" -#: cola/widgets/main.py:932 cola/widgets/main.py:938 +#: cola/widgets/main.py:945 cola/widgets/main.py:951 msgid "error: unable to execute git" msgstr "" @@ -4016,45 +4146,41 @@ msgstr "" msgid "exit code %s" msgstr "kode keluar %s" -#: cola/app.py:301 +#: cola/app.py:304 #, fuzzy, python-format msgid "fatal: \"%s\" is not a directory. Please specify a correct --repo ." msgstr "fatal: \"%s\" bukan direktori. Silahkan tentukan --repo ." -#: cola/widgets/main.py:928 +#: cola/widgets/main.py:941 #, python-format msgid "git cola version %s" msgstr "git cola versi %s" -#: cola/widgets/startup.py:35 +#: cola/widgets/startup.py:34 msgid "git-cola" msgstr "git-cola" -#: cola/difftool.py:63 +#: cola/difftool.py:82 msgid "git-cola diff" msgstr "git-cola diff" -#: cola/widgets/submodules.py:81 +#: cola/widgets/submodules.py:80 msgid "git://git.example.com/repo.git" msgstr "" -#: cola/widgets/grep.py:132 +#: cola/widgets/grep.py:130 msgid "grep result..." msgstr "hasil grep..." -#: cola/widgets/about.py:486 +#: cola/widgets/about.py:469 msgid "hotkeys.html" msgstr "hotkeys.html" -#: cola/widgets/submodules.py:85 +#: cola/widgets/submodules.py:84 msgid "path/to/submodule" msgstr "" -#: cola/cmds.py:2537 -msgid "unknown" -msgstr "tidak diketahui" - -#: cola/widgets/createtag.py:63 +#: cola/widgets/createtag.py:61 msgid "vX.Y.Z" msgstr "vX.Y.Z" @@ -4063,14 +4189,18 @@ msgid "x 1" msgstr "" #: cola/hidpi.py:44 -msgid "x 1.5" +msgid "x 1.25" msgstr "" #: cola/hidpi.py:45 +msgid "x 1.5" +msgstr "" + +#: cola/hidpi.py:46 msgid "x 2" msgstr "" -#: cola/widgets/search.py:53 cola/widgets/search.py:58 +#: cola/widgets/search.py:52 cola/widgets/search.py:57 msgid "yyyy-MM-dd" msgstr "dd-MM-yyyy" @@ -4081,6 +4211,10 @@ msgstr "dd-MM-yyyy" #~ msgid "\"git commit\" returned exit code %s" #~ msgstr "\"git commit\" returned exit code %s" +#, python-format +#~ msgid "A stash named \"%s\" already exists" +#~ msgstr "Stash dengan nama \"%s\" sudah ada" + #~ msgid "Already up-to-date." #~ msgstr "Sudah up-to-date." @@ -4110,6 +4244,9 @@ msgstr "dd-MM-yyyy" #~ msgid "Error %s" #~ msgstr "Error: %s" +#~ msgid "Error: Stash exists" +#~ msgstr "Error: Stash sudah ada" + #~ msgid "Errors: %s" #~ msgstr "Error: %s" @@ -4256,3 +4393,6 @@ msgstr "dd-MM-yyyy" #~ msgstr "" #~ "inotify: dinonaktifkan\n" #~ "Catatan: install python-pyinotify untuk mengaktifkan inotify.\n" + +#~ msgid "unknown" +#~ msgstr "tidak diketahui" diff --git a/cola/i18n/it.po b/cola/i18n/it.po index e0094515..c05f6111 100644 --- a/cola/i18n/it.po +++ b/cola/i18n/it.po @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cola/widgets/patch.py:86 +#: cola/widgets/diff.py:1680 msgid "" "\n" "

\n" @@ -27,7 +27,7 @@ msgid "" " " msgstr "" -#: cola/widgets/about.py:455 +#: cola/widgets/about.py:438 #, python-format msgid "" "\n" @@ -56,7 +56,7 @@ msgid "" " " msgstr "" -#: cola/widgets/about.py:180 +#: cola/widgets/about.py:182 #, python-format msgid "" "\n" @@ -73,7 +73,7 @@ msgid "" " " msgstr "" -#: cola/widgets/about.py:387 +#: cola/widgets/about.py:370 #, python-format msgid "" "\n" @@ -83,7 +83,7 @@ msgid "" " " msgstr "" -#: cola/widgets/status.py:1310 +#: cola/widgets/status.py:1311 #, python-format msgid "" "\n" @@ -98,7 +98,7 @@ msgid "" " %(ext)s = file extension\n" msgstr "" -#: cola/sequenceeditor.py:700 +#: cola/sequenceeditor.py:695 msgid "" "\n" "Commands\n" @@ -137,7 +137,7 @@ msgid "" "ctrl+d = launch difftool\n" msgstr "" -#: cola/widgets/finder.py:65 +#: cola/widgets/finder.py:64 msgid "" "\n" "Keyboard Shortcuts\n" @@ -153,46 +153,72 @@ msgid "" "and the results.\n" msgstr "" -#: cola/widgets/dag.py:894 +#: cola/widgets/prefs.py:133 +msgid "" +"\n" +"This option determines how the supplied commit message should be\n" +"cleaned up before committing.\n" +"\n" +"The can be strip, whitespace, verbatim, scissors or default.\n" +"\n" +"strip\n" +" Strip leading and trailing empty lines, trailing whitespace,\n" +" commentary and collapse consecutive empty lines.\n" +"\n" +"whitespace\n" +" Same as strip except #commentary is not removed.\n" +"\n" +"verbatim\n" +" Do not change the message at all.\n" +"\n" +"scissors\n" +" Same as whitespace except that everything from (and including) the line\n" +" found below is truncated, if the message is to be edited.\n" +" \"#\" can be customized with core.commentChar.\n" +"\n" +" # ------------------------ >8 ------------------------" +msgstr "" + +#: cola/widgets/dag.py:960 msgid " - DAG" msgstr "" -#: cola/widgets/recent.py:54 +#: cola/widgets/recent.py:52 #, fuzzy msgid " commits ago" msgstr "Messaggio di fusione:" -#: cola/cmds.py:1197 +#: cola/cmds.py:1198 #, python-format msgid "\"%(branch)s\" has been deleted from \"%(remote)s\"." msgstr "" -#: cola/widgets/createbranch.py:316 +#: cola/widgets/createbranch.py:314 #, python-format msgid "\"%(command)s\" returned exit status \"%(status)d\"" msgstr "" -#: cola/interaction.py:39 +#: cola/interaction.py:38 #, python-format msgid "\"%(command)s\" returned exit status %(status)d" msgstr "" -#: cola/guicmds.py:157 +#: cola/guicmds.py:156 #, fuzzy, python-format msgid "\"%s\" already exists" msgstr "Il ramo '%s' esiste già." -#: cola/widgets/clone.py:206 +#: cola/widgets/clone.py:204 #, python-format msgid "\"%s\" already exists, cola will create a new directory" msgstr "" -#: cola/cmds.py:2349 +#: cola/cmds.py:2300 #, python-format msgid "\"%s\" requires a selected file." msgstr "" -#: cola/cmds.py:2087 +#: cola/cmds.py:2038 msgid "" "\"git rebase --update-refs\" automatically force-updates any\n" "branches that point to commits that are being rebased.\n" @@ -202,7 +228,11 @@ msgid "" "Using this feature is helpful for \"stacked\" branch workflows." msgstr "" -#: cola/sequenceeditor.py:321 +#: cola/models/stash.py:145 +msgid "\"git stash drop\" did not return a ref to rename." +msgstr "" + +#: cola/sequenceeditor.py:318 msgid "#" msgstr "" @@ -211,37 +241,37 @@ msgstr "" msgid "%(project)s: %(branch)s - Browse" msgstr "" -#: cola/widgets/dag.py:887 +#: cola/widgets/dag.py:953 #, python-format msgid "%(project)s: %(ref)s - DAG" msgstr "" -#: cola/models/browse.py:315 +#: cola/models/browse.py:314 #, python-format msgid "%d days ago" msgstr "" -#: cola/models/browse.py:314 +#: cola/models/browse.py:313 #, python-format msgid "%d hours ago" msgstr "" -#: cola/models/browse.py:307 cola/models/browse.py:311 +#: cola/models/browse.py:306 cola/models/browse.py:310 #, python-format msgid "%d minutes ago" msgstr "" -#: cola/cmds.py:376 +#: cola/cmds.py:377 #, python-format msgid "%d patch(es) applied." msgstr "" -#: cola/widgets/createbranch.py:281 +#: cola/widgets/createbranch.py:279 #, python-format msgid "%d skipped" msgstr "" -#: cola/cmds.py:2580 +#: cola/cmds.py:2522 #, python-format msgid "" "%s appears to contain merge conflicts.\n" @@ -250,36 +280,36 @@ msgid "" "Stage it anyways?" msgstr "" -#: cola/widgets/startup.py:263 +#: cola/widgets/startup.py:262 #, python-format msgid "%s could not be opened. Remove from bookmarks?" msgstr "" -#: cola/app.py:498 cola/widgets/bookmarks.py:482 +#: cola/app.py:501 cola/widgets/bookmarks.py:481 #, fuzzy, python-format msgid "%s is not a Git repository." msgstr "Archivio Git" -#: cola/cmds.py:1015 +#: cola/cmds.py:1016 #, python-format msgid "%s will be removed from your bookmarks." msgstr "" -#: cola/cmds.py:1028 +#: cola/cmds.py:1029 #, python-format msgid "%s will be removed from your recent repositories." msgstr "" -#: cola/cmds.py:1711 +#: cola/cmds.py:1663 #, fuzzy, python-format msgid "%s: No such file or directory." msgstr "errore grave: impossibile effettuare lo stat del path %s: file o directory non trovata" -#: cola/widgets/main.py:734 +#: cola/widgets/main.py:747 msgid "&Edit" msgstr "Modifica" -#: cola/widgets/main.py:676 +#: cola/widgets/main.py:689 #, fuzzy msgid "&File" msgstr "&File" @@ -288,127 +318,122 @@ msgstr "&File" msgid "(Amending)" msgstr "" -#: cola/widgets/compare.py:36 +#: cola/widgets/compare.py:35 msgid "*** Branch Point ***" msgstr "" -#: cola/widgets/compare.py:37 +#: cola/widgets/compare.py:36 msgid "*** Sandbox ***" msgstr "" -#: cola/widgets/diff.py:788 +#: cola/widgets/diff.py:816 msgid "100%" msgstr "" -#: cola/widgets/diff.py:789 +#: cola/widgets/diff.py:817 msgid "200%" msgstr "" -#: cola/widgets/diff.py:786 +#: cola/widgets/diff.py:814 msgid "25%" msgstr "" -#: cola/widgets/diff.py:790 +#: cola/widgets/diff.py:818 msgid "400%" msgstr "" -#: cola/widgets/diff.py:787 +#: cola/widgets/diff.py:815 msgid "50%" msgstr "" -#: cola/widgets/diff.py:791 +#: cola/widgets/diff.py:819 msgid "800%" msgstr "" -#: cola/widgets/finder.py:119 +#: cola/widgets/finder.py:118 msgid " ..." msgstr "" -#: cola/cmds.py:1734 +#: cola/cmds.py:1686 msgid "" "A commit template has not been configured.\n" "Use \"git config\" to define \"commit.template\"\n" "so that it points to a commit template." msgstr "" -#: cola/cmds.py:1784 +#: cola/cmds.py:1735 #, python-format msgid "A hook must be provided at \"%s\"" msgstr "" -#: cola/widgets/stash.py:236 -#, fuzzy, python-format -msgid "A stash named \"%s\" already exists" -msgstr "Il file %s esiste già." - -#: cola/widgets/cfgactions.py:82 cola/widgets/main.py:622 +#: cola/widgets/cfgactions.py:81 cola/widgets/main.py:635 #, fuzzy msgid "Abort" msgstr "Interruzione" -#: cola/widgets/cfgactions.py:149 cola/widgets/cfgactions.py:155 +#: cola/widgets/cfgactions.py:148 cola/widgets/cfgactions.py:154 #, fuzzy msgid "Abort Action" msgstr "Interruzione" -#: cola/cmds.py:132 +#: cola/cmds.py:131 msgid "Abort Applying Patch" msgstr "" -#: cola/cmds.py:126 +#: cola/cmds.py:125 msgid "Abort Applying Patch..." msgstr "" -#: cola/widgets/main.py:245 +#: cola/widgets/main.py:244 msgid "Abort Applying Patches..." msgstr "" -#: cola/cmds.py:162 +#: cola/cmds.py:161 msgid "Abort Cherry-Pick" msgstr "" -#: cola/cmds.py:156 cola/widgets/main.py:334 +#: cola/cmds.py:155 cola/widgets/main.py:329 msgid "Abort Cherry-Pick..." msgstr "" -#: cola/cmds.py:193 +#: cola/cmds.py:192 #, fuzzy msgid "Abort Merge" msgstr "Interrompi fusione..." -#: cola/cmds.py:186 cola/widgets/main.py:368 +#: cola/cmds.py:185 cola/widgets/main.py:363 msgid "Abort Merge..." msgstr "Interrompi fusione..." -#: cola/widgets/cfgactions.py:154 +#: cola/widgets/cfgactions.py:153 msgid "Abort the action?" msgstr "" -#: cola/widgets/main.py:250 +#: cola/widgets/main.py:245 msgid "Abort the current \"git am\" patch session" msgstr "" -#: cola/cmds.py:159 +#: cola/cmds.py:158 msgid "" "Aborting a cherry-pick can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:129 +#: cola/cmds.py:128 msgid "" "Aborting a patch can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:127 +#: cola/cmds.py:126 msgid "Aborting applying the current patch?" msgstr "" -#: cola/cmds.py:157 +#: cola/cmds.py:156 msgid "Aborting the current cherry-pick?" msgstr "" -#: cola/cmds.py:189 +#: cola/cmds.py:188 #, fuzzy msgid "" "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" @@ -420,78 +445,78 @@ msgstr "" "\n" "Continuare con l'interruzione della fusione attuale?" -#: cola/cmds.py:187 +#: cola/cmds.py:186 msgid "Aborting the current merge?" msgstr "" -#: cola/widgets/about.py:91 cola/widgets/main.py:517 +#: cola/widgets/about.py:89 cola/widgets/main.py:530 #, fuzzy msgid "About" msgstr "Informazioni su %s" -#: cola/widgets/about.py:67 +#: cola/widgets/about.py:65 msgid "About git-cola" msgstr "" -#: cola/widgets/bookmarks.py:217 cola/widgets/startup.py:340 +#: cola/widgets/bookmarks.py:216 cola/widgets/startup.py:339 msgid "Accept" msgstr "" -#: cola/sequenceeditor.py:159 +#: cola/sequenceeditor.py:157 msgid "" "Accept changes and rebase\n" "Shortcut: Ctrl+Enter" msgstr "" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 #, fuzzy msgid "Action Name" msgstr "Opzioni" -#: cola/sequenceeditor.py:528 cola/widgets/bookmarks.py:321 -#: cola/widgets/branch.py:217 cola/widgets/browse.py:374 -#: cola/widgets/commitmsg.py:99 cola/widgets/dag.py:315 -#: cola/widgets/filelist.py:110 cola/widgets/main.py:95 -#: cola/widgets/main.py:757 cola/widgets/startup.py:436 +#: cola/sequenceeditor.py:524 cola/widgets/bookmarks.py:320 +#: cola/widgets/branch.py:221 cola/widgets/browse.py:375 +#: cola/widgets/commitmsg.py:105 cola/widgets/dag.py:314 +#: cola/widgets/filelist.py:107 cola/widgets/main.py:93 +#: cola/widgets/main.py:770 cola/widgets/startup.py:435 #, fuzzy msgid "Actions" msgstr "Opzioni" -#: cola/widgets/commitmsg.py:101 +#: cola/widgets/commitmsg.py:107 #, fuzzy msgid "Actions..." msgstr "Opzioni..." -#: cola/widgets/bookmarks.py:71 cola/widgets/gitignore.py:64 -#: cola/widgets/patch.py:103 cola/widgets/patch.py:117 -#: cola/widgets/status.py:1381 +#: cola/widgets/bookmarks.py:70 cola/widgets/diff.py:1697 +#: cola/widgets/diff.py:1711 cola/widgets/gitignore.py:63 +#: cola/widgets/status.py:1382 msgid "Add" msgstr "" -#: cola/widgets/bookmarks.py:470 +#: cola/widgets/bookmarks.py:469 #, fuzzy msgid "Add Favorite" msgstr "Remoto" -#: cola/widgets/editremotes.py:374 +#: cola/widgets/editremotes.py:373 #, fuzzy msgid "Add Remote" msgstr "Remoto" -#: cola/widgets/toolbar.py:315 +#: cola/widgets/toolbar.py:320 msgid "Add Separator" msgstr "" -#: cola/cmds.py:3030 cola/widgets/submodules.py:42 -#: cola/widgets/submodules.py:111 +#: cola/cmds.py:2976 cola/widgets/submodules.py:41 +#: cola/widgets/submodules.py:110 msgid "Add Submodule" msgstr "" -#: cola/cmds.py:3027 cola/widgets/main.py:381 +#: cola/cmds.py:2973 cola/widgets/main.py:376 msgid "Add Submodule..." msgstr "" -#: cola/widgets/editremotes.py:62 +#: cola/widgets/editremotes.py:61 msgid "" "Add and remove remote repositories using the \n" "Add(+) and Delete(-) buttons on the left-hand side.\n" @@ -500,166 +525,166 @@ msgid "" "and pressing \"enter\", or by double-clicking." msgstr "" -#: cola/widgets/editremotes.py:81 +#: cola/widgets/editremotes.py:80 #, fuzzy msgid "Add new remote git repository" msgstr "%s non è un archivio Git." -#: cola/widgets/patch.py:103 +#: cola/widgets/diff.py:1697 msgid "Add patches (+)" msgstr "" -#: cola/widgets/editremotes.py:433 +#: cola/widgets/editremotes.py:431 #, fuzzy msgid "Add remote" msgstr "Remoto" -#: cola/cmds.py:3028 +#: cola/cmds.py:2974 msgid "Add this submodule?" msgstr "" -#: cola/widgets/gitignore.py:54 +#: cola/widgets/gitignore.py:53 msgid "Add to .gitignore" msgstr "" -#: cola/widgets/status.py:286 +#: cola/widgets/status.py:287 msgid "Add to Git Annex" msgstr "" -#: cola/widgets/status.py:290 +#: cola/widgets/status.py:291 msgid "Add to Git LFS" msgstr "" -#: cola/widgets/gitignore.py:28 +#: cola/widgets/gitignore.py:27 msgid "Add to exclusions" msgstr "" -#: cola/widgets/gitignore.py:55 +#: cola/widgets/gitignore.py:54 msgid "Add to local .git/info/exclude" msgstr "" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 #, fuzzy msgid "Additions" msgstr "Opzioni" -#: cola/widgets/archive.py:134 +#: cola/widgets/archive.py:132 msgid "Advanced" msgstr "" -#: cola/widgets/main.py:522 +#: cola/widgets/main.py:535 msgid "Against Commit... (Diff Mode)" msgstr "" -#: cola/models/browse.py:33 +#: cola/models/browse.py:32 msgid "Age" msgstr "" -#: cola/widgets/prefs.py:403 +#: cola/widgets/prefs.py:441 #, fuzzy msgid "All Repositories" msgstr "Tutti gli archivi" -#: cola/cmds.py:3110 +#: cola/cmds.py:3056 #, python-format msgid "" "All submodules will be updated using\n" "\"%s\"" msgstr "" -#: cola/widgets/remote.py:195 +#: cola/widgets/remote.py:199 msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care" msgstr "" -#: cola/widgets/merge.py:61 +#: cola/widgets/merge.py:59 msgid "Always create a merge commit when enabled, even when the merge is a fast-forward update" msgstr "" -#: cola/cmds.py:221 +#: cola/cmds.py:220 msgid "Amend" msgstr "" -#: cola/widgets/commitmsg.py:463 +#: cola/widgets/commitmsg.py:471 #, fuzzy msgid "Amend Commit" msgstr "Correggi l'ultima revisione" -#: cola/widgets/commitmsg.py:110 cola/widgets/main.py:194 +#: cola/widgets/commitmsg.py:116 cola/widgets/main.py:193 msgid "Amend Last Commit" msgstr "Correggi l'ultima revisione" -#: cola/widgets/commitmsg.py:462 +#: cola/widgets/commitmsg.py:470 msgid "Amend the published commit?" msgstr "" -#: cola/widgets/main.py:1157 +#: cola/widgets/main.py:1170 msgid "Amending" msgstr "" -#: cola/widgets/cfgactions.py:151 +#: cola/widgets/cfgactions.py:150 msgid "" "An action is still running.\n" "Terminating it could result in data loss." msgstr "" -#: cola/cmds.py:2804 +#: cola/cmds.py:2750 msgid "" "An unsigned, lightweight tag will be created instead.\n" "Create an unsigned tag?" msgstr "" -#: cola/widgets/prefs.py:406 +#: cola/widgets/prefs.py:444 msgid "Appearance" msgstr "" -#: cola/widgets/diff.py:1230 +#: cola/widgets/diff.py:1304 msgid "Append Patch" msgstr "" -#: cola/widgets/diff.py:1299 +#: cola/widgets/diff.py:1373 msgid "Append Patch..." msgstr "" -#: cola/widgets/patch.py:112 cola/widgets/stash.py:48 cola/widgets/stash.py:107 -#: cola/widgets/toolbar.py:323 +#: cola/widgets/diff.py:1706 cola/widgets/stash.py:50 cola/widgets/stash.py:110 +#: cola/widgets/toolbar.py:328 #, fuzzy msgid "Apply" msgstr "Apple" -#: cola/widgets/patch.py:75 +#: cola/widgets/diff.py:1669 msgid "Apply Patches" msgstr "" -#: cola/widgets/main.py:239 +#: cola/widgets/main.py:238 msgid "Apply Patches..." msgstr "" -#: cola/widgets/stash.py:64 +#: cola/widgets/stash.py:66 msgid "Apply and drop the selected stash (git stash pop)" msgstr "" -#: cola/widgets/stash.py:48 +#: cola/widgets/stash.py:50 msgid "Apply the selected stash" msgstr "" -#: cola/widgets/main.py:1167 +#: cola/widgets/main.py:1180 msgid "Applying Patch" msgstr "" -#: cola/widgets/cfgactions.py:207 +#: cola/widgets/cfgactions.py:205 msgid "Arguments" msgstr "" -#: cola/qtutils.py:850 +#: cola/qtutils.py:887 msgid "Attach" msgstr "" -#: cola/models/browse.py:33 cola/models/browse.py:72 cola/widgets/dag.py:506 +#: cola/models/browse.py:32 cola/models/browse.py:71 cola/widgets/dag.py:572 #, fuzzy msgid "Author" msgstr "Autore:" -#: cola/widgets/about.py:93 +#: cola/widgets/about.py:91 #, fuzzy msgid "Authors" msgstr "Autore:" @@ -668,729 +693,745 @@ msgstr "Autore:" msgid "Auto" msgstr "" -#: cola/widgets/commitmsg.py:137 cola/widgets/prefs.py:259 +#: cola/widgets/commitmsg.py:143 cola/widgets/prefs.py:280 msgid "Auto-Wrap Lines" msgstr "" -#: cola/widgets/prefs.py:184 +#: cola/widgets/prefs.py:206 msgid "Autocomplete Paths" msgstr "" -#: cola/widgets/prefs.py:176 +#: cola/widgets/prefs.py:198 msgid "Automatically Load Commit Message Template" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Basic Regexp" msgstr "" -#: cola/widgets/prefs.py:255 +#: cola/widgets/prefs.py:276 #, fuzzy msgid "Blame Viewer" msgstr "Mostra file" -#: cola/widgets/browse.py:205 +#: cola/widgets/browse.py:206 #, fuzzy msgid "Blame selected paths" msgstr "Rinomina ramo" -#: cola/cmds.py:545 cola/widgets/status.py:282 +#: cola/cmds.py:546 cola/widgets/status.py:283 #, fuzzy msgid "Blame..." msgstr "Rinomina" -#: cola/widgets/prefs.py:347 +#: cola/widgets/prefs.py:367 msgid "Bold on dark headers instead of italic" msgstr "" -#: cola/widgets/main.py:806 cola/widgets/submodules.py:119 +#: cola/widgets/main.py:819 cola/widgets/submodules.py:118 msgid "Branch" msgstr "Ramo" -#: cola/widgets/remote.py:600 +#: cola/widgets/remote.py:635 #, python-format msgid "" "Branch \"%(branch)s\" does not exist in \"%(remote)s\".\n" "A new remote branch will be published." msgstr "" -#: cola/widgets/createbranch.py:258 +#: cola/widgets/createbranch.py:256 #, fuzzy, python-format msgid "Branch \"%s\" already exists." msgstr "Il ramo '%s' esiste già." -#: cola/widgets/compare.py:44 +#: cola/widgets/compare.py:43 msgid "Branch Diff Viewer" msgstr "" -#: cola/widgets/createbranch.py:259 cola/widgets/createbranch.py:271 +#: cola/widgets/createbranch.py:257 cola/widgets/createbranch.py:269 #, fuzzy msgid "Branch Exists" msgstr "Rami" -#: cola/widgets/createbranch.py:98 +#: cola/widgets/createbranch.py:96 msgid "Branch Name" msgstr "Nome del ramo" -#: cola/widgets/submodules.py:89 +#: cola/widgets/submodules.py:88 msgid "Branch name" msgstr "" -#: cola/widgets/browse.py:89 cola/widgets/main.py:1097 +#: cola/widgets/browse.py:89 cola/widgets/main.py:1110 #, fuzzy, python-format msgid "Branch: %s" msgstr "Ramo:" -#: cola/widgets/branch.py:85 cola/widgets/main.py:131 +#: cola/widgets/branch.py:87 cola/widgets/main.py:129 #, fuzzy msgid "Branches" msgstr "Ramo" -#: cola/widgets/main.py:538 +#: cola/widgets/main.py:551 #, fuzzy msgid "Branches..." msgstr "Rami" -#: cola/widgets/about.py:414 cola/widgets/about.py:417 -#: cola/widgets/about.py:437 +#: cola/widgets/about.py:397 cola/widgets/about.py:400 +#: cola/widgets/about.py:420 msgid "Brazilian translation" msgstr "" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 #, fuzzy msgid "Browse" msgstr "Esplora" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 #, fuzzy msgid "Browse Commits..." msgstr "Esplora" -#: cola/widgets/main.py:499 +#: cola/widgets/main.py:512 #, fuzzy msgid "Browse Current Branch..." msgstr "Esplora i file del ramo attuale" -#: cola/widgets/main.py:505 +#: cola/widgets/main.py:518 #, fuzzy msgid "Browse Other Branch..." msgstr "Esplora i file del ramo..." -#: cola/widgets/editremotes.py:437 cola/widgets/search.py:46 -#: cola/widgets/startup.py:65 cola/widgets/startup.py:285 +#: cola/widgets/editremotes.py:435 cola/widgets/search.py:45 +#: cola/widgets/startup.py:64 cola/widgets/startup.py:284 #, fuzzy msgid "Browse..." msgstr "Esplora" -#: cola/widgets/main.py:89 +#: cola/widgets/main.py:87 #, fuzzy msgid "Browser" msgstr "Esplora" -#: cola/widgets/browse.py:589 +#: cola/widgets/browse.py:590 #, fuzzy, python-format msgid "Browsing %s" msgstr "Aggiunta di %s in corso" -#: cola/widgets/commitmsg.py:118 +#: cola/widgets/commitmsg.py:124 msgid "Bypass Commit Hooks" msgstr "" -#: cola/sequenceeditor.py:175 cola/widgets/standard.py:991 +#: cola/sequenceeditor.py:173 cola/widgets/standard.py:1058 msgid "Cancel" msgstr "Annulla" -#: cola/sequenceeditor.py:176 +#: cola/sequenceeditor.py:174 msgid "" "Cancel rebase\n" "Shortcut: Ctrl+Q" msgstr "" -#: cola/cmds.py:254 +#: cola/cmds.py:253 #, fuzzy msgid "Cannot Amend" msgstr "Impossibile scrivere icona:" -#: cola/cmds.py:560 +#: cola/cmds.py:561 #, python-format msgid "Cannot exec \"%s\": please configure a blame viewer" msgstr "" -#: cola/cmds.py:3146 +#: cola/cmds.py:3092 #, python-format msgid "Cannot exec \"%s\": please configure a history browser" msgstr "" -#: cola/cmds.py:1583 +#: cola/cmds.py:1571 #, python-format msgid "Cannot exec \"%s\": please configure your editor" msgstr "" -#: cola/models/browse.py:336 +#: cola/models/browse.py:335 msgid "Changed Upstream" msgstr "" -#: cola/widgets/prefs.py:186 +#: cola/widgets/prefs.py:208 msgid "Check Published Commits when Amending" msgstr "" -#: cola/widgets/commitmsg.py:130 +#: cola/widgets/commitmsg.py:136 msgid "Check Spelling" msgstr "" -#: cola/widgets/prefs.py:265 +#: cola/widgets/prefs.py:286 msgid "Check spelling" msgstr "" -#: cola/widgets/prefs.py:163 +#: cola/widgets/prefs.py:186 msgid "Check whether a commit has been published when amending" msgstr "" -#: cola/guicmds.py:62 cola/widgets/branch.py:222 +#: cola/guicmds.py:61 cola/widgets/branch.py:233 msgid "Checkout" msgstr "Attiva" -#: cola/widgets/createbranch.py:130 +#: cola/widgets/createbranch.py:128 msgid "Checkout After Creation" msgstr "Attiva dopo la creazione" -#: cola/guicmds.py:62 cola/widgets/dag.py:410 +#: cola/guicmds.py:61 cola/widgets/dag.py:409 msgid "Checkout Branch" msgstr "Attiva ramo" -#: cola/widgets/dag.py:414 +#: cola/widgets/dag.py:413 #, fuzzy msgid "Checkout Detached HEAD" msgstr "Attiva ramo" -#: cola/cmds.py:480 cola/cmds.py:518 +#: cola/cmds.py:481 cola/cmds.py:519 msgid "Checkout Files" msgstr "" -#: cola/widgets/branch.py:226 +#: cola/widgets/branch.py:237 #, fuzzy msgid "Checkout as new branch" msgstr "Attiva ramo" -#: cola/cmds.py:507 +#: cola/cmds.py:508 msgid "Checkout files from our branch (HEAD)" msgstr "" -#: cola/cmds.py:511 +#: cola/cmds.py:512 msgid "Checkout files from our branch?" msgstr "" -#: cola/cmds.py:469 +#: cola/cmds.py:470 msgid "Checkout files from their branch (MERGE_HEAD)" msgstr "" -#: cola/cmds.py:473 +#: cola/cmds.py:474 msgid "Checkout files from their branch?" msgstr "" -#: cola/widgets/main.py:576 +#: cola/widgets/main.py:589 msgid "Checkout..." msgstr "Attiva..." -#: cola/widgets/dag.py:387 cola/widgets/search.py:79 +#: cola/widgets/dag.py:386 cola/widgets/search.py:78 msgid "Cherry Pick" msgstr "" -#: cola/guicmds.py:73 +#: cola/guicmds.py:72 #, fuzzy msgid "Cherry-Pick Commit" msgstr "Copia revisione" -#: cola/widgets/main.py:328 +#: cola/widgets/main.py:323 #, fuzzy msgid "Cherry-Pick..." msgstr "Attiva..." -#: cola/cmds.py:584 +#: cola/cmds.py:585 msgid "Cherry-pick failed" msgstr "" -#: cola/widgets/main.py:1161 +#: cola/widgets/main.py:1174 msgid "Cherry-picking" msgstr "" -#: cola/widgets/diff.py:1247 +#: cola/widgets/diff.py:1321 msgid "Choose Patch..." msgstr "" -#: cola/widgets/search.py:319 +#: cola/widgets/search.py:318 #, fuzzy msgid "Choose Paths" msgstr "Scegli %s" -#: cola/widgets/grep.py:116 +#: cola/widgets/grep.py:114 msgid "Choose the \"git grep\" regular expression mode" msgstr "" -#: cola/widgets/bookmarks.py:229 cola/widgets/startup.py:352 +#: cola/widgets/bookmarks.py:228 cola/widgets/startup.py:351 #, fuzzy msgid "Clear Default Repository" msgstr "Crea nuovo archivio" -#: cola/widgets/commitmsg.py:305 +#: cola/widgets/commitmsg.py:313 #, fuzzy msgid "Clear commit message" msgstr "Messaggio di fusione:" -#: cola/widgets/commitmsg.py:302 +#: cola/widgets/commitmsg.py:310 #, fuzzy msgid "Clear commit message?" msgstr "Messaggio di fusione:" -#: cola/widgets/commitmsg.py:62 +#: cola/widgets/commitmsg.py:63 #, fuzzy msgid "Clear..." msgstr "Clona..." -#: cola/widgets/clone.py:126 +#: cola/widgets/clone.py:124 msgid "Clone" msgstr "Clona" -#: cola/widgets/clone.py:62 cola/widgets/clone.py:104 +#: cola/widgets/clone.py:61 cola/widgets/clone.py:102 #, fuzzy msgid "Clone Repository" msgstr "Clona archivio esistente" -#: cola/widgets/main.py:465 cola/widgets/startup.py:58 +#: cola/widgets/main.py:478 cola/widgets/startup.py:57 msgid "Clone..." msgstr "Clona..." -#: cola/widgets/clone.py:62 +#: cola/widgets/clone.py:61 #, fuzzy, python-format msgid "Cloning repository at %s" msgstr "Clona archivio esistente" -#: cola/qtutils.py:757 cola/qtutils.py:807 cola/widgets/about.py:508 -#: cola/widgets/remote.py:328 cola/widgets/text.py:1094 +#: cola/qtutils.py:788 cola/qtutils.py:838 cola/widgets/about.py:491 +#: cola/widgets/remote.py:362 cola/widgets/text.py:1090 msgid "Close" msgstr "Chiudi" -#: cola/widgets/text.py:402 +#: cola/widgets/remote.py:222 +msgid "Close dialog when completed" +msgstr "" + +#: cola/widgets/remote.py:221 +msgid "Close on completion" +msgstr "" + +#: cola/widgets/text.py:399 msgid "Close the find bar" msgstr "" -#: cola/qtutils.py:623 +#: cola/qtutils.py:651 #, fuzzy msgid "Close..." msgstr "Clona..." -#: cola/widgets/recent.py:71 +#: cola/widgets/recent.py:69 #, fuzzy msgid "Collapse all" msgstr "Chiudi" -#: cola/sequenceeditor.py:323 +#: cola/sequenceeditor.py:320 #, fuzzy msgid "Command" msgstr "Revisione:" -#: cola/widgets/main.py:163 cola/widgets/merge.py:74 +#: cola/widgets/main.py:161 cola/widgets/merge.py:72 #, fuzzy msgid "Commit" msgstr "Revisione:" -#: cola/cmds.py:837 +#: cola/widgets/prefs.py:192 +msgid "Commit Message Cleanup" +msgstr "" + +#: cola/widgets/commitmsg.py:495 #, fuzzy msgid "Commit failed" msgstr "Impossibile creare una nuova revisione." -#: cola/widgets/commitmsg.py:61 +#: cola/widgets/commitmsg.py:62 #, fuzzy msgid "Commit staged changes" msgstr "Archiviazione modifiche..." -#: cola/widgets/commitmsg.py:93 +#: cola/widgets/commitmsg.py:94 msgid "" "Commit staged changes\n" "Shortcut: Ctrl+Enter" msgstr "" -#: cola/widgets/commitmsg.py:564 +#: cola/widgets/commitmsg.py:590 #, fuzzy msgid "Commit summary" msgstr "Messaggio di revisione:" -#: cola/widgets/main.py:259 +#: cola/widgets/main.py:253 msgid "Commit the current state and continue applying patches" msgstr "" -#: cola/widgets/merge.py:70 +#: cola/widgets/merge.py:68 msgid "Commit the merge if there are no conflicts. Uncheck to leave the merge uncommitted" msgstr "" -#: cola/widgets/commitmsg.py:58 cola/widgets/commitmsg.py:95 -#: cola/widgets/main.py:778 cola/widgets/main.py:779 +#: cola/widgets/commitmsg.py:59 cola/widgets/commitmsg.py:96 +#: cola/widgets/main.py:791 cola/widgets/main.py:792 msgid "Commit@@verb" msgstr "Nuova revisione" -#: cola/difftool.py:78 cola/widgets/compare.py:70 +#: cola/widgets/dag.py:487 +msgid "Commits authored by me" +msgstr "" + +#: cola/difftool.py:97 cola/widgets/compare.py:69 msgid "Compare" msgstr "" -#: cola/difftool.py:83 +#: cola/difftool.py:102 msgid "Compare All" msgstr "" -#: cola/widgets/toolbar.py:269 cola/widgets/toolbar.py:306 +#: cola/widgets/toolbar.py:274 cola/widgets/toolbar.py:311 msgid "Configure Toolbar" msgstr "" -#: cola/widgets/remote.py:214 +#: cola/widgets/remote.py:218 msgid "Configure the remote branch as the the new upstream" msgstr "" -#: cola/widgets/main.py:170 +#: cola/widgets/main.py:168 #, fuzzy msgid "Console" msgstr "Chiudi" -#: cola/interaction.py:111 cola/widgets/main.py:610 +#: cola/interaction.py:109 cola/widgets/main.py:623 msgid "Continue" msgstr "Continua" -#: cola/widgets/main.py:255 +#: cola/widgets/main.py:252 msgid "Continue Applying Patches" msgstr "" -#: cola/widgets/bookmarks.py:248 cola/widgets/main.py:742 -#: cola/widgets/startup.py:371 +#: cola/widgets/bookmarks.py:247 cola/widgets/main.py:755 +#: cola/widgets/startup.py:370 msgid "Copy" msgstr "Copia" -#: cola/widgets/status.py:268 +#: cola/widgets/status.py:269 msgid "Copy Basename to Clipboard" msgstr "" -#: cola/widgets/diff.py:208 +#: cola/widgets/diff.py:209 msgid "Copy Diff" msgstr "" -#: cola/widgets/status.py:745 +#: cola/widgets/status.py:746 msgid "Copy Leading Path to Clipboard" msgstr "" -#: cola/widgets/status.py:251 +#: cola/widgets/status.py:252 msgid "Copy Path to Clipboard" msgstr "" -#: cola/widgets/status.py:259 +#: cola/widgets/status.py:260 msgid "Copy Relative Path to Clipboard" msgstr "" -#: cola/sequenceeditor.py:334 cola/widgets/dag.py:474 +#: cola/sequenceeditor.py:330 cola/widgets/dag.py:473 #, fuzzy msgid "Copy SHA-1" msgstr "Copia tutto" -#: cola/widgets/status.py:737 +#: cola/widgets/status.py:738 #, fuzzy msgid "Copy..." msgstr "Copia" -#: cola/app.py:490 +#: cola/app.py:493 #, python-format msgid "Could not open %s." msgstr "" -#: cola/widgets/clone.py:191 cola/widgets/clone.py:193 +#: cola/widgets/clone.py:189 cola/widgets/clone.py:191 #, python-format msgid "Could not parse Git URL: \"%s\"" msgstr "" -#: cola/app.py:500 +#: cola/app.py:503 msgid "Create" msgstr "" -#: cola/widgets/createbranch.py:86 cola/widgets/createbranch.py:135 -#: cola/widgets/createbranch.py:301 cola/widgets/dag.py:369 +#: cola/widgets/createbranch.py:84 cola/widgets/createbranch.py:133 +#: cola/widgets/createbranch.py:299 cola/widgets/dag.py:368 msgid "Create Branch" msgstr "Crea ramo" -#: cola/widgets/dag.py:373 +#: cola/widgets/dag.py:372 #, fuzzy msgid "Create Patch" msgstr "Crea ramo" -#: cola/widgets/remote.py:606 +#: cola/widgets/remote.py:641 #, fuzzy msgid "Create Remote Branch" msgstr "Cancella ramo remoto" -#: cola/widgets/commitmsg.py:124 cola/widgets/merge.py:78 +#: cola/widgets/commitmsg.py:130 cola/widgets/merge.py:76 #, fuzzy msgid "Create Signed Commit" msgstr "Creata revisione %s: %s" -#: cola/widgets/createtag.py:55 cola/widgets/createtag.py:91 -#: cola/widgets/dag.py:377 +#: cola/widgets/createtag.py:53 cola/widgets/createtag.py:89 +#: cola/widgets/dag.py:376 #, fuzzy msgid "Create Tag" msgstr "Crea" -#: cola/widgets/main.py:544 +#: cola/widgets/main.py:557 #, fuzzy msgid "Create Tag..." msgstr "Crea..." -#: cola/cmds.py:2807 +#: cola/cmds.py:2753 msgid "Create Unsigned Tag" msgstr "" -#: cola/widgets/remote.py:188 +#: cola/widgets/remote.py:192 msgid "Create a merge commit even when the merge resolves as a fast-forward" msgstr "" -#: cola/widgets/remote.py:605 +#: cola/widgets/remote.py:640 #, fuzzy msgid "Create a new remote branch?" msgstr "Crea nuovo ramo" -#: cola/app.py:499 +#: cola/app.py:502 msgid "Create a new repository at that location?" msgstr "" -#: cola/widgets/submodules.py:100 +#: cola/widgets/submodules.py:99 msgid "Create a shallow clone with history truncated to the specified number of revisions. 0 performs a full clone." msgstr "" -#: cola/widgets/main.py:551 +#: cola/widgets/main.py:564 msgid "Create..." msgstr "Crea..." -#: cola/cmds.py:2843 +#: cola/cmds.py:2789 #, python-format msgid "Created a new tag named \"%s\"" msgstr "" -#: cola/widgets/prefs.py:266 +#: cola/widgets/prefs.py:287 msgid "Ctrl+MouseWheel to Zoom" msgstr "" -#: cola/widgets/prefs.py:404 +#: cola/widgets/prefs.py:442 #, fuzzy msgid "Current Repository" msgstr "Crea nuovo archivio" -#: cola/widgets/status.py:1371 +#: cola/widgets/status.py:1372 msgid "Custom Copy Actions" msgstr "" -#: cola/widgets/status.py:273 +#: cola/widgets/status.py:274 #, fuzzy msgid "Customize..." msgstr "Clona..." -#: cola/widgets/main.py:740 +#: cola/widgets/main.py:753 msgid "Cut" msgstr "Taglia" -#: cola/widgets/about.py:411 cola/widgets/about.py:442 +#: cola/widgets/about.py:394 cola/widgets/about.py:425 msgid "Czech translation" msgstr "" -#: cola/widgets/main.py:592 +#: cola/widgets/main.py:605 msgid "DAG..." msgstr "" -#: cola/icons.py:55 +#: cola/icons.py:54 msgid "Dark Theme" msgstr "" -#: cola/widgets/dag.py:506 +#: cola/widgets/dag.py:572 msgid "Date, Time" msgstr "" -#: cola/icons.py:54 cola/themes.py:637 +#: cola/icons.py:53 cola/themes.py:643 #, fuzzy msgid "Default" msgstr "Ripristina valori predefiniti" -#: cola/widgets/prefs.py:126 +#: cola/widgets/prefs.py:124 msgid "" "Default directory when exporting patches.\n" "Relative paths are relative to the current repository.\n" "Absolute path are used as-is." msgstr "" -#: cola/cmds.py:925 cola/guicmds.py:26 cola/guicmds.py:35 -#: cola/widgets/bookmarks.py:75 cola/widgets/bookmarks.py:251 -#: cola/widgets/main.py:746 cola/widgets/startup.py:373 +#: cola/cmds.py:923 cola/guicmds.py:25 cola/guicmds.py:34 +#: cola/widgets/bookmarks.py:74 cola/widgets/bookmarks.py:250 +#: cola/widgets/main.py:759 cola/widgets/startup.py:372 msgid "Delete" msgstr "Elimina" -#: cola/cmds.py:1088 +#: cola/cmds.py:1089 #, fuzzy, python-format msgid "Delete %d file(s)?" msgstr "Elimina" -#: cola/cmds.py:1016 +#: cola/cmds.py:1017 #, fuzzy msgid "Delete Bookmark" msgstr "Elimina ramo" -#: cola/cmds.py:1014 +#: cola/cmds.py:1015 #, fuzzy msgid "Delete Bookmark?" msgstr "Elimina ramo" -#: cola/cmds.py:1114 cola/cmds.py:1117 cola/guicmds.py:26 -#: cola/widgets/branch.py:268 +#: cola/cmds.py:1115 cola/cmds.py:1118 cola/guicmds.py:25 +#: cola/widgets/branch.py:277 msgid "Delete Branch" msgstr "Elimina ramo" -#: cola/cmds.py:1089 +#: cola/cmds.py:1090 #, fuzzy msgid "Delete Files" msgstr "Elimina" -#: cola/widgets/status.py:311 +#: cola/widgets/status.py:312 #, fuzzy msgid "Delete Files..." msgstr "Elimina..." -#: cola/cmds.py:1085 +#: cola/cmds.py:1086 #, fuzzy msgid "Delete Files?" msgstr "Elimina" -#: cola/cmds.py:922 +#: cola/cmds.py:920 #, fuzzy msgid "Delete Remote" msgstr "Cancella ramo remoto" -#: cola/guicmds.py:35 cola/widgets/branch.py:270 +#: cola/guicmds.py:34 cola/widgets/branch.py:279 #, fuzzy msgid "Delete Remote Branch" msgstr "Cancella ramo remoto" -#: cola/widgets/main.py:564 +#: cola/widgets/main.py:577 #, fuzzy msgid "Delete Remote Branch..." msgstr "Cancella ramo remoto" -#: cola/widgets/toolbar.py:271 +#: cola/widgets/toolbar.py:276 #, fuzzy msgid "Delete Toolbar" msgstr "Elimina ramo" -#: cola/cmds.py:1115 +#: cola/cmds.py:1116 #, python-format msgid "Delete branch \"%s\"?" msgstr "" -#: cola/widgets/editremotes.py:88 +#: cola/widgets/editremotes.py:87 #, fuzzy msgid "Delete remote" msgstr "Cancella ramo remoto" -#: cola/cmds.py:924 +#: cola/cmds.py:922 #, fuzzy, python-format msgid "Delete remote \"%s\"" msgstr "Cancella ramo remoto" -#: cola/cmds.py:923 +#: cola/cmds.py:921 #, fuzzy msgid "Delete remote?" msgstr "Cancella ramo remoto" -#: cola/widgets/main.py:558 +#: cola/widgets/main.py:571 msgid "Delete..." msgstr "Elimina..." -#: cola/cmds.py:1067 +#: cola/cmds.py:1068 #, python-format msgid "Deleting \"%s\" failed" msgstr "" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 #, fuzzy msgid "Deletions" msgstr "Elimina" -#: cola/widgets/submodules.py:120 +#: cola/widgets/submodules.py:119 msgid "Depth" msgstr "" -#: cola/qtutils.py:811 cola/qtutils.py:852 +#: cola/qtutils.py:842 cola/qtutils.py:889 #, fuzzy msgid "Detach" msgstr "Elimina ramo" -#: cola/widgets/prefs.py:181 +#: cola/widgets/prefs.py:203 msgid "Detect Conflict Markers" msgstr "" -#: cola/widgets/prefs.py:151 +#: cola/widgets/prefs.py:174 msgid "Detect conflict markers in unmerged files" msgstr "" -#: cola/widgets/about.py:271 cola/widgets/about.py:274 -#: cola/widgets/about.py:277 cola/widgets/about.py:278 -#: cola/widgets/about.py:279 cola/widgets/about.py:280 -#: cola/widgets/about.py:281 cola/widgets/about.py:282 -#: cola/widgets/about.py:283 cola/widgets/about.py:284 -#: cola/widgets/about.py:285 cola/widgets/about.py:286 -#: cola/widgets/about.py:287 cola/widgets/about.py:288 -#: cola/widgets/about.py:289 cola/widgets/about.py:290 -#: cola/widgets/about.py:291 cola/widgets/about.py:292 -#: cola/widgets/about.py:293 cola/widgets/about.py:294 -#: cola/widgets/about.py:295 cola/widgets/about.py:296 -#: cola/widgets/about.py:297 cola/widgets/about.py:298 -#: cola/widgets/about.py:299 cola/widgets/about.py:300 -#: cola/widgets/about.py:301 cola/widgets/about.py:302 -#: cola/widgets/about.py:303 cola/widgets/about.py:304 -#: cola/widgets/about.py:305 cola/widgets/about.py:306 -#: cola/widgets/about.py:307 cola/widgets/about.py:308 -#: cola/widgets/about.py:309 cola/widgets/about.py:310 -#: cola/widgets/about.py:311 cola/widgets/about.py:312 -#: cola/widgets/about.py:313 cola/widgets/about.py:314 -#: cola/widgets/about.py:315 cola/widgets/about.py:316 -#: cola/widgets/about.py:317 cola/widgets/about.py:318 -#: cola/widgets/about.py:319 cola/widgets/about.py:320 -#: cola/widgets/about.py:321 cola/widgets/about.py:322 -#: cola/widgets/about.py:323 cola/widgets/about.py:324 -#: cola/widgets/about.py:325 cola/widgets/about.py:326 -#: cola/widgets/about.py:327 cola/widgets/about.py:328 -#: cola/widgets/about.py:329 cola/widgets/about.py:330 -#: cola/widgets/about.py:331 cola/widgets/about.py:332 -#: cola/widgets/about.py:333 cola/widgets/about.py:334 -#: cola/widgets/about.py:335 cola/widgets/about.py:336 -#: cola/widgets/about.py:337 cola/widgets/about.py:338 -#: cola/widgets/about.py:339 cola/widgets/about.py:340 -#: cola/widgets/about.py:341 cola/widgets/about.py:342 -#: cola/widgets/about.py:343 cola/widgets/about.py:344 -#: cola/widgets/about.py:345 cola/widgets/about.py:346 -#: cola/widgets/about.py:347 cola/widgets/about.py:348 -#: cola/widgets/about.py:349 cola/widgets/about.py:350 -#: cola/widgets/about.py:351 cola/widgets/about.py:352 -#: cola/widgets/about.py:353 cola/widgets/about.py:354 -#: cola/widgets/about.py:355 cola/widgets/about.py:356 -#: cola/widgets/about.py:357 cola/widgets/about.py:358 -#: cola/widgets/about.py:359 cola/widgets/about.py:360 -#: cola/widgets/about.py:361 cola/widgets/about.py:362 -#: cola/widgets/about.py:363 cola/widgets/about.py:364 -#: cola/widgets/about.py:365 cola/widgets/about.py:366 -#: cola/widgets/about.py:367 cola/widgets/about.py:368 -#: cola/widgets/about.py:369 cola/widgets/about.py:370 -#: cola/widgets/about.py:371 cola/widgets/about.py:372 -#: cola/widgets/about.py:373 cola/widgets/about.py:374 -#: cola/widgets/about.py:375 cola/widgets/about.py:376 -#: cola/widgets/about.py:377 cola/widgets/about.py:378 -#: cola/widgets/about.py:379 cola/widgets/about.py:380 +#: cola/widgets/about.py:254 cola/widgets/about.py:257 +#: cola/widgets/about.py:260 cola/widgets/about.py:261 +#: cola/widgets/about.py:262 cola/widgets/about.py:263 +#: cola/widgets/about.py:264 cola/widgets/about.py:265 +#: cola/widgets/about.py:266 cola/widgets/about.py:267 +#: cola/widgets/about.py:268 cola/widgets/about.py:269 +#: cola/widgets/about.py:270 cola/widgets/about.py:271 +#: cola/widgets/about.py:272 cola/widgets/about.py:273 +#: cola/widgets/about.py:274 cola/widgets/about.py:275 +#: cola/widgets/about.py:276 cola/widgets/about.py:277 +#: cola/widgets/about.py:278 cola/widgets/about.py:279 +#: cola/widgets/about.py:280 cola/widgets/about.py:281 +#: cola/widgets/about.py:282 cola/widgets/about.py:283 +#: cola/widgets/about.py:284 cola/widgets/about.py:285 +#: cola/widgets/about.py:286 cola/widgets/about.py:287 +#: cola/widgets/about.py:288 cola/widgets/about.py:289 +#: cola/widgets/about.py:290 cola/widgets/about.py:291 +#: cola/widgets/about.py:292 cola/widgets/about.py:293 +#: cola/widgets/about.py:294 cola/widgets/about.py:295 +#: cola/widgets/about.py:296 cola/widgets/about.py:297 +#: cola/widgets/about.py:298 cola/widgets/about.py:299 +#: cola/widgets/about.py:300 cola/widgets/about.py:301 +#: cola/widgets/about.py:302 cola/widgets/about.py:303 +#: cola/widgets/about.py:304 cola/widgets/about.py:305 +#: cola/widgets/about.py:306 cola/widgets/about.py:307 +#: cola/widgets/about.py:308 cola/widgets/about.py:309 +#: cola/widgets/about.py:310 cola/widgets/about.py:311 +#: cola/widgets/about.py:312 cola/widgets/about.py:313 +#: cola/widgets/about.py:314 cola/widgets/about.py:315 +#: cola/widgets/about.py:316 cola/widgets/about.py:317 +#: cola/widgets/about.py:318 cola/widgets/about.py:319 +#: cola/widgets/about.py:320 cola/widgets/about.py:321 +#: cola/widgets/about.py:322 cola/widgets/about.py:323 +#: cola/widgets/about.py:324 cola/widgets/about.py:325 +#: cola/widgets/about.py:326 cola/widgets/about.py:327 +#: cola/widgets/about.py:328 cola/widgets/about.py:329 +#: cola/widgets/about.py:330 cola/widgets/about.py:331 +#: cola/widgets/about.py:332 cola/widgets/about.py:333 +#: cola/widgets/about.py:334 cola/widgets/about.py:335 +#: cola/widgets/about.py:336 cola/widgets/about.py:337 +#: cola/widgets/about.py:338 cola/widgets/about.py:339 +#: cola/widgets/about.py:340 cola/widgets/about.py:341 +#: cola/widgets/about.py:342 cola/widgets/about.py:343 +#: cola/widgets/about.py:344 cola/widgets/about.py:345 +#: cola/widgets/about.py:346 cola/widgets/about.py:347 +#: cola/widgets/about.py:348 cola/widgets/about.py:349 +#: cola/widgets/about.py:350 cola/widgets/about.py:351 +#: cola/widgets/about.py:352 cola/widgets/about.py:353 +#: cola/widgets/about.py:354 cola/widgets/about.py:355 +#: cola/widgets/about.py:356 cola/widgets/about.py:357 +#: cola/widgets/about.py:358 cola/widgets/about.py:359 +#: cola/widgets/about.py:360 cola/widgets/about.py:361 +#: cola/widgets/about.py:362 cola/widgets/about.py:363 msgid "Developer" msgstr "" -#: cola/guicmds.py:185 cola/widgets/dag.py:764 cola/widgets/diff.py:781 -#: cola/widgets/main.py:177 cola/widgets/main.py:797 +#: cola/guicmds.py:184 cola/widgets/dag.py:830 cola/widgets/diff.py:809 +#: cola/widgets/main.py:175 cola/widgets/main.py:810 msgid "Diff" msgstr "" -#: cola/guicmds.py:185 +#: cola/guicmds.py:184 msgid "Diff Against Commit" msgstr "" @@ -1398,37 +1439,37 @@ msgstr "" msgid "Diff Against Predecessor..." msgstr "" -#: cola/widgets/main.py:1159 +#: cola/widgets/main.py:1172 msgid "Diff Mode" msgstr "" -#: cola/widgets/diff.py:772 cola/widgets/diff.py:796 +#: cola/widgets/diff.py:800 cola/widgets/diff.py:824 #, fuzzy msgid "Diff Options" msgstr "Opzioni" -#: cola/widgets/prefs.py:256 +#: cola/widgets/prefs.py:277 msgid "Diff Tool" msgstr "" -#: cola/widgets/dag.py:364 +#: cola/widgets/dag.py:363 msgid "Diff selected -> this" msgstr "" -#: cola/widgets/dag.py:358 +#: cola/widgets/dag.py:357 msgid "Diff this -> selected" msgstr "" -#: cola/widgets/main.py:218 +#: cola/widgets/main.py:217 msgid "Diffstat" msgstr "" -#: cola/cmds.py:3262 +#: cola/difftool.py:324 #, fuzzy msgid "Difftool" msgstr "Opzioni" -#: cola/widgets/clone.py:207 +#: cola/widgets/clone.py:205 #, fuzzy msgid "Directory Exists" msgstr "Directory:" @@ -1437,88 +1478,92 @@ msgstr "Directory:" msgid "Disable" msgstr "" -#: cola/widgets/prefs.py:180 +#: cola/widgets/prefs.py:202 msgid "Display Untracked Files" msgstr "" -#: cola/cmds.py:2094 +#: cola/widgets/remote.py:176 +msgid "Display remote messages in a separate dialog" +msgstr "" + +#: cola/cmds.py:2045 msgid "Do not update stacked branches" msgstr "" -#: cola/widgets/main.py:471 +#: cola/widgets/main.py:484 #, fuzzy msgid "Documentation" msgstr "Documentazione sul web" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop" msgstr "" -#: cola/widgets/stash.py:258 +#: cola/widgets/stash.py:276 msgid "Drop Stash" msgstr "" -#: cola/widgets/stash.py:255 +#: cola/widgets/stash.py:273 msgid "Drop Stash?" msgstr "" -#: cola/widgets/stash.py:257 +#: cola/widgets/stash.py:275 #, python-format msgid "Drop the \"%s\" stash?" msgstr "" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop the selected stash" msgstr "" -#: cola/qtutils.py:764 cola/sequenceeditor.py:357 cola/widgets/grep.py:102 +#: cola/qtutils.py:795 cola/sequenceeditor.py:353 cola/widgets/grep.py:100 #, fuzzy msgid "Edit" msgstr "Modifica" -#: cola/widgets/diff.py:1019 +#: cola/widgets/diff.py:1058 msgid "Edit Diff Hunk to Revert..." msgstr "" -#: cola/widgets/diff.py:1017 +#: cola/widgets/diff.py:1056 msgid "Edit Diff Hunk to Stage..." msgstr "" -#: cola/widgets/diff.py:1062 +#: cola/widgets/diff.py:1124 msgid "Edit Diff Hunk to Unstage..." msgstr "" -#: cola/cmds.py:2166 +#: cola/cmds.py:2117 #, fuzzy msgid "Edit Rebase" msgstr "Ripristina" -#: cola/widgets/editremotes.py:36 +#: cola/widgets/editremotes.py:35 #, fuzzy msgid "Edit Remotes" msgstr "Remoto" -#: cola/widgets/main.py:298 +#: cola/widgets/main.py:293 msgid "Edit Remotes..." msgstr "" -#: cola/widgets/diff.py:1014 +#: cola/widgets/diff.py:1053 msgid "Edit Selected Lines to Revert..." msgstr "" -#: cola/widgets/diff.py:1012 +#: cola/widgets/diff.py:1051 msgid "Edit Selected Lines to Stage..." msgstr "" -#: cola/widgets/diff.py:1059 +#: cola/widgets/diff.py:1122 msgid "Edit Selected Lines to Unstage..." msgstr "" -#: cola/widgets/editremotes.py:44 +#: cola/widgets/editremotes.py:43 msgid "Edit remotes by selecting them from the list" msgstr "" -#: cola/widgets/browse.py:197 cola/widgets/common.py:39 +#: cola/widgets/browse.py:198 cola/widgets/common.py:38 msgid "Edit selected paths" msgstr "" @@ -1534,12 +1579,12 @@ msgstr "" msgid "Edit the following patch, which will then be applied to the worktree to revert the changes:" msgstr "" -#: cola/widgets/main.py:604 +#: cola/widgets/main.py:617 #, fuzzy msgid "Edit..." msgstr "Modifica" -#: cola/widgets/prefs.py:253 +#: cola/widgets/prefs.py:274 #, fuzzy msgid "Editor" msgstr "Modifica" @@ -1549,165 +1594,170 @@ msgstr "Modifica" msgid "Editor returned %s exit code. Not applying patch." msgstr "" -#: cola/widgets/prefs.py:167 +#: cola/widgets/prefs.py:190 msgid "Email Address" msgstr "Indirizzo Email" -#: cola/widgets/about.py:258 cola/widgets/about.py:401 +#: cola/widgets/about.py:241 cola/widgets/about.py:384 msgid "Email contributor" msgstr "" -#: cola/widgets/prefs.py:182 +#: cola/widgets/prefs.py:204 msgid "Enable Gravatar Icons" msgstr "" -#: cola/widgets/prefs.py:160 +#: cola/widgets/prefs.py:183 msgid "Enable path autocompletion in tools" msgstr "" -#: cola/widgets/diff.py:768 +#: cola/widgets/diff.py:796 msgid "Enable word wrapping" msgstr "" -#: cola/sequenceeditor.py:322 +#: cola/sequenceeditor.py:319 msgid "Enabled" msgstr "" -#: cola/guicmds.py:333 cola/widgets/branch.py:445 +#: cola/guicmds.py:332 cola/widgets/branch.py:478 #, fuzzy msgid "Enter New Branch Name" msgstr "Nome del ramo" -#: cola/guicmds.py:147 +#: cola/guicmds.py:146 msgid "Enter a name for the new bare repo" msgstr "" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Enter a name for the stash" msgstr "" -#: cola/cmds.py:146 cola/cmds.py:176 cola/cmds.py:207 cola/cmds.py:283 -#: cola/cmds.py:292 cola/cmds.py:307 cola/cmds.py:317 cola/cmds.py:460 -#: cola/cmds.py:496 cola/cmds.py:534 cola/cmds.py:633 cola/cmds.py:751 -#: cola/cmds.py:1067 cola/cmds.py:1164 cola/cmds.py:2005 cola/cmds.py:2394 -#: cola/cmds.py:2637 cola/cmds.py:2643 cola/cmds.py:2651 cola/cmds.py:2872 -#: cola/cmds.py:2890 cola/cmds.py:3180 cola/gitcmds.py:984 cola/guicmds.py:157 -#: cola/models/stash.py:70 cola/models/stash.py:87 cola/models/stash.py:108 -#: cola/widgets/bookmarks.py:482 cola/widgets/branch.py:777 +#: cola/widgets/stash.py:216 +msgid "Enter a new name for the stash" +msgstr "" + +#: cola/cmds.py:145 cola/cmds.py:175 cola/cmds.py:206 cola/cmds.py:284 +#: cola/cmds.py:293 cola/cmds.py:308 cola/cmds.py:318 cola/cmds.py:461 +#: cola/cmds.py:497 cola/cmds.py:535 cola/cmds.py:635 cola/cmds.py:753 +#: cola/cmds.py:1068 cola/cmds.py:1165 cola/cmds.py:1956 cola/cmds.py:2345 +#: cola/cmds.py:2579 cola/cmds.py:2585 cola/cmds.py:2593 cola/cmds.py:2818 +#: cola/cmds.py:2836 cola/cmds.py:3125 cola/gitcmds.py:994 cola/guicmds.py:156 +#: cola/models/stash.py:70 cola/models/stash.py:90 cola/models/stash.py:112 +#: cola/models/stash.py:138 cola/widgets/bookmarks.py:481 +#: cola/widgets/branch.py:829 #, fuzzy msgid "Error" msgstr "errore" -#: cola/widgets/clone.py:191 +#: cola/widgets/clone.py:189 #, fuzzy msgid "Error Cloning" msgstr "Errore nel caricamento del file:" -#: cola/widgets/createbranch.py:314 +#: cola/widgets/createbranch.py:312 #, fuzzy msgid "Error Creating Branch" msgstr "Crea ramo" -#: cola/app.py:502 cola/guicmds.py:101 +#: cola/app.py:505 cola/guicmds.py:100 #, fuzzy msgid "Error Creating Repository" msgstr "Crea nuovo archivio" -#: cola/cmds.py:1202 +#: cola/cmds.py:1206 #, fuzzy msgid "Error Deleting Remote Branch" msgstr "Crea ramo" -#: cola/cmds.py:1585 +#: cola/cmds.py:1573 #, fuzzy msgid "Error Editing File" msgstr "Errore nel caricamento delle differenze:" -#: cola/cmds.py:559 +#: cola/cmds.py:560 #, fuzzy msgid "Error Launching Blame Viewer" msgstr "File browser" -#: cola/cmds.py:3145 +#: cola/cmds.py:3091 #, fuzzy msgid "Error Launching History Browser" msgstr "File browser" -#: cola/app.py:489 +#: cola/app.py:492 msgid "Error Opening Repository" msgstr "" -#: cola/widgets/browse.py:566 +#: cola/models/stash.py:144 +msgid "Error Renaming Stash" +msgstr "" + +#: cola/widgets/browse.py:567 msgid "Error Saving File" msgstr "" -#: cola/cmds.py:914 +#: cola/cmds.py:912 #, python-format msgid "Error creating remote \"%s\"" msgstr "" -#: cola/models/stash.py:197 +#: cola/models/stash.py:233 #, fuzzy msgid "Error creating stash" msgstr "Crea ramo" -#: cola/cmds.py:1126 +#: cola/cmds.py:1127 #, python-format msgid "Error deleting branch \"%s\"" msgstr "" -#: cola/cmds.py:932 +#: cola/cmds.py:930 #, python-format msgid "Error deleting remote \"%s\"" msgstr "" -#: cola/cmds.py:956 +#: cola/cmds.py:955 #, python-format msgid "Error renaming \"%(name)s\" to \"%(new_name)s\"" msgstr "" -#: cola/cmds.py:1771 +#: cola/cmds.py:1722 #, fuzzy msgid "Error running prepare-commitmsg hook" msgstr "Avvio pre-commit hook..." -#: cola/cmds.py:3043 cola/cmds.py:3089 +#: cola/cmds.py:2989 cola/cmds.py:3035 #, fuzzy, python-format msgid "Error updating submodule %s" msgstr "Errore nel caricamento delle differenze:" -#: cola/cmds.py:3125 +#: cola/cmds.py:3071 #, fuzzy msgid "Error updating submodules" msgstr "Errore nel caricamento delle differenze:" -#: cola/widgets/diff.py:1326 +#: cola/widgets/diff.py:1400 msgid "Error writing patch" msgstr "" -#: cola/cmds.py:1710 +#: cola/cmds.py:1662 msgid "Error: Cannot find commit template" msgstr "" -#: cola/widgets/stash.py:235 -msgid "Error: Stash exists" -msgstr "" - -#: cola/cmds.py:1732 +#: cola/cmds.py:1684 msgid "Error: Unconfigured commit template" msgstr "" -#: cola/widgets/clone.py:53 +#: cola/widgets/clone.py:52 #, python-format msgid "Error: could not clone \"%s\"" msgstr "" -#: cola/cmds.py:2835 +#: cola/cmds.py:2781 #, python-format msgid "Error: could not create tag \"%s\"" msgstr "" -#: cola/widgets/branch.py:421 +#: cola/widgets/branch.py:433 #, fuzzy, python-format msgid "Executing action %s" msgstr "Il dizionario è stato reimpostato su %s." @@ -1716,427 +1766,439 @@ msgstr "Il dizionario è stato reimpostato su %s." msgid "Exit \"Diff\" mode" msgstr "" -#: cola/widgets/action.py:67 +#: cola/widgets/action.py:81 msgid "Exit Diff" msgstr "" -#: cola/widgets/main.py:528 +#: cola/widgets/main.py:541 msgid "Exit Diff Mode" msgstr "" -#: cola/widgets/action.py:68 +#: cola/widgets/action.py:81 msgid "Exit Diff mode" msgstr "" -#: cola/widgets/recent.py:67 +#: cola/widgets/recent.py:65 msgid "Expand all" msgstr "" -#: cola/widgets/diff.py:1223 +#: cola/widgets/diff.py:1297 msgid "Export Patch" msgstr "" -#: cola/guicmds.py:168 cola/widgets/search.py:75 +#: cola/guicmds.py:167 cola/widgets/search.py:74 msgid "Export Patches" msgstr "" -#: cola/widgets/main.py:273 +#: cola/widgets/main.py:268 msgid "Export Patches..." msgstr "" -#: cola/widgets/main.py:533 +#: cola/widgets/main.py:546 #, fuzzy msgid "Expression..." msgstr "Opzioni..." -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Extended Regexp" msgstr "" -#: cola/widgets/commitmsg.py:612 +#: cola/widgets/commitmsg.py:638 msgid "Extended description..." msgstr "" -#: cola/cmds.py:387 +#: cola/cmds.py:388 msgid "Failed to commit and continue applying patches" msgstr "" -#: cola/cmds.py:403 +#: cola/cmds.py:404 msgid "Failed to continue applying patches after skipping the current patch" msgstr "" -#: cola/widgets/createbranch.py:124 +#: cola/widgets/createbranch.py:122 msgid "Fast Forward Only" msgstr "Solo fast forward" -#: cola/widgets/remote.py:177 +#: cola/widgets/remote.py:181 #, fuzzy msgid "Fast-forward only" msgstr "Solo fast forward" -#: cola/widgets/bookmarks.py:91 +#: cola/widgets/bookmarks.py:90 #, fuzzy msgid "Favorite repositories" msgstr "Archivi recenti" -#: cola/widgets/main.py:111 +#: cola/widgets/main.py:109 msgid "Favorites" msgstr "" -#: cola/widgets/remote.py:673 +#: cola/widgets/remote.py:735 #, fuzzy msgid "Fetch" msgstr "Ripristina..." -#: cola/widgets/createbranch.py:127 +#: cola/widgets/createbranch.py:125 msgid "Fetch Tracking Branch" msgstr "Recupera duplicato locale di ramo remoto" -#: cola/widgets/action.py:63 cola/widgets/main.py:387 +#: cola/widgets/action.py:67 cola/widgets/main.py:384 +msgid "Fetch from one or more remotes using \"git fetch\"" +msgstr "" + +#: cola/widgets/action.py:65 cola/widgets/main.py:383 #, fuzzy msgid "Fetch..." msgstr "Ripristina..." -#: cola/widgets/main.py:588 +#: cola/widgets/main.py:601 #, fuzzy msgid "File Browser..." msgstr "Esplora" -#: cola/widgets/compare.py:75 +#: cola/widgets/compare.py:74 #, fuzzy msgid "File Differences" msgstr "Preferenze" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 msgid "File Saved" msgstr "" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 #, python-format msgid "File saved to \"%s\"" msgstr "" -#: cola/fsmonitor.py:517 +#: cola/fsmonitor.py:528 msgid "File system change monitoring: disabled because \"cola.inotify\" is false.\n" msgstr "" -#: cola/fsmonitor.py:534 +#: cola/fsmonitor.py:545 msgid "File system change monitoring: disabled because libc does not support the inotify system calls.\n" msgstr "" -#: cola/fsmonitor.py:528 +#: cola/fsmonitor.py:539 msgid "File system change monitoring: disabled because pywin32 is not installed.\n" msgstr "" -#: cola/fsmonitor.py:181 +#: cola/fsmonitor.py:184 msgid "" "File system change monitoring: disabled because the limit on the total number of inotify watches was reached. You may be able to increase the limit on the number of watches by running:\n" "\n" " echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n" msgstr "" -#: cola/fsmonitor.py:142 +#: cola/fsmonitor.py:145 #, fuzzy msgid "File system change monitoring: enabled.\n" msgstr "Fidati delle date di modifica dei file\n" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 #, fuzzy msgid "Filename" msgstr "Rinomina" -#: cola/widgets/dag.py:755 +#: cola/widgets/dag.py:821 #, fuzzy msgid "Files" msgstr "File:" -#: cola/widgets/branch.py:785 +#: cola/widgets/branch.py:837 #, fuzzy msgid "Filter branches..." msgstr "Ripristina..." -#: cola/widgets/status.py:1333 +#: cola/widgets/status.py:1334 #, fuzzy msgid "Filter paths..." msgstr "Ripristina..." -#: cola/widgets/finder.py:113 cola/widgets/main.py:312 +#: cola/widgets/finder.py:112 cola/widgets/main.py:307 #, fuzzy msgid "Find Files" msgstr "File:" -#: cola/widgets/text.py:388 +#: cola/widgets/text.py:385 msgid "Find in diff" msgstr "" -#: cola/widgets/text.py:425 +#: cola/widgets/text.py:422 msgid "Find next item" msgstr "" -#: cola/widgets/text.py:431 +#: cola/widgets/text.py:428 msgid "Find previous item" msgstr "" -#: cola/widgets/text.py:395 +#: cola/widgets/text.py:392 msgid "Find the next occurrence of the phrase" msgstr "" -#: cola/widgets/text.py:391 +#: cola/widgets/text.py:388 msgid "Find the previous occurrence of the phrase" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Fixed String" msgstr "" -#: cola/widgets/prefs.py:251 +#: cola/widgets/prefs.py:270 msgid "Fixed-Width Font" msgstr "" -#: cola/sequenceeditor.py:362 +#: cola/sequenceeditor.py:358 msgid "Fixup" msgstr "" -#: cola/widgets/commitmsg.py:148 +#: cola/widgets/commitmsg.py:154 #, fuzzy msgid "Fixup Previous Commit" msgstr "Messaggio di fusione:" -#: cola/themes.py:672 +#: cola/themes.py:684 msgid "Flat dark blue" msgstr "" -#: cola/themes.py:693 +#: cola/themes.py:705 msgid "Flat dark green" msgstr "" -#: cola/themes.py:686 +#: cola/themes.py:698 msgid "Flat dark grey" msgstr "" -#: cola/themes.py:679 +#: cola/themes.py:691 msgid "Flat dark red" msgstr "" -#: cola/themes.py:644 +#: cola/themes.py:656 msgid "Flat light blue" msgstr "" -#: cola/themes.py:665 +#: cola/themes.py:677 msgid "Flat light green" msgstr "" -#: cola/themes.py:658 +#: cola/themes.py:670 msgid "Flat light grey" msgstr "" -#: cola/themes.py:651 +#: cola/themes.py:663 msgid "Flat light red" msgstr "" -#: cola/widgets/startup.py:73 +#: cola/widgets/startup.py:72 msgid "Folder" msgstr "" -#: cola/widgets/toolbar.py:177 +#: cola/widgets/toolbar.py:181 msgid "Follow System Style" msgstr "" -#: cola/widgets/prefs.py:252 +#: cola/widgets/prefs.py:271 msgid "Font Size" msgstr "Dimensione caratteri" -#: cola/widgets/remote.py:193 +#: cola/widgets/remote.py:197 msgid "Force" msgstr "" -#: cola/widgets/remote.py:617 +#: cola/widgets/remote.py:652 msgid "Force Fetch" msgstr "" -#: cola/widgets/remote.py:614 +#: cola/widgets/remote.py:649 msgid "Force Fetch?" msgstr "" -#: cola/widgets/remote.py:625 +#: cola/widgets/remote.py:660 msgid "Force Push" msgstr "" -#: cola/widgets/remote.py:619 +#: cola/widgets/remote.py:654 msgid "Force Push?" msgstr "" -#: cola/widgets/remote.py:616 +#: cola/widgets/remote.py:651 #, fuzzy, python-format msgid "Force fetching from %s?" msgstr "Recupero %s da %s" -#: cola/widgets/remote.py:624 +#: cola/widgets/remote.py:659 #, python-format msgid "Force push to %s?" msgstr "" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Format String" msgstr "" -#: cola/widgets/about.py:430 cola/widgets/about.py:431 +#: cola/widgets/about.py:413 cola/widgets/about.py:414 msgid "French translation" msgstr "" -#: cola/widgets/merge.py:80 +#: cola/widgets/merge.py:78 msgid "GPG-sign the merge commit" msgstr "" -#: cola/widgets/prefs.py:344 +#: cola/widgets/prefs.py:364 msgid "GUI theme" msgstr "" -#: cola/widgets/editremotes.py:318 +#: cola/widgets/editremotes.py:317 #, fuzzy, python-format msgid "Gathering info for \"%s\"..." msgstr "Caricamento delle differenze di %s..." -#: cola/widgets/about.py:420 cola/widgets/about.py:428 -#: cola/widgets/about.py:429 +#: cola/widgets/about.py:403 cola/widgets/about.py:411 +#: cola/widgets/about.py:412 msgid "German translation" msgstr "" -#: cola/widgets/main.py:511 +#: cola/widgets/main.py:524 #, fuzzy msgid "Get Commit Message Template" msgstr "Larghezza del messaggio di revisione" -#: cola/widgets/dag.py:520 +#: cola/widgets/dag.py:586 msgid "Go Down" msgstr "" -#: cola/widgets/dag.py:516 +#: cola/widgets/dag.py:582 msgid "Go Up" msgstr "" -#: cola/widgets/dag.py:467 cola/widgets/filelist.py:42 +#: cola/widgets/dag.py:466 cola/widgets/filelist.py:39 msgid "Grab File..." msgstr "" -#: cola/widgets/dag.py:782 +#: cola/widgets/dag.py:848 msgid "Graph" msgstr "" -#: cola/widgets/main.py:358 +#: cola/widgets/main.py:353 msgid "Grep" msgstr "" -#: cola/widgets/remote.py:662 +#: cola/widgets/remote.py:707 msgid "Have you rebased/pulled lately?" msgstr "" -#: cola/sequenceeditor.py:110 cola/sequenceeditor.py:171 -#: cola/widgets/finder.py:138 cola/widgets/main.py:854 +#: cola/sequenceeditor.py:108 cola/sequenceeditor.py:169 +#: cola/widgets/finder.py:137 cola/widgets/main.py:867 msgid "Help" msgstr "Aiuto" -#: cola/widgets/status.py:1322 +#: cola/widgets/status.py:1323 msgid "Help - Custom Copy Actions" msgstr "" -#: cola/widgets/finder.py:79 +#: cola/widgets/finder.py:78 msgid "Help - Find Files" msgstr "" -#: cola/sequenceeditor.py:737 +#: cola/sequenceeditor.py:732 msgid "Help - git-cola-sequence-editor" msgstr "" -#: cola/widgets/prefs.py:346 +#: cola/widgets/prefs.py:366 msgid "High DPI" msgstr "" -#: cola/gitcmds.py:876 +#: cola/gitcmds.py:886 msgid "Hint: The \"Actions > Abort Cherry-Pick\" menu action can be used to cancel the current cherry-pick." msgstr "" -#: cola/widgets/prefs.py:254 +#: cola/widgets/prefs.py:275 #, fuzzy msgid "History Browser" msgstr "File browser" -#: cola/widgets/about.py:427 cola/widgets/about.py:441 +#: cola/widgets/about.py:410 cola/widgets/about.py:424 msgid "Hungarian translation" msgstr "" -#: cola/widgets/toolbar.py:178 +#: cola/widgets/toolbar.py:182 msgid "Icon Only" msgstr "" -#: cola/widgets/prefs.py:345 +#: cola/widgets/prefs.py:365 msgid "Icon theme" msgstr "" -#: cola/widgets/diff.py:758 +#: cola/widgets/diff.py:787 msgid "Ignore all whitespace" msgstr "" -#: cola/widgets/diff.py:755 +#: cola/widgets/diff.py:785 msgid "Ignore changes in amount of whitespace" msgstr "" -#: cola/widgets/diff.py:751 +#: cola/widgets/diff.py:782 msgid "Ignore changes in whitespace at EOL" msgstr "" -#: cola/widgets/gitignore.py:46 +#: cola/widgets/gitignore.py:45 msgid "Ignore custom pattern" msgstr "" -#: cola/widgets/gitignore.py:44 +#: cola/widgets/gitignore.py:43 msgid "Ignore exact filename" msgstr "" -#: cola/widgets/gitignore.py:32 +#: cola/widgets/gitignore.py:31 msgid "Ignore filename or pattern" msgstr "" -#: cola/widgets/status.py:933 +#: cola/widgets/dag.py:498 +msgid "Ignore merge commits" +msgstr "" + +#: cola/widgets/status.py:934 msgid "Ignore..." msgstr "" -#: cola/widgets/remote.py:203 +#: cola/widgets/remote.py:207 #, fuzzy msgid "Include tags " msgstr "Includi etichette" -#: cola/widgets/prefs.py:349 +#: cola/widgets/prefs.py:369 msgid "Indent Status paths" msgstr "" -#: cola/widgets/about.py:419 cola/widgets/about.py:426 +#: cola/widgets/about.py:402 cola/widgets/about.py:409 msgid "Indonesian translation" msgstr "" -#: cola/widgets/main.py:643 +#: cola/widgets/main.py:656 #, fuzzy msgid "Initialize Git Annex" msgstr "Inizializzazione..." -#: cola/widgets/main.py:647 +#: cola/widgets/main.py:660 #, fuzzy msgid "Initialize Git LFS" msgstr "Inizializzazione..." -#: cola/widgets/clone.py:116 +#: cola/widgets/clone.py:114 msgid "Inititalize submodules" msgstr "" -#: cola/widgets/prefs.py:260 +#: cola/widgets/prefs.py:281 msgid "Insert spaces instead of tabs" msgstr "" -#: cola/cmds.py:2130 +#: cola/widgets/action.py:73 cola/widgets/main.py:402 +msgid "Integrate changes using \"git pull\"" +msgstr "" + +#: cola/cmds.py:2081 msgid "Interactive Rebase" msgstr "" -#: cola/cmds.py:2364 +#: cola/cmds.py:2315 #, fuzzy msgid "Invalid Revision" msgstr "Revisione non valida: %s" @@ -2145,47 +2207,47 @@ msgstr "Revisione non valida: %s" msgid "It is not necessary to update the hunk header lines as they will be regenerated automatically." msgstr "" -#: cola/widgets/about.py:421 cola/widgets/about.py:424 +#: cola/widgets/about.py:404 cola/widgets/about.py:407 msgid "Japanese translation" msgstr "" -#: cola/widgets/prefs.py:262 +#: cola/widgets/prefs.py:283 msgid "Keep *.orig Merge Backups" msgstr "" -#: cola/widgets/stash.py:71 +#: cola/widgets/stash.py:73 msgid "Keep Index" msgstr "" -#: cola/widgets/main.py:477 +#: cola/widgets/main.py:490 msgid "Keyboard Shortcuts" msgstr "" -#: cola/cmds.py:1608 cola/sequenceeditor.py:165 cola/sequenceeditor.py:338 -#: cola/widgets/dag.py:395 cola/widgets/filelist.py:34 +#: cola/difftool.py:27 cola/sequenceeditor.py:163 cola/sequenceeditor.py:334 +#: cola/widgets/dag.py:394 cola/widgets/filelist.py:31 msgid "Launch Diff Tool" msgstr "" -#: cola/widgets/dag.py:402 +#: cola/widgets/dag.py:401 msgid "Launch Directory Diff Tool" msgstr "" -#: cola/cmds.py:1541 cola/cmds.py:1679 cola/widgets/filelist.py:38 +#: cola/cmds.py:1529 cola/cmds.py:1631 cola/widgets/filelist.py:35 msgid "Launch Editor" msgstr "" -#: cola/cmds.py:1644 +#: cola/cmds.py:1596 msgid "Launch Terminal" msgstr "" -#: cola/sequenceeditor.py:166 +#: cola/sequenceeditor.py:164 msgid "" "Launch external diff tool\n" "Shortcut: Ctrl+D" msgstr "" -#: cola/widgets/diff.py:1005 cola/widgets/diff.py:1051 -#: cola/widgets/status.py:852 cola/widgets/status.py:948 +#: cola/widgets/diff.py:1044 cola/widgets/diff.py:1106 +#: cola/widgets/status.py:853 cola/widgets/status.py:949 msgid "Launch git-cola" msgstr "" @@ -2197,7 +2259,7 @@ msgstr "" msgid "Launch git-difftool on the current path" msgstr "" -#: cola/icons.py:56 +#: cola/icons.py:55 msgid "Light Theme" msgstr "" @@ -2206,187 +2268,203 @@ msgstr "" msgid "Lines starting with '%s' will be ignored." msgstr "" -#: cola/widgets/startup.py:74 +#: cola/widgets/startup.py:73 msgid "List" msgstr "" -#: cola/guicmds.py:267 +#: cola/guicmds.py:266 #, fuzzy msgid "Load Commit Message" msgstr "Messaggio di revisione:" -#: cola/widgets/main.py:339 +#: cola/widgets/main.py:334 #, fuzzy msgid "Load Commit Message..." msgstr "Messaggio di revisione:" -#: cola/widgets/commitmsg.py:144 +#: cola/widgets/commitmsg.py:150 #, fuzzy msgid "Load Previous Commit Message" msgstr "Messaggio di fusione:" -#: cola/widgets/diff.py:264 +#: cola/widgets/diff.py:265 #, fuzzy msgid "Loading..." msgstr "Caricamento %s..." -#: cola/widgets/branch.py:169 cola/widgets/branch.py:240 -#: cola/widgets/branch.py:281 cola/widgets/compare.py:38 -#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/branch.py:173 cola/widgets/branch.py:250 +#: cola/widgets/branch.py:290 cola/widgets/compare.py:37 +#: cola/widgets/compare.py:52 cola/widgets/compare.py:57 msgid "Local" msgstr "" -#: cola/widgets/cfgactions.py:227 cola/widgets/merge.py:46 -#: cola/widgets/remote.py:138 +#: cola/widgets/cfgactions.py:225 cola/widgets/merge.py:44 +#: cola/widgets/remote.py:136 msgid "Local Branch" msgstr "Ramo locale" -#: cola/widgets/createbranch.py:114 +#: cola/widgets/createbranch.py:112 #, fuzzy msgid "Local branch" msgstr "Ramo locale" -#: cola/widgets/dag.py:788 cola/widgets/main.py:651 +#: cola/widgets/dag.py:854 cola/widgets/main.py:664 msgid "Lock Layout" msgstr "" -#: cola/widgets/dag.py:750 +#: cola/widgets/dag.py:816 msgid "Log" msgstr "" -#: cola/widgets/prefs.py:170 +#: cola/widgets/prefs.py:191 msgid "Log Date Format" msgstr "" -#: cola/widgets/about.py:268 +#: cola/themes.py:769 +msgid "MacOS Aqua dark" +msgstr "" + +#: cola/themes.py:765 +msgid "MacOS Aqua light" +msgstr "" + +#: cola/themes.py:781 +msgid "MacOS Vibrant dark" +msgstr "" + +#: cola/themes.py:775 +msgid "MacOS Vibrant light" +msgstr "" + +#: cola/widgets/about.py:251 msgid "Maintainer (since 2007) and developer" msgstr "" -#: cola/widgets/text.py:398 +#: cola/widgets/text.py:395 msgid "Match Case" msgstr "" -#: cola/widgets/merge.py:88 +#: cola/widgets/merge.py:86 msgid "Merge" msgstr "Fusione (Merge)" -#: cola/widgets/merge.py:162 +#: cola/widgets/merge.py:160 #, python-format msgid "Merge \"%(revision)s\" into \"%(branch)s\"" msgstr "" -#: cola/widgets/prefs.py:257 +#: cola/widgets/prefs.py:278 #, fuzzy msgid "Merge Tool" msgstr "Fusione (Merge)" -#: cola/widgets/prefs.py:171 +#: cola/widgets/prefs.py:193 msgid "Merge Verbosity" msgstr "Prolissità della fusione" -#: cola/cmds.py:1829 +#: cola/cmds.py:1780 msgid "Merge failed. Conflict resolution is required." msgstr "Fusione non riuscita. Bisogna risolvere i conflitti." -#: cola/widgets/merge.py:167 +#: cola/widgets/merge.py:165 #, fuzzy, python-format msgid "Merge into \"%s\"" msgstr "Fusione in %s" -#: cola/widgets/branch.py:231 +#: cola/widgets/branch.py:242 #, fuzzy msgid "Merge into current branch" msgstr "Esplora i file del ramo attuale" -#: cola/widgets/main.py:363 +#: cola/widgets/main.py:358 #, fuzzy msgid "Merge..." msgstr "Fusione (Merge)" -#: cola/widgets/main.py:1163 +#: cola/widgets/main.py:1176 #, fuzzy msgid "Merging" msgstr "Fusione (Merge)" -#: cola/models/browse.py:33 cola/widgets/createtag.py:78 +#: cola/models/browse.py:32 cola/widgets/createtag.py:76 #, fuzzy msgid "Message" msgstr "Fusione (Merge)" -#: cola/widgets/commitmsg.py:417 +#: cola/widgets/commitmsg.py:425 #, fuzzy msgid "Missing Commit Message" msgstr "Messaggio di fusione:" -#: cola/widgets/createbranch.py:252 +#: cola/widgets/createbranch.py:250 #, fuzzy msgid "Missing Data" msgstr "Mancante" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 #, fuzzy msgid "Missing Name" msgstr "Mancante" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 #, fuzzy msgid "Missing Revision" msgstr "Revisione iniziale" -#: cola/cmds.py:2801 +#: cola/cmds.py:2747 #, fuzzy msgid "Missing Tag Message" msgstr "Revisione da fondere" -#: cola/models/browse.py:332 cola/widgets/status.py:158 -#: cola/widgets/status.py:631 +#: cola/models/browse.py:331 cola/widgets/status.py:158 +#: cola/widgets/status.py:632 #, fuzzy msgid "Modified" msgstr "Non modificato" -#: cola/widgets/commitmsg.py:506 +#: cola/widgets/commitmsg.py:532 #, fuzzy msgid "More..." msgstr "Clona..." -#: cola/widgets/standard.py:243 cola/widgets/status.py:233 +#: cola/widgets/standard.py:242 cola/widgets/status.py:234 msgid "Move Down" msgstr "" -#: cola/widgets/standard.py:235 cola/widgets/status.py:225 +#: cola/widgets/standard.py:234 cola/widgets/status.py:226 msgid "Move Up" msgstr "" -#: cola/widgets/status.py:300 +#: cola/widgets/status.py:301 msgid "Move files to trash" msgstr "" -#: cola/models/browse.py:33 cola/widgets/bookmarks.py:467 -#: cola/widgets/createtag.py:61 cola/widgets/editremotes.py:450 -#: cola/widgets/status.py:1452 cola/widgets/toolbar.py:312 +#: cola/models/browse.py:32 cola/widgets/bookmarks.py:466 +#: cola/widgets/createtag.py:59 cola/widgets/editremotes.py:448 +#: cola/widgets/status.py:1453 cola/widgets/toolbar.py:317 #, fuzzy msgid "Name" msgstr "Nome:" -#: cola/widgets/editremotes.py:434 +#: cola/widgets/editremotes.py:432 msgid "Name for the new remote" msgstr "" -#: cola/guicmds.py:148 cola/widgets/main.py:285 +#: cola/guicmds.py:147 cola/widgets/main.py:280 #, fuzzy msgid "New Bare Repository..." msgstr "Archivio Git" -#: cola/guicmds.py:87 cola/widgets/main.py:280 +#: cola/guicmds.py:86 cola/widgets/main.py:275 #, fuzzy msgid "New Repository..." msgstr "Archivio Git" -#: cola/widgets/main.py:983 +#: cola/widgets/main.py:996 msgid "New Toolbar" msgstr "" -#: cola/widgets/startup.py:53 +#: cola/widgets/startup.py:52 msgid "New..." msgstr "Nuovo..." @@ -2395,16 +2473,20 @@ msgstr "Nuovo..." msgid "Next File" msgstr "Seleziona tutto" -#: cola/widgets/createbranch.py:123 cola/widgets/standard.py:1065 +#: cola/widgets/createbranch.py:121 cola/widgets/standard.py:1183 msgid "No" msgstr "No" -#: cola/widgets/merge.py:217 cola/widgets/merge.py:227 +#: cola/widgets/merge.py:215 cola/widgets/merge.py:225 #, fuzzy msgid "No Revision Specified" msgstr "Nessuna revisione selezionata." -#: cola/widgets/commitmsg.py:427 +#: cola/widgets/stash.py:225 +msgid "No change made" +msgstr "" + +#: cola/widgets/commitmsg.py:435 #, fuzzy msgid "" "No changes to commit.\n" @@ -2415,35 +2497,35 @@ msgstr "" "\n" "Devi preparare per una nuova revisione almeno 1 file prima di effettuare questa operazione." -#: cola/widgets/selectcommits.py:118 +#: cola/widgets/selectcommits.py:117 msgid "No commits exist in this branch." msgstr "" -#: cola/widgets/merge.py:65 +#: cola/widgets/merge.py:63 #, fuzzy msgid "No fast forward" msgstr "Solo fast forward" -#: cola/widgets/remote.py:186 +#: cola/widgets/remote.py:190 #, fuzzy msgid "No fast-forward" msgstr "Solo fast forward" -#: cola/widgets/remote.py:577 +#: cola/widgets/remote.py:612 msgid "No repository selected." msgstr "Nessun archivio selezionato." -#: cola/widgets/remote.py:615 +#: cola/widgets/remote.py:650 msgid "Non-fast-forward fetch overwrites local history!" msgstr "" -#: cola/widgets/remote.py:621 +#: cola/widgets/remote.py:656 msgid "" "Non-fast-forward push overwrites published history!\n" "(Did you pull first?)" msgstr "" -#: cola/widgets/commitmsg.py:444 +#: cola/widgets/commitmsg.py:452 #, fuzzy msgid "Nothing to commit" msgstr "Nessuna modifica per la nuova revisione." @@ -2453,149 +2535,153 @@ msgstr "Nessuna modifica per la nuova revisione." msgid "Nothing to do" msgstr "Niente da clonare da %s." -#: cola/widgets/prefs.py:172 +#: cola/widgets/prefs.py:194 msgid "Number of Diff Context Lines" msgstr "Numero di linee di contesto nelle differenze" -#: cola/widgets/bookmarks.py:79 cola/widgets/bookmarks.py:213 -#: cola/widgets/startup.py:336 +#: cola/widgets/bookmarks.py:78 cola/widgets/bookmarks.py:212 +#: cola/widgets/startup.py:335 msgid "Open" msgstr "Apri" -#: cola/widgets/text.py:230 +#: cola/widgets/text.py:228 #, python-format msgid "Open \"%s\"" msgstr "" -#: cola/cmds.py:1857 +#: cola/cmds.py:1808 msgid "Open Directory" msgstr "" -#: cola/guicmds.py:205 cola/guicmds.py:214 cola/widgets/editremotes.py:473 -#: cola/widgets/startup.py:55 cola/widgets/startup.py:215 +#: cola/guicmds.py:204 cola/guicmds.py:213 cola/widgets/editremotes.py:471 +#: cola/widgets/startup.py:54 cola/widgets/startup.py:214 #, fuzzy msgid "Open Git Repository" msgstr "Apri archivio esistente" -#: cola/widgets/submodules.py:49 +#: cola/widgets/submodules.py:48 #, fuzzy msgid "Open Parent" msgstr "Apri archivio recente:" -#: cola/cmds.py:1877 +#: cola/cmds.py:1828 #, fuzzy msgid "Open Parent Directory" msgstr "Apri archivio recente:" -#: cola/widgets/main.py:679 +#: cola/widgets/main.py:692 #, fuzzy msgid "Open Recent" msgstr "Apri archivio recente:" -#: cola/cmds.py:1840 +#: cola/cmds.py:1791 msgid "Open Using Default Application" msgstr "" -#: cola/cmds.py:1890 +#: cola/cmds.py:1841 msgid "Open Worktree" msgstr "" -#: cola/widgets/bookmarks.py:221 cola/widgets/startup.py:344 +#: cola/widgets/bookmarks.py:220 cola/widgets/startup.py:343 msgid "Open in New Window" msgstr "" -#: cola/widgets/main.py:408 +#: cola/widgets/main.py:415 #, fuzzy msgid "Open in New Window..." msgstr "Apri archivio esistente" -#: cola/widgets/main.py:402 +#: cola/widgets/main.py:409 msgid "Open..." msgstr "Apri..." -#: cola/widgets/branch.py:345 +#: cola/widgets/branch.py:354 #, fuzzy msgid "Other branches" msgstr "Ripristina..." -#: cola/widgets/archive.py:210 +#: cola/widgets/archive.py:208 msgid "Overwrite" msgstr "" -#: cola/widgets/archive.py:209 +#: cola/widgets/archive.py:207 #, python-format msgid "Overwrite \"%s\"?" msgstr "" -#: cola/widgets/archive.py:207 +#: cola/widgets/archive.py:205 msgid "Overwrite File?" msgstr "" -#: cola/widgets/grep.py:144 +#: cola/widgets/grep.py:142 msgid "" "Parse arguments using a shell.\n" "Queries with spaces will require \"double quotes\"." msgstr "" -#: cola/models/browse.py:330 +#: cola/models/browse.py:329 msgid "Partially Staged" msgstr "" -#: cola/widgets/main.py:744 +#: cola/widgets/main.py:757 msgid "Paste" msgstr "Incolla" -#: cola/cmds.py:363 +#: cola/cmds.py:364 msgid "Patch failed to apply" msgstr "" -#: cola/cmds.py:375 +#: cola/cmds.py:376 msgid "Patch(es) Applied" msgstr "" -#: cola/widgets/diff.py:1219 cola/widgets/main.py:695 +#: cola/widgets/diff.py:1293 cola/widgets/main.py:708 msgid "Patches" msgstr "" -#: cola/widgets/prefs.py:173 +#: cola/widgets/prefs.py:195 msgid "Patches Directory" msgstr "" -#: cola/widgets/bookmarks.py:468 cola/widgets/submodules.py:118 +#: cola/widgets/bookmarks.py:467 cola/widgets/submodules.py:117 msgid "Path" msgstr "" -#: cola/widgets/clone.py:112 +#: cola/widgets/clone.py:110 msgid "Path or URL to clone (Env. $VARS okay)" msgstr "" -#: cola/sequenceeditor.py:346 +#: cola/sequenceeditor.py:342 msgid "Pick" msgstr "" -#: cola/widgets/diff.py:781 +#: cola/widgets/dag.py:490 +msgid "Pickaxe search for changes containing text" +msgstr "" + +#: cola/widgets/diff.py:809 msgid "Pixel XOR" msgstr "" -#: cola/widgets/createbranch.py:253 +#: cola/widgets/createbranch.py:251 msgid "Please provide both a branch name and revision expression." msgstr "" -#: cola/cmds.py:2348 +#: cola/cmds.py:2299 #, fuzzy msgid "Please select a file" msgstr "Scegliere un duplicato locale di ramo remoto" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Please specify a name for the new tag." msgstr "" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 #, fuzzy msgid "Please specify a revision to tag." msgstr "Scegliere un ramo da rinominare." -#: cola/widgets/commitmsg.py:410 +#: cola/widgets/commitmsg.py:418 msgid "" "Please supply a commit message.\n" "\n" @@ -2613,32 +2699,32 @@ msgstr "" "- Seconda linea: vuota.\n" "- Terza linea: spiega a cosa serve la tua modifica.\n" -#: cola/cmds.py:653 +#: cola/cmds.py:655 msgid "Point the current branch head to a new commit?" msgstr "" -#: cola/widgets/about.py:416 +#: cola/widgets/about.py:399 msgid "Polish translation" msgstr "" -#: cola/widgets/stash.py:63 cola/widgets/stash.py:111 cola/widgets/stash.py:115 +#: cola/widgets/stash.py:65 cola/widgets/stash.py:114 cola/widgets/stash.py:118 msgid "Pop" msgstr "" -#: cola/widgets/main.py:293 cola/widgets/prefs.py:395 +#: cola/widgets/main.py:288 cola/widgets/prefs.py:433 msgid "Preferences" msgstr "Preferenze" -#: cola/widgets/archive.py:129 +#: cola/widgets/archive.py:127 msgid "Prefix" msgstr "" -#: cola/widgets/main.py:345 +#: cola/widgets/main.py:340 #, fuzzy msgid "Prepare Commit Message" msgstr "Messaggio di fusione:" -#: cola/widgets/prefs.py:157 +#: cola/widgets/prefs.py:180 msgid "Prevent \"Stage\" from staging all files when nothing is selected" msgstr "" @@ -2646,239 +2732,251 @@ msgstr "" msgid "Previous File" msgstr "" -#: cola/widgets/remote.py:171 +#: cola/widgets/remote.py:169 msgid "Prompt on creation" msgstr "" -#: cola/widgets/remote.py:172 +#: cola/widgets/remote.py:170 #, fuzzy msgid "Prompt when pushing creates new remote branches" msgstr "Crea nuovo ramo" -#: cola/widgets/remote.py:208 +#: cola/widgets/remote.py:212 #, fuzzy msgid "Prune " msgstr "Effettua potatura da" -#: cola/widgets/bookmarks.py:255 cola/widgets/startup.py:376 +#: cola/widgets/bookmarks.py:254 cola/widgets/startup.py:375 msgid "Prune Missing Entries" msgstr "" -#: cola/widgets/branch.py:247 cola/widgets/remote.py:728 +#: cola/widgets/branch.py:256 cola/widgets/remote.py:783 #, fuzzy msgid "Pull" msgstr "Propaga..." -#: cola/widgets/action.py:65 cola/widgets/main.py:397 +#: cola/widgets/action.py:73 cola/widgets/main.py:401 #, fuzzy msgid "Pull..." msgstr "Propaga..." -#: cola/widgets/branch.py:253 cola/widgets/remote.py:593 -#: cola/widgets/remote.py:698 +#: cola/widgets/branch.py:262 cola/widgets/remote.py:628 +#: cola/widgets/remote.py:758 msgid "Push" msgstr "Propaga (Push)" -#: cola/widgets/action.py:64 cola/widgets/main.py:392 +#: cola/widgets/action.py:70 cola/widgets/main.py:393 +msgid "Push to one or more remotes using \"git push\"" +msgstr "" + +#: cola/widgets/action.py:70 cola/widgets/main.py:392 msgid "Push..." msgstr "Propaga..." -#: cola/guicmds.py:252 +#: cola/guicmds.py:251 msgid "Quick Open Repository" msgstr "" -#: cola/widgets/main.py:660 +#: cola/widgets/main.py:673 msgid "Quick Open..." msgstr "" -#: cola/widgets/main.py:355 +#: cola/widgets/main.py:350 msgid "Quit" msgstr "Esci" -#: cola/cmds.py:2144 cola/cmds.py:2180 cola/cmds.py:2181 cola/cmds.py:2194 -#: cola/cmds.py:2195 cola/sequenceeditor.py:158 cola/sequenceeditor.py:199 -#: cola/widgets/main.py:822 cola/widgets/remote.py:211 +#: cola/cmds.py:2095 cola/cmds.py:2131 cola/cmds.py:2132 cola/cmds.py:2145 +#: cola/cmds.py:2146 cola/sequenceeditor.py:156 cola/sequenceeditor.py:197 +#: cola/widgets/main.py:835 cola/widgets/remote.py:215 #, fuzzy msgid "Rebase" msgstr "Ripristina" -#: cola/cmds.py:2143 +#: cola/cmds.py:2094 #, fuzzy, python-format msgid "Rebase onto %s" msgstr "Ripristina" -#: cola/cmds.py:2156 +#: cola/cmds.py:2107 #, fuzzy msgid "Rebase stopped" msgstr "Ripristina" -#: cola/widgets/remote.py:210 +#: cola/widgets/remote.py:214 msgid "Rebase the current branch instead of merging" msgstr "" -#: cola/widgets/dag.py:419 +#: cola/widgets/dag.py:418 msgid "Rebase to this commit" msgstr "" -#: cola/widgets/main.py:1165 +#: cola/widgets/main.py:1178 #, fuzzy msgid "Rebasing" msgstr "Ripristina" -#: cola/widgets/main.py:120 +#: cola/widgets/main.py:118 #, fuzzy msgid "Recent" msgstr "Ripristina" -#: cola/widgets/bookmarks.py:93 +#: cola/widgets/bookmarks.py:92 #, fuzzy msgid "Recent repositories" msgstr "Archivi recenti" -#: cola/widgets/prefs.py:258 +#: cola/widgets/prefs.py:279 #, fuzzy msgid "Recent repository count" msgstr "Archivi recenti" -#: cola/widgets/recent.py:46 +#: cola/widgets/recent.py:44 msgid "Recently Modified Files" msgstr "" -#: cola/widgets/main.py:320 +#: cola/widgets/main.py:315 #, fuzzy msgid "Recently Modified Files..." msgstr "Ricerca di file modificati in corso..." -#: cola/widgets/stash.py:256 +#: cola/widgets/stash.py:274 #, fuzzy msgid "Recovering a dropped stash is not possible." msgstr "Ricomporre le revisioni perdute potrebbe non essere semplice." -#: cola/widgets/createbranch.py:283 +#: cola/widgets/createbranch.py:281 msgid "Recovering lost commits may not be easy." msgstr "Ricomporre le revisioni perdute potrebbe non essere semplice." -#: cola/widgets/main.py:737 +#: cola/widgets/main.py:750 msgid "Redo" msgstr "Ripeti" -#: cola/widgets/clone.py:121 +#: cola/widgets/clone.py:119 msgid "Reduce commit history to minimum" msgstr "" -#: cola/widgets/submodules.py:121 +#: cola/widgets/submodules.py:120 msgid "Reference Repository" msgstr "" -#: cola/widgets/submodules.py:105 +#: cola/widgets/submodules.py:104 msgid "Reference URL" msgstr "" -#: cola/widgets/submodules.py:106 +#: cola/widgets/submodules.py:105 msgid "Reference repository to use when cloning (optional)" msgstr "" -#: cola/cmds.py:2222 cola/qtutils.py:770 cola/widgets/action.py:62 -#: cola/widgets/dag.py:792 cola/widgets/editremotes.py:85 -#: cola/widgets/grep.py:105 cola/widgets/recent.py:116 -#: cola/widgets/submodules.py:45 +#: cola/cmds.py:2173 cola/qtutils.py:801 cola/widgets/action.py:63 +#: cola/widgets/dag.py:858 cola/widgets/editremotes.py:84 +#: cola/widgets/grep.py:103 cola/widgets/recent.py:114 +#: cola/widgets/submodules.py:44 msgid "Refresh" msgstr "Rinfresca" -#: cola/widgets/remote.py:179 +#: cola/widgets/remote.py:183 msgid "Refuse to merge unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward" msgstr "" -#: cola/widgets/branch.py:173 cola/widgets/branch.py:225 -#: cola/widgets/branch.py:269 cola/widgets/branch.py:470 -#: cola/widgets/compare.py:54 cola/widgets/compare.py:59 -#: cola/widgets/remote.py:147 +#: cola/widgets/branch.py:177 cola/widgets/branch.py:236 +#: cola/widgets/branch.py:278 cola/widgets/branch.py:513 +#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/remote.py:145 msgid "Remote" msgstr "Remoto" -#: cola/widgets/remote.py:162 +#: cola/widgets/remote.py:160 #, fuzzy msgid "Remote Branch" msgstr "Rinomina ramo" -#: cola/cmds.py:1196 +#: cola/cmds.py:1197 #, fuzzy msgid "Remote Branch Deleted" msgstr "Rinomina ramo" -#: cola/widgets/editremotes.py:49 +#: cola/widgets/log.py:99 +msgid "Remote Messages" +msgstr "" + +#: cola/widgets/editremotes.py:48 msgid "Remote git repositories - double-click to rename" msgstr "" -#: cola/cmds.py:1029 cola/widgets/patch.py:107 cola/widgets/patch.py:122 -#: cola/widgets/startup.py:265 cola/widgets/status.py:1382 +#: cola/cmds.py:1030 cola/widgets/diff.py:1701 cola/widgets/diff.py:1716 +#: cola/widgets/startup.py:264 cola/widgets/status.py:1383 #, fuzzy msgid "Remove" msgstr "Remoto" -#: cola/cmds.py:1027 +#: cola/cmds.py:1028 #, python-format msgid "Remove %s from the recent list?" msgstr "" -#: cola/widgets/toolbar.py:316 +#: cola/widgets/toolbar.py:321 #, fuzzy msgid "Remove Element" msgstr "Remoto" -#: cola/widgets/remote.py:206 +#: cola/widgets/remote.py:210 msgid "Remove remote-tracking branches that no longer exist on the remote" msgstr "" -#: cola/widgets/patch.py:109 +#: cola/widgets/diff.py:1703 #, fuzzy msgid "Remove selected (Delete)" msgstr "Rinomina ramo" -#: cola/widgets/bookmarks.py:258 cola/widgets/startup.py:379 +#: cola/widgets/bookmarks.py:257 cola/widgets/startup.py:378 msgid "Remove stale entries for repositories that no longer exist" msgstr "" -#: cola/guicmds.py:333 cola/widgets/browse.py:159 +#: cola/guicmds.py:332 cola/widgets/browse.py:159 cola/widgets/stash.py:44 msgid "Rename" msgstr "Rinomina" -#: cola/cmds.py:1153 +#: cola/cmds.py:1154 #, fuzzy, python-format msgid "Rename \"%s\"" msgstr "Rinomina" -#: cola/widgets/branch.py:259 +#: cola/widgets/branch.py:268 #, fuzzy msgid "Rename Branch" msgstr "Rinomina ramo" -#: cola/widgets/main.py:570 +#: cola/widgets/main.py:583 #, fuzzy msgid "Rename Branch..." msgstr "Rinomina ramo" -#: cola/guicmds.py:330 +#: cola/guicmds.py:329 #, fuzzy msgid "Rename Existing Branch" msgstr "Aggiorna ramo esistente:" -#: cola/cmds.py:944 +#: cola/cmds.py:942 #, fuzzy msgid "Rename Remote" msgstr "Remoto" -#: cola/widgets/bookmarks.py:233 cola/widgets/startup.py:356 +#: cola/widgets/bookmarks.py:232 cola/widgets/startup.py:355 #, fuzzy msgid "Rename Repository" msgstr "Clona archivio esistente" -#: cola/widgets/branch.py:445 +#: cola/widgets/stash.py:218 +msgid "Rename Stash" +msgstr "" + +#: cola/widgets/branch.py:478 #, fuzzy msgid "Rename branch" msgstr "Rinomina ramo" -#: cola/cmds.py:945 +#: cola/cmds.py:943 #, python-format msgid "Rename remote \"%(current)s\" to \"%(new)s\"?" msgstr "" @@ -2888,188 +2986,192 @@ msgstr "" msgid "Rename selected paths" msgstr "Rinomina ramo" -#: cola/app.py:497 cola/widgets/startup.py:262 +#: cola/widgets/stash.py:45 +msgid "Rename the selected stash" +msgstr "" + +#: cola/app.py:500 cola/widgets/startup.py:261 msgid "Repository Not Found" msgstr "" -#: cola/widgets/browse.py:87 cola/widgets/main.py:1095 +#: cola/widgets/browse.py:87 cola/widgets/main.py:1108 #, fuzzy, python-format msgid "Repository: %s" msgstr "Archivio:" -#: cola/guicmds.py:351 cola/widgets/createbranch.py:125 cola/widgets/dag.py:331 -#: cola/widgets/editremotes.py:58 cola/widgets/main.py:832 +#: cola/guicmds.py:350 cola/widgets/createbranch.py:123 cola/widgets/dag.py:330 +#: cola/widgets/editremotes.py:57 cola/widgets/main.py:845 msgid "Reset" msgstr "Ripristina" -#: cola/widgets/createbranch.py:286 +#: cola/widgets/createbranch.py:284 #, python-format msgid "Reset \"%(branch)s\" to \"%(revision)s\"?" msgstr "" -#: cola/guicmds.py:359 +#: cola/guicmds.py:358 msgid "Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/cmds.py:655 cola/cmds.py:706 cola/guicmds.py:342 -#: cola/widgets/createbranch.py:295 +#: cola/cmds.py:657 cola/cmds.py:708 cola/guicmds.py:341 +#: cola/widgets/createbranch.py:293 #, fuzzy msgid "Reset Branch" msgstr "Elimina ramo" -#: cola/cmds.py:703 cola/guicmds.py:341 cola/widgets/dag.py:425 -#: cola/widgets/main.py:419 +#: cola/cmds.py:705 cola/guicmds.py:340 cola/widgets/dag.py:424 +#: cola/widgets/main.py:431 msgid "Reset Branch (Soft)" msgstr "" -#: cola/cmds.py:652 cola/guicmds.py:350 cola/widgets/dag.py:431 -#: cola/widgets/main.py:426 +#: cola/cmds.py:654 cola/guicmds.py:349 cola/widgets/dag.py:430 +#: cola/widgets/main.py:439 msgid "Reset Branch and Stage (Mixed)" msgstr "" -#: cola/widgets/createbranch.py:292 +#: cola/widgets/createbranch.py:290 #, fuzzy msgid "Reset Branch?" msgstr "Elimina ramo" -#: cola/widgets/main.py:655 +#: cola/widgets/main.py:668 msgid "Reset Layout" msgstr "" -#: cola/cmds.py:687 +#: cola/cmds.py:689 msgid "Reset Worktree and Reset All?" msgstr "" -#: cola/cmds.py:672 cola/cmds.py:689 cola/cmds.py:723 cola/guicmds.py:360 -#: cola/guicmds.py:373 cola/guicmds.py:382 +#: cola/cmds.py:674 cola/cmds.py:691 cola/cmds.py:725 cola/guicmds.py:359 +#: cola/guicmds.py:372 cola/guicmds.py:381 msgid "Reset and Restore" msgstr "" -#: cola/cmds.py:704 +#: cola/cmds.py:706 msgid "Reset branch?" msgstr "" -#: cola/widgets/createbranch.py:266 +#: cola/widgets/createbranch.py:264 #, fuzzy, python-format msgid "Resetting \"%(branch)s\" to \"%(revision)s\" will lose commits." msgstr "Ripristinare '%s' a '%s' comporterà la perdita delle seguenti revisioni:" -#: cola/widgets/prefs.py:264 +#: cola/widgets/prefs.py:285 msgid "Resize File Browser columns" msgstr "" -#: cola/widgets/prefs.py:374 +#: cola/widgets/prefs.py:412 msgid "Restart the application after changing appearance settings." msgstr "" -#: cola/cmds.py:757 cola/cmds.py:760 cola/guicmds.py:390 cola/guicmds.py:391 -#: cola/widgets/dag.py:461 cola/widgets/main.py:457 +#: cola/cmds.py:759 cola/cmds.py:762 cola/guicmds.py:389 cola/guicmds.py:390 +#: cola/widgets/dag.py:460 cola/widgets/main.py:471 msgid "Restore Worktree" msgstr "" -#: cola/cmds.py:720 cola/guicmds.py:381 cola/widgets/dag.py:454 -#: cola/widgets/main.py:450 +#: cola/cmds.py:722 cola/guicmds.py:380 cola/widgets/dag.py:453 +#: cola/widgets/main.py:463 msgid "Restore Worktree and Reset All (Hard)" msgstr "" -#: cola/cmds.py:669 cola/widgets/main.py:434 +#: cola/cmds.py:671 cola/widgets/main.py:447 msgid "Restore Worktree and Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/widgets/dag.py:438 +#: cola/widgets/dag.py:437 msgid "Restore Worktree and Reset All (Keep Unstaged Edits)" msgstr "" -#: cola/cmds.py:686 cola/guicmds.py:372 cola/widgets/dag.py:446 -#: cola/widgets/main.py:442 +#: cola/cmds.py:688 cola/guicmds.py:371 cola/widgets/dag.py:445 +#: cola/widgets/main.py:455 msgid "Restore Worktree and Reset All (Merge)" msgstr "" -#: cola/cmds.py:721 +#: cola/cmds.py:723 msgid "Restore Worktree and Reset All?" msgstr "" -#: cola/cmds.py:758 +#: cola/cmds.py:760 #, python-format msgid "Restore Worktree to %s?" msgstr "" -#: cola/cmds.py:670 +#: cola/cmds.py:672 msgid "Restore worktree, reset, and preserve unstaged edits?" msgstr "" -#: cola/widgets/dag.py:390 +#: cola/widgets/dag.py:389 msgid "Revert" msgstr "" -#: cola/widgets/diff.py:1153 +#: cola/widgets/diff.py:1227 msgid "Revert Diff Hunk" msgstr "" -#: cola/widgets/diff.py:1018 +#: cola/widgets/diff.py:1057 msgid "Revert Diff Hunk..." msgstr "" -#: cola/widgets/diff.py:1152 +#: cola/widgets/diff.py:1226 msgid "Revert Diff Hunk?" msgstr "" -#: cola/widgets/diff.py:1150 +#: cola/widgets/diff.py:1224 msgid "Revert Selected Lines" msgstr "" -#: cola/widgets/diff.py:1013 +#: cola/widgets/diff.py:1052 msgid "Revert Selected Lines..." msgstr "" -#: cola/widgets/diff.py:1149 +#: cola/widgets/diff.py:1223 #, fuzzy msgid "Revert Selected Lines?" msgstr "Annullare le modifiche nel file %s?" -#: cola/cmds.py:2311 +#: cola/cmds.py:2262 #, fuzzy msgid "Revert Uncommitted Changes" msgstr "Annulla modifiche" -#: cola/cmds.py:2305 +#: cola/cmds.py:2256 #, fuzzy msgid "Revert Uncommitted Changes?" msgstr "Annulla modifiche" -#: cola/cmds.py:2298 +#: cola/cmds.py:2249 #, fuzzy msgid "Revert Uncommitted Edits..." msgstr "Annulla modifiche" -#: cola/cmds.py:2289 +#: cola/cmds.py:2240 #, fuzzy msgid "Revert Unstaged Changes" msgstr "Modifiche non preparate" -#: cola/cmds.py:2283 +#: cola/cmds.py:2234 #, fuzzy msgid "Revert Unstaged Changes?" msgstr "Modifiche non preparate" -#: cola/cmds.py:2275 +#: cola/cmds.py:2226 msgid "Revert Unstaged Edits..." msgstr "" -#: cola/cmds.py:598 +#: cola/cmds.py:599 msgid "Revert failed" msgstr "" -#: cola/cmds.py:2310 cola/widgets/diff.py:1161 +#: cola/cmds.py:2261 cola/widgets/diff.py:1235 msgid "Revert the uncommitted changes?" msgstr "" -#: cola/cmds.py:2288 +#: cola/cmds.py:2239 #, fuzzy msgid "Revert the unstaged changes?" msgstr "Modifiche non preparate" -#: cola/widgets/browse.py:189 +#: cola/widgets/browse.py:190 #, fuzzy msgid "Revert uncommitted changes to selected paths" msgstr "Annullare le modifiche nel file %s?" @@ -3079,467 +3181,481 @@ msgstr "Annullare le modifiche nel file %s?" msgid "Revert unstaged changes to selected paths" msgstr "Annullare le modifiche nel file %s?" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Review" msgstr "" -#: cola/widgets/main.py:583 +#: cola/widgets/main.py:596 #, fuzzy msgid "Review..." msgstr "Ripristina..." -#: cola/widgets/cfgactions.py:233 cola/widgets/createtag.py:84 +#: cola/widgets/cfgactions.py:231 cola/widgets/createtag.py:82 msgid "Revision" msgstr "Revisione" -#: cola/widgets/selectcommits.py:62 +#: cola/widgets/selectcommits.py:61 msgid "Revision Expression:" msgstr "Espressione di revisione:" -#: cola/widgets/merge.py:39 cola/widgets/merge.py:42 +#: cola/widgets/merge.py:37 cola/widgets/merge.py:40 msgid "Revision to Merge" msgstr "Revisione da fondere" -#: cola/sequenceeditor.py:351 +#: cola/sequenceeditor.py:347 msgid "Reword" msgstr "" -#: cola/cmds.py:776 cola/widgets/commitmsg.py:456 +#: cola/cmds.py:778 cola/widgets/commitmsg.py:464 msgid "Rewrite Published Commit?" msgstr "" -#: cola/widgets/log.py:31 +#: cola/widgets/log.py:31 cola/widgets/log.py:133 msgid "Right-click links to open:" msgstr "" -#: cola/interaction.py:127 cola/widgets/cfgactions.py:245 +#: cola/interaction.py:125 cola/widgets/cfgactions.py:243 msgid "Run" msgstr "" -#: cola/cmds.py:2341 +#: cola/cmds.py:2292 #, python-format msgid "Run \"%s\"?" msgstr "" -#: cola/interaction.py:124 +#: cola/interaction.py:122 #, python-format msgid "Run %s?" msgstr "" -#: cola/interaction.py:125 +#: cola/interaction.py:123 #, python-format msgid "Run the \"%s\" command?" msgstr "" -#: cola/cmds.py:2380 +#: cola/cmds.py:2331 #, python-format msgid "Running command: %s" msgstr "" -#: cola/widgets/about.py:422 +#: cola/widgets/about.py:405 msgid "Russian translation" msgstr "" -#: cola/sequenceeditor.py:324 +#: cola/sequenceeditor.py:321 #, fuzzy msgid "SHA-1" msgstr "Copia tutto" -#: cola/widgets/prefs.py:183 +#: cola/widgets/prefs.py:205 msgid "Safe Mode" msgstr "" -#: cola/cmds.py:2167 cola/widgets/archive.py:126 cola/widgets/browse.py:609 -#: cola/widgets/editremotes.py:54 cola/widgets/stash.py:52 -#: cola/widgets/status.py:1388 +#: cola/cmds.py:2118 cola/widgets/archive.py:124 cola/widgets/browse.py:610 +#: cola/widgets/editremotes.py:53 cola/widgets/stash.py:54 +#: cola/widgets/status.py:1389 msgid "Save" msgstr "Salva" -#: cola/widgets/archive.py:113 +#: cola/widgets/archive.py:111 msgid "Save Archive" msgstr "" -#: cola/widgets/dag.py:382 cola/widgets/main.py:351 +#: cola/widgets/dag.py:381 cola/widgets/main.py:346 msgid "Save As Tarball/Zip..." msgstr "" -#: cola/widgets/prefs.py:263 +#: cola/widgets/prefs.py:284 msgid "Save GUI Settings" msgstr "" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Save Stash" msgstr "" -#: cola/widgets/stash.py:53 +#: cola/widgets/stash.py:55 msgid "Save modified state to new stash" msgstr "" -#: cola/widgets/browse.py:570 +#: cola/widgets/browse.py:571 #, python-format msgid "Saved \"%(filename)s\" from \"%(ref)s\" to \"%(destination)s\"" msgstr "" -#: cola/widgets/bookmarks.py:83 cola/widgets/grep.py:98 -#: cola/widgets/search.py:42 cola/widgets/search.py:62 +#: cola/widgets/bookmarks.py:82 cola/widgets/grep.py:96 +#: cola/widgets/search.py:41 cola/widgets/search.py:61 msgid "Search" msgstr "" -#: cola/widgets/search.py:226 +#: cola/widgets/search.py:225 msgid "Search Authors" msgstr "" -#: cola/widgets/search.py:224 +#: cola/widgets/search.py:223 #, fuzzy msgid "Search Commit Messages" msgstr "Messaggio di fusione:" -#: cola/widgets/search.py:227 +#: cola/widgets/search.py:226 #, fuzzy msgid "Search Committers" msgstr "Revisione creata da:" -#: cola/widgets/search.py:228 +#: cola/widgets/search.py:227 msgid "Search Date Range" msgstr "" -#: cola/widgets/search.py:225 +#: cola/widgets/search.py:224 msgid "Search Diffs" msgstr "" -#: cola/widgets/search.py:222 +#: cola/widgets/search.py:221 #, fuzzy msgid "Search by Expression" msgstr "Espressione di revisione:" -#: cola/widgets/search.py:223 +#: cola/widgets/search.py:222 msgid "Search by Path" msgstr "" -#: cola/widgets/grep.py:124 +#: cola/widgets/dag.py:494 +msgid "Search commit messages" +msgstr "" + +#: cola/widgets/grep.py:122 msgid "Search for a fixed string" msgstr "" -#: cola/widgets/diff.py:519 cola/widgets/diff.py:1514 +#: cola/widgets/diff.py:526 cola/widgets/diff.py:1576 msgid "Search in Diff" msgstr "" -#: cola/guicmds.py:253 cola/widgets/bookmarks.py:62 +#: cola/guicmds.py:252 cola/widgets/bookmarks.py:61 msgid "Search repositories by name..." msgstr "" -#: cola/widgets/grep.py:122 +#: cola/widgets/grep.py:120 msgid "Search using a POSIX basic regular expression" msgstr "" -#: cola/widgets/grep.py:123 +#: cola/widgets/grep.py:121 msgid "Search using a POSIX extended regular expression" msgstr "" -#: cola/widgets/main.py:493 +#: cola/widgets/main.py:506 #, fuzzy msgid "Search..." msgstr "Avvio in corso..." -#: cola/widgets/selectcommits.py:67 +#: cola/widgets/selectcommits.py:66 msgid "Search:" msgstr "" -#: cola/guicmds.py:330 cola/widgets/selectcommits.py:74 +#: cola/guicmds.py:329 cola/widgets/selectcommits.py:73 msgid "Select" msgstr "Seleziona" -#: cola/widgets/main.py:750 +#: cola/widgets/main.py:763 msgid "Select All" msgstr "Seleziona tutto" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 #, fuzzy msgid "Select Branch to Review" msgstr "Elimina ramo" -#: cola/widgets/dag.py:1610 +#: cola/widgets/dag.py:1667 #, fuzzy msgid "Select Child" msgstr "Seleziona tutto" -#: cola/widgets/commitmsg.py:512 +#: cola/widgets/commitmsg.py:538 #, fuzzy msgid "Select Commit" msgstr "Messaggio di fusione:" -#: cola/guicmds.py:137 +#: cola/guicmds.py:136 #, fuzzy msgid "Select Directory..." msgstr "Archivio Git" -#: cola/cmds.py:2129 +#: cola/cmds.py:2080 #, fuzzy msgid "Select New Upstream" msgstr "Seleziona" -#: cola/widgets/dag.py:1614 +#: cola/widgets/dag.py:1671 msgid "Select Newest Child" msgstr "" -#: cola/widgets/dag.py:1604 +#: cola/widgets/dag.py:1661 msgid "Select Oldest Parent" msgstr "" -#: cola/widgets/dag.py:1599 +#: cola/widgets/dag.py:1656 #, fuzzy msgid "Select Parent" msgstr "Seleziona" -#: cola/widgets/browse.py:525 +#: cola/widgets/browse.py:526 msgid "Select Previous Version" msgstr "" -#: cola/widgets/clone.py:197 +#: cola/widgets/clone.py:195 msgid "Select a parent directory for the new clone" msgstr "" -#: cola/widgets/standard.py:756 cola/widgets/standard.py:779 +#: cola/widgets/standard.py:826 cola/widgets/standard.py:848 msgid "Select directory" msgstr "" -#: cola/widgets/selectcommits.py:162 +#: cola/widgets/selectcommits.py:161 #, fuzzy msgid "Select output dir" msgstr "Messaggio di fusione:" -#: cola/widgets/selectcommits.py:183 +#: cola/widgets/selectcommits.py:182 #, fuzzy msgid "Select output directory" msgstr "Archivio Git" -#: cola/widgets/patch.py:175 +#: cola/widgets/diff.py:1769 #, fuzzy msgid "Select patch file(s)..." msgstr "Elimina..." -#: cola/widgets/editremotes.py:437 +#: cola/widgets/editremotes.py:435 #, fuzzy msgid "Select repository" msgstr "Archivio Git" -#: cola/widgets/bookmarks.py:225 cola/widgets/startup.py:348 +#: cola/widgets/bookmarks.py:224 cola/widgets/startup.py:347 #, fuzzy msgid "Set Default Repository" msgstr "Archivio Git" -#: cola/widgets/branch.py:282 +#: cola/widgets/branch.py:291 #, fuzzy msgid "Set Upstream Branch" msgstr "Seleziona" -#: cola/widgets/branch.py:72 +#: cola/widgets/branch.py:74 msgid "" "Set the sort order for branches and tags.\n" "Toggle between date-based and version-name-based sorting." msgstr "" -#: cola/widgets/remote.py:213 +#: cola/widgets/remote.py:217 #, fuzzy msgid "Set upstream" msgstr "Seleziona" -#: cola/widgets/prefs.py:405 +#: cola/widgets/prefs.py:443 #, fuzzy msgid "Settings" msgstr "Avvio in corso..." -#: cola/widgets/grep.py:142 +#: cola/widgets/grep.py:140 msgid "Shell arguments" msgstr "" -#: cola/sequenceeditor.py:375 +#: cola/sequenceeditor.py:371 msgid "Shift Down" msgstr "" -#: cola/sequenceeditor.py:379 +#: cola/sequenceeditor.py:375 msgid "Shift Up" msgstr "" -#: cola/widgets/about.py:499 +#: cola/widgets/about.py:482 msgid "Shortcuts" msgstr "" -#: cola/widgets/prefs.py:179 +#: cola/widgets/prefs.py:201 msgid "Show Diffstat After Merge" msgstr "Mostra statistiche delle differenze dopo la fusione" -#: cola/widgets/prefs.py:178 +#: cola/widgets/prefs.py:200 msgid "Show Full Paths in the Window Title" msgstr "" -#: cola/sequenceeditor.py:106 cola/widgets/finder.py:187 -#: cola/widgets/status.py:1384 +#: cola/sequenceeditor.py:104 cola/widgets/finder.py:186 +#: cola/widgets/status.py:1385 #, fuzzy msgid "Show Help" msgstr "Aiuto" -#: cola/widgets/filelist.py:30 +#: cola/widgets/filelist.py:27 msgid "Show History" msgstr "" -#: cola/widgets/prefs.py:348 +#: cola/widgets/prefs.py:368 msgid "Show file counts in Status titles" msgstr "" -#: cola/sequenceeditor.py:171 cola/widgets/finder.py:138 +#: cola/widgets/diff.py:794 +msgid "Show filenames" +msgstr "" + +#: cola/sequenceeditor.py:169 cola/widgets/finder.py:137 msgid "" "Show help\n" "Shortcut: ?" msgstr "" -#: cola/widgets/diff.py:765 +#: cola/widgets/diff.py:792 msgid "Show line numbers" msgstr "" -#: cola/widgets/diff.py:761 +#: cola/widgets/remote.py:175 +msgid "Show remote messages" +msgstr "" + +#: cola/widgets/diff.py:789 msgid "Show whole surrounding functions of changes" msgstr "" -#: cola/widgets/recent.py:58 +#: cola/widgets/recent.py:56 #, fuzzy msgid "Showing changes since" msgstr "Propagazione modifiche a %s" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "Side by side" msgstr "" -#: cola/cmds.py:2512 +#: cola/cmds.py:2463 msgid "Sign Off" msgstr "Sign Off" -#: cola/widgets/createtag.py:71 +#: cola/widgets/createtag.py:69 #, fuzzy msgid "Sign Tag" msgstr "Sign Off" -#: cola/widgets/commitmsg.py:55 +#: cola/widgets/commitmsg.py:56 #, fuzzy msgid "Sign off on this commit" msgstr "Preparato per una nuova revisione" -#: cola/widgets/about.py:412 cola/widgets/about.py:425 +#: cola/widgets/about.py:395 cola/widgets/about.py:408 msgid "Simplified Chinese translation" msgstr "" -#: cola/cmds.py:2587 +#: cola/cmds.py:2529 msgid "Skip" msgstr "" -#: cola/widgets/main.py:264 cola/widgets/main.py:617 +#: cola/widgets/main.py:260 cola/widgets/main.py:630 #, fuzzy msgid "Skip Current Patch" msgstr "Crea ramo" -#: cola/widgets/main.py:267 +#: cola/widgets/main.py:261 msgid "Skip applying the current patch and continue applying patches" msgstr "" -#: cola/widgets/prefs.py:261 +#: cola/widgets/prefs.py:282 msgid "Sort bookmarks alphabetically" msgstr "" -#: cola/widgets/about.py:413 cola/widgets/about.py:436 -#: cola/widgets/about.py:440 +#: cola/widgets/about.py:396 cola/widgets/about.py:419 +#: cola/widgets/about.py:423 msgid "Spanish translation" msgstr "" -#: cola/widgets/createtag.py:88 +#: cola/widgets/createtag.py:86 msgid "Specifies the SHA-1 to tag" msgstr "" -#: cola/widgets/createtag.py:81 +#: cola/widgets/createtag.py:79 msgid "Specifies the tag message" msgstr "" -#: cola/widgets/createtag.py:65 +#: cola/widgets/createtag.py:63 msgid "Specifies the tag name" msgstr "" -#: cola/widgets/spellcheck.py:46 +#: cola/widgets/spellcheck.py:45 #, fuzzy msgid "Spelling Suggestions" msgstr "Nessun suggerimento" -#: cola/sequenceeditor.py:369 cola/widgets/merge.py:58 +#: cola/sequenceeditor.py:365 cola/widgets/merge.py:56 #, fuzzy msgid "Squash" msgstr "Propaga (Push)" -#: cola/widgets/merge.py:57 +#: cola/widgets/merge.py:55 msgid "Squash the merged commits into a single commit" msgstr "" -#: cola/cmds.py:2598 cola/widgets/action.py:60 cola/widgets/diff.py:982 +#: cola/cmds.py:2540 cola/widgets/action.py:58 cola/widgets/diff.py:1168 #, fuzzy msgid "Stage" msgstr "Salva" -#: cola/cmds.py:2753 -#, fuzzy +#: cola/cmds.py:2699 msgid "Stage / Unstage" msgstr "" -#: cola/cmds.py:2735 +#: cola/cmds.py:2681 msgid "Stage / Unstage All" msgstr "" -#: cola/widgets/diff.py:1016 -#, fuzzy +#: cola/widgets/diff.py:1055 msgid "Stage Diff Hunk" msgstr "" -#: cola/cmds.py:2691 +#: cola/cmds.py:2633 msgid "Stage Modified" msgstr "Prepara modificati" -#: cola/cmds.py:2724 +#: cola/cmds.py:2670 msgid "Stage Modified and Untracked" msgstr "" -#: cola/widgets/status.py:872 cola/widgets/status.py:894 -#: cola/widgets/status.py:962 +#: cola/widgets/status.py:873 cola/widgets/status.py:895 +#: cola/widgets/status.py:963 #, fuzzy msgid "Stage Selected" msgstr "Seleziona" -#: cola/widgets/diff.py:1011 +#: cola/widgets/diff.py:1050 #, fuzzy msgid "Stage Selected Lines" msgstr "Modifiche non preparate" -#: cola/cmds.py:2702 +#: cola/cmds.py:2644 #, fuzzy msgid "Stage Unmerged" msgstr "Prepara non merged" -#: cola/cmds.py:2713 +#: cola/cmds.py:2655 #, fuzzy msgid "Stage Untracked" msgstr "Prepara non tracked" -#: cola/widgets/commitmsg.py:438 +#: cola/widgets/commitmsg.py:446 #, fuzzy msgid "Stage and Commit" msgstr "Prepara per una nuova revisione" -#: cola/widgets/commitmsg.py:435 +#: cola/widgets/commitmsg.py:443 #, fuzzy msgid "Stage and commit?" msgstr "Preparato per una nuova revisione" -#: cola/cmds.py:2586 +#: cola/widgets/action.py:58 +msgid "Stage changes using \"git add\"" +msgstr "" + +#: cola/cmds.py:2528 #, fuzzy msgid "Stage conflicts" msgstr "Preparato per una nuova revisione" -#: cola/cmds.py:2577 +#: cola/cmds.py:2519 #, fuzzy msgid "Stage conflicts?" msgstr "Preparato per una nuova revisione" @@ -3549,50 +3665,49 @@ msgstr "Preparato per una nuova revisione" msgid "Stage/unstage selected paths for commit" msgstr "Preparato per una nuova revisione" -#: cola/models/browse.py:334 cola/widgets/status.py:156 -#: cola/widgets/status.py:620 -#, fuzzy +#: cola/models/browse.py:333 cola/widgets/status.py:156 +#: cola/widgets/status.py:621 msgid "Staged" msgstr "" -#: cola/cmds.py:2605 +#: cola/cmds.py:2547 #, fuzzy, python-format msgid "Staging: %s" msgstr "Analisi in corso %s..." -#: cola/widgets/main.py:597 +#: cola/widgets/main.py:610 msgid "Start Interactive Rebase..." msgstr "" -#: cola/widgets/createbranch.py:107 +#: cola/widgets/createbranch.py:105 msgid "Starting Revision" msgstr "Revisione iniziale" -#: cola/widgets/stash.py:40 +#: cola/widgets/stash.py:36 msgid "Stash" msgstr "" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 #, fuzzy msgid "Stash Index" msgstr "Errore nell'indice" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 #, fuzzy msgid "Stash staged changes only" msgstr "Archiviazione modifiche..." -#: cola/widgets/stash.py:73 +#: cola/widgets/stash.py:75 #, fuzzy msgid "Stash unstaged changes only, keeping staged changes" msgstr "Annullare le modifiche nel file %s?" -#: cola/widgets/action.py:66 cola/widgets/main.py:414 +#: cola/widgets/action.py:76 cola/widgets/main.py:422 #, fuzzy msgid "Stash..." msgstr "Propaga..." -#: cola/models/browse.py:33 cola/widgets/main.py:102 +#: cola/models/browse.py:32 cola/widgets/main.py:100 msgid "Status" msgstr "" @@ -3600,212 +3715,219 @@ msgstr "" msgid "Stop tracking paths" msgstr "" -#: cola/widgets/submodules.py:82 +#: cola/widgets/submodules.py:81 msgid "Submodule URL (can be relative, ex: ../repo.git)" msgstr "" -#: cola/widgets/submodules.py:90 +#: cola/widgets/submodules.py:89 msgid "Submodule branch to track (optional)" msgstr "" -#: cola/widgets/submodules.py:86 +#: cola/widgets/submodules.py:85 msgid "Submodule path within the current repository (optional)" msgstr "" -#: cola/widgets/main.py:143 cola/widgets/submodules.py:32 +#: cola/widgets/main.py:141 cola/widgets/submodules.py:31 msgid "Submodules" msgstr "" -#: cola/widgets/prefs.py:174 +#: cola/widgets/prefs.py:196 msgid "Summarize Merge Commits" msgstr "Riepilogo nelle revisioni di fusione" -#: cola/sequenceeditor.py:325 cola/widgets/dag.py:506 +#: cola/sequenceeditor.py:322 cola/widgets/dag.py:572 msgid "Summary" msgstr "" -#: cola/widgets/prefs.py:168 +#: cola/widgets/prefs.py:273 msgid "Tab Width" msgstr "" -#: cola/widgets/cfgactions.py:229 cola/widgets/createbranch.py:116 -#: cola/widgets/merge.py:48 +#: cola/widgets/cfgactions.py:227 cola/widgets/createbranch.py:114 +#: cola/widgets/merge.py:46 msgid "Tag" msgstr "Etichetta" -#: cola/cmds.py:2842 -#, fuzzy +#: cola/cmds.py:2788 msgid "Tag Created" msgstr "" -#: cola/widgets/createtag.py:80 +#: cola/widgets/createtag.py:78 msgid "Tag message..." msgstr "" -#: cola/cmds.py:2802 +#: cola/cmds.py:2748 msgid "Tag-signing was requested but the tag message is empty." msgstr "" -#: cola/widgets/branch.py:179 cola/widgets/branch.py:238 +#: cola/widgets/branch.py:183 cola/widgets/branch.py:248 msgid "Tags" msgstr "" -#: cola/widgets/toolbar.py:180 +#: cola/widgets/action.py:78 cola/widgets/main.py:423 +msgid "Temporarily stash away uncommitted changes using \"git stash\"" +msgstr "" + +#: cola/widgets/toolbar.py:184 msgid "Text Beside Icon" msgstr "" -#: cola/widgets/toolbar.py:179 +#: cola/widgets/toolbar.py:183 msgid "Text Only" msgstr "" -#: cola/widgets/toolbar.py:181 +#: cola/widgets/toolbar.py:185 msgid "Text Under Icon" msgstr "" -#: cola/widgets/prefs.py:169 +#: cola/widgets/prefs.py:272 msgid "Text Width" msgstr "" -#: cola/cmds.py:1116 +#: cola/cmds.py:1117 msgid "The branch will be no longer available." msgstr "" -#: cola/cmds.py:648 +#: cola/cmds.py:650 #, python-format msgid "The branch will be reset using \"git reset --mixed %s\"" msgstr "" -#: cola/cmds.py:699 cola/cmds.py:790 +#: cola/cmds.py:701 cola/cmds.py:792 #, python-format msgid "The branch will be reset using \"git reset --soft %s\"" msgstr "" -#: cola/widgets/commitmsg.py:303 +#: cola/widgets/commitmsg.py:311 #, fuzzy msgid "The commit message will be cleared." msgstr "Larghezza del messaggio di revisione" -#: cola/widgets/prefs.py:146 +#: cola/widgets/prefs.py:169 msgid "" "The date-time format used when displaying dates in Git DAG.\n" "This value is passed to git log --date=" msgstr "" -#: cola/widgets/archive.py:208 +#: cola/widgets/archive.py:206 #, python-format msgid "The file \"%s\" exists and will be overwritten." msgstr "" -#: cola/cmds.py:1086 +#: cola/cmds.py:1087 msgid "The following files will be deleted:" msgstr "" -#: cola/widgets/status.py:1646 +#: cola/widgets/status.py:1647 msgid "The number of leading paths to strip" msgstr "" -#: cola/cmds.py:716 +#: cola/cmds.py:718 #, python-format msgid "The repository will be reset using \"git reset --hard %s\"" msgstr "" -#: cola/cmds.py:665 +#: cola/cmds.py:667 #, python-format msgid "The repository will be reset using \"git reset --keep %s\"" msgstr "" -#: cola/cmds.py:682 +#: cola/cmds.py:684 #, python-format msgid "The repository will be reset using \"git reset --merge %s\"" msgstr "" -#: cola/cmds.py:2365 +#: cola/cmds.py:2316 #, fuzzy msgid "The revision expression cannot be empty." msgstr "L'espressione di revisione è vuota." -#: cola/cmds.py:3029 +#: cola/widgets/stash.py:225 +msgid "The stash has not been renamed" +msgstr "" + +#: cola/cmds.py:2975 #, python-format msgid "" "The submodule will be added using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:3074 +#: cola/cmds.py:3020 #, python-format msgid "" "The submodule will be updated using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:736 +#: cola/cmds.py:738 #, python-format msgid "The worktree will be restored using \"git read-tree --reset -u %s\"" msgstr "" -#: cola/widgets/commitmsg.py:304 +#: cola/widgets/commitmsg.py:312 msgid "This cannot be undone. Clear commit message?" msgstr "" -#: cola/cmds.py:778 cola/widgets/commitmsg.py:458 +#: cola/cmds.py:780 cola/widgets/commitmsg.py:466 msgid "" "This commit has already been published.\n" "This operation will rewrite published history.\n" "You probably don't want to do this." msgstr "" -#: cola/widgets/diff.py:1158 +#: cola/widgets/diff.py:1232 msgid "" "This operation drops uncommitted changes.\n" "These changes cannot be recovered." msgstr "" -#: cola/cmds.py:2307 +#: cola/cmds.py:2258 msgid "" "This operation removes uncommitted edits from selected files.\n" "These changes cannot be recovered." msgstr "" -#: cola/cmds.py:2285 +#: cola/cmds.py:2236 msgid "" "This operation removes unstaged edits from selected files.\n" "These changes cannot be recovered." msgstr "" -#: cola/cmds.py:475 +#: cola/cmds.py:476 msgid "" "This operation will replace the selected unmerged files with content from the branch being merged using \"git checkout --theirs\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:513 +#: cola/cmds.py:514 msgid "" "This operation will replace the selected unmerged files with content from your current branch using \"git checkout --ours\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/widgets/main.py:1109 +#: cola/widgets/main.py:1122 msgid "" "This repository has unresolved conflicts after applying a patch.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1102 +#: cola/widgets/main.py:1115 msgid "" "This repository is currently being rebased.\n" "Resolve conflicts, commit changes, and run:\n" " Rebase > Continue" msgstr "" -#: cola/widgets/main.py:1115 +#: cola/widgets/main.py:1128 msgid "" "This repository is in the middle of a cherry-pick.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1121 +#: cola/widgets/main.py:1134 msgid "" "This repository is in the middle of a merge.\n" "Resolve conflicts and commit changes." @@ -3823,15 +3945,15 @@ msgstr "" msgid "To avoid applying removal lines ('-'), change them to context lines (' ')." msgstr "" -#: cola/sequenceeditor.py:342 +#: cola/sequenceeditor.py:338 msgid "Toggle Enabled" msgstr "" -#: cola/widgets/diff.py:776 +#: cola/widgets/diff.py:804 msgid "Toggle image diff" msgstr "" -#: cola/widgets/branch.py:63 +#: cola/widgets/branch.py:65 msgid "Toggle the branches filter" msgstr "" @@ -3839,52 +3961,52 @@ msgstr "" msgid "Toggle the paths filter" msgstr "" -#: cola/widgets/toolbar.py:317 +#: cola/widgets/toolbar.py:322 msgid "Toolbar Style:" msgstr "" -#: cola/widgets/cfgactions.py:228 cola/widgets/merge.py:47 +#: cola/widgets/cfgactions.py:226 cola/widgets/merge.py:45 msgid "Tracking Branch" msgstr "Duplicato locale di ramo remoto" -#: cola/widgets/createbranch.py:115 +#: cola/widgets/createbranch.py:113 #, fuzzy msgid "Tracking branch" msgstr "Duplicato locale di ramo remoto" -#: cola/widgets/about.py:408 cola/widgets/about.py:434 -#: cola/widgets/about.py:445 +#: cola/widgets/about.py:391 cola/widgets/about.py:417 +#: cola/widgets/about.py:428 msgid "Traditional Chinese (Taiwan) translation" msgstr "" -#: cola/widgets/about.py:439 +#: cola/widgets/about.py:422 msgid "Translation" msgstr "" -#: cola/widgets/about.py:94 +#: cola/widgets/about.py:92 msgid "Translators" msgstr "" -#: cola/widgets/about.py:418 cola/widgets/about.py:423 -#: cola/widgets/about.py:438 +#: cola/widgets/about.py:401 cola/widgets/about.py:406 +#: cola/widgets/about.py:421 msgid "Turkish translation" msgstr "" -#: cola/widgets/clone.py:109 cola/widgets/editremotes.py:451 -#: cola/widgets/submodules.py:117 +#: cola/widgets/clone.py:107 cola/widgets/editremotes.py:449 +#: cola/widgets/submodules.py:116 msgid "URL" msgstr "URL" -#: cola/widgets/remote.py:463 +#: cola/widgets/remote.py:497 #, fuzzy, python-format msgid "URL: %s" msgstr "URL:" -#: cola/widgets/about.py:415 +#: cola/widgets/about.py:398 msgid "Ukranian translation" msgstr "" -#: cola/cmds.py:2122 +#: cola/cmds.py:2073 #, fuzzy msgid "Unable to rebase" msgstr "Impossibile ripulire %s" @@ -3894,56 +4016,61 @@ msgstr "Impossibile ripulire %s" msgid "Unable to set URL for \"%(name)s\" to \"%(url)s\"" msgstr "" -#: cola/widgets/diff.py:1327 +#: cola/widgets/diff.py:1401 #, python-format msgid "Unable to write patch to \"%s\". Check permissions?" msgstr "" -#: cola/widgets/main.py:735 +#: cola/widgets/main.py:748 msgid "Undo" msgstr "Annulla" -#: cola/cmds.py:783 cola/cmds.py:788 cola/cmds.py:791 cola/widgets/main.py:208 +#: cola/cmds.py:785 cola/cmds.py:790 cola/cmds.py:793 cola/widgets/main.py:207 msgid "Undo Last Commit" msgstr "" -#: cola/cmds.py:789 +#: cola/cmds.py:791 msgid "Undo last commit?" msgstr "" -#: cola/cmds.py:782 +#: cola/cmds.py:784 msgid "Undo the published commit?" msgstr "" -#: cola/models/browse.py:328 cola/widgets/status.py:157 -#: cola/widgets/status.py:640 +#: cola/models/browse.py:327 cola/widgets/status.py:157 +#: cola/widgets/status.py:641 #, fuzzy msgid "Unmerged" msgstr "Fusione (Merge)" -#: cola/cmds.py:2855 cola/widgets/action.py:61 cola/widgets/diff.py:985 +#: cola/cmds.py:2801 cola/widgets/action.py:61 cola/widgets/diff.py:1165 +#: cola/widgets/main.py:212 #, fuzzy msgid "Unstage" msgstr "Modifiche non preparate" -#: cola/widgets/main.py:203 cola/widgets/status.py:790 +#: cola/widgets/main.py:202 cola/widgets/status.py:791 msgid "Unstage All" msgstr "" -#: cola/widgets/diff.py:1061 +#: cola/widgets/diff.py:1017 msgid "Unstage Diff Hunk" msgstr "" -#: cola/widgets/status.py:823 cola/widgets/status.py:858 +#: cola/widgets/status.py:824 cola/widgets/status.py:859 msgid "Unstage Selected" msgstr "" -#: cola/widgets/diff.py:1058 +#: cola/widgets/diff.py:1015 #, fuzzy msgid "Unstage Selected Lines" msgstr "Modifiche non preparate" -#: cola/cmds.py:2867 +#: cola/widgets/action.py:61 +msgid "Unstage changes using \"git reset\"" +msgstr "" + +#: cola/cmds.py:2813 #, fuzzy, python-format msgid "Unstaging: %s" msgstr "%s non farà parte della prossima revisione" @@ -3952,89 +4079,88 @@ msgstr "%s non farà parte della prossima revisione" msgid "Untrack Selected" msgstr "" -#: cola/widgets/status.py:159 cola/widgets/status.py:646 +#: cola/widgets/status.py:159 cola/widgets/status.py:647 #, fuzzy msgid "Untracked" msgstr "Non tracciato, non preparato per una nuova revisione" -#: cola/cmds.py:1141 cola/cmds.py:2923 +#: cola/cmds.py:1142 cola/cmds.py:2869 #, python-format msgid "Untracking: %s" msgstr "" -#: cola/widgets/main.py:374 +#: cola/widgets/main.py:369 msgid "Update All Submodules..." msgstr "" -#: cola/widgets/createbranch.py:121 +#: cola/widgets/createbranch.py:119 msgid "Update Existing Branch:" msgstr "Aggiorna ramo esistente:" -#: cola/cmds.py:3075 +#: cola/cmds.py:3021 #, fuzzy msgid "Update Submodule" msgstr "Aggiornato" -#: cola/cmds.py:3072 +#: cola/cmds.py:3018 msgid "Update Submodule..." msgstr "" -#: cola/cmds.py:3111 +#: cola/cmds.py:3057 msgid "Update Submodules" msgstr "" -#: cola/cmds.py:3109 +#: cola/cmds.py:3055 msgid "Update all submodules?" msgstr "" -#: cola/cmds.py:2093 +#: cola/cmds.py:2044 msgid "Update stacked branches" msgstr "" -#: cola/cmds.py:2085 cola/cmds.py:2092 +#: cola/cmds.py:2036 cola/cmds.py:2043 msgid "Update stacked branches when rebasing?" msgstr "" -#: cola/cmds.py:3108 +#: cola/cmds.py:3054 msgid "Update submodules..." msgstr "" -#: cola/widgets/status.py:953 +#: cola/widgets/status.py:954 msgid "Update this submodule" msgstr "" -#: cola/cmds.py:3073 +#: cola/cmds.py:3019 msgid "Update this submodule?" msgstr "" -#: cola/widgets/branch.py:421 cola/widgets/createbranch.py:302 -#: cola/widgets/remote.py:135 +#: cola/widgets/branch.py:433 cola/widgets/createbranch.py:300 #, fuzzy msgid "Updating" msgstr "Avvio in corso..." -#: cola/widgets/prefs.py:350 +#: cola/widgets/prefs.py:370 msgid "Use a block cursor in diff editors" msgstr "" -#: cola/widgets/prefs.py:154 +#: cola/widgets/prefs.py:177 msgid "Use gravatar.com to lookup icons for author emails" msgstr "" -#: cola/widgets/prefs.py:166 +#: cola/widgets/prefs.py:189 msgid "User Name" msgstr "Nome utente" -#: cola/widgets/about.py:92 +#: cola/widgets/about.py:90 #, fuzzy msgid "Version" msgstr "Revisione" -#: cola/widgets/dag.py:800 cola/widgets/main.py:845 cola/widgets/main.py:966 +#: cola/widgets/dag.py:866 cola/widgets/main.py:858 cola/widgets/main.py:979 msgid "View" msgstr "" -#: cola/widgets/browse.py:137 cola/widgets/status.py:278 +#: cola/widgets/browse.py:137 cola/widgets/status.py:279 msgid "View History..." msgstr "" @@ -4043,77 +4169,77 @@ msgstr "" msgid "View history for selected paths" msgstr "Annullare le modifiche nel file %s?" -#: cola/widgets/merge.py:54 +#: cola/widgets/branch.py:224 cola/widgets/merge.py:52 msgid "Visualize" msgstr "Visualizza" -#: cola/widgets/main.py:488 +#: cola/widgets/main.py:501 #, fuzzy msgid "Visualize All Branches..." msgstr "Visualizza la cronologia di tutti i rami" -#: cola/widgets/main.py:482 +#: cola/widgets/main.py:495 #, fuzzy msgid "Visualize Current Branch..." msgstr "Visualizza la cronologia del ramo attuale" -#: cola/widgets/createtag.py:73 +#: cola/widgets/createtag.py:71 msgid "Whether to sign the tag (git tag -s)" msgstr "" -#: cola/widgets/text.py:399 +#: cola/widgets/text.py:396 msgid "Whole Words" msgstr "" -#: cola/widgets/commitmsg.py:432 +#: cola/widgets/commitmsg.py:440 msgid "Would you like to stage and commit all modified files?" msgstr "" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "XOR" msgstr "" -#: cola/widgets/standard.py:1064 +#: cola/widgets/standard.py:1182 msgid "Yes" msgstr "" -#: cola/cmds.py:256 +#: cola/cmds.py:255 msgid "" "You are in the middle of a merge.\n" "Cannot amend while merging." msgstr "" -#: cola/cmds.py:2123 +#: cola/cmds.py:2074 #, fuzzy msgid "You cannot rebase with uncommitted changes." msgstr "Annulla modifiche" -#: cola/widgets/merge.py:227 +#: cola/widgets/merge.py:225 msgid "You must specify a revision to merge." msgstr "" -#: cola/widgets/merge.py:217 +#: cola/widgets/merge.py:215 msgid "You must specify a revision to view." msgstr "" -#: cola/widgets/dag.py:710 cola/widgets/dag.py:1588 +#: cola/widgets/dag.py:776 cola/widgets/dag.py:1645 msgid "Zoom In" msgstr "" -#: cola/widgets/dag.py:706 cola/widgets/dag.py:1594 +#: cola/widgets/dag.py:772 cola/widgets/dag.py:1651 msgid "Zoom Out" msgstr "" -#: cola/widgets/dag.py:524 cola/widgets/dag.py:714 cola/widgets/dag.py:1596 -#: cola/widgets/diff.py:785 +#: cola/widgets/dag.py:590 cola/widgets/dag.py:780 cola/widgets/dag.py:1653 +#: cola/widgets/diff.py:813 msgid "Zoom to Fit" msgstr "" -#: cola/widgets/grep.py:112 +#: cola/widgets/grep.py:110 msgid "command-line arguments" msgstr "" -#: cola/widgets/main.py:932 cola/widgets/main.py:938 +#: cola/widgets/main.py:945 cola/widgets/main.py:951 msgid "error: unable to execute git" msgstr "" @@ -4122,45 +4248,41 @@ msgstr "" msgid "exit code %s" msgstr "recupera da %s" -#: cola/app.py:301 +#: cola/app.py:304 #, python-format msgid "fatal: \"%s\" is not a directory. Please specify a correct --repo ." msgstr "" -#: cola/widgets/main.py:928 +#: cola/widgets/main.py:941 #, python-format msgid "git cola version %s" msgstr "" -#: cola/widgets/startup.py:35 +#: cola/widgets/startup.py:34 msgid "git-cola" msgstr "" -#: cola/difftool.py:63 +#: cola/difftool.py:82 msgid "git-cola diff" msgstr "" -#: cola/widgets/submodules.py:81 +#: cola/widgets/submodules.py:80 msgid "git://git.example.com/repo.git" msgstr "" -#: cola/widgets/grep.py:132 +#: cola/widgets/grep.py:130 msgid "grep result..." msgstr "" -#: cola/widgets/about.py:486 +#: cola/widgets/about.py:469 msgid "hotkeys.html" msgstr "" -#: cola/widgets/submodules.py:85 +#: cola/widgets/submodules.py:84 msgid "path/to/submodule" msgstr "" -#: cola/cmds.py:2537 -msgid "unknown" -msgstr "" - -#: cola/widgets/createtag.py:63 +#: cola/widgets/createtag.py:61 msgid "vX.Y.Z" msgstr "" @@ -4169,14 +4291,18 @@ msgid "x 1" msgstr "" #: cola/hidpi.py:44 -msgid "x 1.5" +msgid "x 1.25" msgstr "" #: cola/hidpi.py:45 +msgid "x 1.5" +msgstr "" + +#: cola/hidpi.py:46 msgid "x 2" msgstr "" -#: cola/widgets/search.py:53 cola/widgets/search.py:58 +#: cola/widgets/search.py:52 cola/widgets/search.py:57 msgid "yyyy-MM-dd" msgstr "" @@ -4221,6 +4347,10 @@ msgstr "" #~ msgid "A branch is required for 'Merged Into'." #~ msgstr "Si richiede un ramo per 'Fuso in'." +#, fuzzy, python-format +#~ msgid "A stash named \"%s\" already exists" +#~ msgstr "Il file %s esiste già." + #~ msgid "Abort completed. Ready." #~ msgstr "Interruzione completata. Pronto." diff --git a/cola/i18n/ja.po b/cola/i18n/ja.po index fce2f48a..f85c8927 100644 --- a/cola/i18n/ja.po +++ b/cola/i18n/ja.po @@ -18,7 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cola/widgets/patch.py:86 +#: cola/widgets/diff.py:1680 msgid "" "\n" "

\n" @@ -34,7 +34,7 @@ msgstr "" "

\n" " " -#: cola/widgets/about.py:455 +#: cola/widgets/about.py:438 #, python-format msgid "" "\n" @@ -87,7 +87,7 @@ msgstr "" "\n" " " -#: cola/widgets/about.py:180 +#: cola/widgets/about.py:182 #, python-format msgid "" "\n" @@ -116,7 +116,7 @@ msgstr "" " \n" " " -#: cola/widgets/about.py:387 +#: cola/widgets/about.py:370 #, python-format msgid "" "\n" @@ -131,7 +131,7 @@ msgstr "" "
\n" " " -#: cola/widgets/status.py:1310 +#: cola/widgets/status.py:1311 #, python-format msgid "" "\n" @@ -156,7 +156,7 @@ msgstr "" " %(basename)s = ファイルのベース名(拡張子なし)\n" " %(ext)s = ファイルの拡張子\n" -#: cola/sequenceeditor.py:700 +#: cola/sequenceeditor.py:695 msgid "" "\n" "Commands\n" @@ -195,7 +195,7 @@ msgid "" "ctrl+d = launch difftool\n" msgstr "" -#: cola/widgets/finder.py:65 +#: cola/widgets/finder.py:64 msgid "" "\n" "Keyboard Shortcuts\n" @@ -222,45 +222,71 @@ msgstr "" "\n" "カーソルの上下でテキスト項目と結果の間でフォーカスを変更する。\n" -#: cola/widgets/dag.py:894 +#: cola/widgets/prefs.py:133 +msgid "" +"\n" +"This option determines how the supplied commit message should be\n" +"cleaned up before committing.\n" +"\n" +"The can be strip, whitespace, verbatim, scissors or default.\n" +"\n" +"strip\n" +" Strip leading and trailing empty lines, trailing whitespace,\n" +" commentary and collapse consecutive empty lines.\n" +"\n" +"whitespace\n" +" Same as strip except #commentary is not removed.\n" +"\n" +"verbatim\n" +" Do not change the message at all.\n" +"\n" +"scissors\n" +" Same as whitespace except that everything from (and including) the line\n" +" found below is truncated, if the message is to be edited.\n" +" \"#\" can be customized with core.commentChar.\n" +"\n" +" # ------------------------ >8 ------------------------" +msgstr "" + +#: cola/widgets/dag.py:960 msgid " - DAG" msgstr " - DAG" -#: cola/widgets/recent.py:54 +#: cola/widgets/recent.py:52 msgid " commits ago" msgstr " 前にコミット" -#: cola/cmds.py:1197 +#: cola/cmds.py:1198 #, python-format msgid "\"%(branch)s\" has been deleted from \"%(remote)s\"." msgstr "\"%(branch)s\" は \"%(remote)s\" から削除されています。" -#: cola/widgets/createbranch.py:316 +#: cola/widgets/createbranch.py:314 #, python-format msgid "\"%(command)s\" returned exit status \"%(status)d\"" msgstr "\"%(command)s\" は終了ステータスとして \"%(status)d\" を返しました。" -#: cola/interaction.py:39 +#: cola/interaction.py:38 #, python-format msgid "\"%(command)s\" returned exit status %(status)d" msgstr "\"%(command)s\" は終了ステータスとして %(status)d を返しました。" -#: cola/guicmds.py:157 +#: cola/guicmds.py:156 #, python-format msgid "\"%s\" already exists" msgstr "\"%s\" ブランチは既に存在します。" -#: cola/widgets/clone.py:206 +#: cola/widgets/clone.py:204 #, python-format msgid "\"%s\" already exists, cola will create a new directory" msgstr "\"%s\" は既に存在しています。git colaは新しいディレクトリを作成してします。" -#: cola/cmds.py:2349 +#: cola/cmds.py:2300 #, python-format msgid "\"%s\" requires a selected file." msgstr "\"%s\" は選択したファイルを要求します。" -#: cola/cmds.py:2087 +#: cola/cmds.py:2038 msgid "" "\"git rebase --update-refs\" automatically force-updates any\n" "branches that point to commits that are being rebased.\n" @@ -270,7 +296,11 @@ msgid "" "Using this feature is helpful for \"stacked\" branch workflows." msgstr "" -#: cola/sequenceeditor.py:321 +#: cola/models/stash.py:145 +msgid "\"git stash drop\" did not return a ref to rename." +msgstr "" + +#: cola/sequenceeditor.py:318 msgid "#" msgstr "#" @@ -279,37 +309,37 @@ msgstr "#" msgid "%(project)s: %(branch)s - Browse" msgstr "%(project)s: %(branch)s - ブラウズ" -#: cola/widgets/dag.py:887 +#: cola/widgets/dag.py:953 #, python-format msgid "%(project)s: %(ref)s - DAG" msgstr "%(project)s: %(ref)s - DAG" -#: cola/models/browse.py:315 +#: cola/models/browse.py:314 #, python-format msgid "%d days ago" msgstr "%d 日前" -#: cola/models/browse.py:314 +#: cola/models/browse.py:313 #, python-format msgid "%d hours ago" msgstr "%d 時間前" -#: cola/models/browse.py:307 cola/models/browse.py:311 +#: cola/models/browse.py:306 cola/models/browse.py:310 #, python-format msgid "%d minutes ago" msgstr "%d 分前" -#: cola/cmds.py:376 +#: cola/cmds.py:377 #, python-format msgid "%d patch(es) applied." msgstr "%d パッチを適用しました。" -#: cola/widgets/createbranch.py:281 +#: cola/widgets/createbranch.py:279 #, python-format msgid "%d skipped" msgstr "%d スキップしました。" -#: cola/cmds.py:2580 +#: cola/cmds.py:2522 #, python-format msgid "" "%s appears to contain merge conflicts.\n" @@ -322,36 +352,36 @@ msgstr "" "このファイルはおそらくスキップすべきです。\n" "これをステージングしますか？" -#: cola/widgets/startup.py:263 +#: cola/widgets/startup.py:262 #, python-format msgid "%s could not be opened. Remove from bookmarks?" msgstr "%s を開けませんでした。ブックマークから削除しますか?" -#: cola/app.py:498 cola/widgets/bookmarks.py:482 +#: cola/app.py:501 cola/widgets/bookmarks.py:481 #, python-format msgid "%s is not a Git repository." msgstr "%s は Gitのリポジトリではありません。" -#: cola/cmds.py:1015 +#: cola/cmds.py:1016 #, python-format msgid "%s will be removed from your bookmarks." msgstr "%s をあなたのブックマークから削除します。" -#: cola/cmds.py:1028 +#: cola/cmds.py:1029 #, python-format msgid "%s will be removed from your recent repositories." msgstr "%s をあなたの最近のリポジトリリストから削除します。" -#: cola/cmds.py:1711 +#: cola/cmds.py:1663 #, python-format msgid "%s: No such file or directory." msgstr "%s: そのようなファイルやディレクトリはありません。" -#: cola/widgets/main.py:734 +#: cola/widgets/main.py:747 msgid "&Edit" msgstr "編集(&E)" -#: cola/widgets/main.py:676 +#: cola/widgets/main.py:689 msgid "&File" msgstr "ファイル(&F)" @@ -359,43 +389,43 @@ msgstr "ファイル(&F)" msgid "(Amending)" msgstr "(訂正)" -#: cola/widgets/compare.py:36 +#: cola/widgets/compare.py:35 msgid "*** Branch Point ***" msgstr "*** ブランチポイント ***" -#: cola/widgets/compare.py:37 +#: cola/widgets/compare.py:36 msgid "*** Sandbox ***" msgstr "*** サンドボックス ***" -#: cola/widgets/diff.py:788 +#: cola/widgets/diff.py:816 msgid "100%" msgstr "100%" -#: cola/widgets/diff.py:789 +#: cola/widgets/diff.py:817 msgid "200%" msgstr "200%" -#: cola/widgets/diff.py:786 +#: cola/widgets/diff.py:814 msgid "25%" msgstr "25%" -#: cola/widgets/diff.py:790 +#: cola/widgets/diff.py:818 msgid "400%" msgstr "400%" -#: cola/widgets/diff.py:787 +#: cola/widgets/diff.py:815 msgid "50%" msgstr "50%" -#: cola/widgets/diff.py:791 +#: cola/widgets/diff.py:819 msgid "800%" msgstr "800%" -#: cola/widgets/finder.py:119 +#: cola/widgets/finder.py:118 msgid " ..." msgstr "<パス> ..." -#: cola/cmds.py:1734 +#: cola/cmds.py:1686 msgid "" "A commit template has not been configured.\n" "Use \"git config\" to define \"commit.template\"\n" @@ -405,81 +435,76 @@ msgstr "" "\"git config\" を使って、\"commit.template\"を定義してください。\n" "これはコミットテンプレートを指定します。" -#: cola/cmds.py:1784 +#: cola/cmds.py:1735 #, python-format msgid "A hook must be provided at \"%s\"" msgstr "フックが\"%s\"で提供されなければなりません。" -#: cola/widgets/stash.py:236 -#, python-format -msgid "A stash named \"%s\" already exists" -msgstr "\"%s\" という名前のstashは既に存在します。" - -#: cola/widgets/cfgactions.py:82 cola/widgets/main.py:622 +#: cola/widgets/cfgactions.py:81 cola/widgets/main.py:635 msgid "Abort" msgstr "中止" -#: cola/widgets/cfgactions.py:149 cola/widgets/cfgactions.py:155 +#: cola/widgets/cfgactions.py:148 cola/widgets/cfgactions.py:154 msgid "Abort Action" msgstr "アクションを中止" -#: cola/cmds.py:132 +#: cola/cmds.py:131 msgid "Abort Applying Patch" msgstr "" -#: cola/cmds.py:126 +#: cola/cmds.py:125 msgid "Abort Applying Patch..." msgstr "" -#: cola/widgets/main.py:245 +#: cola/widgets/main.py:244 msgid "Abort Applying Patches..." msgstr "" -#: cola/cmds.py:162 +#: cola/cmds.py:161 msgid "Abort Cherry-Pick" msgstr "" -#: cola/cmds.py:156 cola/widgets/main.py:334 +#: cola/cmds.py:155 cola/widgets/main.py:329 msgid "Abort Cherry-Pick..." msgstr "" -#: cola/cmds.py:193 +#: cola/cmds.py:192 msgid "Abort Merge" msgstr "マージを中止" -#: cola/cmds.py:186 cola/widgets/main.py:368 +#: cola/cmds.py:185 cola/widgets/main.py:363 msgid "Abort Merge..." msgstr "マージを中止…" -#: cola/widgets/cfgactions.py:154 +#: cola/widgets/cfgactions.py:153 msgid "Abort the action?" msgstr "このアクションを中止しますか？" -#: cola/widgets/main.py:250 +#: cola/widgets/main.py:245 msgid "Abort the current \"git am\" patch session" msgstr "" -#: cola/cmds.py:159 +#: cola/cmds.py:158 msgid "" "Aborting a cherry-pick can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:129 +#: cola/cmds.py:128 msgid "" "Aborting a patch can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:127 +#: cola/cmds.py:126 msgid "Aborting applying the current patch?" msgstr "" -#: cola/cmds.py:157 +#: cola/cmds.py:156 msgid "Aborting the current cherry-pick?" msgstr "" -#: cola/cmds.py:189 +#: cola/cmds.py:188 msgid "" "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." @@ -487,23 +512,23 @@ msgstr "" "現在のマージを中止すると、コミットしていない *全て* の変更を失います。\n" "コミットしていない変更を戻すことはできません。" -#: cola/cmds.py:187 +#: cola/cmds.py:186 msgid "Aborting the current merge?" msgstr "現在のマージを中止しますか？" -#: cola/widgets/about.py:91 cola/widgets/main.py:517 +#: cola/widgets/about.py:89 cola/widgets/main.py:530 msgid "About" msgstr "About" -#: cola/widgets/about.py:67 +#: cola/widgets/about.py:65 msgid "About git-cola" msgstr "git-colaについて" -#: cola/widgets/bookmarks.py:217 cola/widgets/startup.py:340 +#: cola/widgets/bookmarks.py:216 cola/widgets/startup.py:339 msgid "Accept" msgstr "受け入れ" -#: cola/sequenceeditor.py:159 +#: cola/sequenceeditor.py:157 msgid "" "Accept changes and rebase\n" "Shortcut: Ctrl+Enter" @@ -511,50 +536,50 @@ msgstr "" "変更を受け入れてrebaseします。\n" "ショートカット: Ctrl+Enter" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Action Name" msgstr "アクション名" -#: cola/sequenceeditor.py:528 cola/widgets/bookmarks.py:321 -#: cola/widgets/branch.py:217 cola/widgets/browse.py:374 -#: cola/widgets/commitmsg.py:99 cola/widgets/dag.py:315 -#: cola/widgets/filelist.py:110 cola/widgets/main.py:95 -#: cola/widgets/main.py:757 cola/widgets/startup.py:436 +#: cola/sequenceeditor.py:524 cola/widgets/bookmarks.py:320 +#: cola/widgets/branch.py:221 cola/widgets/browse.py:375 +#: cola/widgets/commitmsg.py:105 cola/widgets/dag.py:314 +#: cola/widgets/filelist.py:107 cola/widgets/main.py:93 +#: cola/widgets/main.py:770 cola/widgets/startup.py:435 msgid "Actions" msgstr "アクション" -#: cola/widgets/commitmsg.py:101 +#: cola/widgets/commitmsg.py:107 msgid "Actions..." msgstr "アクション..." -#: cola/widgets/bookmarks.py:71 cola/widgets/gitignore.py:64 -#: cola/widgets/patch.py:103 cola/widgets/patch.py:117 -#: cola/widgets/status.py:1381 +#: cola/widgets/bookmarks.py:70 cola/widgets/diff.py:1697 +#: cola/widgets/diff.py:1711 cola/widgets/gitignore.py:63 +#: cola/widgets/status.py:1382 msgid "Add" msgstr "追加" -#: cola/widgets/bookmarks.py:470 +#: cola/widgets/bookmarks.py:469 msgid "Add Favorite" msgstr "お気に入りの追加" -#: cola/widgets/editremotes.py:374 +#: cola/widgets/editremotes.py:373 msgid "Add Remote" msgstr "リモートの追加" -#: cola/widgets/toolbar.py:315 +#: cola/widgets/toolbar.py:320 msgid "Add Separator" msgstr "セパレータの追加" -#: cola/cmds.py:3030 cola/widgets/submodules.py:42 -#: cola/widgets/submodules.py:111 +#: cola/cmds.py:2976 cola/widgets/submodules.py:41 +#: cola/widgets/submodules.py:110 msgid "Add Submodule" msgstr "サブモジュールの追加" -#: cola/cmds.py:3027 cola/widgets/main.py:381 +#: cola/cmds.py:2973 cola/widgets/main.py:376 msgid "Add Submodule..." msgstr "サブモジュールの追加..." -#: cola/widgets/editremotes.py:62 +#: cola/widgets/editremotes.py:61 msgid "" "Add and remove remote repositories using the \n" "Add(+) and Delete(-) buttons on the left-hand side.\n" @@ -568,98 +593,98 @@ msgstr "" "リモートリポジトリの名前を変更するには、リストから選択して\n" "\"enter\"を入力する、またはダブルクリックします。" -#: cola/widgets/editremotes.py:81 +#: cola/widgets/editremotes.py:80 msgid "Add new remote git repository" msgstr "新しいgitのリモートリポジトリを追加します。" -#: cola/widgets/patch.py:103 +#: cola/widgets/diff.py:1697 msgid "Add patches (+)" msgstr "パッチを追加 (+)" -#: cola/widgets/editremotes.py:433 +#: cola/widgets/editremotes.py:431 msgid "Add remote" msgstr "リモートを追加" -#: cola/cmds.py:3028 +#: cola/cmds.py:2974 msgid "Add this submodule?" msgstr "このサブモジュールを追加しますか？" -#: cola/widgets/gitignore.py:54 +#: cola/widgets/gitignore.py:53 msgid "Add to .gitignore" msgstr ".gitignoreに追加" -#: cola/widgets/status.py:286 +#: cola/widgets/status.py:287 msgid "Add to Git Annex" msgstr "Git Annexに追加" -#: cola/widgets/status.py:290 +#: cola/widgets/status.py:291 msgid "Add to Git LFS" msgstr "Git LFSに追加" -#: cola/widgets/gitignore.py:28 +#: cola/widgets/gitignore.py:27 msgid "Add to exclusions" msgstr "exclusionsに追加" -#: cola/widgets/gitignore.py:55 +#: cola/widgets/gitignore.py:54 msgid "Add to local .git/info/exclude" msgstr "ローカルの .git/info/exclude に追加" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Additions" msgstr "追加" -#: cola/widgets/archive.py:134 +#: cola/widgets/archive.py:132 msgid "Advanced" msgstr "拡張" -#: cola/widgets/main.py:522 +#: cola/widgets/main.py:535 msgid "Against Commit... (Diff Mode)" msgstr "" -#: cola/models/browse.py:33 +#: cola/models/browse.py:32 msgid "Age" msgstr "年齢" -#: cola/widgets/prefs.py:403 +#: cola/widgets/prefs.py:441 msgid "All Repositories" msgstr "全てのリポジトリ" -#: cola/cmds.py:3110 +#: cola/cmds.py:3056 #, python-format msgid "" "All submodules will be updated using\n" "\"%s\"" msgstr "" -#: cola/widgets/remote.py:195 +#: cola/widgets/remote.py:199 msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care" msgstr "ファストフォワードではない更新を許可します。\"force\" はリモートリポジトリでコミットを失う可能性があります。使用には注意してください。" -#: cola/widgets/merge.py:61 +#: cola/widgets/merge.py:59 msgid "Always create a merge commit when enabled, even when the merge is a fast-forward update" msgstr "可能な場合には常にマージコミットを作成するする、たとえそのマージがファーストフォワードアップデートだった場合でもでも作成する。" -#: cola/cmds.py:221 +#: cola/cmds.py:220 msgid "Amend" msgstr "訂正" -#: cola/widgets/commitmsg.py:463 +#: cola/widgets/commitmsg.py:471 msgid "Amend Commit" msgstr "コミットの訂正" -#: cola/widgets/commitmsg.py:110 cola/widgets/main.py:194 +#: cola/widgets/commitmsg.py:116 cola/widgets/main.py:193 msgid "Amend Last Commit" msgstr "最新コミットを訂正" -#: cola/widgets/commitmsg.py:462 +#: cola/widgets/commitmsg.py:470 msgid "Amend the published commit?" msgstr "発行済のコミットを訂正しますか？" -#: cola/widgets/main.py:1157 +#: cola/widgets/main.py:1170 msgid "Amending" msgstr "訂正中" -#: cola/widgets/cfgactions.py:151 +#: cola/widgets/cfgactions.py:150 msgid "" "An action is still running.\n" "Terminating it could result in data loss." @@ -667,7 +692,7 @@ msgstr "" "アクション継続中です。\n" "中断は結果としてデータを失うことがありえます。" -#: cola/cmds.py:2804 +#: cola/cmds.py:2750 msgid "" "An unsigned, lightweight tag will be created instead.\n" "Create an unsigned tag?" @@ -675,56 +700,56 @@ msgstr "" "署名のない、軽量のタグを代わりにに作成します。\n" "署名なしタグを作成しますか？" -#: cola/widgets/prefs.py:406 +#: cola/widgets/prefs.py:444 msgid "Appearance" msgstr "外観" -#: cola/widgets/diff.py:1230 +#: cola/widgets/diff.py:1304 msgid "Append Patch" msgstr "" -#: cola/widgets/diff.py:1299 +#: cola/widgets/diff.py:1373 msgid "Append Patch..." msgstr "" -#: cola/widgets/patch.py:112 cola/widgets/stash.py:48 cola/widgets/stash.py:107 -#: cola/widgets/toolbar.py:323 +#: cola/widgets/diff.py:1706 cola/widgets/stash.py:50 cola/widgets/stash.py:110 +#: cola/widgets/toolbar.py:328 msgid "Apply" msgstr "適用" -#: cola/widgets/patch.py:75 +#: cola/widgets/diff.py:1669 msgid "Apply Patches" msgstr "パッチの適用" -#: cola/widgets/main.py:239 +#: cola/widgets/main.py:238 msgid "Apply Patches..." msgstr "パッチの適用..." -#: cola/widgets/stash.py:64 +#: cola/widgets/stash.py:66 msgid "Apply and drop the selected stash (git stash pop)" msgstr "選択したスタッシュを適用する(git stash pop)" -#: cola/widgets/stash.py:48 +#: cola/widgets/stash.py:50 msgid "Apply the selected stash" msgstr "選択したスタッシュを適用する" -#: cola/widgets/main.py:1167 +#: cola/widgets/main.py:1180 msgid "Applying Patch" msgstr "" -#: cola/widgets/cfgactions.py:207 +#: cola/widgets/cfgactions.py:205 msgid "Arguments" msgstr "引数" -#: cola/qtutils.py:850 +#: cola/qtutils.py:887 msgid "Attach" msgstr "アタッチ" -#: cola/models/browse.py:33 cola/models/browse.py:72 cola/widgets/dag.py:506 +#: cola/models/browse.py:32 cola/models/browse.py:71 cola/widgets/dag.py:572 msgid "Author" msgstr "著者" -#: cola/widgets/about.py:93 +#: cola/widgets/about.py:91 msgid "Authors" msgstr "著者" @@ -732,44 +757,44 @@ msgstr "著者" msgid "Auto" msgstr "自動" -#: cola/widgets/commitmsg.py:137 cola/widgets/prefs.py:259 +#: cola/widgets/commitmsg.py:143 cola/widgets/prefs.py:280 msgid "Auto-Wrap Lines" msgstr "自動行折り返し" -#: cola/widgets/prefs.py:184 +#: cola/widgets/prefs.py:206 msgid "Autocomplete Paths" msgstr "自動補完パス" -#: cola/widgets/prefs.py:176 +#: cola/widgets/prefs.py:198 msgid "Automatically Load Commit Message Template" msgstr "自動的にコミットメッセージテンプレート読み込み" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Basic Regexp" msgstr "基本正規表現" -#: cola/widgets/prefs.py:255 +#: cola/widgets/prefs.py:276 msgid "Blame Viewer" msgstr "責任者ビューアー" -#: cola/widgets/browse.py:205 +#: cola/widgets/browse.py:206 #, fuzzy msgid "Blame selected paths" msgstr "選択したパスの名前を変更" -#: cola/cmds.py:545 cola/widgets/status.py:282 +#: cola/cmds.py:546 cola/widgets/status.py:283 msgid "Blame..." msgstr "責任者..." -#: cola/widgets/prefs.py:347 +#: cola/widgets/prefs.py:367 msgid "Bold on dark headers instead of italic" msgstr "イタリックフォントからボールドフォントとダークヘッダに" -#: cola/widgets/main.py:806 cola/widgets/submodules.py:119 +#: cola/widgets/main.py:819 cola/widgets/submodules.py:118 msgid "Branch" msgstr "ブランチ" -#: cola/widgets/remote.py:600 +#: cola/widgets/remote.py:635 #, python-format msgid "" "Branch \"%(branch)s\" does not exist in \"%(remote)s\".\n" @@ -778,84 +803,84 @@ msgstr "" "\"%(branch)s\" は \"%(remote)s\" に存在していません。\n" "新しいリモートブランチを作成し、公開します。" -#: cola/widgets/createbranch.py:258 +#: cola/widgets/createbranch.py:256 #, python-format msgid "Branch \"%s\" already exists." msgstr "\"%s\" ブランチは既に存在します。" -#: cola/widgets/compare.py:44 +#: cola/widgets/compare.py:43 msgid "Branch Diff Viewer" msgstr "ブランチ差分ビューアー" -#: cola/widgets/createbranch.py:259 cola/widgets/createbranch.py:271 +#: cola/widgets/createbranch.py:257 cola/widgets/createbranch.py:269 msgid "Branch Exists" msgstr "ブランチの存在" -#: cola/widgets/createbranch.py:98 +#: cola/widgets/createbranch.py:96 msgid "Branch Name" msgstr "ブランチ名" -#: cola/widgets/submodules.py:89 +#: cola/widgets/submodules.py:88 msgid "Branch name" msgstr "ブランチ名" -#: cola/widgets/browse.py:89 cola/widgets/main.py:1097 +#: cola/widgets/browse.py:89 cola/widgets/main.py:1110 #, python-format msgid "Branch: %s" msgstr "ブランチ: %s" -#: cola/widgets/branch.py:85 cola/widgets/main.py:131 +#: cola/widgets/branch.py:87 cola/widgets/main.py:129 msgid "Branches" msgstr "ブランチ" -#: cola/widgets/main.py:538 +#: cola/widgets/main.py:551 msgid "Branches..." msgstr "ブランチ..." -#: cola/widgets/about.py:414 cola/widgets/about.py:417 -#: cola/widgets/about.py:437 +#: cola/widgets/about.py:397 cola/widgets/about.py:400 +#: cola/widgets/about.py:420 msgid "Brazilian translation" msgstr "ブラジル語翻訳" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse" msgstr "ブラウズ" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse Commits..." msgstr "コミットのブラウズ..." -#: cola/widgets/main.py:499 +#: cola/widgets/main.py:512 msgid "Browse Current Branch..." msgstr "現在ブランチのブラウズ..." -#: cola/widgets/main.py:505 +#: cola/widgets/main.py:518 msgid "Browse Other Branch..." msgstr "その他のブランチのブラウズ..." -#: cola/widgets/editremotes.py:437 cola/widgets/search.py:46 -#: cola/widgets/startup.py:65 cola/widgets/startup.py:285 +#: cola/widgets/editremotes.py:435 cola/widgets/search.py:45 +#: cola/widgets/startup.py:64 cola/widgets/startup.py:284 msgid "Browse..." msgstr "ブラウズ..." -#: cola/widgets/main.py:89 +#: cola/widgets/main.py:87 msgid "Browser" msgstr "ブラウザー" -#: cola/widgets/browse.py:589 +#: cola/widgets/browse.py:590 #, python-format msgid "Browsing %s" msgstr "%s のブラウズ" -#: cola/widgets/commitmsg.py:118 +#: cola/widgets/commitmsg.py:124 msgid "Bypass Commit Hooks" msgstr "コミットフックの回避" -#: cola/sequenceeditor.py:175 cola/widgets/standard.py:991 +#: cola/sequenceeditor.py:173 cola/widgets/standard.py:1058 msgid "Cancel" msgstr "中止" -#: cola/sequenceeditor.py:176 +#: cola/sequenceeditor.py:174 msgid "" "Cancel rebase\n" "Shortcut: Ctrl+Q" @@ -863,188 +888,200 @@ msgstr "" "rebaseの中止\n" "ショートカット: Ctrl+Q: Ctrl+Q" -#: cola/cmds.py:254 +#: cola/cmds.py:253 msgid "Cannot Amend" msgstr "訂正不可" -#: cola/cmds.py:560 +#: cola/cmds.py:561 #, python-format msgid "Cannot exec \"%s\": please configure a blame viewer" msgstr "\"%s\"を実行できません。責任者ビューアーを設定してください。" -#: cola/cmds.py:3146 +#: cola/cmds.py:3092 #, python-format msgid "Cannot exec \"%s\": please configure a history browser" msgstr "\"%s\"を実行できません。履歴ビューアーを設定してください。" -#: cola/cmds.py:1583 +#: cola/cmds.py:1571 #, python-format msgid "Cannot exec \"%s\": please configure your editor" msgstr "\"%s\"を実行できません。エディタを設定してください。" -#: cola/models/browse.py:336 +#: cola/models/browse.py:335 msgid "Changed Upstream" msgstr "変更したアップストリーム" -#: cola/widgets/prefs.py:186 +#: cola/widgets/prefs.py:208 msgid "Check Published Commits when Amending" msgstr "アメンド時の発行したコミットを確認" -#: cola/widgets/commitmsg.py:130 +#: cola/widgets/commitmsg.py:136 msgid "Check Spelling" msgstr "スペルチェック" -#: cola/widgets/prefs.py:265 +#: cola/widgets/prefs.py:286 msgid "Check spelling" msgstr "スペルチェック" -#: cola/widgets/prefs.py:163 +#: cola/widgets/prefs.py:186 msgid "Check whether a commit has been published when amending" msgstr "アメンド時にコミットを発行したかどうかを確認" -#: cola/guicmds.py:62 cola/widgets/branch.py:222 +#: cola/guicmds.py:61 cola/widgets/branch.py:233 msgid "Checkout" msgstr "チェックアウト" -#: cola/widgets/createbranch.py:130 +#: cola/widgets/createbranch.py:128 msgid "Checkout After Creation" msgstr "作成してすぐチェックアウト" -#: cola/guicmds.py:62 cola/widgets/dag.py:410 +#: cola/guicmds.py:61 cola/widgets/dag.py:409 msgid "Checkout Branch" msgstr "ブランチをチェックアウト" -#: cola/widgets/dag.py:414 +#: cola/widgets/dag.py:413 msgid "Checkout Detached HEAD" msgstr "デタッチしたHEADをチェックアウト" -#: cola/cmds.py:480 cola/cmds.py:518 +#: cola/cmds.py:481 cola/cmds.py:519 msgid "Checkout Files" msgstr "" -#: cola/widgets/branch.py:226 +#: cola/widgets/branch.py:237 msgid "Checkout as new branch" msgstr "新しいブランチとしてチェックアウト" -#: cola/cmds.py:507 +#: cola/cmds.py:508 msgid "Checkout files from our branch (HEAD)" msgstr "" -#: cola/cmds.py:511 +#: cola/cmds.py:512 msgid "Checkout files from our branch?" msgstr "" -#: cola/cmds.py:469 +#: cola/cmds.py:470 msgid "Checkout files from their branch (MERGE_HEAD)" msgstr "" -#: cola/cmds.py:473 +#: cola/cmds.py:474 msgid "Checkout files from their branch?" msgstr "" -#: cola/widgets/main.py:576 +#: cola/widgets/main.py:589 msgid "Checkout..." msgstr "チェックアウト..." -#: cola/widgets/dag.py:387 cola/widgets/search.py:79 +#: cola/widgets/dag.py:386 cola/widgets/search.py:78 msgid "Cherry Pick" msgstr "チェリーピック" -#: cola/guicmds.py:73 +#: cola/guicmds.py:72 msgid "Cherry-Pick Commit" msgstr "チェリーピックコミット" -#: cola/widgets/main.py:328 +#: cola/widgets/main.py:323 msgid "Cherry-Pick..." msgstr "チェリーピック..." -#: cola/cmds.py:584 +#: cola/cmds.py:585 msgid "Cherry-pick failed" msgstr "" -#: cola/widgets/main.py:1161 +#: cola/widgets/main.py:1174 msgid "Cherry-picking" msgstr "" -#: cola/widgets/diff.py:1247 +#: cola/widgets/diff.py:1321 msgid "Choose Patch..." msgstr "" -#: cola/widgets/search.py:319 +#: cola/widgets/search.py:318 msgid "Choose Paths" msgstr "パスの選択" -#: cola/widgets/grep.py:116 +#: cola/widgets/grep.py:114 msgid "Choose the \"git grep\" regular expression mode" msgstr "\"git grep\" 正規表現モードを選択する" -#: cola/widgets/bookmarks.py:229 cola/widgets/startup.py:352 +#: cola/widgets/bookmarks.py:228 cola/widgets/startup.py:351 msgid "Clear Default Repository" msgstr "デフォルトリポジトリをクリアする" -#: cola/widgets/commitmsg.py:305 +#: cola/widgets/commitmsg.py:313 msgid "Clear commit message" msgstr "コミットメッセージをクリアする" -#: cola/widgets/commitmsg.py:302 +#: cola/widgets/commitmsg.py:310 msgid "Clear commit message?" msgstr "コミットメッセージをクリアしますか？" -#: cola/widgets/commitmsg.py:62 +#: cola/widgets/commitmsg.py:63 msgid "Clear..." msgstr "クリア..." -#: cola/widgets/clone.py:126 +#: cola/widgets/clone.py:124 msgid "Clone" msgstr "Clone" -#: cola/widgets/clone.py:62 cola/widgets/clone.py:104 +#: cola/widgets/clone.py:61 cola/widgets/clone.py:102 msgid "Clone Repository" msgstr "リポジトリのClone" -#: cola/widgets/main.py:465 cola/widgets/startup.py:58 +#: cola/widgets/main.py:478 cola/widgets/startup.py:57 msgid "Clone..." msgstr "Clone…" -#: cola/widgets/clone.py:62 +#: cola/widgets/clone.py:61 #, python-format msgid "Cloning repository at %s" msgstr "リポジトリのClone中: %s" -#: cola/qtutils.py:757 cola/qtutils.py:807 cola/widgets/about.py:508 -#: cola/widgets/remote.py:328 cola/widgets/text.py:1094 +#: cola/qtutils.py:788 cola/qtutils.py:838 cola/widgets/about.py:491 +#: cola/widgets/remote.py:362 cola/widgets/text.py:1090 msgid "Close" msgstr "閉じる" -#: cola/widgets/text.py:402 +#: cola/widgets/remote.py:222 +msgid "Close dialog when completed" +msgstr "" + +#: cola/widgets/remote.py:221 +msgid "Close on completion" +msgstr "" + +#: cola/widgets/text.py:399 msgid "Close the find bar" msgstr "" -#: cola/qtutils.py:623 +#: cola/qtutils.py:651 msgid "Close..." msgstr "閉じ作業中..." -#: cola/widgets/recent.py:71 +#: cola/widgets/recent.py:69 msgid "Collapse all" msgstr "全てCollapse" -#: cola/sequenceeditor.py:323 +#: cola/sequenceeditor.py:320 msgid "Command" msgstr "コマンド" -#: cola/widgets/main.py:163 cola/widgets/merge.py:74 +#: cola/widgets/main.py:161 cola/widgets/merge.py:72 msgid "Commit" msgstr "コミット" -#: cola/cmds.py:837 +#: cola/widgets/prefs.py:192 +msgid "Commit Message Cleanup" +msgstr "" + +#: cola/widgets/commitmsg.py:495 msgid "Commit failed" msgstr "コミット失敗" -#: cola/widgets/commitmsg.py:61 +#: cola/widgets/commitmsg.py:62 msgid "Commit staged changes" msgstr "ステージした変更をコミット" -#: cola/widgets/commitmsg.py:93 +#: cola/widgets/commitmsg.py:94 msgid "" "Commit staged changes\n" "Shortcut: Ctrl+Enter" @@ -1052,362 +1089,366 @@ msgstr "" "ステージした変更をコミット\n" "ショートカット: Ctrl+Enter" -#: cola/widgets/commitmsg.py:564 +#: cola/widgets/commitmsg.py:590 msgid "Commit summary" msgstr "コミットサマリー" -#: cola/widgets/main.py:259 +#: cola/widgets/main.py:253 msgid "Commit the current state and continue applying patches" msgstr "" -#: cola/widgets/merge.py:70 +#: cola/widgets/merge.py:68 msgid "Commit the merge if there are no conflicts. Uncheck to leave the merge uncommitted" msgstr "衝突のない場合のみこのマージをコミットチェックなしで、コミットされていないマージを残す。" -#: cola/widgets/commitmsg.py:58 cola/widgets/commitmsg.py:95 -#: cola/widgets/main.py:778 cola/widgets/main.py:779 +#: cola/widgets/commitmsg.py:59 cola/widgets/commitmsg.py:96 +#: cola/widgets/main.py:791 cola/widgets/main.py:792 msgid "Commit@@verb" msgstr "コミット" -#: cola/difftool.py:78 cola/widgets/compare.py:70 +#: cola/widgets/dag.py:487 +msgid "Commits authored by me" +msgstr "" + +#: cola/difftool.py:97 cola/widgets/compare.py:69 msgid "Compare" msgstr "比較" -#: cola/difftool.py:83 +#: cola/difftool.py:102 msgid "Compare All" msgstr "全て比較" -#: cola/widgets/toolbar.py:269 cola/widgets/toolbar.py:306 +#: cola/widgets/toolbar.py:274 cola/widgets/toolbar.py:311 msgid "Configure Toolbar" msgstr "ツールバーの設定" -#: cola/widgets/remote.py:214 +#: cola/widgets/remote.py:218 msgid "Configure the remote branch as the the new upstream" msgstr "新しいアップストリームとしてリモートブランチを設定する" -#: cola/widgets/main.py:170 +#: cola/widgets/main.py:168 msgid "Console" msgstr "コンソール" -#: cola/interaction.py:111 cola/widgets/main.py:610 +#: cola/interaction.py:109 cola/widgets/main.py:623 msgid "Continue" msgstr "続行" -#: cola/widgets/main.py:255 +#: cola/widgets/main.py:252 msgid "Continue Applying Patches" msgstr "" -#: cola/widgets/bookmarks.py:248 cola/widgets/main.py:742 -#: cola/widgets/startup.py:371 +#: cola/widgets/bookmarks.py:247 cola/widgets/main.py:755 +#: cola/widgets/startup.py:370 msgid "Copy" msgstr "コピー" -#: cola/widgets/status.py:268 +#: cola/widgets/status.py:269 msgid "Copy Basename to Clipboard" msgstr "ベースネームをクリップボードにコピー" -#: cola/widgets/diff.py:208 +#: cola/widgets/diff.py:209 msgid "Copy Diff" msgstr "" -#: cola/widgets/status.py:745 +#: cola/widgets/status.py:746 msgid "Copy Leading Path to Clipboard" msgstr "リーディングパスをクリップボードにコピー" -#: cola/widgets/status.py:251 +#: cola/widgets/status.py:252 msgid "Copy Path to Clipboard" msgstr "パスをクリップボードにコピー" -#: cola/widgets/status.py:259 +#: cola/widgets/status.py:260 msgid "Copy Relative Path to Clipboard" msgstr "相対パスをクリップボードにコピー" -#: cola/sequenceeditor.py:334 cola/widgets/dag.py:474 +#: cola/sequenceeditor.py:330 cola/widgets/dag.py:473 msgid "Copy SHA-1" msgstr "SHA-1をコピー" -#: cola/widgets/status.py:737 +#: cola/widgets/status.py:738 msgid "Copy..." msgstr "コピー中..." -#: cola/app.py:490 +#: cola/app.py:493 #, python-format msgid "Could not open %s." msgstr "%s を開けませんでした。" -#: cola/widgets/clone.py:191 cola/widgets/clone.py:193 +#: cola/widgets/clone.py:189 cola/widgets/clone.py:191 #, python-format msgid "Could not parse Git URL: \"%s\"" msgstr "Git URL \"%s\"がパースできません。" -#: cola/app.py:500 +#: cola/app.py:503 msgid "Create" msgstr "作成" -#: cola/widgets/createbranch.py:86 cola/widgets/createbranch.py:135 -#: cola/widgets/createbranch.py:301 cola/widgets/dag.py:369 +#: cola/widgets/createbranch.py:84 cola/widgets/createbranch.py:133 +#: cola/widgets/createbranch.py:299 cola/widgets/dag.py:368 msgid "Create Branch" msgstr "ブランチを作成" -#: cola/widgets/dag.py:373 +#: cola/widgets/dag.py:372 msgid "Create Patch" msgstr "パッチを作成" -#: cola/widgets/remote.py:606 +#: cola/widgets/remote.py:641 msgid "Create Remote Branch" msgstr "リモートブランチを作成" -#: cola/widgets/commitmsg.py:124 cola/widgets/merge.py:78 +#: cola/widgets/commitmsg.py:130 cola/widgets/merge.py:76 msgid "Create Signed Commit" msgstr "署名されたコミットの作成" -#: cola/widgets/createtag.py:55 cola/widgets/createtag.py:91 -#: cola/widgets/dag.py:377 +#: cola/widgets/createtag.py:53 cola/widgets/createtag.py:89 +#: cola/widgets/dag.py:376 msgid "Create Tag" msgstr "タグの作成" -#: cola/widgets/main.py:544 +#: cola/widgets/main.py:557 msgid "Create Tag..." msgstr "タグの作成中..." -#: cola/cmds.py:2807 +#: cola/cmds.py:2753 msgid "Create Unsigned Tag" msgstr "書名のないタグの作成" -#: cola/widgets/remote.py:188 +#: cola/widgets/remote.py:192 msgid "Create a merge commit even when the merge resolves as a fast-forward" msgstr "マージコミットを作成するそれがファーストフォワードとしてマージされる可能性がある" -#: cola/widgets/remote.py:605 +#: cola/widgets/remote.py:640 msgid "Create a new remote branch?" msgstr "リモートブランチを作成しますか？" -#: cola/app.py:499 +#: cola/app.py:502 msgid "Create a new repository at that location?" msgstr "この場所に新しいリポジトリを作成しますか?" -#: cola/widgets/submodules.py:100 +#: cola/widgets/submodules.py:99 msgid "Create a shallow clone with history truncated to the specified number of revisions. 0 performs a full clone." msgstr "指定した数まで履歴を切り詰めた浅いクローンを作成します。0 は完全なクローンになります。" -#: cola/widgets/main.py:551 +#: cola/widgets/main.py:564 msgid "Create..." msgstr "作成…" -#: cola/cmds.py:2843 +#: cola/cmds.py:2789 #, python-format msgid "Created a new tag named \"%s\"" msgstr "新しく作成したタグ \"%s\" " -#: cola/widgets/prefs.py:266 +#: cola/widgets/prefs.py:287 msgid "Ctrl+MouseWheel to Zoom" msgstr "" -#: cola/widgets/prefs.py:404 +#: cola/widgets/prefs.py:442 msgid "Current Repository" msgstr "現在のリポジトリ" -#: cola/widgets/status.py:1371 +#: cola/widgets/status.py:1372 msgid "Custom Copy Actions" msgstr "コピーアクションをカスタム" -#: cola/widgets/status.py:273 +#: cola/widgets/status.py:274 msgid "Customize..." msgstr "カスタマイズ中..." -#: cola/widgets/main.py:740 +#: cola/widgets/main.py:753 msgid "Cut" msgstr "切り取り" -#: cola/widgets/about.py:411 cola/widgets/about.py:442 +#: cola/widgets/about.py:394 cola/widgets/about.py:425 msgid "Czech translation" msgstr "チェコ語翻訳" -#: cola/widgets/main.py:592 +#: cola/widgets/main.py:605 msgid "DAG..." msgstr "DAG中..." -#: cola/icons.py:55 +#: cola/icons.py:54 msgid "Dark Theme" msgstr "ダークテーマ" -#: cola/widgets/dag.py:506 +#: cola/widgets/dag.py:572 msgid "Date, Time" msgstr "日時" -#: cola/icons.py:54 cola/themes.py:637 +#: cola/icons.py:53 cola/themes.py:643 #, fuzzy msgid "Default" msgstr "既定値に戻す" -#: cola/widgets/prefs.py:126 +#: cola/widgets/prefs.py:124 msgid "" "Default directory when exporting patches.\n" "Relative paths are relative to the current repository.\n" "Absolute path are used as-is." msgstr "" -#: cola/cmds.py:925 cola/guicmds.py:26 cola/guicmds.py:35 -#: cola/widgets/bookmarks.py:75 cola/widgets/bookmarks.py:251 -#: cola/widgets/main.py:746 cola/widgets/startup.py:373 +#: cola/cmds.py:923 cola/guicmds.py:25 cola/guicmds.py:34 +#: cola/widgets/bookmarks.py:74 cola/widgets/bookmarks.py:250 +#: cola/widgets/main.py:759 cola/widgets/startup.py:372 msgid "Delete" msgstr "削除" -#: cola/cmds.py:1088 +#: cola/cmds.py:1089 #, python-format msgid "Delete %d file(s)?" msgstr "%d のfileを削除しますか？" -#: cola/cmds.py:1016 +#: cola/cmds.py:1017 msgid "Delete Bookmark" msgstr "ブックマークの削除" -#: cola/cmds.py:1014 +#: cola/cmds.py:1015 msgid "Delete Bookmark?" msgstr "ブックマークを削除しますか？" -#: cola/cmds.py:1114 cola/cmds.py:1117 cola/guicmds.py:26 -#: cola/widgets/branch.py:268 +#: cola/cmds.py:1115 cola/cmds.py:1118 cola/guicmds.py:25 +#: cola/widgets/branch.py:277 msgid "Delete Branch" msgstr "ブランチ削除" -#: cola/cmds.py:1089 +#: cola/cmds.py:1090 msgid "Delete Files" msgstr "ファイルの削除" -#: cola/widgets/status.py:311 +#: cola/widgets/status.py:312 msgid "Delete Files..." msgstr "ファイルを削除中..." -#: cola/cmds.py:1085 +#: cola/cmds.py:1086 msgid "Delete Files?" msgstr "ファイルを削除しますか？" -#: cola/cmds.py:922 +#: cola/cmds.py:920 msgid "Delete Remote" msgstr "リモートの削除" -#: cola/guicmds.py:35 cola/widgets/branch.py:270 +#: cola/guicmds.py:34 cola/widgets/branch.py:279 msgid "Delete Remote Branch" msgstr "リモートブランチの削除" -#: cola/widgets/main.py:564 +#: cola/widgets/main.py:577 msgid "Delete Remote Branch..." msgstr "リモートブランチの削除中..." -#: cola/widgets/toolbar.py:271 +#: cola/widgets/toolbar.py:276 msgid "Delete Toolbar" msgstr "ツールバーの削除" -#: cola/cmds.py:1115 +#: cola/cmds.py:1116 #, python-format msgid "Delete branch \"%s\"?" msgstr "ブランチ \"%s\" を削除しますか?" -#: cola/widgets/editremotes.py:88 +#: cola/widgets/editremotes.py:87 msgid "Delete remote" msgstr "リモートの削除" -#: cola/cmds.py:924 +#: cola/cmds.py:922 #, python-format msgid "Delete remote \"%s\"" msgstr "リモート \"%s\"の削除" -#: cola/cmds.py:923 +#: cola/cmds.py:921 msgid "Delete remote?" msgstr "リモートを削除しますか？" -#: cola/widgets/main.py:558 +#: cola/widgets/main.py:571 msgid "Delete..." msgstr "削除中…" -#: cola/cmds.py:1067 +#: cola/cmds.py:1068 #, python-format msgid "Deleting \"%s\" failed" msgstr "\"%s\"の削除に失敗しました。" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Deletions" msgstr "削除" -#: cola/widgets/submodules.py:120 +#: cola/widgets/submodules.py:119 msgid "Depth" msgstr "" -#: cola/qtutils.py:811 cola/qtutils.py:852 +#: cola/qtutils.py:842 cola/qtutils.py:889 msgid "Detach" msgstr "デタッチ" -#: cola/widgets/prefs.py:181 +#: cola/widgets/prefs.py:203 msgid "Detect Conflict Markers" msgstr "衝突マーカーをデタッチ" -#: cola/widgets/prefs.py:151 +#: cola/widgets/prefs.py:174 msgid "Detect conflict markers in unmerged files" msgstr "マージされていない衝突マーカーの検出" -#: cola/widgets/about.py:271 cola/widgets/about.py:274 -#: cola/widgets/about.py:277 cola/widgets/about.py:278 -#: cola/widgets/about.py:279 cola/widgets/about.py:280 -#: cola/widgets/about.py:281 cola/widgets/about.py:282 -#: cola/widgets/about.py:283 cola/widgets/about.py:284 -#: cola/widgets/about.py:285 cola/widgets/about.py:286 -#: cola/widgets/about.py:287 cola/widgets/about.py:288 -#: cola/widgets/about.py:289 cola/widgets/about.py:290 -#: cola/widgets/about.py:291 cola/widgets/about.py:292 -#: cola/widgets/about.py:293 cola/widgets/about.py:294 -#: cola/widgets/about.py:295 cola/widgets/about.py:296 -#: cola/widgets/about.py:297 cola/widgets/about.py:298 -#: cola/widgets/about.py:299 cola/widgets/about.py:300 -#: cola/widgets/about.py:301 cola/widgets/about.py:302 -#: cola/widgets/about.py:303 cola/widgets/about.py:304 -#: cola/widgets/about.py:305 cola/widgets/about.py:306 -#: cola/widgets/about.py:307 cola/widgets/about.py:308 -#: cola/widgets/about.py:309 cola/widgets/about.py:310 -#: cola/widgets/about.py:311 cola/widgets/about.py:312 -#: cola/widgets/about.py:313 cola/widgets/about.py:314 -#: cola/widgets/about.py:315 cola/widgets/about.py:316 -#: cola/widgets/about.py:317 cola/widgets/about.py:318 -#: cola/widgets/about.py:319 cola/widgets/about.py:320 -#: cola/widgets/about.py:321 cola/widgets/about.py:322 -#: cola/widgets/about.py:323 cola/widgets/about.py:324 -#: cola/widgets/about.py:325 cola/widgets/about.py:326 -#: cola/widgets/about.py:327 cola/widgets/about.py:328 -#: cola/widgets/about.py:329 cola/widgets/about.py:330 -#: cola/widgets/about.py:331 cola/widgets/about.py:332 -#: cola/widgets/about.py:333 cola/widgets/about.py:334 -#: cola/widgets/about.py:335 cola/widgets/about.py:336 -#: cola/widgets/about.py:337 cola/widgets/about.py:338 -#: cola/widgets/about.py:339 cola/widgets/about.py:340 -#: cola/widgets/about.py:341 cola/widgets/about.py:342 -#: cola/widgets/about.py:343 cola/widgets/about.py:344 -#: cola/widgets/about.py:345 cola/widgets/about.py:346 -#: cola/widgets/about.py:347 cola/widgets/about.py:348 -#: cola/widgets/about.py:349 cola/widgets/about.py:350 -#: cola/widgets/about.py:351 cola/widgets/about.py:352 -#: cola/widgets/about.py:353 cola/widgets/about.py:354 -#: cola/widgets/about.py:355 cola/widgets/about.py:356 -#: cola/widgets/about.py:357 cola/widgets/about.py:358 -#: cola/widgets/about.py:359 cola/widgets/about.py:360 -#: cola/widgets/about.py:361 cola/widgets/about.py:362 -#: cola/widgets/about.py:363 cola/widgets/about.py:364 -#: cola/widgets/about.py:365 cola/widgets/about.py:366 -#: cola/widgets/about.py:367 cola/widgets/about.py:368 -#: cola/widgets/about.py:369 cola/widgets/about.py:370 -#: cola/widgets/about.py:371 cola/widgets/about.py:372 -#: cola/widgets/about.py:373 cola/widgets/about.py:374 -#: cola/widgets/about.py:375 cola/widgets/about.py:376 -#: cola/widgets/about.py:377 cola/widgets/about.py:378 -#: cola/widgets/about.py:379 cola/widgets/about.py:380 +#: cola/widgets/about.py:254 cola/widgets/about.py:257 +#: cola/widgets/about.py:260 cola/widgets/about.py:261 +#: cola/widgets/about.py:262 cola/widgets/about.py:263 +#: cola/widgets/about.py:264 cola/widgets/about.py:265 +#: cola/widgets/about.py:266 cola/widgets/about.py:267 +#: cola/widgets/about.py:268 cola/widgets/about.py:269 +#: cola/widgets/about.py:270 cola/widgets/about.py:271 +#: cola/widgets/about.py:272 cola/widgets/about.py:273 +#: cola/widgets/about.py:274 cola/widgets/about.py:275 +#: cola/widgets/about.py:276 cola/widgets/about.py:277 +#: cola/widgets/about.py:278 cola/widgets/about.py:279 +#: cola/widgets/about.py:280 cola/widgets/about.py:281 +#: cola/widgets/about.py:282 cola/widgets/about.py:283 +#: cola/widgets/about.py:284 cola/widgets/about.py:285 +#: cola/widgets/about.py:286 cola/widgets/about.py:287 +#: cola/widgets/about.py:288 cola/widgets/about.py:289 +#: cola/widgets/about.py:290 cola/widgets/about.py:291 +#: cola/widgets/about.py:292 cola/widgets/about.py:293 +#: cola/widgets/about.py:294 cola/widgets/about.py:295 +#: cola/widgets/about.py:296 cola/widgets/about.py:297 +#: cola/widgets/about.py:298 cola/widgets/about.py:299 +#: cola/widgets/about.py:300 cola/widgets/about.py:301 +#: cola/widgets/about.py:302 cola/widgets/about.py:303 +#: cola/widgets/about.py:304 cola/widgets/about.py:305 +#: cola/widgets/about.py:306 cola/widgets/about.py:307 +#: cola/widgets/about.py:308 cola/widgets/about.py:309 +#: cola/widgets/about.py:310 cola/widgets/about.py:311 +#: cola/widgets/about.py:312 cola/widgets/about.py:313 +#: cola/widgets/about.py:314 cola/widgets/about.py:315 +#: cola/widgets/about.py:316 cola/widgets/about.py:317 +#: cola/widgets/about.py:318 cola/widgets/about.py:319 +#: cola/widgets/about.py:320 cola/widgets/about.py:321 +#: cola/widgets/about.py:322 cola/widgets/about.py:323 +#: cola/widgets/about.py:324 cola/widgets/about.py:325 +#: cola/widgets/about.py:326 cola/widgets/about.py:327 +#: cola/widgets/about.py:328 cola/widgets/about.py:329 +#: cola/widgets/about.py:330 cola/widgets/about.py:331 +#: cola/widgets/about.py:332 cola/widgets/about.py:333 +#: cola/widgets/about.py:334 cola/widgets/about.py:335 +#: cola/widgets/about.py:336 cola/widgets/about.py:337 +#: cola/widgets/about.py:338 cola/widgets/about.py:339 +#: cola/widgets/about.py:340 cola/widgets/about.py:341 +#: cola/widgets/about.py:342 cola/widgets/about.py:343 +#: cola/widgets/about.py:344 cola/widgets/about.py:345 +#: cola/widgets/about.py:346 cola/widgets/about.py:347 +#: cola/widgets/about.py:348 cola/widgets/about.py:349 +#: cola/widgets/about.py:350 cola/widgets/about.py:351 +#: cola/widgets/about.py:352 cola/widgets/about.py:353 +#: cola/widgets/about.py:354 cola/widgets/about.py:355 +#: cola/widgets/about.py:356 cola/widgets/about.py:357 +#: cola/widgets/about.py:358 cola/widgets/about.py:359 +#: cola/widgets/about.py:360 cola/widgets/about.py:361 +#: cola/widgets/about.py:362 cola/widgets/about.py:363 msgid "Developer" msgstr "開発者" -#: cola/guicmds.py:185 cola/widgets/dag.py:764 cola/widgets/diff.py:781 -#: cola/widgets/main.py:177 cola/widgets/main.py:797 +#: cola/guicmds.py:184 cola/widgets/dag.py:830 cola/widgets/diff.py:809 +#: cola/widgets/main.py:175 cola/widgets/main.py:810 msgid "Diff" msgstr "差分" -#: cola/guicmds.py:185 +#: cola/guicmds.py:184 msgid "Diff Against Commit" msgstr "" @@ -1415,35 +1456,35 @@ msgstr "" msgid "Diff Against Predecessor..." msgstr "前任者との差分..." -#: cola/widgets/main.py:1159 +#: cola/widgets/main.py:1172 msgid "Diff Mode" msgstr "" -#: cola/widgets/diff.py:772 cola/widgets/diff.py:796 +#: cola/widgets/diff.py:800 cola/widgets/diff.py:824 msgid "Diff Options" msgstr "diffツールオプション" -#: cola/widgets/prefs.py:256 +#: cola/widgets/prefs.py:277 msgid "Diff Tool" msgstr "差分ツール" -#: cola/widgets/dag.py:364 +#: cola/widgets/dag.py:363 msgid "Diff selected -> this" msgstr "Diff 選択 -> this" -#: cola/widgets/dag.py:358 +#: cola/widgets/dag.py:357 msgid "Diff this -> selected" msgstr "Diff this -> 選択" -#: cola/widgets/main.py:218 +#: cola/widgets/main.py:217 msgid "Diffstat" msgstr "差分状態" -#: cola/cmds.py:3262 +#: cola/difftool.py:324 msgid "Difftool" msgstr "差分ツール" -#: cola/widgets/clone.py:207 +#: cola/widgets/clone.py:205 msgid "Directory Exists" msgstr "ディレクトリが存在" @@ -1451,84 +1492,88 @@ msgstr "ディレクトリが存在" msgid "Disable" msgstr "無効" -#: cola/widgets/prefs.py:180 +#: cola/widgets/prefs.py:202 msgid "Display Untracked Files" msgstr "未追跡ファイルの表示" -#: cola/cmds.py:2094 +#: cola/widgets/remote.py:176 +msgid "Display remote messages in a separate dialog" +msgstr "" + +#: cola/cmds.py:2045 msgid "Do not update stacked branches" msgstr "" -#: cola/widgets/main.py:471 +#: cola/widgets/main.py:484 msgid "Documentation" msgstr "ドキュメント" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop" msgstr "ドロップ" -#: cola/widgets/stash.py:258 +#: cola/widgets/stash.py:276 msgid "Drop Stash" msgstr "スタッシュのドロップ" -#: cola/widgets/stash.py:255 +#: cola/widgets/stash.py:273 msgid "Drop Stash?" msgstr "ドロップをスタッシュしますか？" -#: cola/widgets/stash.py:257 +#: cola/widgets/stash.py:275 #, python-format msgid "Drop the \"%s\" stash?" msgstr "\"%s\" スタッシュをドロップしますか？" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop the selected stash" msgstr "選択したスタッシュをドロップします。" -#: cola/qtutils.py:764 cola/sequenceeditor.py:357 cola/widgets/grep.py:102 +#: cola/qtutils.py:795 cola/sequenceeditor.py:353 cola/widgets/grep.py:100 msgid "Edit" msgstr "編集" -#: cola/widgets/diff.py:1019 +#: cola/widgets/diff.py:1058 msgid "Edit Diff Hunk to Revert..." msgstr "" -#: cola/widgets/diff.py:1017 +#: cola/widgets/diff.py:1056 msgid "Edit Diff Hunk to Stage..." msgstr "" -#: cola/widgets/diff.py:1062 +#: cola/widgets/diff.py:1124 msgid "Edit Diff Hunk to Unstage..." msgstr "" -#: cola/cmds.py:2166 +#: cola/cmds.py:2117 msgid "Edit Rebase" msgstr "リベースを編集" -#: cola/widgets/editremotes.py:36 +#: cola/widgets/editremotes.py:35 msgid "Edit Remotes" msgstr "リモートを編集" -#: cola/widgets/main.py:298 +#: cola/widgets/main.py:293 msgid "Edit Remotes..." msgstr "リモートを編集中..." -#: cola/widgets/diff.py:1014 +#: cola/widgets/diff.py:1053 msgid "Edit Selected Lines to Revert..." msgstr "" -#: cola/widgets/diff.py:1012 +#: cola/widgets/diff.py:1051 msgid "Edit Selected Lines to Stage..." msgstr "" -#: cola/widgets/diff.py:1059 +#: cola/widgets/diff.py:1122 msgid "Edit Selected Lines to Unstage..." msgstr "" -#: cola/widgets/editremotes.py:44 +#: cola/widgets/editremotes.py:43 msgid "Edit remotes by selecting them from the list" msgstr "リストから選択してリモートを編集する" -#: cola/widgets/browse.py:197 cola/widgets/common.py:39 +#: cola/widgets/browse.py:198 cola/widgets/common.py:38 msgid "Edit selected paths" msgstr "選択したパスを編集する" @@ -1544,11 +1589,11 @@ msgstr "" msgid "Edit the following patch, which will then be applied to the worktree to revert the changes:" msgstr "" -#: cola/widgets/main.py:604 +#: cola/widgets/main.py:617 msgid "Edit..." msgstr "編集中..." -#: cola/widgets/prefs.py:253 +#: cola/widgets/prefs.py:274 msgid "Editor" msgstr "エディタ" @@ -1557,154 +1602,159 @@ msgstr "エディタ" msgid "Editor returned %s exit code. Not applying patch." msgstr "" -#: cola/widgets/prefs.py:167 +#: cola/widgets/prefs.py:190 msgid "Email Address" msgstr "メールアドレス" -#: cola/widgets/about.py:258 cola/widgets/about.py:401 +#: cola/widgets/about.py:241 cola/widgets/about.py:384 msgid "Email contributor" msgstr "メールコントリビュータ" -#: cola/widgets/prefs.py:182 +#: cola/widgets/prefs.py:204 msgid "Enable Gravatar Icons" msgstr "" -#: cola/widgets/prefs.py:160 +#: cola/widgets/prefs.py:183 msgid "Enable path autocompletion in tools" msgstr "ツールのパス自動補完を有効にする" -#: cola/widgets/diff.py:768 +#: cola/widgets/diff.py:796 msgid "Enable word wrapping" msgstr "" -#: cola/sequenceeditor.py:322 +#: cola/sequenceeditor.py:319 msgid "Enabled" msgstr "有効" -#: cola/guicmds.py:333 cola/widgets/branch.py:445 +#: cola/guicmds.py:332 cola/widgets/branch.py:478 msgid "Enter New Branch Name" msgstr "新しいブランチ名を入力する" -#: cola/guicmds.py:147 +#: cola/guicmds.py:146 msgid "Enter a name for the new bare repo" msgstr "新しいbaraリポジトリの名前を入力する" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Enter a name for the stash" msgstr "スタッシュの名前を入力する" -#: cola/cmds.py:146 cola/cmds.py:176 cola/cmds.py:207 cola/cmds.py:283 -#: cola/cmds.py:292 cola/cmds.py:307 cola/cmds.py:317 cola/cmds.py:460 -#: cola/cmds.py:496 cola/cmds.py:534 cola/cmds.py:633 cola/cmds.py:751 -#: cola/cmds.py:1067 cola/cmds.py:1164 cola/cmds.py:2005 cola/cmds.py:2394 -#: cola/cmds.py:2637 cola/cmds.py:2643 cola/cmds.py:2651 cola/cmds.py:2872 -#: cola/cmds.py:2890 cola/cmds.py:3180 cola/gitcmds.py:984 cola/guicmds.py:157 -#: cola/models/stash.py:70 cola/models/stash.py:87 cola/models/stash.py:108 -#: cola/widgets/bookmarks.py:482 cola/widgets/branch.py:777 +#: cola/widgets/stash.py:216 +msgid "Enter a new name for the stash" +msgstr "" + +#: cola/cmds.py:145 cola/cmds.py:175 cola/cmds.py:206 cola/cmds.py:284 +#: cola/cmds.py:293 cola/cmds.py:308 cola/cmds.py:318 cola/cmds.py:461 +#: cola/cmds.py:497 cola/cmds.py:535 cola/cmds.py:635 cola/cmds.py:753 +#: cola/cmds.py:1068 cola/cmds.py:1165 cola/cmds.py:1956 cola/cmds.py:2345 +#: cola/cmds.py:2579 cola/cmds.py:2585 cola/cmds.py:2593 cola/cmds.py:2818 +#: cola/cmds.py:2836 cola/cmds.py:3125 cola/gitcmds.py:994 cola/guicmds.py:156 +#: cola/models/stash.py:70 cola/models/stash.py:90 cola/models/stash.py:112 +#: cola/models/stash.py:138 cola/widgets/bookmarks.py:481 +#: cola/widgets/branch.py:829 msgid "Error" msgstr "エラー" -#: cola/widgets/clone.py:191 +#: cola/widgets/clone.py:189 msgid "Error Cloning" msgstr "クローン中のエラー" -#: cola/widgets/createbranch.py:314 +#: cola/widgets/createbranch.py:312 msgid "Error Creating Branch" msgstr "ブランチ作成エラー" -#: cola/app.py:502 cola/guicmds.py:101 +#: cola/app.py:505 cola/guicmds.py:100 msgid "Error Creating Repository" msgstr "リポジトリ作成エラー" -#: cola/cmds.py:1202 +#: cola/cmds.py:1206 msgid "Error Deleting Remote Branch" msgstr "リモートブランチ削除エラー" -#: cola/cmds.py:1585 +#: cola/cmds.py:1573 msgid "Error Editing File" msgstr "ファイル編集エラー" -#: cola/cmds.py:559 +#: cola/cmds.py:560 msgid "Error Launching Blame Viewer" msgstr "責任者ビューア起動エラー" -#: cola/cmds.py:3145 +#: cola/cmds.py:3091 msgid "Error Launching History Browser" msgstr "履歴ブラウザ起動エラー" -#: cola/app.py:489 +#: cola/app.py:492 msgid "Error Opening Repository" msgstr "履歴オープン時のエラー" -#: cola/widgets/browse.py:566 +#: cola/models/stash.py:144 +msgid "Error Renaming Stash" +msgstr "" + +#: cola/widgets/browse.py:567 msgid "Error Saving File" msgstr "" -#: cola/cmds.py:914 +#: cola/cmds.py:912 #, python-format msgid "Error creating remote \"%s\"" msgstr "リモート \"%s\"作成エラー" -#: cola/models/stash.py:197 +#: cola/models/stash.py:233 msgid "Error creating stash" msgstr "スタッシュ作成エラー" -#: cola/cmds.py:1126 +#: cola/cmds.py:1127 #, python-format msgid "Error deleting branch \"%s\"" msgstr "ブランチ削除エラー \"%s\"" -#: cola/cmds.py:932 +#: cola/cmds.py:930 #, python-format msgid "Error deleting remote \"%s\"" msgstr "リモート \"%s\" 削除エラー" -#: cola/cmds.py:956 +#: cola/cmds.py:955 #, python-format msgid "Error renaming \"%(name)s\" to \"%(new_name)s\"" msgstr "\"%(name)s\" から \"%(new_name)s\" の名前変更エラー" -#: cola/cmds.py:1771 +#: cola/cmds.py:1722 msgid "Error running prepare-commitmsg hook" msgstr "コミットメッセージ前フック実行エラー" -#: cola/cmds.py:3043 cola/cmds.py:3089 +#: cola/cmds.py:2989 cola/cmds.py:3035 #, fuzzy, python-format msgid "Error updating submodule %s" msgstr "リモート \"%s\"作成エラー" -#: cola/cmds.py:3125 +#: cola/cmds.py:3071 #, fuzzy msgid "Error updating submodules" msgstr "ファイル編集エラー" -#: cola/widgets/diff.py:1326 +#: cola/widgets/diff.py:1400 msgid "Error writing patch" msgstr "" -#: cola/cmds.py:1710 +#: cola/cmds.py:1662 msgid "Error: Cannot find commit template" msgstr "エラー:コミットテンプレートが見つかりません。" -#: cola/widgets/stash.py:235 -msgid "Error: Stash exists" -msgstr "エラー:スタッシュの存在" - -#: cola/cmds.py:1732 +#: cola/cmds.py:1684 msgid "Error: Unconfigured commit template" msgstr "エラー:コミットテンプレートが設定されていない" -#: cola/widgets/clone.py:53 +#: cola/widgets/clone.py:52 #, python-format msgid "Error: could not clone \"%s\"" msgstr "エラー: \"%s\" が cloneできない" -#: cola/cmds.py:2835 +#: cola/cmds.py:2781 #, python-format msgid "Error: could not create tag \"%s\"" msgstr "エラー: tag \"%s\" が作成できない" -#: cola/widgets/branch.py:421 +#: cola/widgets/branch.py:433 #, python-format msgid "Executing action %s" msgstr "アクション %s の実行中" @@ -1713,112 +1763,116 @@ msgstr "アクション %s の実行中" msgid "Exit \"Diff\" mode" msgstr "" -#: cola/widgets/action.py:67 +#: cola/widgets/action.py:81 msgid "Exit Diff" msgstr "" -#: cola/widgets/main.py:528 +#: cola/widgets/main.py:541 msgid "Exit Diff Mode" msgstr "" -#: cola/widgets/action.py:68 +#: cola/widgets/action.py:81 msgid "Exit Diff mode" msgstr "" -#: cola/widgets/recent.py:67 +#: cola/widgets/recent.py:65 msgid "Expand all" msgstr "全て展開" -#: cola/widgets/diff.py:1223 +#: cola/widgets/diff.py:1297 msgid "Export Patch" msgstr "" -#: cola/guicmds.py:168 cola/widgets/search.py:75 +#: cola/guicmds.py:167 cola/widgets/search.py:74 msgid "Export Patches" msgstr "パッチのエクスポート" -#: cola/widgets/main.py:273 +#: cola/widgets/main.py:268 msgid "Export Patches..." msgstr "パッチのエクスポート中..." -#: cola/widgets/main.py:533 +#: cola/widgets/main.py:546 msgid "Expression..." msgstr "表現..." -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Extended Regexp" msgstr "拡張正規表現" -#: cola/widgets/commitmsg.py:612 +#: cola/widgets/commitmsg.py:638 msgid "Extended description..." msgstr "拡張記述..." -#: cola/cmds.py:387 +#: cola/cmds.py:388 msgid "Failed to commit and continue applying patches" msgstr "" -#: cola/cmds.py:403 +#: cola/cmds.py:404 msgid "Failed to continue applying patches after skipping the current patch" msgstr "" -#: cola/widgets/createbranch.py:124 +#: cola/widgets/createbranch.py:122 msgid "Fast Forward Only" msgstr "ファーストフードのみ" -#: cola/widgets/remote.py:177 +#: cola/widgets/remote.py:181 msgid "Fast-forward only" msgstr "ファーストフードのみ" -#: cola/widgets/bookmarks.py:91 +#: cola/widgets/bookmarks.py:90 msgid "Favorite repositories" msgstr "よく使うリポジトリ" -#: cola/widgets/main.py:111 +#: cola/widgets/main.py:109 msgid "Favorites" msgstr "よく使う" -#: cola/widgets/remote.py:673 +#: cola/widgets/remote.py:735 msgid "Fetch" msgstr "取得" -#: cola/widgets/createbranch.py:127 +#: cola/widgets/createbranch.py:125 msgid "Fetch Tracking Branch" msgstr "トラッキング・ブランチを取得" -#: cola/widgets/action.py:63 cola/widgets/main.py:387 +#: cola/widgets/action.py:67 cola/widgets/main.py:384 +msgid "Fetch from one or more remotes using \"git fetch\"" +msgstr "" + +#: cola/widgets/action.py:65 cola/widgets/main.py:383 msgid "Fetch..." msgstr "取得中..." -#: cola/widgets/main.py:588 +#: cola/widgets/main.py:601 msgid "File Browser..." msgstr "ファイルブラウザ..." -#: cola/widgets/compare.py:75 +#: cola/widgets/compare.py:74 msgid "File Differences" msgstr "ファイル差分" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 msgid "File Saved" msgstr "保存したファイル" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 #, python-format msgid "File saved to \"%s\"" msgstr "ファイルを \"%s\" へ保存" -#: cola/fsmonitor.py:517 +#: cola/fsmonitor.py:528 msgid "File system change monitoring: disabled because \"cola.inotify\" is false.\n" msgstr "ファイルシステム変更監視: \"cola.inotify\"がfalseであるため、無効です。\n" -#: cola/fsmonitor.py:534 +#: cola/fsmonitor.py:545 msgid "File system change monitoring: disabled because libc does not support the inotify system calls.\n" msgstr "ファイルシステム変更監視: libcがinotifyシステムコールをサポートしていないため、無効です。\n" -#: cola/fsmonitor.py:528 +#: cola/fsmonitor.py:539 msgid "File system change monitoring: disabled because pywin32 is not installed.\n" msgstr "ファイルシステム変更監視: pywin32がインストールされていないため、無効です。\n" -#: cola/fsmonitor.py:181 +#: cola/fsmonitor.py:184 msgid "" "File system change monitoring: disabled because the limit on the total number of inotify watches was reached. You may be able to increase the limit on the number of watches by running:\n" "\n" @@ -1828,296 +1882,304 @@ msgstr "" "\n" " echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n" -#: cola/fsmonitor.py:142 +#: cola/fsmonitor.py:145 msgid "File system change monitoring: enabled.\n" msgstr "ファイルシステム変更監視: 有効です。\n" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Filename" msgstr "ファイル名" -#: cola/widgets/dag.py:755 +#: cola/widgets/dag.py:821 msgid "Files" msgstr "ファイル" -#: cola/widgets/branch.py:785 +#: cola/widgets/branch.py:837 msgid "Filter branches..." msgstr "ブランチのフィルタ..." -#: cola/widgets/status.py:1333 +#: cola/widgets/status.py:1334 msgid "Filter paths..." msgstr "パスのフィルタ..." -#: cola/widgets/finder.py:113 cola/widgets/main.py:312 +#: cola/widgets/finder.py:112 cola/widgets/main.py:307 msgid "Find Files" msgstr "ファイルの検索" -#: cola/widgets/text.py:388 +#: cola/widgets/text.py:385 msgid "Find in diff" msgstr "" -#: cola/widgets/text.py:425 +#: cola/widgets/text.py:422 msgid "Find next item" msgstr "" -#: cola/widgets/text.py:431 +#: cola/widgets/text.py:428 msgid "Find previous item" msgstr "" -#: cola/widgets/text.py:395 +#: cola/widgets/text.py:392 msgid "Find the next occurrence of the phrase" msgstr "" -#: cola/widgets/text.py:391 +#: cola/widgets/text.py:388 msgid "Find the previous occurrence of the phrase" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Fixed String" msgstr "固定文字列" -#: cola/widgets/prefs.py:251 +#: cola/widgets/prefs.py:270 msgid "Fixed-Width Font" msgstr "固定幅フォント" -#: cola/sequenceeditor.py:362 +#: cola/sequenceeditor.py:358 msgid "Fixup" msgstr "修正" -#: cola/widgets/commitmsg.py:148 +#: cola/widgets/commitmsg.py:154 msgid "Fixup Previous Commit" msgstr "以前のコミットを修正" -#: cola/themes.py:672 +#: cola/themes.py:684 msgid "Flat dark blue" msgstr "フラットダークブルー" -#: cola/themes.py:693 +#: cola/themes.py:705 msgid "Flat dark green" msgstr "フラットダークグリーン" -#: cola/themes.py:686 +#: cola/themes.py:698 msgid "Flat dark grey" msgstr "フラットダークグレー" -#: cola/themes.py:679 +#: cola/themes.py:691 msgid "Flat dark red" msgstr "フラットダークレッド" -#: cola/themes.py:644 +#: cola/themes.py:656 msgid "Flat light blue" msgstr "フラットライトブルー" -#: cola/themes.py:665 +#: cola/themes.py:677 msgid "Flat light green" msgstr "フラットライトグリーン" -#: cola/themes.py:658 +#: cola/themes.py:670 msgid "Flat light grey" msgstr "フラットライトグレー" -#: cola/themes.py:651 +#: cola/themes.py:663 msgid "Flat light red" msgstr "フラットライトレッド" -#: cola/widgets/startup.py:73 +#: cola/widgets/startup.py:72 msgid "Folder" msgstr "フォルダ" -#: cola/widgets/toolbar.py:177 +#: cola/widgets/toolbar.py:181 msgid "Follow System Style" msgstr "" -#: cola/widgets/prefs.py:252 +#: cola/widgets/prefs.py:271 msgid "Font Size" msgstr "フォントサイズ" -#: cola/widgets/remote.py:193 +#: cola/widgets/remote.py:197 msgid "Force" msgstr "強制" -#: cola/widgets/remote.py:617 +#: cola/widgets/remote.py:652 msgid "Force Fetch" msgstr "強制フェッチ" -#: cola/widgets/remote.py:614 +#: cola/widgets/remote.py:649 msgid "Force Fetch?" msgstr "強制フェッチしますか?" -#: cola/widgets/remote.py:625 +#: cola/widgets/remote.py:660 msgid "Force Push" msgstr "強制プッシュ" -#: cola/widgets/remote.py:619 +#: cola/widgets/remote.py:654 msgid "Force Push?" msgstr "強制プッシュしますか？" -#: cola/widgets/remote.py:616 +#: cola/widgets/remote.py:651 #, python-format msgid "Force fetching from %s?" msgstr "%sから強制フェッチしますか?" -#: cola/widgets/remote.py:624 +#: cola/widgets/remote.py:659 #, python-format msgid "Force push to %s?" msgstr "%sへ強制プッシュしますか?" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Format String" msgstr "フォーマットストリング" -#: cola/widgets/about.py:430 cola/widgets/about.py:431 +#: cola/widgets/about.py:413 cola/widgets/about.py:414 msgid "French translation" msgstr "フランス語翻訳" -#: cola/widgets/merge.py:80 +#: cola/widgets/merge.py:78 msgid "GPG-sign the merge commit" msgstr "マージコミットのGPG署名" -#: cola/widgets/prefs.py:344 +#: cola/widgets/prefs.py:364 msgid "GUI theme" msgstr "GUIテーマ" -#: cola/widgets/editremotes.py:318 +#: cola/widgets/editremotes.py:317 #, python-format msgid "Gathering info for \"%s\"..." msgstr "\"%s\"の情報を収集..." -#: cola/widgets/about.py:420 cola/widgets/about.py:428 -#: cola/widgets/about.py:429 +#: cola/widgets/about.py:403 cola/widgets/about.py:411 +#: cola/widgets/about.py:412 msgid "German translation" msgstr "ドイツ語翻訳" -#: cola/widgets/main.py:511 +#: cola/widgets/main.py:524 msgid "Get Commit Message Template" msgstr "コミットメッセージのテンプレートを取得" -#: cola/widgets/dag.py:520 +#: cola/widgets/dag.py:586 msgid "Go Down" msgstr "下に移動" -#: cola/widgets/dag.py:516 +#: cola/widgets/dag.py:582 msgid "Go Up" msgstr "上に移動" -#: cola/widgets/dag.py:467 cola/widgets/filelist.py:42 +#: cola/widgets/dag.py:466 cola/widgets/filelist.py:39 msgid "Grab File..." msgstr "ファイルのGrab..." -#: cola/widgets/dag.py:782 +#: cola/widgets/dag.py:848 msgid "Graph" msgstr "グラフ" -#: cola/widgets/main.py:358 +#: cola/widgets/main.py:353 msgid "Grep" msgstr "Grep" -#: cola/widgets/remote.py:662 +#: cola/widgets/remote.py:707 msgid "Have you rebased/pulled lately?" msgstr "最近rebaseまたはpullを実行しましたか?" -#: cola/sequenceeditor.py:110 cola/sequenceeditor.py:171 -#: cola/widgets/finder.py:138 cola/widgets/main.py:854 +#: cola/sequenceeditor.py:108 cola/sequenceeditor.py:169 +#: cola/widgets/finder.py:137 cola/widgets/main.py:867 msgid "Help" msgstr "ヘルプ" -#: cola/widgets/status.py:1322 +#: cola/widgets/status.py:1323 msgid "Help - Custom Copy Actions" msgstr "ヘルプ - カスタムコピーアクション" -#: cola/widgets/finder.py:79 +#: cola/widgets/finder.py:78 msgid "Help - Find Files" msgstr "ヘルプ - ファイルの捜索" -#: cola/sequenceeditor.py:737 +#: cola/sequenceeditor.py:732 msgid "Help - git-cola-sequence-editor" msgstr "ヘルプ - git-cola-sequence-editor" -#: cola/widgets/prefs.py:346 +#: cola/widgets/prefs.py:366 msgid "High DPI" msgstr "高DPI" -#: cola/gitcmds.py:876 +#: cola/gitcmds.py:886 msgid "Hint: The \"Actions > Abort Cherry-Pick\" menu action can be used to cancel the current cherry-pick." msgstr "" -#: cola/widgets/prefs.py:254 +#: cola/widgets/prefs.py:275 msgid "History Browser" msgstr "履歴ブラウザ" -#: cola/widgets/about.py:427 cola/widgets/about.py:441 +#: cola/widgets/about.py:410 cola/widgets/about.py:424 msgid "Hungarian translation" msgstr "ハンガリー語翻訳" -#: cola/widgets/toolbar.py:178 +#: cola/widgets/toolbar.py:182 msgid "Icon Only" msgstr "" -#: cola/widgets/prefs.py:345 +#: cola/widgets/prefs.py:365 msgid "Icon theme" msgstr "アイコンテーマ" -#: cola/widgets/diff.py:758 +#: cola/widgets/diff.py:787 msgid "Ignore all whitespace" msgstr "全ての空白文字を無視する" -#: cola/widgets/diff.py:755 +#: cola/widgets/diff.py:785 msgid "Ignore changes in amount of whitespace" msgstr "変更の空白文字を無視する" -#: cola/widgets/diff.py:751 +#: cola/widgets/diff.py:782 msgid "Ignore changes in whitespace at EOL" msgstr "変更の、改行などの行末空白文字を無視する" -#: cola/widgets/gitignore.py:46 +#: cola/widgets/gitignore.py:45 msgid "Ignore custom pattern" msgstr "カスタムパターンで無視を指定する" -#: cola/widgets/gitignore.py:44 +#: cola/widgets/gitignore.py:43 msgid "Ignore exact filename" msgstr "厳密に指定したファイル名で無視を指定する" -#: cola/widgets/gitignore.py:32 +#: cola/widgets/gitignore.py:31 msgid "Ignore filename or pattern" msgstr "ファイル名またはパターンで無視を指定する" -#: cola/widgets/status.py:933 +#: cola/widgets/dag.py:498 +msgid "Ignore merge commits" +msgstr "" + +#: cola/widgets/status.py:934 msgid "Ignore..." msgstr "無視..." -#: cola/widgets/remote.py:203 +#: cola/widgets/remote.py:207 msgid "Include tags " msgstr "タグを含める " -#: cola/widgets/prefs.py:349 +#: cola/widgets/prefs.py:369 msgid "Indent Status paths" msgstr "" -#: cola/widgets/about.py:419 cola/widgets/about.py:426 +#: cola/widgets/about.py:402 cola/widgets/about.py:409 msgid "Indonesian translation" msgstr "インドネシア語翻訳" -#: cola/widgets/main.py:643 +#: cola/widgets/main.py:656 msgid "Initialize Git Annex" msgstr "Git Annexを初期化する" -#: cola/widgets/main.py:647 +#: cola/widgets/main.py:660 msgid "Initialize Git LFS" msgstr "Git LFSを初期化する" -#: cola/widgets/clone.py:116 +#: cola/widgets/clone.py:114 msgid "Inititalize submodules" msgstr "サブモジュールを初期化する" -#: cola/widgets/prefs.py:260 +#: cola/widgets/prefs.py:281 msgid "Insert spaces instead of tabs" msgstr "タブではなく空白スペースを挿入する" -#: cola/cmds.py:2130 +#: cola/widgets/action.py:73 cola/widgets/main.py:402 +msgid "Integrate changes using \"git pull\"" +msgstr "" + +#: cola/cmds.py:2081 msgid "Interactive Rebase" msgstr "インタラクティブリベース" -#: cola/cmds.py:2364 +#: cola/cmds.py:2315 msgid "Invalid Revision" msgstr "無効なリビジョン" @@ -2125,40 +2187,40 @@ msgstr "無効なリビジョン" msgid "It is not necessary to update the hunk header lines as they will be regenerated automatically." msgstr "" -#: cola/widgets/about.py:421 cola/widgets/about.py:424 +#: cola/widgets/about.py:404 cola/widgets/about.py:407 msgid "Japanese translation" msgstr "日本語翻訳" -#: cola/widgets/prefs.py:262 +#: cola/widgets/prefs.py:283 msgid "Keep *.orig Merge Backups" msgstr "*.orig マージバックアップを保持" -#: cola/widgets/stash.py:71 +#: cola/widgets/stash.py:73 msgid "Keep Index" msgstr "インデックスを保持" -#: cola/widgets/main.py:477 +#: cola/widgets/main.py:490 msgid "Keyboard Shortcuts" msgstr "キーボードショートカット" -#: cola/cmds.py:1608 cola/sequenceeditor.py:165 cola/sequenceeditor.py:338 -#: cola/widgets/dag.py:395 cola/widgets/filelist.py:34 +#: cola/difftool.py:27 cola/sequenceeditor.py:163 cola/sequenceeditor.py:334 +#: cola/widgets/dag.py:394 cola/widgets/filelist.py:31 msgid "Launch Diff Tool" msgstr "差分ツールを起動" -#: cola/widgets/dag.py:402 +#: cola/widgets/dag.py:401 msgid "Launch Directory Diff Tool" msgstr "ディレクトリ差分ツールを起動" -#: cola/cmds.py:1541 cola/cmds.py:1679 cola/widgets/filelist.py:38 +#: cola/cmds.py:1529 cola/cmds.py:1631 cola/widgets/filelist.py:35 msgid "Launch Editor" msgstr "エディタを起動" -#: cola/cmds.py:1644 +#: cola/cmds.py:1596 msgid "Launch Terminal" msgstr "ターミナルを起動" -#: cola/sequenceeditor.py:166 +#: cola/sequenceeditor.py:164 msgid "" "Launch external diff tool\n" "Shortcut: Ctrl+D" @@ -2166,8 +2228,8 @@ msgstr "" "外部差分ツールを起動\n" "ショートカット: Ctrl+D" -#: cola/widgets/diff.py:1005 cola/widgets/diff.py:1051 -#: cola/widgets/status.py:852 cola/widgets/status.py:948 +#: cola/widgets/diff.py:1044 cola/widgets/diff.py:1106 +#: cola/widgets/status.py:853 cola/widgets/status.py:949 msgid "Launch git-cola" msgstr "git-colaを起動" @@ -2179,7 +2241,7 @@ msgstr "git差分ツールを以前のバージョンに対して起動" msgid "Launch git-difftool on the current path" msgstr "git差分ツールを現在のパスに対して起動" -#: cola/icons.py:56 +#: cola/icons.py:55 msgid "Light Theme" msgstr "ライトテーマ" @@ -2188,167 +2250,183 @@ msgstr "ライトテーマ" msgid "Lines starting with '%s' will be ignored." msgstr "" -#: cola/widgets/startup.py:74 +#: cola/widgets/startup.py:73 msgid "List" msgstr "リスト" -#: cola/guicmds.py:267 +#: cola/guicmds.py:266 msgid "Load Commit Message" msgstr "コミットメッセージをロード" -#: cola/widgets/main.py:339 +#: cola/widgets/main.py:334 msgid "Load Commit Message..." msgstr "コミットメッセージをロード中" -#: cola/widgets/commitmsg.py:144 +#: cola/widgets/commitmsg.py:150 msgid "Load Previous Commit Message" msgstr "以前のコミットメッセージをロード" -#: cola/widgets/diff.py:264 +#: cola/widgets/diff.py:265 msgid "Loading..." msgstr "ロード中..." -#: cola/widgets/branch.py:169 cola/widgets/branch.py:240 -#: cola/widgets/branch.py:281 cola/widgets/compare.py:38 -#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/branch.py:173 cola/widgets/branch.py:250 +#: cola/widgets/branch.py:290 cola/widgets/compare.py:37 +#: cola/widgets/compare.py:52 cola/widgets/compare.py:57 msgid "Local" msgstr "ローカル" -#: cola/widgets/cfgactions.py:227 cola/widgets/merge.py:46 -#: cola/widgets/remote.py:138 +#: cola/widgets/cfgactions.py:225 cola/widgets/merge.py:44 +#: cola/widgets/remote.py:136 msgid "Local Branch" msgstr "ローカルブランチ" -#: cola/widgets/createbranch.py:114 +#: cola/widgets/createbranch.py:112 msgid "Local branch" msgstr "ローカルブランチ" -#: cola/widgets/dag.py:788 cola/widgets/main.py:651 +#: cola/widgets/dag.py:854 cola/widgets/main.py:664 msgid "Lock Layout" msgstr "レイアウトのロック" -#: cola/widgets/dag.py:750 +#: cola/widgets/dag.py:816 msgid "Log" msgstr "ログ" -#: cola/widgets/prefs.py:170 +#: cola/widgets/prefs.py:191 msgid "Log Date Format" msgstr "" -#: cola/widgets/about.py:268 +#: cola/themes.py:769 +msgid "MacOS Aqua dark" +msgstr "" + +#: cola/themes.py:765 +msgid "MacOS Aqua light" +msgstr "" + +#: cola/themes.py:781 +msgid "MacOS Vibrant dark" +msgstr "" + +#: cola/themes.py:775 +msgid "MacOS Vibrant light" +msgstr "" + +#: cola/widgets/about.py:251 msgid "Maintainer (since 2007) and developer" msgstr "2007年からのメンテナーと開発者" -#: cola/widgets/text.py:398 +#: cola/widgets/text.py:395 msgid "Match Case" msgstr "" -#: cola/widgets/merge.py:88 +#: cola/widgets/merge.py:86 msgid "Merge" msgstr "マージ" -#: cola/widgets/merge.py:162 +#: cola/widgets/merge.py:160 #, python-format msgid "Merge \"%(revision)s\" into \"%(branch)s\"" msgstr "\"%(revision)s\" を \"%(branch)s\" にマージ" -#: cola/widgets/prefs.py:257 +#: cola/widgets/prefs.py:278 msgid "Merge Tool" msgstr "マージツール" -#: cola/widgets/prefs.py:171 +#: cola/widgets/prefs.py:193 msgid "Merge Verbosity" msgstr "マージの冗長度" -#: cola/cmds.py:1829 +#: cola/cmds.py:1780 msgid "Merge failed. Conflict resolution is required." msgstr "マージ失敗衝突の解明が必要です。" -#: cola/widgets/merge.py:167 +#: cola/widgets/merge.py:165 #, python-format msgid "Merge into \"%s\"" msgstr "\"%s\"へのマージ" -#: cola/widgets/branch.py:231 +#: cola/widgets/branch.py:242 msgid "Merge into current branch" msgstr "現在のブランチへマージ" -#: cola/widgets/main.py:363 +#: cola/widgets/main.py:358 msgid "Merge..." msgstr "マージ中..." -#: cola/widgets/main.py:1163 +#: cola/widgets/main.py:1176 msgid "Merging" msgstr "マージ中" -#: cola/models/browse.py:33 cola/widgets/createtag.py:78 +#: cola/models/browse.py:32 cola/widgets/createtag.py:76 msgid "Message" msgstr "メッセージ" -#: cola/widgets/commitmsg.py:417 +#: cola/widgets/commitmsg.py:425 msgid "Missing Commit Message" msgstr "コミットメッセージの喪失" -#: cola/widgets/createbranch.py:252 +#: cola/widgets/createbranch.py:250 msgid "Missing Data" msgstr "データの喪失" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Missing Name" msgstr "名前の喪失" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Missing Revision" msgstr "リビジョンの喪失" -#: cola/cmds.py:2801 +#: cola/cmds.py:2747 msgid "Missing Tag Message" msgstr "タグメッセージの喪失" -#: cola/models/browse.py:332 cola/widgets/status.py:158 -#: cola/widgets/status.py:631 +#: cola/models/browse.py:331 cola/widgets/status.py:158 +#: cola/widgets/status.py:632 msgid "Modified" msgstr "修正" -#: cola/widgets/commitmsg.py:506 +#: cola/widgets/commitmsg.py:532 msgid "More..." msgstr "以上..." -#: cola/widgets/standard.py:243 cola/widgets/status.py:233 +#: cola/widgets/standard.py:242 cola/widgets/status.py:234 msgid "Move Down" msgstr "下に移動" -#: cola/widgets/standard.py:235 cola/widgets/status.py:225 +#: cola/widgets/standard.py:234 cola/widgets/status.py:226 msgid "Move Up" msgstr "上に移動" -#: cola/widgets/status.py:300 +#: cola/widgets/status.py:301 msgid "Move files to trash" msgstr "ファイルをゴミ箱に移動" -#: cola/models/browse.py:33 cola/widgets/bookmarks.py:467 -#: cola/widgets/createtag.py:61 cola/widgets/editremotes.py:450 -#: cola/widgets/status.py:1452 cola/widgets/toolbar.py:312 +#: cola/models/browse.py:32 cola/widgets/bookmarks.py:466 +#: cola/widgets/createtag.py:59 cola/widgets/editremotes.py:448 +#: cola/widgets/status.py:1453 cola/widgets/toolbar.py:317 msgid "Name" msgstr "名前" -#: cola/widgets/editremotes.py:434 +#: cola/widgets/editremotes.py:432 msgid "Name for the new remote" msgstr "新しいリモートの名前" -#: cola/guicmds.py:148 cola/widgets/main.py:285 +#: cola/guicmds.py:147 cola/widgets/main.py:280 msgid "New Bare Repository..." msgstr "新しい Bare リポジトリ..." -#: cola/guicmds.py:87 cola/widgets/main.py:280 +#: cola/guicmds.py:86 cola/widgets/main.py:275 msgid "New Repository..." msgstr "新しいリポジトリ..." -#: cola/widgets/main.py:983 +#: cola/widgets/main.py:996 msgid "New Toolbar" msgstr "ツールバーの追加" -#: cola/widgets/startup.py:53 +#: cola/widgets/startup.py:52 msgid "New..." msgstr "新規…" @@ -2356,15 +2434,19 @@ msgstr "新規…" msgid "Next File" msgstr "次のファイル" -#: cola/widgets/createbranch.py:123 cola/widgets/standard.py:1065 +#: cola/widgets/createbranch.py:121 cola/widgets/standard.py:1183 msgid "No" msgstr "いいえ" -#: cola/widgets/merge.py:217 cola/widgets/merge.py:227 +#: cola/widgets/merge.py:215 cola/widgets/merge.py:225 msgid "No Revision Specified" msgstr "指定リビジョンがありません" -#: cola/widgets/commitmsg.py:427 +#: cola/widgets/stash.py:225 +msgid "No change made" +msgstr "" + +#: cola/widgets/commitmsg.py:435 msgid "" "No changes to commit.\n" "\n" @@ -2374,27 +2456,27 @@ msgstr "" "\n" "コミットする前に少なくとも1ファイルをステージしなければなりません。" -#: cola/widgets/selectcommits.py:118 +#: cola/widgets/selectcommits.py:117 msgid "No commits exist in this branch." msgstr "このブランチにコミットはありません。" -#: cola/widgets/merge.py:65 +#: cola/widgets/merge.py:63 msgid "No fast forward" msgstr "ファーストフォワードがありません" -#: cola/widgets/remote.py:186 +#: cola/widgets/remote.py:190 msgid "No fast-forward" msgstr "ファーストフォワードがありません" -#: cola/widgets/remote.py:577 +#: cola/widgets/remote.py:612 msgid "No repository selected." msgstr "リポジトリが選択されていません。" -#: cola/widgets/remote.py:615 +#: cola/widgets/remote.py:650 msgid "Non-fast-forward fetch overwrites local history!" msgstr "ファーストフォワードではないフェッチはローカルの履歴を上書きします！" -#: cola/widgets/remote.py:621 +#: cola/widgets/remote.py:656 msgid "" "Non-fast-forward push overwrites published history!\n" "(Did you pull first?)" @@ -2402,7 +2484,7 @@ msgstr "" "ファーストフォワードではないフェッチは発行した履歴を上書きします！\n" "(pullを先に行いますか?)" -#: cola/widgets/commitmsg.py:444 +#: cola/widgets/commitmsg.py:452 msgid "Nothing to commit" msgstr "コミットするものはありません。" @@ -2410,80 +2492,80 @@ msgstr "コミットするものはありません。" msgid "Nothing to do" msgstr "すべきことはありません" -#: cola/widgets/prefs.py:172 +#: cola/widgets/prefs.py:194 msgid "Number of Diff Context Lines" msgstr "diff の文脈行数" -#: cola/widgets/bookmarks.py:79 cola/widgets/bookmarks.py:213 -#: cola/widgets/startup.py:336 +#: cola/widgets/bookmarks.py:78 cola/widgets/bookmarks.py:212 +#: cola/widgets/startup.py:335 msgid "Open" msgstr "開く" -#: cola/widgets/text.py:230 +#: cola/widgets/text.py:228 #, python-format msgid "Open \"%s\"" msgstr "" -#: cola/cmds.py:1857 +#: cola/cmds.py:1808 msgid "Open Directory" msgstr "" -#: cola/guicmds.py:205 cola/guicmds.py:214 cola/widgets/editremotes.py:473 -#: cola/widgets/startup.py:55 cola/widgets/startup.py:215 +#: cola/guicmds.py:204 cola/guicmds.py:213 cola/widgets/editremotes.py:471 +#: cola/widgets/startup.py:54 cola/widgets/startup.py:214 msgid "Open Git Repository" msgstr "Git リポジトリを開く" -#: cola/widgets/submodules.py:49 +#: cola/widgets/submodules.py:48 #, fuzzy msgid "Open Parent" msgstr "最近のものを開く" -#: cola/cmds.py:1877 +#: cola/cmds.py:1828 msgid "Open Parent Directory" msgstr "親ディレクトリを開く" -#: cola/widgets/main.py:679 +#: cola/widgets/main.py:692 msgid "Open Recent" msgstr "最近のものを開く" -#: cola/cmds.py:1840 +#: cola/cmds.py:1791 msgid "Open Using Default Application" msgstr "デフォルトのアプリケーションで開く" -#: cola/cmds.py:1890 +#: cola/cmds.py:1841 msgid "Open Worktree" msgstr "" -#: cola/widgets/bookmarks.py:221 cola/widgets/startup.py:344 +#: cola/widgets/bookmarks.py:220 cola/widgets/startup.py:343 msgid "Open in New Window" msgstr "新しいウィンドウで開く" -#: cola/widgets/main.py:408 +#: cola/widgets/main.py:415 msgid "Open in New Window..." msgstr "新しいウィンドウで開いています..." -#: cola/widgets/main.py:402 +#: cola/widgets/main.py:409 msgid "Open..." msgstr "開く…" -#: cola/widgets/branch.py:345 +#: cola/widgets/branch.py:354 msgid "Other branches" msgstr "その他のブランチ" -#: cola/widgets/archive.py:210 +#: cola/widgets/archive.py:208 msgid "Overwrite" msgstr "上書き" -#: cola/widgets/archive.py:209 +#: cola/widgets/archive.py:207 #, python-format msgid "Overwrite \"%s\"?" msgstr "\"%s\"を上書きしますか?" -#: cola/widgets/archive.py:207 +#: cola/widgets/archive.py:205 msgid "Overwrite File?" msgstr "ファイルを上書きしますか?" -#: cola/widgets/grep.py:144 +#: cola/widgets/grep.py:142 msgid "" "Parse arguments using a shell.\n" "Queries with spaces will require \"double quotes\"." @@ -2491,63 +2573,67 @@ msgstr "" "シェルで引数をパースします。\n" "空白文字のあるクエリは二重引用符で囲む必要があります。" -#: cola/models/browse.py:330 +#: cola/models/browse.py:329 msgid "Partially Staged" msgstr "部分ステージ" -#: cola/widgets/main.py:744 +#: cola/widgets/main.py:757 msgid "Paste" msgstr "貼り付け" -#: cola/cmds.py:363 +#: cola/cmds.py:364 msgid "Patch failed to apply" msgstr "" -#: cola/cmds.py:375 +#: cola/cmds.py:376 msgid "Patch(es) Applied" msgstr "パッチの適用" -#: cola/widgets/diff.py:1219 cola/widgets/main.py:695 +#: cola/widgets/diff.py:1293 cola/widgets/main.py:708 msgid "Patches" msgstr "" -#: cola/widgets/prefs.py:173 +#: cola/widgets/prefs.py:195 msgid "Patches Directory" msgstr "" -#: cola/widgets/bookmarks.py:468 cola/widgets/submodules.py:118 +#: cola/widgets/bookmarks.py:467 cola/widgets/submodules.py:117 msgid "Path" msgstr "パス" -#: cola/widgets/clone.py:112 +#: cola/widgets/clone.py:110 msgid "Path or URL to clone (Env. $VARS okay)" msgstr "CloneのパスやURL(環境変数は解釈できる)" -#: cola/sequenceeditor.py:346 +#: cola/sequenceeditor.py:342 msgid "Pick" msgstr "ピック" -#: cola/widgets/diff.py:781 +#: cola/widgets/dag.py:490 +msgid "Pickaxe search for changes containing text" +msgstr "" + +#: cola/widgets/diff.py:809 msgid "Pixel XOR" msgstr "Pixel XOR" -#: cola/widgets/createbranch.py:253 +#: cola/widgets/createbranch.py:251 msgid "Please provide both a branch name and revision expression." msgstr "ブランチ名とリビジョン表現を両方を提供してください。" -#: cola/cmds.py:2348 +#: cola/cmds.py:2299 msgid "Please select a file" msgstr "ファイルを選択してください" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Please specify a name for the new tag." msgstr "新しいタグの名前を指定してください。" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Please specify a revision to tag." msgstr "タグをつけるためのリビジョンを指定してください。" -#: cola/widgets/commitmsg.py:410 +#: cola/widgets/commitmsg.py:418 msgid "" "Please supply a commit message.\n" "\n" @@ -2565,31 +2651,31 @@ msgstr "" "- 2行目: 空行\n" "- 3行目以降: あなたがした変更の理由を説明します。\n" -#: cola/cmds.py:653 +#: cola/cmds.py:655 msgid "Point the current branch head to a new commit?" msgstr "現在のブランチのheadを新しいコミットに指定しますか?" -#: cola/widgets/about.py:416 +#: cola/widgets/about.py:399 msgid "Polish translation" msgstr "ポーランド語翻訳" -#: cola/widgets/stash.py:63 cola/widgets/stash.py:111 cola/widgets/stash.py:115 +#: cola/widgets/stash.py:65 cola/widgets/stash.py:114 cola/widgets/stash.py:118 msgid "Pop" msgstr "Pop" -#: cola/widgets/main.py:293 cola/widgets/prefs.py:395 +#: cola/widgets/main.py:288 cola/widgets/prefs.py:433 msgid "Preferences" msgstr "設定" -#: cola/widgets/archive.py:129 +#: cola/widgets/archive.py:127 msgid "Prefix" msgstr "prefix" -#: cola/widgets/main.py:345 +#: cola/widgets/main.py:340 msgid "Prepare Commit Message" msgstr "コミットメッセージの準備" -#: cola/widgets/prefs.py:157 +#: cola/widgets/prefs.py:180 msgid "Prevent \"Stage\" from staging all files when nothing is selected" msgstr "何も選択されていないとき、全てのファイルをステージングしないようにする" @@ -2597,216 +2683,228 @@ msgstr "何も選択されていないとき、全てのファイルをステー msgid "Previous File" msgstr "以前のファイル" -#: cola/widgets/remote.py:171 +#: cola/widgets/remote.py:169 msgid "Prompt on creation" msgstr "生成時のプロンプト" -#: cola/widgets/remote.py:172 +#: cola/widgets/remote.py:170 msgid "Prompt when pushing creates new remote branches" msgstr "新規のリモートブランチを作成するプッシュ時のプロンプト" -#: cola/widgets/remote.py:208 +#: cola/widgets/remote.py:212 msgid "Prune " msgstr "Prune " -#: cola/widgets/bookmarks.py:255 cola/widgets/startup.py:376 +#: cola/widgets/bookmarks.py:254 cola/widgets/startup.py:375 msgid "Prune Missing Entries" msgstr "" -#: cola/widgets/branch.py:247 cola/widgets/remote.py:728 +#: cola/widgets/branch.py:256 cola/widgets/remote.py:783 msgid "Pull" msgstr "プル" -#: cola/widgets/action.py:65 cola/widgets/main.py:397 +#: cola/widgets/action.py:73 cola/widgets/main.py:401 msgid "Pull..." msgstr "プル..." -#: cola/widgets/branch.py:253 cola/widgets/remote.py:593 -#: cola/widgets/remote.py:698 +#: cola/widgets/branch.py:262 cola/widgets/remote.py:628 +#: cola/widgets/remote.py:758 msgid "Push" msgstr "プッシュ" -#: cola/widgets/action.py:64 cola/widgets/main.py:392 +#: cola/widgets/action.py:70 cola/widgets/main.py:393 +msgid "Push to one or more remotes using \"git push\"" +msgstr "" + +#: cola/widgets/action.py:70 cola/widgets/main.py:392 msgid "Push..." msgstr "プッシュ…" -#: cola/guicmds.py:252 +#: cola/guicmds.py:251 msgid "Quick Open Repository" msgstr "" -#: cola/widgets/main.py:660 +#: cola/widgets/main.py:673 msgid "Quick Open..." msgstr "" -#: cola/widgets/main.py:355 +#: cola/widgets/main.py:350 msgid "Quit" msgstr "終了" -#: cola/cmds.py:2144 cola/cmds.py:2180 cola/cmds.py:2181 cola/cmds.py:2194 -#: cola/cmds.py:2195 cola/sequenceeditor.py:158 cola/sequenceeditor.py:199 -#: cola/widgets/main.py:822 cola/widgets/remote.py:211 +#: cola/cmds.py:2095 cola/cmds.py:2131 cola/cmds.py:2132 cola/cmds.py:2145 +#: cola/cmds.py:2146 cola/sequenceeditor.py:156 cola/sequenceeditor.py:197 +#: cola/widgets/main.py:835 cola/widgets/remote.py:215 msgid "Rebase" msgstr "Rebase" -#: cola/cmds.py:2143 +#: cola/cmds.py:2094 #, python-format msgid "Rebase onto %s" msgstr "%s にrebase" -#: cola/cmds.py:2156 +#: cola/cmds.py:2107 msgid "Rebase stopped" msgstr "停止したrebase" -#: cola/widgets/remote.py:210 +#: cola/widgets/remote.py:214 msgid "Rebase the current branch instead of merging" msgstr "マージの代わりに現在ブランチをrebase" -#: cola/widgets/dag.py:419 +#: cola/widgets/dag.py:418 msgid "Rebase to this commit" msgstr "" -#: cola/widgets/main.py:1165 +#: cola/widgets/main.py:1178 msgid "Rebasing" msgstr "rebase中" -#: cola/widgets/main.py:120 +#: cola/widgets/main.py:118 msgid "Recent" msgstr "最近" -#: cola/widgets/bookmarks.py:93 +#: cola/widgets/bookmarks.py:92 msgid "Recent repositories" msgstr "最近のリポジトリ" -#: cola/widgets/prefs.py:258 +#: cola/widgets/prefs.py:279 msgid "Recent repository count" msgstr "最近のリポジトリ数" -#: cola/widgets/recent.py:46 +#: cola/widgets/recent.py:44 msgid "Recently Modified Files" msgstr "最近の修正ファイル" -#: cola/widgets/main.py:320 +#: cola/widgets/main.py:315 msgid "Recently Modified Files..." msgstr "最近の修正ファイル..." -#: cola/widgets/stash.py:256 +#: cola/widgets/stash.py:274 msgid "Recovering a dropped stash is not possible." msgstr "ドロップしたスタッシュの回復をはできません。" -#: cola/widgets/createbranch.py:283 +#: cola/widgets/createbranch.py:281 msgid "Recovering lost commits may not be easy." msgstr "失なわれたコミットを回復するのは簡単ではありません。" -#: cola/widgets/main.py:737 +#: cola/widgets/main.py:750 msgid "Redo" msgstr "やり直し" -#: cola/widgets/clone.py:121 +#: cola/widgets/clone.py:119 msgid "Reduce commit history to minimum" msgstr "コミット履歴を最小に減らす" -#: cola/widgets/submodules.py:121 +#: cola/widgets/submodules.py:120 msgid "Reference Repository" msgstr "参照リポジトリ" -#: cola/widgets/submodules.py:105 +#: cola/widgets/submodules.py:104 msgid "Reference URL" msgstr "参照URL" -#: cola/widgets/submodules.py:106 +#: cola/widgets/submodules.py:105 msgid "Reference repository to use when cloning (optional)" msgstr "clone時に使用する参照リポジトリ(任意)" -#: cola/cmds.py:2222 cola/qtutils.py:770 cola/widgets/action.py:62 -#: cola/widgets/dag.py:792 cola/widgets/editremotes.py:85 -#: cola/widgets/grep.py:105 cola/widgets/recent.py:116 -#: cola/widgets/submodules.py:45 +#: cola/cmds.py:2173 cola/qtutils.py:801 cola/widgets/action.py:63 +#: cola/widgets/dag.py:858 cola/widgets/editremotes.py:84 +#: cola/widgets/grep.py:103 cola/widgets/recent.py:114 +#: cola/widgets/submodules.py:44 msgid "Refresh" msgstr "再読み込み" -#: cola/widgets/remote.py:179 +#: cola/widgets/remote.py:183 msgid "Refuse to merge unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward" msgstr "現在のHEADが既に最新ではないまたはマージがファーストフォワードとして解決されない限りマージを拒否する。" -#: cola/widgets/branch.py:173 cola/widgets/branch.py:225 -#: cola/widgets/branch.py:269 cola/widgets/branch.py:470 -#: cola/widgets/compare.py:54 cola/widgets/compare.py:59 -#: cola/widgets/remote.py:147 +#: cola/widgets/branch.py:177 cola/widgets/branch.py:236 +#: cola/widgets/branch.py:278 cola/widgets/branch.py:513 +#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/remote.py:145 msgid "Remote" msgstr "リモート" -#: cola/widgets/remote.py:162 +#: cola/widgets/remote.py:160 msgid "Remote Branch" msgstr "リモートブランチ" -#: cola/cmds.py:1196 +#: cola/cmds.py:1197 msgid "Remote Branch Deleted" msgstr "リモートブランチ削除" -#: cola/widgets/editremotes.py:49 +#: cola/widgets/log.py:99 +msgid "Remote Messages" +msgstr "" + +#: cola/widgets/editremotes.py:48 msgid "Remote git repositories - double-click to rename" msgstr "リモートgitリポジトリ - ダブルクリックして名前の変更" -#: cola/cmds.py:1029 cola/widgets/patch.py:107 cola/widgets/patch.py:122 -#: cola/widgets/startup.py:265 cola/widgets/status.py:1382 +#: cola/cmds.py:1030 cola/widgets/diff.py:1701 cola/widgets/diff.py:1716 +#: cola/widgets/startup.py:264 cola/widgets/status.py:1383 msgid "Remove" msgstr "削除" -#: cola/cmds.py:1027 +#: cola/cmds.py:1028 #, python-format msgid "Remove %s from the recent list?" msgstr "最近のリストから %s を削除しますか?" -#: cola/widgets/toolbar.py:316 +#: cola/widgets/toolbar.py:321 msgid "Remove Element" msgstr "要素の削除" -#: cola/widgets/remote.py:206 +#: cola/widgets/remote.py:210 msgid "Remove remote-tracking branches that no longer exist on the remote" msgstr "リモートリポジトリ上に今は存在するしないブランチのリモートトラッキングを削除する" -#: cola/widgets/patch.py:109 +#: cola/widgets/diff.py:1703 msgid "Remove selected (Delete)" msgstr "選択したものを削除 (Delete)" -#: cola/widgets/bookmarks.py:258 cola/widgets/startup.py:379 +#: cola/widgets/bookmarks.py:257 cola/widgets/startup.py:378 msgid "Remove stale entries for repositories that no longer exist" msgstr "" -#: cola/guicmds.py:333 cola/widgets/browse.py:159 +#: cola/guicmds.py:332 cola/widgets/browse.py:159 cola/widgets/stash.py:44 msgid "Rename" msgstr "名前変更" -#: cola/cmds.py:1153 +#: cola/cmds.py:1154 #, python-format msgid "Rename \"%s\"" msgstr "\"%s\" の名前を変更" -#: cola/widgets/branch.py:259 +#: cola/widgets/branch.py:268 msgid "Rename Branch" msgstr "ブランチの名前変更" -#: cola/widgets/main.py:570 +#: cola/widgets/main.py:583 msgid "Rename Branch..." msgstr "ブランチの名前変更中..." -#: cola/guicmds.py:330 +#: cola/guicmds.py:329 msgid "Rename Existing Branch" msgstr "存在するブランチの名前変更" -#: cola/cmds.py:944 +#: cola/cmds.py:942 msgid "Rename Remote" msgstr "リモートの名前変更" -#: cola/widgets/bookmarks.py:233 cola/widgets/startup.py:356 +#: cola/widgets/bookmarks.py:232 cola/widgets/startup.py:355 msgid "Rename Repository" msgstr "リポジトリの名前変更" -#: cola/widgets/branch.py:445 +#: cola/widgets/stash.py:218 +msgid "Rename Stash" +msgstr "" + +#: cola/widgets/branch.py:478 msgid "Rename branch" msgstr "ブランチの名前変更" -#: cola/cmds.py:945 +#: cola/cmds.py:943 #, python-format msgid "Rename remote \"%(current)s\" to \"%(new)s\"?" msgstr "リモートの\"%(current)s\" を \"%(new)s\" と名前を変更しますか?" @@ -2815,179 +2913,183 @@ msgstr "リモートの\"%(current)s\" を \"%(new)s\" と名前を変更しま msgid "Rename selected paths" msgstr "選択したパスの名前を変更" -#: cola/app.py:497 cola/widgets/startup.py:262 +#: cola/widgets/stash.py:45 +msgid "Rename the selected stash" +msgstr "" + +#: cola/app.py:500 cola/widgets/startup.py:261 msgid "Repository Not Found" msgstr "リポジトリが見付かりません" -#: cola/widgets/browse.py:87 cola/widgets/main.py:1095 +#: cola/widgets/browse.py:87 cola/widgets/main.py:1108 #, python-format msgid "Repository: %s" msgstr "リポジトリ: %s" -#: cola/guicmds.py:351 cola/widgets/createbranch.py:125 cola/widgets/dag.py:331 -#: cola/widgets/editremotes.py:58 cola/widgets/main.py:832 +#: cola/guicmds.py:350 cola/widgets/createbranch.py:123 cola/widgets/dag.py:330 +#: cola/widgets/editremotes.py:57 cola/widgets/main.py:845 msgid "Reset" msgstr "リセット" -#: cola/widgets/createbranch.py:286 +#: cola/widgets/createbranch.py:284 #, python-format msgid "Reset \"%(branch)s\" to \"%(revision)s\"?" msgstr "ブランチの \"%(branch)s\" を \"%(revision)s\" リビジョンにリセットしますか？" -#: cola/guicmds.py:359 +#: cola/guicmds.py:358 msgid "Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/cmds.py:655 cola/cmds.py:706 cola/guicmds.py:342 -#: cola/widgets/createbranch.py:295 +#: cola/cmds.py:657 cola/cmds.py:708 cola/guicmds.py:341 +#: cola/widgets/createbranch.py:293 msgid "Reset Branch" msgstr "ブランチのリセット" -#: cola/cmds.py:703 cola/guicmds.py:341 cola/widgets/dag.py:425 -#: cola/widgets/main.py:419 +#: cola/cmds.py:705 cola/guicmds.py:340 cola/widgets/dag.py:424 +#: cola/widgets/main.py:431 msgid "Reset Branch (Soft)" msgstr "" -#: cola/cmds.py:652 cola/guicmds.py:350 cola/widgets/dag.py:431 -#: cola/widgets/main.py:426 +#: cola/cmds.py:654 cola/guicmds.py:349 cola/widgets/dag.py:430 +#: cola/widgets/main.py:439 msgid "Reset Branch and Stage (Mixed)" msgstr "" -#: cola/widgets/createbranch.py:292 +#: cola/widgets/createbranch.py:290 msgid "Reset Branch?" msgstr "ブランチをリセットしますか?" -#: cola/widgets/main.py:655 +#: cola/widgets/main.py:668 msgid "Reset Layout" msgstr "レイアウトのリセット" -#: cola/cmds.py:687 +#: cola/cmds.py:689 msgid "Reset Worktree and Reset All?" msgstr "" -#: cola/cmds.py:672 cola/cmds.py:689 cola/cmds.py:723 cola/guicmds.py:360 -#: cola/guicmds.py:373 cola/guicmds.py:382 +#: cola/cmds.py:674 cola/cmds.py:691 cola/cmds.py:725 cola/guicmds.py:359 +#: cola/guicmds.py:372 cola/guicmds.py:381 msgid "Reset and Restore" msgstr "" -#: cola/cmds.py:704 +#: cola/cmds.py:706 msgid "Reset branch?" msgstr "" -#: cola/widgets/createbranch.py:266 +#: cola/widgets/createbranch.py:264 #, python-format msgid "Resetting \"%(branch)s\" to \"%(revision)s\" will lose commits." msgstr "\"%(branch)s\" ブランチを \"%(revision)s\" リビジョンにリセットするとコミットが失われます。" -#: cola/widgets/prefs.py:264 +#: cola/widgets/prefs.py:285 msgid "Resize File Browser columns" msgstr "" -#: cola/widgets/prefs.py:374 +#: cola/widgets/prefs.py:412 msgid "Restart the application after changing appearance settings." msgstr "外観の設定を変更後にこのアプリケーションを再起動します。" -#: cola/cmds.py:757 cola/cmds.py:760 cola/guicmds.py:390 cola/guicmds.py:391 -#: cola/widgets/dag.py:461 cola/widgets/main.py:457 +#: cola/cmds.py:759 cola/cmds.py:762 cola/guicmds.py:389 cola/guicmds.py:390 +#: cola/widgets/dag.py:460 cola/widgets/main.py:471 msgid "Restore Worktree" msgstr "" -#: cola/cmds.py:720 cola/guicmds.py:381 cola/widgets/dag.py:454 -#: cola/widgets/main.py:450 +#: cola/cmds.py:722 cola/guicmds.py:380 cola/widgets/dag.py:453 +#: cola/widgets/main.py:463 msgid "Restore Worktree and Reset All (Hard)" msgstr "" -#: cola/cmds.py:669 cola/widgets/main.py:434 +#: cola/cmds.py:671 cola/widgets/main.py:447 msgid "Restore Worktree and Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/widgets/dag.py:438 +#: cola/widgets/dag.py:437 msgid "Restore Worktree and Reset All (Keep Unstaged Edits)" msgstr "" -#: cola/cmds.py:686 cola/guicmds.py:372 cola/widgets/dag.py:446 -#: cola/widgets/main.py:442 +#: cola/cmds.py:688 cola/guicmds.py:371 cola/widgets/dag.py:445 +#: cola/widgets/main.py:455 msgid "Restore Worktree and Reset All (Merge)" msgstr "" -#: cola/cmds.py:721 +#: cola/cmds.py:723 msgid "Restore Worktree and Reset All?" msgstr "" -#: cola/cmds.py:758 +#: cola/cmds.py:760 #, python-format msgid "Restore Worktree to %s?" msgstr "" -#: cola/cmds.py:670 +#: cola/cmds.py:672 msgid "Restore worktree, reset, and preserve unstaged edits?" msgstr "" -#: cola/widgets/dag.py:390 +#: cola/widgets/dag.py:389 msgid "Revert" msgstr "リバート" -#: cola/widgets/diff.py:1153 +#: cola/widgets/diff.py:1227 msgid "Revert Diff Hunk" msgstr "差分のリバート" -#: cola/widgets/diff.py:1018 +#: cola/widgets/diff.py:1057 msgid "Revert Diff Hunk..." msgstr "差分のリバート…" -#: cola/widgets/diff.py:1152 +#: cola/widgets/diff.py:1226 msgid "Revert Diff Hunk?" msgstr "差分をリバートしますか?" -#: cola/widgets/diff.py:1150 +#: cola/widgets/diff.py:1224 msgid "Revert Selected Lines" msgstr "選択行のリバート" -#: cola/widgets/diff.py:1013 +#: cola/widgets/diff.py:1052 msgid "Revert Selected Lines..." msgstr "選択行のリバート…" -#: cola/widgets/diff.py:1149 +#: cola/widgets/diff.py:1223 msgid "Revert Selected Lines?" msgstr "選択行をリバートしますか？" -#: cola/cmds.py:2311 +#: cola/cmds.py:2262 msgid "Revert Uncommitted Changes" msgstr "コミットしていない変更のリバート" -#: cola/cmds.py:2305 +#: cola/cmds.py:2256 msgid "Revert Uncommitted Changes?" msgstr "コミットしていない変更をリバートしますか？" -#: cola/cmds.py:2298 +#: cola/cmds.py:2249 msgid "Revert Uncommitted Edits..." msgstr "コミットしていない編集のリバート…" -#: cola/cmds.py:2289 +#: cola/cmds.py:2240 msgid "Revert Unstaged Changes" msgstr "ステージングしていない変更のリバート" -#: cola/cmds.py:2283 +#: cola/cmds.py:2234 msgid "Revert Unstaged Changes?" msgstr "ステージングしていない変更をリバートしますか？" -#: cola/cmds.py:2275 +#: cola/cmds.py:2226 msgid "Revert Unstaged Edits..." msgstr "ステージングしていない編集のリバート…" -#: cola/cmds.py:598 +#: cola/cmds.py:599 msgid "Revert failed" msgstr "" -#: cola/cmds.py:2310 cola/widgets/diff.py:1161 +#: cola/cmds.py:2261 cola/widgets/diff.py:1235 msgid "Revert the uncommitted changes?" msgstr "コミットしていない変更をリバートしますか？" -#: cola/cmds.py:2288 +#: cola/cmds.py:2239 msgid "Revert the unstaged changes?" msgstr "ステージングしていない変更をリバートしますか？" -#: cola/widgets/browse.py:189 +#: cola/widgets/browse.py:190 msgid "Revert uncommitted changes to selected paths" msgstr "コミットしていない変更を選択パスへリバート" @@ -2995,243 +3097,247 @@ msgstr "コミットしていない変更を選択パスへリバート" msgid "Revert unstaged changes to selected paths" msgstr "ステージングしていない変更を選択パスへリバート" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Review" msgstr "レビュー" -#: cola/widgets/main.py:583 +#: cola/widgets/main.py:596 msgid "Review..." msgstr "レビュー..." -#: cola/widgets/cfgactions.py:233 cola/widgets/createtag.py:84 +#: cola/widgets/cfgactions.py:231 cola/widgets/createtag.py:82 msgid "Revision" msgstr "リビジョン" -#: cola/widgets/selectcommits.py:62 +#: cola/widgets/selectcommits.py:61 msgid "Revision Expression:" msgstr "リビジョン表現:" -#: cola/widgets/merge.py:39 cola/widgets/merge.py:42 +#: cola/widgets/merge.py:37 cola/widgets/merge.py:40 msgid "Revision to Merge" msgstr "マージするリビジョン" -#: cola/sequenceeditor.py:351 +#: cola/sequenceeditor.py:347 msgid "Reword" msgstr "書き直し" -#: cola/cmds.py:776 cola/widgets/commitmsg.py:456 +#: cola/cmds.py:778 cola/widgets/commitmsg.py:464 msgid "Rewrite Published Commit?" msgstr "発行済コミットを書き直しますか?" -#: cola/widgets/log.py:31 +#: cola/widgets/log.py:31 cola/widgets/log.py:133 msgid "Right-click links to open:" msgstr "" -#: cola/interaction.py:127 cola/widgets/cfgactions.py:245 +#: cola/interaction.py:125 cola/widgets/cfgactions.py:243 msgid "Run" msgstr "実行" -#: cola/cmds.py:2341 +#: cola/cmds.py:2292 #, python-format msgid "Run \"%s\"?" msgstr "\"%s\"を実行しますか？" -#: cola/interaction.py:124 +#: cola/interaction.py:122 #, python-format msgid "Run %s?" msgstr "%sを実行しますか？" -#: cola/interaction.py:125 +#: cola/interaction.py:123 #, python-format msgid "Run the \"%s\" command?" msgstr "\"%s\"コマンドを実行しますか？" -#: cola/cmds.py:2380 +#: cola/cmds.py:2331 #, python-format msgid "Running command: %s" msgstr "コマンド %s を実行中..." -#: cola/widgets/about.py:422 +#: cola/widgets/about.py:405 msgid "Russian translation" msgstr "ロシア語翻訳" -#: cola/sequenceeditor.py:324 +#: cola/sequenceeditor.py:321 msgid "SHA-1" msgstr "SHA-1" -#: cola/widgets/prefs.py:183 +#: cola/widgets/prefs.py:205 msgid "Safe Mode" msgstr "セーフモード" -#: cola/cmds.py:2167 cola/widgets/archive.py:126 cola/widgets/browse.py:609 -#: cola/widgets/editremotes.py:54 cola/widgets/stash.py:52 -#: cola/widgets/status.py:1388 +#: cola/cmds.py:2118 cola/widgets/archive.py:124 cola/widgets/browse.py:610 +#: cola/widgets/editremotes.py:53 cola/widgets/stash.py:54 +#: cola/widgets/status.py:1389 msgid "Save" msgstr "保存" -#: cola/widgets/archive.py:113 +#: cola/widgets/archive.py:111 msgid "Save Archive" msgstr "アーカイブ保存" -#: cola/widgets/dag.py:382 cola/widgets/main.py:351 +#: cola/widgets/dag.py:381 cola/widgets/main.py:346 msgid "Save As Tarball/Zip..." msgstr "Tarball/Zip形式で保存する" -#: cola/widgets/prefs.py:263 +#: cola/widgets/prefs.py:284 msgid "Save GUI Settings" msgstr "GUI設定を保存する" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Save Stash" msgstr "スタッシュを保存する" -#: cola/widgets/stash.py:53 +#: cola/widgets/stash.py:55 msgid "Save modified state to new stash" msgstr "修正した状態を新しいスタッシュで保存する" -#: cola/widgets/browse.py:570 +#: cola/widgets/browse.py:571 #, python-format msgid "Saved \"%(filename)s\" from \"%(ref)s\" to \"%(destination)s\"" msgstr "\"%(ref)s\" から \"%(destination)s\" に \"%(filename)s\" を保存する" -#: cola/widgets/bookmarks.py:83 cola/widgets/grep.py:98 -#: cola/widgets/search.py:42 cola/widgets/search.py:62 +#: cola/widgets/bookmarks.py:82 cola/widgets/grep.py:96 +#: cola/widgets/search.py:41 cola/widgets/search.py:61 msgid "Search" msgstr "検索" -#: cola/widgets/search.py:226 +#: cola/widgets/search.py:225 msgid "Search Authors" msgstr "著者を検索" -#: cola/widgets/search.py:224 +#: cola/widgets/search.py:223 msgid "Search Commit Messages" msgstr "コミットメッセージを検索" -#: cola/widgets/search.py:227 +#: cola/widgets/search.py:226 msgid "Search Committers" msgstr "コミッターを検索" -#: cola/widgets/search.py:228 +#: cola/widgets/search.py:227 msgid "Search Date Range" msgstr "検索日時の範囲" -#: cola/widgets/search.py:225 +#: cola/widgets/search.py:224 msgid "Search Diffs" msgstr "差分検索" -#: cola/widgets/search.py:222 +#: cola/widgets/search.py:221 msgid "Search by Expression" msgstr "表現による検索" -#: cola/widgets/search.py:223 +#: cola/widgets/search.py:222 msgid "Search by Path" msgstr "パスによる検索" -#: cola/widgets/grep.py:124 +#: cola/widgets/dag.py:494 +msgid "Search commit messages" +msgstr "" + +#: cola/widgets/grep.py:122 msgid "Search for a fixed string" msgstr "固定文字列検索" -#: cola/widgets/diff.py:519 cola/widgets/diff.py:1514 +#: cola/widgets/diff.py:526 cola/widgets/diff.py:1576 msgid "Search in Diff" msgstr "" -#: cola/guicmds.py:253 cola/widgets/bookmarks.py:62 +#: cola/guicmds.py:252 cola/widgets/bookmarks.py:61 msgid "Search repositories by name..." msgstr "" -#: cola/widgets/grep.py:122 +#: cola/widgets/grep.py:120 msgid "Search using a POSIX basic regular expression" msgstr "POSIX基本正規表現検索" -#: cola/widgets/grep.py:123 +#: cola/widgets/grep.py:121 msgid "Search using a POSIX extended regular expression" msgstr "POSIX拡張正規表現検索" -#: cola/widgets/main.py:493 +#: cola/widgets/main.py:506 msgid "Search..." msgstr "検索中..." -#: cola/widgets/selectcommits.py:67 +#: cola/widgets/selectcommits.py:66 msgid "Search:" msgstr "" -#: cola/guicmds.py:330 cola/widgets/selectcommits.py:74 +#: cola/guicmds.py:329 cola/widgets/selectcommits.py:73 msgid "Select" msgstr "選択" -#: cola/widgets/main.py:750 +#: cola/widgets/main.py:763 msgid "Select All" msgstr "全て選択" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Select Branch to Review" msgstr "レビュー対象のブランチを選択" -#: cola/widgets/dag.py:1610 +#: cola/widgets/dag.py:1667 msgid "Select Child" msgstr "子を選択" -#: cola/widgets/commitmsg.py:512 +#: cola/widgets/commitmsg.py:538 msgid "Select Commit" msgstr "コミットを選択" -#: cola/guicmds.py:137 +#: cola/guicmds.py:136 msgid "Select Directory..." msgstr "ディレクトリを選択..." -#: cola/cmds.py:2129 +#: cola/cmds.py:2080 msgid "Select New Upstream" msgstr "新しいアップストリームを選択" -#: cola/widgets/dag.py:1614 +#: cola/widgets/dag.py:1671 msgid "Select Newest Child" msgstr "最新の子を選択" -#: cola/widgets/dag.py:1604 +#: cola/widgets/dag.py:1661 msgid "Select Oldest Parent" msgstr "最古の親を選択" -#: cola/widgets/dag.py:1599 +#: cola/widgets/dag.py:1656 msgid "Select Parent" msgstr "親を選択" -#: cola/widgets/browse.py:525 +#: cola/widgets/browse.py:526 msgid "Select Previous Version" msgstr "以前のバージョンを選択" -#: cola/widgets/clone.py:197 +#: cola/widgets/clone.py:195 msgid "Select a parent directory for the new clone" msgstr "新しいクローン用に親ディレクトリを選択" -#: cola/widgets/standard.py:756 cola/widgets/standard.py:779 +#: cola/widgets/standard.py:826 cola/widgets/standard.py:848 msgid "Select directory" msgstr "" -#: cola/widgets/selectcommits.py:162 +#: cola/widgets/selectcommits.py:161 msgid "Select output dir" msgstr "出力ディレクトリを選択" -#: cola/widgets/selectcommits.py:183 +#: cola/widgets/selectcommits.py:182 msgid "Select output directory" msgstr "出力ディレクトリを選択" -#: cola/widgets/patch.py:175 +#: cola/widgets/diff.py:1769 msgid "Select patch file(s)..." msgstr "パッチファイルを選択..." -#: cola/widgets/editremotes.py:437 +#: cola/widgets/editremotes.py:435 msgid "Select repository" msgstr "リポジトリを選択" -#: cola/widgets/bookmarks.py:225 cola/widgets/startup.py:348 +#: cola/widgets/bookmarks.py:224 cola/widgets/startup.py:347 msgid "Set Default Repository" msgstr "デフォルトリポジトリを設定" -#: cola/widgets/branch.py:282 +#: cola/widgets/branch.py:291 msgid "Set Upstream Branch" msgstr "アップストリームブランチを設定" -#: cola/widgets/branch.py:72 +#: cola/widgets/branch.py:74 msgid "" "Set the sort order for branches and tags.\n" "Toggle between date-based and version-name-based sorting." @@ -3239,52 +3345,56 @@ msgstr "" "ブランチやタグのソート順番を設定します。\n" "ソートを日付順とバージョン名順を切り替えます。" -#: cola/widgets/remote.py:213 +#: cola/widgets/remote.py:217 msgid "Set upstream" msgstr "アップストリームを設定" -#: cola/widgets/prefs.py:405 +#: cola/widgets/prefs.py:443 msgid "Settings" msgstr "設定" -#: cola/widgets/grep.py:142 +#: cola/widgets/grep.py:140 msgid "Shell arguments" msgstr "シェル引数" -#: cola/sequenceeditor.py:375 +#: cola/sequenceeditor.py:371 msgid "Shift Down" msgstr "シフトダウン" -#: cola/sequenceeditor.py:379 +#: cola/sequenceeditor.py:375 msgid "Shift Up" msgstr "シフトアップ" -#: cola/widgets/about.py:499 +#: cola/widgets/about.py:482 msgid "Shortcuts" msgstr "ショートカット" -#: cola/widgets/prefs.py:179 +#: cola/widgets/prefs.py:201 msgid "Show Diffstat After Merge" msgstr "マージ後に diffstat を表示" -#: cola/widgets/prefs.py:178 +#: cola/widgets/prefs.py:200 msgid "Show Full Paths in the Window Title" msgstr "ウィンドウタイトルにフルパスを表示" -#: cola/sequenceeditor.py:106 cola/widgets/finder.py:187 -#: cola/widgets/status.py:1384 +#: cola/sequenceeditor.py:104 cola/widgets/finder.py:186 +#: cola/widgets/status.py:1385 msgid "Show Help" msgstr "ヘルプの表示" -#: cola/widgets/filelist.py:30 +#: cola/widgets/filelist.py:27 msgid "Show History" msgstr "履歴の表示" -#: cola/widgets/prefs.py:348 +#: cola/widgets/prefs.py:368 msgid "Show file counts in Status titles" msgstr "ステータスタイトリにファイル数を表示" -#: cola/sequenceeditor.py:171 cola/widgets/finder.py:138 +#: cola/widgets/diff.py:794 +msgid "Show filenames" +msgstr "" + +#: cola/sequenceeditor.py:169 cola/widgets/finder.py:137 msgid "" "Show help\n" "Shortcut: ?" @@ -3292,137 +3402,145 @@ msgstr "" "ヘルプの表示\n" "ショートカット: ?" -#: cola/widgets/diff.py:765 +#: cola/widgets/diff.py:792 msgid "Show line numbers" msgstr "行数の表示" -#: cola/widgets/diff.py:761 +#: cola/widgets/remote.py:175 +msgid "Show remote messages" +msgstr "" + +#: cola/widgets/diff.py:789 msgid "Show whole surrounding functions of changes" msgstr "変更を含む関数全体を表示" -#: cola/widgets/recent.py:58 +#: cola/widgets/recent.py:56 msgid "Showing changes since" msgstr "期日以降の変更の表示 :" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "Side by side" msgstr "サイドバイサイド表示" -#: cola/cmds.py:2512 +#: cola/cmds.py:2463 msgid "Sign Off" msgstr "署名" -#: cola/widgets/createtag.py:71 +#: cola/widgets/createtag.py:69 msgid "Sign Tag" msgstr "署名されたタグ" -#: cola/widgets/commitmsg.py:55 +#: cola/widgets/commitmsg.py:56 msgid "Sign off on this commit" msgstr "このコミットの署名をOFFにする" -#: cola/widgets/about.py:412 cola/widgets/about.py:425 +#: cola/widgets/about.py:395 cola/widgets/about.py:408 msgid "Simplified Chinese translation" msgstr "簡体字中国語翻訳" -#: cola/cmds.py:2587 +#: cola/cmds.py:2529 msgid "Skip" msgstr "スキップ" -#: cola/widgets/main.py:264 cola/widgets/main.py:617 +#: cola/widgets/main.py:260 cola/widgets/main.py:630 msgid "Skip Current Patch" msgstr "現在のパスをスキップ" -#: cola/widgets/main.py:267 +#: cola/widgets/main.py:261 msgid "Skip applying the current patch and continue applying patches" msgstr "" -#: cola/widgets/prefs.py:261 +#: cola/widgets/prefs.py:282 msgid "Sort bookmarks alphabetically" msgstr "ブックマークをアルファベット順にソート" -#: cola/widgets/about.py:413 cola/widgets/about.py:436 -#: cola/widgets/about.py:440 +#: cola/widgets/about.py:396 cola/widgets/about.py:419 +#: cola/widgets/about.py:423 msgid "Spanish translation" msgstr "スペイン語翻訳" -#: cola/widgets/createtag.py:88 +#: cola/widgets/createtag.py:86 msgid "Specifies the SHA-1 to tag" msgstr "タグにSHA-1を指定する" -#: cola/widgets/createtag.py:81 +#: cola/widgets/createtag.py:79 msgid "Specifies the tag message" msgstr "タグメッセージを指定する" -#: cola/widgets/createtag.py:65 +#: cola/widgets/createtag.py:63 msgid "Specifies the tag name" msgstr "タグ名を指定する" -#: cola/widgets/spellcheck.py:46 +#: cola/widgets/spellcheck.py:45 msgid "Spelling Suggestions" msgstr "スペルの提案" -#: cola/sequenceeditor.py:369 cola/widgets/merge.py:58 +#: cola/sequenceeditor.py:365 cola/widgets/merge.py:56 msgid "Squash" msgstr "スカッシュ" -#: cola/widgets/merge.py:57 +#: cola/widgets/merge.py:55 msgid "Squash the merged commits into a single commit" msgstr "複数のマージコミットを一つのコミットにまとめる(スカッシュ)" -#: cola/cmds.py:2598 cola/widgets/action.py:60 cola/widgets/diff.py:982 +#: cola/cmds.py:2540 cola/widgets/action.py:58 cola/widgets/diff.py:1168 msgid "Stage" msgstr "ステージ" -#: cola/cmds.py:2753 +#: cola/cmds.py:2699 msgid "Stage / Unstage" msgstr "ステージ / ステージ解除" -#: cola/cmds.py:2735 +#: cola/cmds.py:2681 msgid "Stage / Unstage All" msgstr "一括ステージ / 一括ステージ解除" -#: cola/widgets/diff.py:1016 +#: cola/widgets/diff.py:1055 msgid "Stage Diff Hunk" msgstr "差分のステージング" -#: cola/cmds.py:2691 +#: cola/cmds.py:2633 msgid "Stage Modified" msgstr "修正のステージング" -#: cola/cmds.py:2724 +#: cola/cmds.py:2670 msgid "Stage Modified and Untracked" msgstr "修正と未追跡のステージング" -#: cola/widgets/status.py:872 cola/widgets/status.py:894 -#: cola/widgets/status.py:962 +#: cola/widgets/status.py:873 cola/widgets/status.py:895 +#: cola/widgets/status.py:963 msgid "Stage Selected" msgstr "選択分のステージング" -#: cola/widgets/diff.py:1011 +#: cola/widgets/diff.py:1050 msgid "Stage Selected Lines" msgstr "選択行のステージング" -#: cola/cmds.py:2702 +#: cola/cmds.py:2644 msgid "Stage Unmerged" msgstr "非マージ分のステージング" -#: cola/cmds.py:2713 +#: cola/cmds.py:2655 msgid "Stage Untracked" msgstr "未追跡のステージング" -#: cola/widgets/commitmsg.py:438 +#: cola/widgets/commitmsg.py:446 msgid "Stage and Commit" msgstr "ステージングとコミット" -#: cola/widgets/commitmsg.py:435 +#: cola/widgets/commitmsg.py:443 msgid "Stage and commit?" msgstr "ステージングとコミットをしますか？" -#: cola/cmds.py:2586 +#: cola/widgets/action.py:58 +msgid "Stage changes using \"git add\"" +msgstr "" + +#: cola/cmds.py:2528 msgid "Stage conflicts" msgstr "コンフリクトのステージング" -#: cola/cmds.py:2577 +#: cola/cmds.py:2519 msgid "Stage conflicts?" msgstr "コンフリクトのステージングしますか？" @@ -3430,45 +3548,45 @@ msgstr "コンフリクトのステージングしますか？" msgid "Stage/unstage selected paths for commit" msgstr "選択したパスのステージングまたは登録解除" -#: cola/models/browse.py:334 cola/widgets/status.py:156 -#: cola/widgets/status.py:620 +#: cola/models/browse.py:333 cola/widgets/status.py:156 +#: cola/widgets/status.py:621 msgid "Staged" msgstr "ステージ済" -#: cola/cmds.py:2605 +#: cola/cmds.py:2547 #, python-format msgid "Staging: %s" msgstr "%s をステージしています…" -#: cola/widgets/main.py:597 +#: cola/widgets/main.py:610 msgid "Start Interactive Rebase..." msgstr "インタラクティブリベースを開始する..." -#: cola/widgets/createbranch.py:107 +#: cola/widgets/createbranch.py:105 msgid "Starting Revision" msgstr "初期リビジョン" -#: cola/widgets/stash.py:40 +#: cola/widgets/stash.py:36 msgid "Stash" msgstr "スタッシュ" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash Index" msgstr "インデックスのスタッシュ" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash staged changes only" msgstr "ステージされた変更のみをスタッシュ" -#: cola/widgets/stash.py:73 +#: cola/widgets/stash.py:75 msgid "Stash unstaged changes only, keeping staged changes" msgstr "ステージされていない変更のみをスタッシュ、ステージされた変更を維持" -#: cola/widgets/action.py:66 cola/widgets/main.py:414 +#: cola/widgets/action.py:76 cola/widgets/main.py:422 msgid "Stash..." msgstr "スタッシュ中..." -#: cola/models/browse.py:33 cola/widgets/main.py:102 +#: cola/models/browse.py:32 cola/widgets/main.py:100 msgid "Status" msgstr "ステータス" @@ -3476,128 +3594,136 @@ msgstr "ステータス" msgid "Stop tracking paths" msgstr "パスのトラッキングを中止する" -#: cola/widgets/submodules.py:82 +#: cola/widgets/submodules.py:81 msgid "Submodule URL (can be relative, ex: ../repo.git)" msgstr "サブモジュールのURL(取得可能なもの、例: ../repo.git)" -#: cola/widgets/submodules.py:90 +#: cola/widgets/submodules.py:89 msgid "Submodule branch to track (optional)" msgstr "追跡するサブモジュールのブランチ(任意)" -#: cola/widgets/submodules.py:86 +#: cola/widgets/submodules.py:85 msgid "Submodule path within the current repository (optional)" msgstr "現在のリポジトリ内のサブモジュールのパス (任意)" -#: cola/widgets/main.py:143 cola/widgets/submodules.py:32 +#: cola/widgets/main.py:141 cola/widgets/submodules.py:31 msgid "Submodules" msgstr "サブモジュール" -#: cola/widgets/prefs.py:174 +#: cola/widgets/prefs.py:196 msgid "Summarize Merge Commits" msgstr "マージコミットの要約" -#: cola/sequenceeditor.py:325 cola/widgets/dag.py:506 +#: cola/sequenceeditor.py:322 cola/widgets/dag.py:572 msgid "Summary" msgstr "要約" -#: cola/widgets/prefs.py:168 +#: cola/widgets/prefs.py:273 msgid "Tab Width" msgstr "タグ幅" -#: cola/widgets/cfgactions.py:229 cola/widgets/createbranch.py:116 -#: cola/widgets/merge.py:48 +#: cola/widgets/cfgactions.py:227 cola/widgets/createbranch.py:114 +#: cola/widgets/merge.py:46 msgid "Tag" msgstr "タグ" -#: cola/cmds.py:2842 +#: cola/cmds.py:2788 msgid "Tag Created" msgstr "作成されたタグ" -#: cola/widgets/createtag.py:80 +#: cola/widgets/createtag.py:78 msgid "Tag message..." msgstr "タグメッセージ..." -#: cola/cmds.py:2802 +#: cola/cmds.py:2748 msgid "Tag-signing was requested but the tag message is empty." msgstr "タグの署名が要求されていますが、タグメッセージが空です。" -#: cola/widgets/branch.py:179 cola/widgets/branch.py:238 +#: cola/widgets/branch.py:183 cola/widgets/branch.py:248 msgid "Tags" msgstr "タグ" -#: cola/widgets/toolbar.py:180 +#: cola/widgets/action.py:78 cola/widgets/main.py:423 +msgid "Temporarily stash away uncommitted changes using \"git stash\"" +msgstr "" + +#: cola/widgets/toolbar.py:184 msgid "Text Beside Icon" msgstr "" -#: cola/widgets/toolbar.py:179 +#: cola/widgets/toolbar.py:183 msgid "Text Only" msgstr "" -#: cola/widgets/toolbar.py:181 +#: cola/widgets/toolbar.py:185 msgid "Text Under Icon" msgstr "" -#: cola/widgets/prefs.py:169 +#: cola/widgets/prefs.py:272 msgid "Text Width" msgstr "テキスト幅" -#: cola/cmds.py:1116 +#: cola/cmds.py:1117 msgid "The branch will be no longer available." msgstr "このブランチはもう利用できません。" -#: cola/cmds.py:648 +#: cola/cmds.py:650 #, python-format msgid "The branch will be reset using \"git reset --mixed %s\"" msgstr "このブランチは\"git reset --mixed %s\"でリセットする。" -#: cola/cmds.py:699 cola/cmds.py:790 +#: cola/cmds.py:701 cola/cmds.py:792 #, python-format msgid "The branch will be reset using \"git reset --soft %s\"" msgstr "このブランチは\"git reset --soft %s\"でリセットする。" -#: cola/widgets/commitmsg.py:303 +#: cola/widgets/commitmsg.py:311 msgid "The commit message will be cleared." msgstr "このコミットメッセージはクリアされました。" -#: cola/widgets/prefs.py:146 +#: cola/widgets/prefs.py:169 msgid "" "The date-time format used when displaying dates in Git DAG.\n" "This value is passed to git log --date=" msgstr "" -#: cola/widgets/archive.py:208 +#: cola/widgets/archive.py:206 #, python-format msgid "The file \"%s\" exists and will be overwritten." msgstr "このファイル \"%s\"は存在します。そんため上書きされます。" -#: cola/cmds.py:1086 +#: cola/cmds.py:1087 msgid "The following files will be deleted:" msgstr "以下のファイルは削除されます。:" -#: cola/widgets/status.py:1646 +#: cola/widgets/status.py:1647 msgid "The number of leading paths to strip" msgstr "" -#: cola/cmds.py:716 +#: cola/cmds.py:718 #, python-format msgid "The repository will be reset using \"git reset --hard %s\"" msgstr "" -#: cola/cmds.py:665 +#: cola/cmds.py:667 #, python-format msgid "The repository will be reset using \"git reset --keep %s\"" msgstr "" -#: cola/cmds.py:682 +#: cola/cmds.py:684 #, python-format msgid "The repository will be reset using \"git reset --merge %s\"" msgstr "" -#: cola/cmds.py:2365 +#: cola/cmds.py:2316 msgid "The revision expression cannot be empty." msgstr "このリビジョン表記を空にできません。" -#: cola/cmds.py:3029 +#: cola/widgets/stash.py:225 +msgid "The stash has not been renamed" +msgstr "" + +#: cola/cmds.py:2975 #, python-format msgid "" "The submodule will be added using\n" @@ -3606,7 +3732,7 @@ msgstr "" "\"%s\"を使ってサブモジュールを\n" "追加します" -#: cola/cmds.py:3074 +#: cola/cmds.py:3020 #, python-format msgid "" "The submodule will be updated using\n" @@ -3615,16 +3741,16 @@ msgstr "" "\"%s\"を使ってサブモジュールを\n" "更新" -#: cola/cmds.py:736 +#: cola/cmds.py:738 #, python-format msgid "The worktree will be restored using \"git read-tree --reset -u %s\"" msgstr "" -#: cola/widgets/commitmsg.py:304 +#: cola/widgets/commitmsg.py:312 msgid "This cannot be undone. Clear commit message?" msgstr "これは元に戻せません。コミットメッセージをクリアしますか？" -#: cola/cmds.py:778 cola/widgets/commitmsg.py:458 +#: cola/cmds.py:780 cola/widgets/commitmsg.py:466 msgid "" "This commit has already been published.\n" "This operation will rewrite published history.\n" @@ -3634,7 +3760,7 @@ msgstr "" "この操作は、発行済履歴を上書きします。\n" "この操作は、あなたが望んだ操作ではない可能性が高いです。" -#: cola/widgets/diff.py:1158 +#: cola/widgets/diff.py:1232 msgid "" "This operation drops uncommitted changes.\n" "These changes cannot be recovered." @@ -3642,7 +3768,7 @@ msgstr "" "この操作は、コミットしていない変更を破棄します。\n" "これらの変更は回復できません。" -#: cola/cmds.py:2307 +#: cola/cmds.py:2258 msgid "" "This operation removes uncommitted edits from selected files.\n" "These changes cannot be recovered." @@ -3650,7 +3776,7 @@ msgstr "" "この操作は、選択されたファイルのコミットされていない編集を削除します。\n" "これらの変更は回復できません。" -#: cola/cmds.py:2285 +#: cola/cmds.py:2236 msgid "" "This operation removes unstaged edits from selected files.\n" "These changes cannot be recovered." @@ -3658,27 +3784,27 @@ msgstr "" "この操作は、選択されたファイルのステージされていない編集を削除します。\n" "これらの変更は回復できません。" -#: cola/cmds.py:475 +#: cola/cmds.py:476 msgid "" "This operation will replace the selected unmerged files with content from the branch being merged using \"git checkout --theirs\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:513 +#: cola/cmds.py:514 msgid "" "This operation will replace the selected unmerged files with content from your current branch using \"git checkout --ours\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/widgets/main.py:1109 +#: cola/widgets/main.py:1122 msgid "" "This repository has unresolved conflicts after applying a patch.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1102 +#: cola/widgets/main.py:1115 msgid "" "This repository is currently being rebased.\n" "Resolve conflicts, commit changes, and run:\n" @@ -3688,13 +3814,13 @@ msgstr "" "衝突を解決し、変更をコミットして実行します。:\n" " Rebase > Continue" -#: cola/widgets/main.py:1115 +#: cola/widgets/main.py:1128 msgid "" "This repository is in the middle of a cherry-pick.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1121 +#: cola/widgets/main.py:1134 msgid "" "This repository is in the middle of a merge.\n" "Resolve conflicts and commit changes." @@ -3714,15 +3840,15 @@ msgstr "" msgid "To avoid applying removal lines ('-'), change them to context lines (' ')." msgstr "" -#: cola/sequenceeditor.py:342 +#: cola/sequenceeditor.py:338 msgid "Toggle Enabled" msgstr "有効に切り替えます。" -#: cola/widgets/diff.py:776 +#: cola/widgets/diff.py:804 msgid "Toggle image diff" msgstr "イメージ差分を切り替えます" -#: cola/widgets/branch.py:63 +#: cola/widgets/branch.py:65 msgid "Toggle the branches filter" msgstr "ブランチフィルタを切り替えます" @@ -3730,51 +3856,51 @@ msgstr "ブランチフィルタを切り替えます" msgid "Toggle the paths filter" msgstr "パスフィルタを切り替えます" -#: cola/widgets/toolbar.py:317 +#: cola/widgets/toolbar.py:322 msgid "Toolbar Style:" msgstr "" -#: cola/widgets/cfgactions.py:228 cola/widgets/merge.py:47 +#: cola/widgets/cfgactions.py:226 cola/widgets/merge.py:45 msgid "Tracking Branch" msgstr "トラッキングブランチ" -#: cola/widgets/createbranch.py:115 +#: cola/widgets/createbranch.py:113 msgid "Tracking branch" msgstr "トラッキングブランチ" -#: cola/widgets/about.py:408 cola/widgets/about.py:434 -#: cola/widgets/about.py:445 +#: cola/widgets/about.py:391 cola/widgets/about.py:417 +#: cola/widgets/about.py:428 msgid "Traditional Chinese (Taiwan) translation" msgstr "繁体字中国語(台湾)翻訳" -#: cola/widgets/about.py:439 +#: cola/widgets/about.py:422 msgid "Translation" msgstr "翻訳" -#: cola/widgets/about.py:94 +#: cola/widgets/about.py:92 msgid "Translators" msgstr "翻訳者" -#: cola/widgets/about.py:418 cola/widgets/about.py:423 -#: cola/widgets/about.py:438 +#: cola/widgets/about.py:401 cola/widgets/about.py:406 +#: cola/widgets/about.py:421 msgid "Turkish translation" msgstr "トルコ語翻訳" -#: cola/widgets/clone.py:109 cola/widgets/editremotes.py:451 -#: cola/widgets/submodules.py:117 +#: cola/widgets/clone.py:107 cola/widgets/editremotes.py:449 +#: cola/widgets/submodules.py:116 msgid "URL" msgstr "URL" -#: cola/widgets/remote.py:463 +#: cola/widgets/remote.py:497 #, python-format msgid "URL: %s" msgstr "URL: %s" -#: cola/widgets/about.py:415 +#: cola/widgets/about.py:398 msgid "Ukranian translation" msgstr "ウクライナ語翻訳" -#: cola/cmds.py:2122 +#: cola/cmds.py:2073 msgid "Unable to rebase" msgstr "リベースできません" @@ -3783,53 +3909,58 @@ msgstr "リベースできません" msgid "Unable to set URL for \"%(name)s\" to \"%(url)s\"" msgstr "URLの\"%(name)s\" を \"%(url)s\" に設定できません。" -#: cola/widgets/diff.py:1327 +#: cola/widgets/diff.py:1401 #, python-format msgid "Unable to write patch to \"%s\". Check permissions?" msgstr "" -#: cola/widgets/main.py:735 +#: cola/widgets/main.py:748 msgid "Undo" msgstr "元に戻す" -#: cola/cmds.py:783 cola/cmds.py:788 cola/cmds.py:791 cola/widgets/main.py:208 +#: cola/cmds.py:785 cola/cmds.py:790 cola/cmds.py:793 cola/widgets/main.py:207 msgid "Undo Last Commit" msgstr "" -#: cola/cmds.py:789 +#: cola/cmds.py:791 msgid "Undo last commit?" msgstr "" -#: cola/cmds.py:782 +#: cola/cmds.py:784 msgid "Undo the published commit?" msgstr "" -#: cola/models/browse.py:328 cola/widgets/status.py:157 -#: cola/widgets/status.py:640 +#: cola/models/browse.py:327 cola/widgets/status.py:157 +#: cola/widgets/status.py:641 msgid "Unmerged" msgstr "マージされていない" -#: cola/cmds.py:2855 cola/widgets/action.py:61 cola/widgets/diff.py:985 +#: cola/cmds.py:2801 cola/widgets/action.py:61 cola/widgets/diff.py:1165 +#: cola/widgets/main.py:212 msgid "Unstage" msgstr "ステージされていない" -#: cola/widgets/main.py:203 cola/widgets/status.py:790 +#: cola/widgets/main.py:202 cola/widgets/status.py:791 msgid "Unstage All" msgstr "全てのステージを解除" -#: cola/widgets/diff.py:1061 +#: cola/widgets/diff.py:1017 msgid "Unstage Diff Hunk" msgstr "差分のステージ解除" -#: cola/widgets/status.py:823 cola/widgets/status.py:858 +#: cola/widgets/status.py:824 cola/widgets/status.py:859 msgid "Unstage Selected" msgstr "選択をステージ解除" -#: cola/widgets/diff.py:1058 +#: cola/widgets/diff.py:1015 msgid "Unstage Selected Lines" msgstr "選択行をステージ解除する" -#: cola/cmds.py:2867 +#: cola/widgets/action.py:61 +msgid "Unstage changes using \"git reset\"" +msgstr "" + +#: cola/cmds.py:2813 #, python-format msgid "Unstaging: %s" msgstr "ステージ解除: %s" @@ -3838,90 +3969,89 @@ msgstr "ステージ解除: %s" msgid "Untrack Selected" msgstr "選択を未追跡にする" -#: cola/widgets/status.py:159 cola/widgets/status.py:646 +#: cola/widgets/status.py:159 cola/widgets/status.py:647 msgid "Untracked" msgstr "未追跡" -#: cola/cmds.py:1141 cola/cmds.py:2923 +#: cola/cmds.py:1142 cola/cmds.py:2869 #, python-format msgid "Untracking: %s" msgstr "未追跡にしています: %s" -#: cola/widgets/main.py:374 +#: cola/widgets/main.py:369 msgid "Update All Submodules..." msgstr "全てのサブモジュールを更新..." -#: cola/widgets/createbranch.py:121 +#: cola/widgets/createbranch.py:119 msgid "Update Existing Branch:" msgstr "既存のブランチを更新:" -#: cola/cmds.py:3075 +#: cola/cmds.py:3021 #, fuzzy msgid "Update Submodule" msgstr "更新しました" -#: cola/cmds.py:3072 +#: cola/cmds.py:3018 msgid "Update Submodule..." msgstr "" -#: cola/cmds.py:3111 +#: cola/cmds.py:3057 #, fuzzy msgid "Update Submodules" msgstr "サブモジュールを初期化する" -#: cola/cmds.py:3109 +#: cola/cmds.py:3055 #, fuzzy msgid "Update all submodules?" msgstr "サブモジュールを初期化しますか?" -#: cola/cmds.py:2093 +#: cola/cmds.py:2044 msgid "Update stacked branches" msgstr "" -#: cola/cmds.py:2085 cola/cmds.py:2092 +#: cola/cmds.py:2036 cola/cmds.py:2043 msgid "Update stacked branches when rebasing?" msgstr "" -#: cola/cmds.py:3108 +#: cola/cmds.py:3054 #, fuzzy msgid "Update submodules..." msgstr "サブモジュールを初期化する..." -#: cola/widgets/status.py:953 +#: cola/widgets/status.py:954 #, fuzzy msgid "Update this submodule" msgstr "サブモジュールを初期化する" -#: cola/cmds.py:3073 +#: cola/cmds.py:3019 msgid "Update this submodule?" msgstr "このサブモジュールを更新しますか?" -#: cola/widgets/branch.py:421 cola/widgets/createbranch.py:302 -#: cola/widgets/remote.py:135 +#: cola/widgets/branch.py:433 cola/widgets/createbranch.py:300 msgid "Updating" msgstr "更新" -#: cola/widgets/prefs.py:350 +#: cola/widgets/prefs.py:370 msgid "Use a block cursor in diff editors" msgstr "" -#: cola/widgets/prefs.py:154 +#: cola/widgets/prefs.py:177 msgid "Use gravatar.com to lookup icons for author emails" msgstr "" -#: cola/widgets/prefs.py:166 +#: cola/widgets/prefs.py:189 msgid "User Name" msgstr "ユーザ名" -#: cola/widgets/about.py:92 +#: cola/widgets/about.py:90 msgid "Version" msgstr "バージョン" -#: cola/widgets/dag.py:800 cola/widgets/main.py:845 cola/widgets/main.py:966 +#: cola/widgets/dag.py:866 cola/widgets/main.py:858 cola/widgets/main.py:979 msgid "View" msgstr "ビュー" -#: cola/widgets/browse.py:137 cola/widgets/status.py:278 +#: cola/widgets/browse.py:137 cola/widgets/status.py:279 msgid "View History..." msgstr "ビュー履歴..." @@ -3929,39 +4059,39 @@ msgstr "ビュー履歴..." msgid "View history for selected paths" msgstr "選択パスのビュー履歴" -#: cola/widgets/merge.py:54 +#: cola/widgets/branch.py:224 cola/widgets/merge.py:52 msgid "Visualize" msgstr "可視化" -#: cola/widgets/main.py:488 +#: cola/widgets/main.py:501 msgid "Visualize All Branches..." msgstr "全てのブランチを可視化" -#: cola/widgets/main.py:482 +#: cola/widgets/main.py:495 msgid "Visualize Current Branch..." msgstr "現在ブランチを可視化" -#: cola/widgets/createtag.py:73 +#: cola/widgets/createtag.py:71 msgid "Whether to sign the tag (git tag -s)" msgstr "タグで署名した場所 (git tag -s)" -#: cola/widgets/text.py:399 +#: cola/widgets/text.py:396 msgid "Whole Words" msgstr "" -#: cola/widgets/commitmsg.py:432 +#: cola/widgets/commitmsg.py:440 msgid "Would you like to stage and commit all modified files?" msgstr "全ての修正したファイルを、ステージしてコミットしますか？" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "XOR" msgstr "XOR" -#: cola/widgets/standard.py:1064 +#: cola/widgets/standard.py:1182 msgid "Yes" msgstr "はい" -#: cola/cmds.py:256 +#: cola/cmds.py:255 msgid "" "You are in the middle of a merge.\n" "Cannot amend while merging." @@ -3969,36 +4099,36 @@ msgstr "" "マージ中です。\n" "マージ中は訂正できません。" -#: cola/cmds.py:2123 +#: cola/cmds.py:2074 msgid "You cannot rebase with uncommitted changes." msgstr "コミットされていない変更をリベースできません。" -#: cola/widgets/merge.py:227 +#: cola/widgets/merge.py:225 msgid "You must specify a revision to merge." msgstr "マージするリビジョンを指定してください。" -#: cola/widgets/merge.py:217 +#: cola/widgets/merge.py:215 msgid "You must specify a revision to view." msgstr "表示するリビジョンを指定してください。" -#: cola/widgets/dag.py:710 cola/widgets/dag.py:1588 +#: cola/widgets/dag.py:776 cola/widgets/dag.py:1645 msgid "Zoom In" msgstr "ズームイン" -#: cola/widgets/dag.py:706 cola/widgets/dag.py:1594 +#: cola/widgets/dag.py:772 cola/widgets/dag.py:1651 msgid "Zoom Out" msgstr "ズームアウト" -#: cola/widgets/dag.py:524 cola/widgets/dag.py:714 cola/widgets/dag.py:1596 -#: cola/widgets/diff.py:785 +#: cola/widgets/dag.py:590 cola/widgets/dag.py:780 cola/widgets/dag.py:1653 +#: cola/widgets/diff.py:813 msgid "Zoom to Fit" msgstr "表示幅に合わせてズーム" -#: cola/widgets/grep.py:112 +#: cola/widgets/grep.py:110 msgid "command-line arguments" msgstr "コマンドライン引数" -#: cola/widgets/main.py:932 cola/widgets/main.py:938 +#: cola/widgets/main.py:945 cola/widgets/main.py:951 msgid "error: unable to execute git" msgstr "エラー: gitを実行できません。" @@ -4007,45 +4137,41 @@ msgstr "エラー: gitを実行できません。" msgid "exit code %s" msgstr "終了コード %s" -#: cola/app.py:301 +#: cola/app.py:304 #, python-format msgid "fatal: \"%s\" is not a directory. Please specify a correct --repo ." msgstr "致命的: \"%s\" はディレクトリではありません。正しいパスを--repo で指定してください。" -#: cola/widgets/main.py:928 +#: cola/widgets/main.py:941 #, python-format msgid "git cola version %s" msgstr "git cola バージョン %s" -#: cola/widgets/startup.py:35 +#: cola/widgets/startup.py:34 msgid "git-cola" msgstr "git-cola" -#: cola/difftool.py:63 +#: cola/difftool.py:82 msgid "git-cola diff" msgstr "git-cola diff" -#: cola/widgets/submodules.py:81 +#: cola/widgets/submodules.py:80 msgid "git://git.example.com/repo.git" msgstr "git://git.example.com/repo.git" -#: cola/widgets/grep.py:132 +#: cola/widgets/grep.py:130 msgid "grep result..." msgstr "grep 結果..." -#: cola/widgets/about.py:486 +#: cola/widgets/about.py:469 msgid "hotkeys.html" msgstr "hotkeys.html" -#: cola/widgets/submodules.py:85 +#: cola/widgets/submodules.py:84 msgid "path/to/submodule" msgstr "path/to/submodule" -#: cola/cmds.py:2537 -msgid "unknown" -msgstr "不明" - -#: cola/widgets/createtag.py:63 +#: cola/widgets/createtag.py:61 msgid "vX.Y.Z" msgstr "vX.Y.Z" @@ -4054,14 +4180,18 @@ msgid "x 1" msgstr "" #: cola/hidpi.py:44 -msgid "x 1.5" +msgid "x 1.25" msgstr "" #: cola/hidpi.py:45 +msgid "x 1.5" +msgstr "" + +#: cola/hidpi.py:46 msgid "x 2" msgstr "" -#: cola/widgets/search.py:53 cola/widgets/search.py:58 +#: cola/widgets/search.py:52 cola/widgets/search.py:57 msgid "yyyy-MM-dd" msgstr "yyyy-MM-dd" @@ -4176,6 +4306,10 @@ msgstr "yyyy-MM-dd" #~ msgid "A branch is required for 'Merged Into'." #~ msgstr "'マージ先' にはブランチが必要です。" +#, python-format +#~ msgid "A stash named \"%s\" already exists" +#~ msgstr "\"%s\" という名前のstashは既に存在します。" + #~ msgid "Abort completed. Ready." #~ msgstr "中断完了。" @@ -4403,6 +4537,9 @@ msgstr "yyyy-MM-dd" #~ msgid "Error: Command Failed" #~ msgstr "エラー: コマンドが失敗しました" +#~ msgid "Error: Stash exists" +#~ msgstr "エラー:スタッシュの存在" + #~ msgid "Failed to completely save options:" #~ msgstr "完全にオプションを保存できません:" @@ -5147,6 +5284,9 @@ msgstr "yyyy-MM-dd" #~ msgid "title" #~ msgstr "タイトル" +#~ msgid "unknown" +#~ msgstr "不明" + #~ msgid "update-ref failed:" #~ msgstr "update-ref が失敗しました:" diff --git a/cola/i18n/pl.po b/cola/i18n/pl.po index 3ecada91..01d60943 100644 --- a/cola/i18n/pl.po +++ b/cola/i18n/pl.po @@ -14,11 +14,10 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10" -" || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 23.08.3\n" -#: cola/widgets/patch.py:86 +#: cola/widgets/diff.py:1680 msgid "" "\n" "

\n" @@ -29,13 +28,12 @@ msgid "" msgstr "" "\n" "

\n" -" Przeciągnij i upuść lub naciśnij Dodaj, aby" -" dodać\n" +" Przeciągnij i upuść lub naciśnij Dodaj, aby dodać\n" " łaty do listy\n" "

\n" " " -#: cola/widgets/about.py:455 +#: cola/widgets/about.py:438 #, python-format msgid "" "\n" @@ -55,8 +53,7 @@ msgid "" "\n" "
\n" "

\n" -" We invite you to participate in translation by adding or" -" updating\n" +" We invite you to participate in translation by adding or updating\n" " a translation and opening a pull request.\n" "

\n" "\n" @@ -82,15 +79,14 @@ msgstr "" "
\n" "

\n" " Zachęcamy do udziału w tłumaczeniu, poprzez dodawanie lub\n" -" uaktualnianie tłumaczenia, a następnie utworzeniu prośby o" -" wciągnięcie.\n" +" uaktualnianie tłumaczenia, a następnie utworzeniu prośby o wciągnięcie.\n" "

\n" "\n" "
\n" "\n" " " -#: cola/widgets/about.py:180 +#: cola/widgets/about.py:182 #, python-format msgid "" "\n" @@ -119,7 +115,7 @@ msgstr "" " \n" " " -#: cola/widgets/about.py:387 +#: cola/widgets/about.py:370 #, python-format msgid "" "\n" @@ -134,7 +130,7 @@ msgstr "" "
\n" " " -#: cola/widgets/status.py:1310 +#: cola/widgets/status.py:1311 #, python-format msgid "" "\n" @@ -159,7 +155,7 @@ msgstr "" " %(basename)s = nazwa pliku bez jego rozszerzenia\n" " %(ext)s = rozszerzenie pliku\n" -#: cola/sequenceeditor.py:700 +#: cola/sequenceeditor.py:695 msgid "" "\n" "Commands\n" @@ -233,7 +229,7 @@ msgstr "" "ctrl+q = anuluj i porzuć zmienianie podstawy\n" "ctrl+d = uruchom narzędzie różnicy\n" -#: cola/widgets/finder.py:65 +#: cola/widgets/finder.py:64 msgid "" "\n" "Keyboard Shortcuts\n" @@ -261,45 +257,71 @@ msgstr "" "Strzałki w górę i dół zmieniają uaktywnienie pomiędzy polem tekstowym\n" "i wynikami.\n" -#: cola/widgets/dag.py:894 +#: cola/widgets/prefs.py:133 +msgid "" +"\n" +"This option determines how the supplied commit message should be\n" +"cleaned up before committing.\n" +"\n" +"The can be strip, whitespace, verbatim, scissors or default.\n" +"\n" +"strip\n" +" Strip leading and trailing empty lines, trailing whitespace,\n" +" commentary and collapse consecutive empty lines.\n" +"\n" +"whitespace\n" +" Same as strip except #commentary is not removed.\n" +"\n" +"verbatim\n" +" Do not change the message at all.\n" +"\n" +"scissors\n" +" Same as whitespace except that everything from (and including) the line\n" +" found below is truncated, if the message is to be edited.\n" +" \"#\" can be customized with core.commentChar.\n" +"\n" +" # ------------------------ >8 ------------------------" +msgstr "" + +#: cola/widgets/dag.py:960 msgid " - DAG" msgstr " - DAG" -#: cola/widgets/recent.py:54 +#: cola/widgets/recent.py:52 msgid " commits ago" msgstr " zmian temu" -#: cola/cmds.py:1197 +#: cola/cmds.py:1198 #, python-format msgid "\"%(branch)s\" has been deleted from \"%(remote)s\"." msgstr "\"%(branch)s\" została usunięta z \"%(remote)s\"." -#: cola/widgets/createbranch.py:316 +#: cola/widgets/createbranch.py:314 #, python-format msgid "\"%(command)s\" returned exit status \"%(status)d\"" msgstr "\"%(command)s\" zwróciło kod wyjścia \"%(status)d\"" -#: cola/interaction.py:39 +#: cola/interaction.py:38 #, python-format msgid "\"%(command)s\" returned exit status %(status)d" msgstr "\"%(command)s\" zwróciło kod wyjścia %(status)d" -#: cola/guicmds.py:157 +#: cola/guicmds.py:156 #, python-format msgid "\"%s\" already exists" msgstr "\"%s\" już istnieje" -#: cola/widgets/clone.py:206 +#: cola/widgets/clone.py:204 #, python-format msgid "\"%s\" already exists, cola will create a new directory" msgstr "\"%s\" już istnieje, cola utworzy nowy katalog" -#: cola/cmds.py:2349 +#: cola/cmds.py:2300 #, python-format msgid "\"%s\" requires a selected file." msgstr "\"%s\" wymaga wybrania pliku." -#: cola/cmds.py:2087 +#: cola/cmds.py:2038 msgid "" "\"git rebase --update-refs\" automatically force-updates any\n" "branches that point to commits that are being rebased.\n" @@ -311,12 +333,15 @@ msgstr "" "\"git rebase --update-refs\" sam siłowo uaktualnia wszystkie\n" "gałęzie, które wskazują na zmiany, który podstawa ulegnie zmianie.\n" "\n" -"Wszystkie gałęzie, które zostały pobrane w drzewie pracy nie zostaną" -" uaktualnione.\n" +"Wszystkie gałęzie, które zostały pobrane w drzewie pracy nie zostaną uaktualnione.\n" "\n" "Używanie tego jest pomocne przy pracy z \"nałożonymi\" gałęziami." -#: cola/sequenceeditor.py:321 +#: cola/models/stash.py:145 +msgid "\"git stash drop\" did not return a ref to rename." +msgstr "" + +#: cola/sequenceeditor.py:318 msgid "#" msgstr "#" @@ -325,37 +350,37 @@ msgstr "#" msgid "%(project)s: %(branch)s - Browse" msgstr "%(project)s: %(branch)s - Przeglądaj" -#: cola/widgets/dag.py:887 +#: cola/widgets/dag.py:953 #, python-format msgid "%(project)s: %(ref)s - DAG" msgstr "%(project)s: %(ref)s - DAG" -#: cola/models/browse.py:315 +#: cola/models/browse.py:314 #, python-format msgid "%d days ago" msgstr "%d dni temu" -#: cola/models/browse.py:314 +#: cola/models/browse.py:313 #, python-format msgid "%d hours ago" msgstr "%d godzin temu" -#: cola/models/browse.py:307 cola/models/browse.py:311 +#: cola/models/browse.py:306 cola/models/browse.py:310 #, python-format msgid "%d minutes ago" msgstr "%d minut temu" -#: cola/cmds.py:376 +#: cola/cmds.py:377 #, python-format msgid "%d patch(es) applied." msgstr "Zastosowano %d łat" -#: cola/widgets/createbranch.py:281 +#: cola/widgets/createbranch.py:279 #, python-format msgid "%d skipped" msgstr "Pominięto %d" -#: cola/cmds.py:2580 +#: cola/cmds.py:2522 #, python-format msgid "" "%s appears to contain merge conflicts.\n" @@ -368,36 +393,36 @@ msgstr "" "Powinieneś pominąć ten plik.\n" "Czy dobrać go mimo tego?" -#: cola/widgets/startup.py:263 +#: cola/widgets/startup.py:262 #, python-format msgid "%s could not be opened. Remove from bookmarks?" msgstr "Nie można otworzyć %s. Czy usunąć z zakładek?" -#: cola/app.py:498 cola/widgets/bookmarks.py:482 +#: cola/app.py:501 cola/widgets/bookmarks.py:481 #, python-format msgid "%s is not a Git repository." msgstr "%s nie jest repozytorium Git." -#: cola/cmds.py:1015 +#: cola/cmds.py:1016 #, python-format msgid "%s will be removed from your bookmarks." msgstr "%s zostanie usunięta z twoich zakładek." -#: cola/cmds.py:1028 +#: cola/cmds.py:1029 #, python-format msgid "%s will be removed from your recent repositories." msgstr "%s zostanie usunięte z listy ostatnich repozytoriów." -#: cola/cmds.py:1711 +#: cola/cmds.py:1663 #, python-format msgid "%s: No such file or directory." msgstr "%s: Nie ma takiego pliku lub katalogu." -#: cola/widgets/main.py:734 +#: cola/widgets/main.py:747 msgid "&Edit" msgstr "&Edycja" -#: cola/widgets/main.py:676 +#: cola/widgets/main.py:689 msgid "&File" msgstr "Plik" @@ -405,43 +430,43 @@ msgstr "Plik" msgid "(Amending)" msgstr "(Uzupełnianie)" -#: cola/widgets/compare.py:36 +#: cola/widgets/compare.py:35 msgid "*** Branch Point ***" msgstr "*** Punkt gałęzi ***" -#: cola/widgets/compare.py:37 +#: cola/widgets/compare.py:36 msgid "*** Sandbox ***" msgstr "*** Piaskownica ***" -#: cola/widgets/diff.py:788 +#: cola/widgets/diff.py:816 msgid "100%" msgstr "100%" -#: cola/widgets/diff.py:789 +#: cola/widgets/diff.py:817 msgid "200%" msgstr "200%" -#: cola/widgets/diff.py:786 +#: cola/widgets/diff.py:814 msgid "25%" msgstr "25%" -#: cola/widgets/diff.py:790 +#: cola/widgets/diff.py:818 msgid "400%" msgstr "400%" -#: cola/widgets/diff.py:787 +#: cola/widgets/diff.py:815 msgid "50%" msgstr "50%" -#: cola/widgets/diff.py:791 +#: cola/widgets/diff.py:819 msgid "800%" msgstr "800%" -#: cola/widgets/finder.py:119 +#: cola/widgets/finder.py:118 msgid " ..." msgstr "<ścieżka> ..." -#: cola/cmds.py:1734 +#: cola/cmds.py:1686 msgid "" "A commit template has not been configured.\n" "Use \"git config\" to define \"commit.template\"\n" @@ -451,70 +476,64 @@ msgstr "" "Wykonaj \"git config\", aby ustawić \"commit.template\"\n" "tak, aby wskazywał na plik wzorca zmiany." -#: cola/cmds.py:1784 +#: cola/cmds.py:1735 #, python-format msgid "A hook must be provided at \"%s\"" msgstr "Należy podać haczyk w \"%s\"" -#: cola/widgets/stash.py:236 -#, python-format -msgid "A stash named \"%s\" already exists" -msgstr "Przechowalnia o nazwie \"%s\" już istnieje" - -#: cola/widgets/cfgactions.py:82 cola/widgets/main.py:622 +#: cola/widgets/cfgactions.py:81 cola/widgets/main.py:635 msgid "Abort" msgstr "Przerwij" -#: cola/widgets/cfgactions.py:149 cola/widgets/cfgactions.py:155 +#: cola/widgets/cfgactions.py:148 cola/widgets/cfgactions.py:154 msgid "Abort Action" msgstr "Przerwij działanie" -#: cola/cmds.py:132 +#: cola/cmds.py:131 msgid "Abort Applying Patch" msgstr "Przerwij stosowanie łaty" -#: cola/cmds.py:126 +#: cola/cmds.py:125 msgid "Abort Applying Patch..." msgstr "Przerwij stosowanie łaty..." -#: cola/widgets/main.py:245 +#: cola/widgets/main.py:244 msgid "Abort Applying Patches..." msgstr "Przerwij stosowanie łat..." -#: cola/cmds.py:162 +#: cola/cmds.py:161 msgid "Abort Cherry-Pick" msgstr "Przerwij wybiórcze zaciąganie" -#: cola/cmds.py:156 cola/widgets/main.py:334 +#: cola/cmds.py:155 cola/widgets/main.py:329 msgid "Abort Cherry-Pick..." msgstr "Przerwij wybiórcze zaciąganie..." -#: cola/cmds.py:193 +#: cola/cmds.py:192 msgid "Abort Merge" msgstr "Przerwij scalanie" -#: cola/cmds.py:186 cola/widgets/main.py:368 +#: cola/cmds.py:185 cola/widgets/main.py:363 msgid "Abort Merge..." msgstr "Przerwij scalanie..." -#: cola/widgets/cfgactions.py:154 +#: cola/widgets/cfgactions.py:153 msgid "Abort the action?" msgstr "Przerwać działanie?" -#: cola/widgets/main.py:250 +#: cola/widgets/main.py:245 msgid "Abort the current \"git am\" patch session" msgstr "Przerwij bieżące posiedzenie łatania \"git am\"" -#: cola/cmds.py:159 +#: cola/cmds.py:158 msgid "" "Aborting a cherry-pick can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -"Przerwanie zaciągnięcia wybiórczego może spowodować utratę niezatwierdzonych" -" zmian.\n" +"Przerwanie zaciągnięcia wybiórczego może spowodować utratę niezatwierdzonych zmian.\n" "Przywrócenie ich będzie niemożliwe." -#: cola/cmds.py:129 +#: cola/cmds.py:128 msgid "" "Aborting a patch can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." @@ -522,40 +541,39 @@ msgstr "" "Przerwanie nakładania łaty może spowodować utratę niezatwierdzonych zmian.\n" "Przywrócenie ich będzie niemożliwe." -#: cola/cmds.py:127 +#: cola/cmds.py:126 msgid "Aborting applying the current patch?" msgstr "Przerwać stosowanie bieżącej łaty?" -#: cola/cmds.py:157 +#: cola/cmds.py:156 msgid "Aborting the current cherry-pick?" msgstr "Przerwać bieżące zaciągnięcie wybiórcze?" -#: cola/cmds.py:189 +#: cola/cmds.py:188 msgid "" "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -"Przerwanie obecnego scalania spowoduje utratę *WSZYSTKICH* niezatwierdzonych" -" zmian.\n" +"Przerwanie obecnego scalania spowoduje utratę *WSZYSTKICH* niezatwierdzonych zmian.\n" "Przywrócenie niezatwierdzonych zmian będzie niemożliwe." -#: cola/cmds.py:187 +#: cola/cmds.py:186 msgid "Aborting the current merge?" msgstr "Przerwać bieżące scalanie?" -#: cola/widgets/about.py:91 cola/widgets/main.py:517 +#: cola/widgets/about.py:89 cola/widgets/main.py:530 msgid "About" msgstr "O programie" -#: cola/widgets/about.py:67 +#: cola/widgets/about.py:65 msgid "About git-cola" msgstr "O git-cola" -#: cola/widgets/bookmarks.py:217 cola/widgets/startup.py:340 +#: cola/widgets/bookmarks.py:216 cola/widgets/startup.py:339 msgid "Accept" msgstr "Przyjmij" -#: cola/sequenceeditor.py:159 +#: cola/sequenceeditor.py:157 msgid "" "Accept changes and rebase\n" "Shortcut: Ctrl+Enter" @@ -563,50 +581,50 @@ msgstr "" "Przyjmij zmiany i zmień podstawę\n" "Skrót: Ctrl+Enter" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Action Name" msgstr "Nazwa działania" -#: cola/sequenceeditor.py:528 cola/widgets/bookmarks.py:321 -#: cola/widgets/branch.py:217 cola/widgets/browse.py:374 -#: cola/widgets/commitmsg.py:99 cola/widgets/dag.py:315 -#: cola/widgets/filelist.py:110 cola/widgets/main.py:95 -#: cola/widgets/main.py:757 cola/widgets/startup.py:436 +#: cola/sequenceeditor.py:524 cola/widgets/bookmarks.py:320 +#: cola/widgets/branch.py:221 cola/widgets/browse.py:375 +#: cola/widgets/commitmsg.py:105 cola/widgets/dag.py:314 +#: cola/widgets/filelist.py:107 cola/widgets/main.py:93 +#: cola/widgets/main.py:770 cola/widgets/startup.py:435 msgid "Actions" msgstr "Działania" -#: cola/widgets/commitmsg.py:101 +#: cola/widgets/commitmsg.py:107 msgid "Actions..." msgstr "Działania..." -#: cola/widgets/bookmarks.py:71 cola/widgets/gitignore.py:64 -#: cola/widgets/patch.py:103 cola/widgets/patch.py:117 -#: cola/widgets/status.py:1381 +#: cola/widgets/bookmarks.py:70 cola/widgets/diff.py:1697 +#: cola/widgets/diff.py:1711 cola/widgets/gitignore.py:63 +#: cola/widgets/status.py:1382 msgid "Add" msgstr "Dodaj" -#: cola/widgets/bookmarks.py:470 +#: cola/widgets/bookmarks.py:469 msgid "Add Favorite" msgstr "Dodaj ulubione" -#: cola/widgets/editremotes.py:374 +#: cola/widgets/editremotes.py:373 msgid "Add Remote" msgstr "Dodaj zdalne repozytorium" -#: cola/widgets/toolbar.py:315 +#: cola/widgets/toolbar.py:320 msgid "Add Separator" msgstr "Dodaj oddzielacz" -#: cola/cmds.py:3030 cola/widgets/submodules.py:42 -#: cola/widgets/submodules.py:111 +#: cola/cmds.py:2976 cola/widgets/submodules.py:41 +#: cola/widgets/submodules.py:110 msgid "Add Submodule" msgstr "Dodaj podmoduł" -#: cola/cmds.py:3027 cola/widgets/main.py:381 +#: cola/cmds.py:2973 cola/widgets/main.py:376 msgid "Add Submodule..." msgstr "Dodaj podmoduł..." -#: cola/widgets/editremotes.py:62 +#: cola/widgets/editremotes.py:61 msgid "" "Add and remove remote repositories using the \n" "Add(+) and Delete(-) buttons on the left-hand side.\n" @@ -620,63 +638,63 @@ msgstr "" "Nazwy repozytoriów zdalnych można zmienić zaznaczając je na wykazie\n" "i naciskając \"enter\" lub klikając dwukrotnie." -#: cola/widgets/editremotes.py:81 +#: cola/widgets/editremotes.py:80 msgid "Add new remote git repository" msgstr "Dodaj nowe zdalne repozytorium git" -#: cola/widgets/patch.py:103 +#: cola/widgets/diff.py:1697 msgid "Add patches (+)" msgstr "Dodaj łaty (+)" -#: cola/widgets/editremotes.py:433 +#: cola/widgets/editremotes.py:431 msgid "Add remote" msgstr "Dodaj zdalne repozytorium" -#: cola/cmds.py:3028 +#: cola/cmds.py:2974 msgid "Add this submodule?" msgstr "Czy dodać ten podmoduł?" -#: cola/widgets/gitignore.py:54 +#: cola/widgets/gitignore.py:53 msgid "Add to .gitignore" msgstr "Dodaj do .gitignore" -#: cola/widgets/status.py:286 +#: cola/widgets/status.py:287 msgid "Add to Git Annex" msgstr "Dodaj do Git Annex" -#: cola/widgets/status.py:290 +#: cola/widgets/status.py:291 msgid "Add to Git LFS" msgstr "Dodaj do Git LFS" -#: cola/widgets/gitignore.py:28 +#: cola/widgets/gitignore.py:27 msgid "Add to exclusions" msgstr "Dodaj do wykluczonych" -#: cola/widgets/gitignore.py:55 +#: cola/widgets/gitignore.py:54 msgid "Add to local .git/info/exclude" msgstr "Dodaj do lokalnego .git/info/exclude" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Additions" msgstr "Dodano" -#: cola/widgets/archive.py:134 +#: cola/widgets/archive.py:132 msgid "Advanced" msgstr "Zaawansowane" -#: cola/widgets/main.py:522 +#: cola/widgets/main.py:535 msgid "Against Commit... (Diff Mode)" msgstr "Względem zmiany... (tryb różnicy)" -#: cola/models/browse.py:33 +#: cola/models/browse.py:32 msgid "Age" msgstr "Wiek" -#: cola/widgets/prefs.py:403 +#: cola/widgets/prefs.py:441 msgid "All Repositories" msgstr "Wszystkie repozytoria" -#: cola/cmds.py:3110 +#: cola/cmds.py:3056 #, python-format msgid "" "All submodules will be updated using\n" @@ -685,43 +703,35 @@ msgstr "" "Wszystkie podmoduły zostaną uaktualnione przy użyciu\n" "\"%s\"" -#: cola/widgets/remote.py:195 -msgid "" -"Allow non-fast-forward updates. Using \"force\" can cause the remote" -" repository to lose commits; use it with care" -msgstr "" -"Zezwól na uaktualnienia nie będące przewinięciem do przodu. Użycie \"wymuś\"" -" może spowodować, że zdalne repozytoria zgubią zmiany; używaj z rozwagą" +#: cola/widgets/remote.py:199 +msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care" +msgstr "Zezwól na uaktualnienia nie będące przewinięciem do przodu. Użycie \"wymuś\" może spowodować, że zdalne repozytoria zgubią zmiany; używaj z rozwagą" -#: cola/widgets/merge.py:61 -msgid "" -"Always create a merge commit when enabled, even when the merge is a" -" fast-forward update" -msgstr "" -"Zawsze twórz zmianę scalenia, gdy włączone, nawet gdy scalanie polega na" -" przewinięciu do przodu" +#: cola/widgets/merge.py:59 +msgid "Always create a merge commit when enabled, even when the merge is a fast-forward update" +msgstr "Zawsze twórz zmianę scalenia, gdy włączone, nawet gdy scalanie polega na przewinięciu do przodu" -#: cola/cmds.py:221 +#: cola/cmds.py:220 msgid "Amend" msgstr "Uzupełnij" -#: cola/widgets/commitmsg.py:463 +#: cola/widgets/commitmsg.py:471 msgid "Amend Commit" msgstr "Uzupełnij zmianę" -#: cola/widgets/commitmsg.py:110 cola/widgets/main.py:194 +#: cola/widgets/commitmsg.py:116 cola/widgets/main.py:193 msgid "Amend Last Commit" msgstr "Uzupełnij ostatnią zmianę" -#: cola/widgets/commitmsg.py:462 +#: cola/widgets/commitmsg.py:470 msgid "Amend the published commit?" msgstr "Uzupełnić opublikowaną zmianę?" -#: cola/widgets/main.py:1157 +#: cola/widgets/main.py:1170 msgid "Amending" msgstr "Uzupełnianie" -#: cola/widgets/cfgactions.py:151 +#: cola/widgets/cfgactions.py:150 msgid "" "An action is still running.\n" "Terminating it could result in data loss." @@ -729,7 +739,7 @@ msgstr "" "Działanie nadal jest wykonywane.\n" "Jego zakończenie może skutkować utratą danych." -#: cola/cmds.py:2804 +#: cola/cmds.py:2750 msgid "" "An unsigned, lightweight tag will be created instead.\n" "Create an unsigned tag?" @@ -737,56 +747,56 @@ msgstr "" "Zamiast tego zostanie utworzony niepodpisany, lekki znacznik.\n" "Czy utworzyć niepodpisany znacznik?" -#: cola/widgets/prefs.py:406 +#: cola/widgets/prefs.py:444 msgid "Appearance" msgstr "Wygląd" -#: cola/widgets/diff.py:1230 +#: cola/widgets/diff.py:1304 msgid "Append Patch" msgstr "Dołącz łatę" -#: cola/widgets/diff.py:1299 +#: cola/widgets/diff.py:1373 msgid "Append Patch..." msgstr "Dołącz łatę..." -#: cola/widgets/patch.py:112 cola/widgets/stash.py:48 cola/widgets/stash.py:107 -#: cola/widgets/toolbar.py:323 +#: cola/widgets/diff.py:1706 cola/widgets/stash.py:50 cola/widgets/stash.py:110 +#: cola/widgets/toolbar.py:328 msgid "Apply" msgstr "Zastosuj" -#: cola/widgets/patch.py:75 +#: cola/widgets/diff.py:1669 msgid "Apply Patches" msgstr "Stosowanie łat" -#: cola/widgets/main.py:239 +#: cola/widgets/main.py:238 msgid "Apply Patches..." msgstr "Zastosuj łaty..." -#: cola/widgets/stash.py:64 +#: cola/widgets/stash.py:66 msgid "Apply and drop the selected stash (git stash pop)" msgstr "Zastosuj i porzuć wybraną przechowalnię (git stash pop)" -#: cola/widgets/stash.py:48 +#: cola/widgets/stash.py:50 msgid "Apply the selected stash" msgstr "Zastosuj wybraną przechowalnię" -#: cola/widgets/main.py:1167 +#: cola/widgets/main.py:1180 msgid "Applying Patch" msgstr "Nakładanie łaty" -#: cola/widgets/cfgactions.py:207 +#: cola/widgets/cfgactions.py:205 msgid "Arguments" msgstr "Argumenty" -#: cola/qtutils.py:850 +#: cola/qtutils.py:887 msgid "Attach" msgstr "Dołącz" -#: cola/models/browse.py:33 cola/models/browse.py:72 cola/widgets/dag.py:506 +#: cola/models/browse.py:32 cola/models/browse.py:71 cola/widgets/dag.py:572 msgid "Author" msgstr "Autor" -#: cola/widgets/about.py:93 +#: cola/widgets/about.py:91 msgid "Authors" msgstr "Autorzy" @@ -794,43 +804,43 @@ msgstr "Autorzy" msgid "Auto" msgstr "Auto" -#: cola/widgets/commitmsg.py:137 cola/widgets/prefs.py:259 +#: cola/widgets/commitmsg.py:143 cola/widgets/prefs.py:280 msgid "Auto-Wrap Lines" msgstr "Zawijaj wiersze" -#: cola/widgets/prefs.py:184 +#: cola/widgets/prefs.py:206 msgid "Autocomplete Paths" msgstr "Uzupełniaj ścieżki" -#: cola/widgets/prefs.py:176 +#: cola/widgets/prefs.py:198 msgid "Automatically Load Commit Message Template" msgstr "Sam wczytaj wzorzec opisu zmiany" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Basic Regexp" msgstr "Podstawowe wyrażenie regularne" -#: cola/widgets/prefs.py:255 +#: cola/widgets/prefs.py:276 msgid "Blame Viewer" msgstr "Przeglądarka autorów" -#: cola/widgets/browse.py:205 +#: cola/widgets/browse.py:206 msgid "Blame selected paths" msgstr "Obwiń wybrane ścieżki" -#: cola/cmds.py:545 cola/widgets/status.py:282 +#: cola/cmds.py:546 cola/widgets/status.py:283 msgid "Blame..." msgstr "Przejrzyj autorów..." -#: cola/widgets/prefs.py:347 +#: cola/widgets/prefs.py:367 msgid "Bold on dark headers instead of italic" msgstr "Wytłuść czcionkę zamiast ją pochylać na ciemnych nagłówkach" -#: cola/widgets/main.py:806 cola/widgets/submodules.py:119 +#: cola/widgets/main.py:819 cola/widgets/submodules.py:118 msgid "Branch" msgstr "Gałąź" -#: cola/widgets/remote.py:600 +#: cola/widgets/remote.py:635 #, python-format msgid "" "Branch \"%(branch)s\" does not exist in \"%(remote)s\".\n" @@ -839,84 +849,84 @@ msgstr "" "Gałąź \"%(branch)s\" nie istnieje w \"%(remote)s\".\n" "Zostanie opublikowana nowa zdalna gałąź." -#: cola/widgets/createbranch.py:258 +#: cola/widgets/createbranch.py:256 #, python-format msgid "Branch \"%s\" already exists." msgstr "Gałąź \"%s\" już istnieje." -#: cola/widgets/compare.py:44 +#: cola/widgets/compare.py:43 msgid "Branch Diff Viewer" msgstr "Przeglądarka różnic na gałęziach" -#: cola/widgets/createbranch.py:259 cola/widgets/createbranch.py:271 +#: cola/widgets/createbranch.py:257 cola/widgets/createbranch.py:269 msgid "Branch Exists" msgstr "Gałąź istnieje" -#: cola/widgets/createbranch.py:98 +#: cola/widgets/createbranch.py:96 msgid "Branch Name" msgstr "Nazwa gałęzi" -#: cola/widgets/submodules.py:89 +#: cola/widgets/submodules.py:88 msgid "Branch name" msgstr "Nazwa gałęzi" -#: cola/widgets/browse.py:89 cola/widgets/main.py:1097 +#: cola/widgets/browse.py:89 cola/widgets/main.py:1110 #, python-format msgid "Branch: %s" msgstr "Gałąź: %s" -#: cola/widgets/branch.py:85 cola/widgets/main.py:131 +#: cola/widgets/branch.py:87 cola/widgets/main.py:129 msgid "Branches" msgstr "Gałęzie" -#: cola/widgets/main.py:538 +#: cola/widgets/main.py:551 msgid "Branches..." msgstr "Pomiędzy gałęziami..." -#: cola/widgets/about.py:414 cola/widgets/about.py:417 -#: cola/widgets/about.py:437 +#: cola/widgets/about.py:397 cola/widgets/about.py:400 +#: cola/widgets/about.py:420 msgid "Brazilian translation" msgstr "Tłumaczenie na brazylijski" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse" msgstr "Przeglądaj" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse Commits..." msgstr "Przejrzyj zmiany..." -#: cola/widgets/main.py:499 +#: cola/widgets/main.py:512 msgid "Browse Current Branch..." msgstr "Przejrzyj bieżącą gałąź..." -#: cola/widgets/main.py:505 +#: cola/widgets/main.py:518 msgid "Browse Other Branch..." msgstr "Przejrzyj inną gałąź..." -#: cola/widgets/editremotes.py:437 cola/widgets/search.py:46 -#: cola/widgets/startup.py:65 cola/widgets/startup.py:285 +#: cola/widgets/editremotes.py:435 cola/widgets/search.py:45 +#: cola/widgets/startup.py:64 cola/widgets/startup.py:284 msgid "Browse..." msgstr "Przeglądaj..." -#: cola/widgets/main.py:89 +#: cola/widgets/main.py:87 msgid "Browser" msgstr "Przeglądarka" -#: cola/widgets/browse.py:589 +#: cola/widgets/browse.py:590 #, python-format msgid "Browsing %s" msgstr "Przeglądanie %s" -#: cola/widgets/commitmsg.py:118 +#: cola/widgets/commitmsg.py:124 msgid "Bypass Commit Hooks" msgstr "Pomiń wykonywanie haczyków" -#: cola/sequenceeditor.py:175 cola/widgets/standard.py:991 +#: cola/sequenceeditor.py:173 cola/widgets/standard.py:1058 msgid "Cancel" msgstr "Zaniechaj" -#: cola/sequenceeditor.py:176 +#: cola/sequenceeditor.py:174 msgid "" "Cancel rebase\n" "Shortcut: Ctrl+Q" @@ -924,188 +934,200 @@ msgstr "" "Zaniechaj zmieniania podstawy\n" "Skrót: Ctrl+Enter" -#: cola/cmds.py:254 +#: cola/cmds.py:253 msgid "Cannot Amend" msgstr "Nie można uzupełnić" -#: cola/cmds.py:560 +#: cola/cmds.py:561 #, python-format msgid "Cannot exec \"%s\": please configure a blame viewer" msgstr "Nie można wykonać \"%s\": najpierw ustaw przeglądarkę autorów" -#: cola/cmds.py:3146 +#: cola/cmds.py:3092 #, python-format msgid "Cannot exec \"%s\": please configure a history browser" msgstr "Nie można wykonać \"%s\": najpierw ustaw przeglądarkę historii" -#: cola/cmds.py:1583 +#: cola/cmds.py:1571 #, python-format msgid "Cannot exec \"%s\": please configure your editor" msgstr "Nie można wykonać \"%s\": ustaw swój edytor" -#: cola/models/browse.py:336 +#: cola/models/browse.py:335 msgid "Changed Upstream" msgstr "Zmienione w źródle odgórnym" -#: cola/widgets/prefs.py:186 +#: cola/widgets/prefs.py:208 msgid "Check Published Commits when Amending" msgstr "Uzupełniając zmianę, sprawdź jej opublikowanie" -#: cola/widgets/commitmsg.py:130 +#: cola/widgets/commitmsg.py:136 msgid "Check Spelling" msgstr "Sprawdź pisownię" -#: cola/widgets/prefs.py:265 +#: cola/widgets/prefs.py:286 msgid "Check spelling" msgstr "Sprawdź pisownię" -#: cola/widgets/prefs.py:163 +#: cola/widgets/prefs.py:186 msgid "Check whether a commit has been published when amending" msgstr "Sprawdź, czy zmiana została już opublikowana, przed jej uzupełnieniem" -#: cola/guicmds.py:62 cola/widgets/branch.py:222 +#: cola/guicmds.py:61 cola/widgets/branch.py:233 msgid "Checkout" msgstr "Przełącz" -#: cola/widgets/createbranch.py:130 +#: cola/widgets/createbranch.py:128 msgid "Checkout After Creation" msgstr "Przełącz po utworzeniu" -#: cola/guicmds.py:62 cola/widgets/dag.py:410 +#: cola/guicmds.py:61 cola/widgets/dag.py:409 msgid "Checkout Branch" msgstr "Przełącz na gałąź" -#: cola/widgets/dag.py:414 +#: cola/widgets/dag.py:413 msgid "Checkout Detached HEAD" msgstr "Przełącz na odłączony HEAD" -#: cola/cmds.py:480 cola/cmds.py:518 +#: cola/cmds.py:481 cola/cmds.py:519 msgid "Checkout Files" msgstr "Pobierz pliki" -#: cola/widgets/branch.py:226 +#: cola/widgets/branch.py:237 msgid "Checkout as new branch" msgstr "Przełącz jako nowa gałąź" -#: cola/cmds.py:507 +#: cola/cmds.py:508 msgid "Checkout files from our branch (HEAD)" msgstr "Pobierz pliki z naszej gałęzi (HEAD)" -#: cola/cmds.py:511 +#: cola/cmds.py:512 msgid "Checkout files from our branch?" msgstr "Pobrać pliki z naszej gałęzi?" -#: cola/cmds.py:469 +#: cola/cmds.py:470 msgid "Checkout files from their branch (MERGE_HEAD)" msgstr "Pobierz pliki z ich gałęzi (MERGE_HEAD)" -#: cola/cmds.py:473 +#: cola/cmds.py:474 msgid "Checkout files from their branch?" msgstr "Pobrać pliki z ich gałęzi?" -#: cola/widgets/main.py:576 +#: cola/widgets/main.py:589 msgid "Checkout..." msgstr "Przełącz..." -#: cola/widgets/dag.py:387 cola/widgets/search.py:79 +#: cola/widgets/dag.py:386 cola/widgets/search.py:78 msgid "Cherry Pick" msgstr "Zaciągnij wybiórczo" -#: cola/guicmds.py:73 +#: cola/guicmds.py:72 msgid "Cherry-Pick Commit" msgstr "Wybiórczo zaciągnij zmianę" -#: cola/widgets/main.py:328 +#: cola/widgets/main.py:323 msgid "Cherry-Pick..." msgstr "Zaciągnij wybiórczo..." -#: cola/cmds.py:584 +#: cola/cmds.py:585 msgid "Cherry-pick failed" msgstr "Nie udało się zaciągnąć wybiórczo" -#: cola/widgets/main.py:1161 +#: cola/widgets/main.py:1174 msgid "Cherry-picking" msgstr "Zaciąganie wybiórcze" -#: cola/widgets/diff.py:1247 +#: cola/widgets/diff.py:1321 msgid "Choose Patch..." msgstr "Wybierz łatę..." -#: cola/widgets/search.py:319 +#: cola/widgets/search.py:318 msgid "Choose Paths" msgstr "Wybierz ścieżkę/ścieżki" -#: cola/widgets/grep.py:116 +#: cola/widgets/grep.py:114 msgid "Choose the \"git grep\" regular expression mode" msgstr "Wybierz tryb wyrażenia regularnego \"git grep\"" -#: cola/widgets/bookmarks.py:229 cola/widgets/startup.py:352 +#: cola/widgets/bookmarks.py:228 cola/widgets/startup.py:351 msgid "Clear Default Repository" msgstr "Wyczyść domyślne repozytorium" -#: cola/widgets/commitmsg.py:305 +#: cola/widgets/commitmsg.py:313 msgid "Clear commit message" msgstr "Wyczyść opis zmiany" -#: cola/widgets/commitmsg.py:302 +#: cola/widgets/commitmsg.py:310 msgid "Clear commit message?" msgstr "Wyczyścić opis zmiany?" -#: cola/widgets/commitmsg.py:62 +#: cola/widgets/commitmsg.py:63 msgid "Clear..." msgstr "Wyczyść..." -#: cola/widgets/clone.py:126 +#: cola/widgets/clone.py:124 msgid "Clone" msgstr "Pobierz" -#: cola/widgets/clone.py:62 cola/widgets/clone.py:104 +#: cola/widgets/clone.py:61 cola/widgets/clone.py:102 msgid "Clone Repository" msgstr "Pobieranie repozytorium" -#: cola/widgets/main.py:465 cola/widgets/startup.py:58 +#: cola/widgets/main.py:478 cola/widgets/startup.py:57 msgid "Clone..." msgstr "Pobierz..." -#: cola/widgets/clone.py:62 +#: cola/widgets/clone.py:61 #, python-format msgid "Cloning repository at %s" msgstr "Pobieranie repozytorium o adresie %s" -#: cola/qtutils.py:757 cola/qtutils.py:807 cola/widgets/about.py:508 -#: cola/widgets/remote.py:328 cola/widgets/text.py:1094 +#: cola/qtutils.py:788 cola/qtutils.py:838 cola/widgets/about.py:491 +#: cola/widgets/remote.py:362 cola/widgets/text.py:1090 msgid "Close" msgstr "Zamknij" -#: cola/widgets/text.py:402 +#: cola/widgets/remote.py:222 +msgid "Close dialog when completed" +msgstr "" + +#: cola/widgets/remote.py:221 +msgid "Close on completion" +msgstr "" + +#: cola/widgets/text.py:399 msgid "Close the find bar" msgstr "Zamknij pasek wyszukiwania" -#: cola/qtutils.py:623 +#: cola/qtutils.py:651 msgid "Close..." msgstr "Zamknij..." -#: cola/widgets/recent.py:71 +#: cola/widgets/recent.py:69 msgid "Collapse all" msgstr "Zwiń wszystko" -#: cola/sequenceeditor.py:323 +#: cola/sequenceeditor.py:320 msgid "Command" msgstr "Polecenie" -#: cola/widgets/main.py:163 cola/widgets/merge.py:74 +#: cola/widgets/main.py:161 cola/widgets/merge.py:72 msgid "Commit" msgstr "Zmiana" -#: cola/cmds.py:837 +#: cola/widgets/prefs.py:192 +msgid "Commit Message Cleanup" +msgstr "" + +#: cola/widgets/commitmsg.py:495 msgid "Commit failed" msgstr "Nie udało się zatwierdzić" -#: cola/widgets/commitmsg.py:61 +#: cola/widgets/commitmsg.py:62 msgid "Commit staged changes" msgstr "Zatwierdź dobrane zmiany" -#: cola/widgets/commitmsg.py:93 +#: cola/widgets/commitmsg.py:94 msgid "" "Commit staged changes\n" "Shortcut: Ctrl+Enter" @@ -1113,204 +1135,198 @@ msgstr "" "Zatwierdź zebrane zmiany\n" "Skrót: Ctrl+Enter" -#: cola/widgets/commitmsg.py:564 +#: cola/widgets/commitmsg.py:590 msgid "Commit summary" msgstr "Nazwa zmiany" -#: cola/widgets/main.py:259 +#: cola/widgets/main.py:253 msgid "Commit the current state and continue applying patches" msgstr "Zatwierdź bieżący stan i kontynuuj stosowanie pozostałych łat" -#: cola/widgets/merge.py:70 -msgid "" -"Commit the merge if there are no conflicts. Uncheck to leave the merge" -" uncommitted" -msgstr "" -"Zatwierdź scalenie, jeśli brak sprzeczności. Odznacz pole, aby pozostawić" -" scalenie niezatwierdzonym" +#: cola/widgets/merge.py:68 +msgid "Commit the merge if there are no conflicts. Uncheck to leave the merge uncommitted" +msgstr "Zatwierdź scalenie, jeśli brak sprzeczności. Odznacz pole, aby pozostawić scalenie niezatwierdzonym" -#: cola/widgets/commitmsg.py:58 cola/widgets/commitmsg.py:95 -#: cola/widgets/main.py:778 cola/widgets/main.py:779 +#: cola/widgets/commitmsg.py:59 cola/widgets/commitmsg.py:96 +#: cola/widgets/main.py:791 cola/widgets/main.py:792 msgid "Commit@@verb" msgstr "Zatwierdź@@verb" -#: cola/difftool.py:78 cola/widgets/compare.py:70 +#: cola/widgets/dag.py:487 +msgid "Commits authored by me" +msgstr "" + +#: cola/difftool.py:97 cola/widgets/compare.py:69 msgid "Compare" msgstr "Porównaj" -#: cola/difftool.py:83 +#: cola/difftool.py:102 msgid "Compare All" msgstr "Porównaj wszystkie" -#: cola/widgets/toolbar.py:269 cola/widgets/toolbar.py:306 +#: cola/widgets/toolbar.py:274 cola/widgets/toolbar.py:311 msgid "Configure Toolbar" msgstr "Ustawienia paska narzędzi" -#: cola/widgets/remote.py:214 +#: cola/widgets/remote.py:218 msgid "Configure the remote branch as the the new upstream" msgstr "Ustaw zdalną gałąź jako nową gałąź odgórną" -#: cola/widgets/main.py:170 +#: cola/widgets/main.py:168 msgid "Console" msgstr "Konsola" -#: cola/interaction.py:111 cola/widgets/main.py:610 +#: cola/interaction.py:109 cola/widgets/main.py:623 msgid "Continue" msgstr "Dalej" -#: cola/widgets/main.py:255 +#: cola/widgets/main.py:252 msgid "Continue Applying Patches" msgstr "Kontynuuj stosowanie łat" -#: cola/widgets/bookmarks.py:248 cola/widgets/main.py:742 -#: cola/widgets/startup.py:371 +#: cola/widgets/bookmarks.py:247 cola/widgets/main.py:755 +#: cola/widgets/startup.py:370 msgid "Copy" msgstr "Skopiuj " -#: cola/widgets/status.py:268 +#: cola/widgets/status.py:269 msgid "Copy Basename to Clipboard" msgstr "Skopiuj nazwę pliku do schowka" -#: cola/widgets/diff.py:208 +#: cola/widgets/diff.py:209 msgid "Copy Diff" msgstr "Skopiuj różnicę" -#: cola/widgets/status.py:745 +#: cola/widgets/status.py:746 msgid "Copy Leading Path to Clipboard" msgstr "Skopiuj ścieżkę katalogu do schowka" -#: cola/widgets/status.py:251 +#: cola/widgets/status.py:252 msgid "Copy Path to Clipboard" msgstr "Skopiuj ścieżkę do schowka" -#: cola/widgets/status.py:259 +#: cola/widgets/status.py:260 msgid "Copy Relative Path to Clipboard" msgstr "Skopiuj względną ścieżkę do schowka" -#: cola/sequenceeditor.py:334 cola/widgets/dag.py:474 +#: cola/sequenceeditor.py:330 cola/widgets/dag.py:473 msgid "Copy SHA-1" msgstr "Skopiuj SHA-1" -#: cola/widgets/status.py:737 +#: cola/widgets/status.py:738 msgid "Copy..." msgstr "Skopiuj..." -#: cola/app.py:490 +#: cola/app.py:493 #, python-format msgid "Could not open %s." msgstr "Nie można otworzyć %s." -#: cola/widgets/clone.py:191 cola/widgets/clone.py:193 +#: cola/widgets/clone.py:189 cola/widgets/clone.py:191 #, python-format msgid "Could not parse Git URL: \"%s\"" msgstr "Nie można przetworzyć adresu URL Gita: \"%s\"" -#: cola/app.py:500 +#: cola/app.py:503 msgid "Create" msgstr "Utwórz" -#: cola/widgets/createbranch.py:86 cola/widgets/createbranch.py:135 -#: cola/widgets/createbranch.py:301 cola/widgets/dag.py:369 +#: cola/widgets/createbranch.py:84 cola/widgets/createbranch.py:133 +#: cola/widgets/createbranch.py:299 cola/widgets/dag.py:368 msgid "Create Branch" msgstr "Utwórz gałąź" -#: cola/widgets/dag.py:373 +#: cola/widgets/dag.py:372 msgid "Create Patch" msgstr "Utwórz łatę" -#: cola/widgets/remote.py:606 +#: cola/widgets/remote.py:641 msgid "Create Remote Branch" msgstr "Utwórz zdalną gałąź" -#: cola/widgets/commitmsg.py:124 cola/widgets/merge.py:78 +#: cola/widgets/commitmsg.py:130 cola/widgets/merge.py:76 msgid "Create Signed Commit" msgstr "Podpisz zmianę" -#: cola/widgets/createtag.py:55 cola/widgets/createtag.py:91 -#: cola/widgets/dag.py:377 +#: cola/widgets/createtag.py:53 cola/widgets/createtag.py:89 +#: cola/widgets/dag.py:376 msgid "Create Tag" msgstr "Utwórz znacznik" -#: cola/widgets/main.py:544 +#: cola/widgets/main.py:557 msgid "Create Tag..." msgstr "Utwórz znacznik..." -#: cola/cmds.py:2807 +#: cola/cmds.py:2753 msgid "Create Unsigned Tag" msgstr "Utwórz niepodpisany znacznik" -#: cola/widgets/remote.py:188 +#: cola/widgets/remote.py:192 msgid "Create a merge commit even when the merge resolves as a fast-forward" -msgstr "" -"Utwórz zmianę scalenia, nawet gdy scalanie będzie polegać na przewinięciu do" -" przodu" +msgstr "Utwórz zmianę scalenia, nawet gdy scalanie będzie polegać na przewinięciu do przodu" -#: cola/widgets/remote.py:605 +#: cola/widgets/remote.py:640 msgid "Create a new remote branch?" msgstr "Czy utworzyć nową zdalną gałąź?" -#: cola/app.py:499 +#: cola/app.py:502 msgid "Create a new repository at that location?" msgstr "Czy utworzyć nowe repozytorium w tym miejscu?" -#: cola/widgets/submodules.py:100 -msgid "" -"Create a shallow clone with history truncated to the specified number of" -" revisions. 0 performs a full clone." -msgstr "" -"Pobierz płytko z historią przyciętą do danej liczby wydań. 0 wykonuje pobiera" -" z całą historią." +#: cola/widgets/submodules.py:99 +msgid "Create a shallow clone with history truncated to the specified number of revisions. 0 performs a full clone." +msgstr "Pobierz płytko z historią przyciętą do danej liczby wydań. 0 wykonuje pobiera z całą historią." -#: cola/widgets/main.py:551 +#: cola/widgets/main.py:564 msgid "Create..." msgstr "Utwórz..." -#: cola/cmds.py:2843 +#: cola/cmds.py:2789 #, python-format msgid "Created a new tag named \"%s\"" msgstr "Utworzono nowy znacznik o nazwie \"%s\"" -#: cola/widgets/prefs.py:266 +#: cola/widgets/prefs.py:287 msgid "Ctrl+MouseWheel to Zoom" msgstr "Ctrl+rolka myszy, aby powiększać" -#: cola/widgets/prefs.py:404 +#: cola/widgets/prefs.py:442 msgid "Current Repository" msgstr "Bieżące repozytorium" -#: cola/widgets/status.py:1371 +#: cola/widgets/status.py:1372 msgid "Custom Copy Actions" msgstr "Własne działania kopiowania" -#: cola/widgets/status.py:273 +#: cola/widgets/status.py:274 msgid "Customize..." msgstr "Dostosuj..." -#: cola/widgets/main.py:740 +#: cola/widgets/main.py:753 msgid "Cut" msgstr "Wytnij" -#: cola/widgets/about.py:411 cola/widgets/about.py:442 +#: cola/widgets/about.py:394 cola/widgets/about.py:425 msgid "Czech translation" msgstr "Tłumaczenie na czeski" -#: cola/widgets/main.py:592 +#: cola/widgets/main.py:605 msgid "DAG..." msgstr "DAG..." -#: cola/icons.py:55 +#: cola/icons.py:54 msgid "Dark Theme" msgstr "Ciemne" -#: cola/widgets/dag.py:506 +#: cola/widgets/dag.py:572 msgid "Date, Time" msgstr "Data, czas" -#: cola/icons.py:54 cola/themes.py:637 +#: cola/icons.py:53 cola/themes.py:643 msgid "Default" msgstr "Domyślne" -#: cola/widgets/prefs.py:126 +#: cola/widgets/prefs.py:124 msgid "" "Default directory when exporting patches.\n" "Relative paths are relative to the current repository.\n" @@ -1320,167 +1336,167 @@ msgstr "" "Odniesieniem dla ścieżek względnych będzie bieżące repozytorium.\n" "Ścieżki bezwzględne będą używane tak jak podano." -#: cola/cmds.py:925 cola/guicmds.py:26 cola/guicmds.py:35 -#: cola/widgets/bookmarks.py:75 cola/widgets/bookmarks.py:251 -#: cola/widgets/main.py:746 cola/widgets/startup.py:373 +#: cola/cmds.py:923 cola/guicmds.py:25 cola/guicmds.py:34 +#: cola/widgets/bookmarks.py:74 cola/widgets/bookmarks.py:250 +#: cola/widgets/main.py:759 cola/widgets/startup.py:372 msgid "Delete" msgstr "Usuń" -#: cola/cmds.py:1088 +#: cola/cmds.py:1089 #, python-format msgid "Delete %d file(s)?" msgstr "Usunąć %d plik(ów)?" -#: cola/cmds.py:1016 +#: cola/cmds.py:1017 msgid "Delete Bookmark" msgstr "Usuń zakładkę" -#: cola/cmds.py:1014 +#: cola/cmds.py:1015 msgid "Delete Bookmark?" msgstr "Usunąć zakładkę?" -#: cola/cmds.py:1114 cola/cmds.py:1117 cola/guicmds.py:26 -#: cola/widgets/branch.py:268 +#: cola/cmds.py:1115 cola/cmds.py:1118 cola/guicmds.py:25 +#: cola/widgets/branch.py:277 msgid "Delete Branch" msgstr "Usuń gałąź" -#: cola/cmds.py:1089 +#: cola/cmds.py:1090 msgid "Delete Files" msgstr "Usuń pliki" -#: cola/widgets/status.py:311 +#: cola/widgets/status.py:312 msgid "Delete Files..." msgstr "Usuń plik(i)..." -#: cola/cmds.py:1085 +#: cola/cmds.py:1086 msgid "Delete Files?" msgstr "Usunąć pliki?" -#: cola/cmds.py:922 +#: cola/cmds.py:920 msgid "Delete Remote" msgstr "Usuń zdalną gałąź" -#: cola/guicmds.py:35 cola/widgets/branch.py:270 +#: cola/guicmds.py:34 cola/widgets/branch.py:279 msgid "Delete Remote Branch" msgstr "Usuń zdalną gałąź" -#: cola/widgets/main.py:564 +#: cola/widgets/main.py:577 msgid "Delete Remote Branch..." msgstr "Usuń zdalną gałąź..." -#: cola/widgets/toolbar.py:271 +#: cola/widgets/toolbar.py:276 msgid "Delete Toolbar" msgstr "Usuń pasek narzędzi" -#: cola/cmds.py:1115 +#: cola/cmds.py:1116 #, python-format msgid "Delete branch \"%s\"?" msgstr "Usuń gałąź \"%s\"?" -#: cola/widgets/editremotes.py:88 +#: cola/widgets/editremotes.py:87 msgid "Delete remote" msgstr "Usuń zdalne repozytorium" -#: cola/cmds.py:924 +#: cola/cmds.py:922 #, python-format msgid "Delete remote \"%s\"" msgstr "Usuń zdalne repozytorium \"%s\"" -#: cola/cmds.py:923 +#: cola/cmds.py:921 msgid "Delete remote?" msgstr "Usunąć zdalne repozytorium?" -#: cola/widgets/main.py:558 +#: cola/widgets/main.py:571 msgid "Delete..." msgstr "Usuń..." -#: cola/cmds.py:1067 +#: cola/cmds.py:1068 #, python-format msgid "Deleting \"%s\" failed" msgstr "Nie udało się usunąć \"%s\"" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Deletions" msgstr "Usunięto" -#: cola/widgets/submodules.py:120 +#: cola/widgets/submodules.py:119 msgid "Depth" msgstr "Głębokość" -#: cola/qtutils.py:811 cola/qtutils.py:852 +#: cola/qtutils.py:842 cola/qtutils.py:889 msgid "Detach" msgstr "Odczep" -#: cola/widgets/prefs.py:181 +#: cola/widgets/prefs.py:203 msgid "Detect Conflict Markers" msgstr "Wykryj znaczniki sprzeczności" -#: cola/widgets/prefs.py:151 +#: cola/widgets/prefs.py:174 msgid "Detect conflict markers in unmerged files" msgstr "Wykryj znaczniki sprzeczności w niescalonych plikach" -#: cola/widgets/about.py:271 cola/widgets/about.py:274 -#: cola/widgets/about.py:277 cola/widgets/about.py:278 -#: cola/widgets/about.py:279 cola/widgets/about.py:280 -#: cola/widgets/about.py:281 cola/widgets/about.py:282 -#: cola/widgets/about.py:283 cola/widgets/about.py:284 -#: cola/widgets/about.py:285 cola/widgets/about.py:286 -#: cola/widgets/about.py:287 cola/widgets/about.py:288 -#: cola/widgets/about.py:289 cola/widgets/about.py:290 -#: cola/widgets/about.py:291 cola/widgets/about.py:292 -#: cola/widgets/about.py:293 cola/widgets/about.py:294 -#: cola/widgets/about.py:295 cola/widgets/about.py:296 -#: cola/widgets/about.py:297 cola/widgets/about.py:298 -#: cola/widgets/about.py:299 cola/widgets/about.py:300 -#: cola/widgets/about.py:301 cola/widgets/about.py:302 -#: cola/widgets/about.py:303 cola/widgets/about.py:304 -#: cola/widgets/about.py:305 cola/widgets/about.py:306 -#: cola/widgets/about.py:307 cola/widgets/about.py:308 -#: cola/widgets/about.py:309 cola/widgets/about.py:310 -#: cola/widgets/about.py:311 cola/widgets/about.py:312 -#: cola/widgets/about.py:313 cola/widgets/about.py:314 -#: cola/widgets/about.py:315 cola/widgets/about.py:316 -#: cola/widgets/about.py:317 cola/widgets/about.py:318 -#: cola/widgets/about.py:319 cola/widgets/about.py:320 -#: cola/widgets/about.py:321 cola/widgets/about.py:322 -#: cola/widgets/about.py:323 cola/widgets/about.py:324 -#: cola/widgets/about.py:325 cola/widgets/about.py:326 -#: cola/widgets/about.py:327 cola/widgets/about.py:328 -#: cola/widgets/about.py:329 cola/widgets/about.py:330 -#: cola/widgets/about.py:331 cola/widgets/about.py:332 -#: cola/widgets/about.py:333 cola/widgets/about.py:334 -#: cola/widgets/about.py:335 cola/widgets/about.py:336 -#: cola/widgets/about.py:337 cola/widgets/about.py:338 -#: cola/widgets/about.py:339 cola/widgets/about.py:340 -#: cola/widgets/about.py:341 cola/widgets/about.py:342 -#: cola/widgets/about.py:343 cola/widgets/about.py:344 -#: cola/widgets/about.py:345 cola/widgets/about.py:346 -#: cola/widgets/about.py:347 cola/widgets/about.py:348 -#: cola/widgets/about.py:349 cola/widgets/about.py:350 -#: cola/widgets/about.py:351 cola/widgets/about.py:352 -#: cola/widgets/about.py:353 cola/widgets/about.py:354 -#: cola/widgets/about.py:355 cola/widgets/about.py:356 -#: cola/widgets/about.py:357 cola/widgets/about.py:358 -#: cola/widgets/about.py:359 cola/widgets/about.py:360 -#: cola/widgets/about.py:361 cola/widgets/about.py:362 -#: cola/widgets/about.py:363 cola/widgets/about.py:364 -#: cola/widgets/about.py:365 cola/widgets/about.py:366 -#: cola/widgets/about.py:367 cola/widgets/about.py:368 -#: cola/widgets/about.py:369 cola/widgets/about.py:370 -#: cola/widgets/about.py:371 cola/widgets/about.py:372 -#: cola/widgets/about.py:373 cola/widgets/about.py:374 -#: cola/widgets/about.py:375 cola/widgets/about.py:376 -#: cola/widgets/about.py:377 cola/widgets/about.py:378 -#: cola/widgets/about.py:379 cola/widgets/about.py:380 +#: cola/widgets/about.py:254 cola/widgets/about.py:257 +#: cola/widgets/about.py:260 cola/widgets/about.py:261 +#: cola/widgets/about.py:262 cola/widgets/about.py:263 +#: cola/widgets/about.py:264 cola/widgets/about.py:265 +#: cola/widgets/about.py:266 cola/widgets/about.py:267 +#: cola/widgets/about.py:268 cola/widgets/about.py:269 +#: cola/widgets/about.py:270 cola/widgets/about.py:271 +#: cola/widgets/about.py:272 cola/widgets/about.py:273 +#: cola/widgets/about.py:274 cola/widgets/about.py:275 +#: cola/widgets/about.py:276 cola/widgets/about.py:277 +#: cola/widgets/about.py:278 cola/widgets/about.py:279 +#: cola/widgets/about.py:280 cola/widgets/about.py:281 +#: cola/widgets/about.py:282 cola/widgets/about.py:283 +#: cola/widgets/about.py:284 cola/widgets/about.py:285 +#: cola/widgets/about.py:286 cola/widgets/about.py:287 +#: cola/widgets/about.py:288 cola/widgets/about.py:289 +#: cola/widgets/about.py:290 cola/widgets/about.py:291 +#: cola/widgets/about.py:292 cola/widgets/about.py:293 +#: cola/widgets/about.py:294 cola/widgets/about.py:295 +#: cola/widgets/about.py:296 cola/widgets/about.py:297 +#: cola/widgets/about.py:298 cola/widgets/about.py:299 +#: cola/widgets/about.py:300 cola/widgets/about.py:301 +#: cola/widgets/about.py:302 cola/widgets/about.py:303 +#: cola/widgets/about.py:304 cola/widgets/about.py:305 +#: cola/widgets/about.py:306 cola/widgets/about.py:307 +#: cola/widgets/about.py:308 cola/widgets/about.py:309 +#: cola/widgets/about.py:310 cola/widgets/about.py:311 +#: cola/widgets/about.py:312 cola/widgets/about.py:313 +#: cola/widgets/about.py:314 cola/widgets/about.py:315 +#: cola/widgets/about.py:316 cola/widgets/about.py:317 +#: cola/widgets/about.py:318 cola/widgets/about.py:319 +#: cola/widgets/about.py:320 cola/widgets/about.py:321 +#: cola/widgets/about.py:322 cola/widgets/about.py:323 +#: cola/widgets/about.py:324 cola/widgets/about.py:325 +#: cola/widgets/about.py:326 cola/widgets/about.py:327 +#: cola/widgets/about.py:328 cola/widgets/about.py:329 +#: cola/widgets/about.py:330 cola/widgets/about.py:331 +#: cola/widgets/about.py:332 cola/widgets/about.py:333 +#: cola/widgets/about.py:334 cola/widgets/about.py:335 +#: cola/widgets/about.py:336 cola/widgets/about.py:337 +#: cola/widgets/about.py:338 cola/widgets/about.py:339 +#: cola/widgets/about.py:340 cola/widgets/about.py:341 +#: cola/widgets/about.py:342 cola/widgets/about.py:343 +#: cola/widgets/about.py:344 cola/widgets/about.py:345 +#: cola/widgets/about.py:346 cola/widgets/about.py:347 +#: cola/widgets/about.py:348 cola/widgets/about.py:349 +#: cola/widgets/about.py:350 cola/widgets/about.py:351 +#: cola/widgets/about.py:352 cola/widgets/about.py:353 +#: cola/widgets/about.py:354 cola/widgets/about.py:355 +#: cola/widgets/about.py:356 cola/widgets/about.py:357 +#: cola/widgets/about.py:358 cola/widgets/about.py:359 +#: cola/widgets/about.py:360 cola/widgets/about.py:361 +#: cola/widgets/about.py:362 cola/widgets/about.py:363 msgid "Developer" msgstr "Programista" -#: cola/guicmds.py:185 cola/widgets/dag.py:764 cola/widgets/diff.py:781 -#: cola/widgets/main.py:177 cola/widgets/main.py:797 +#: cola/guicmds.py:184 cola/widgets/dag.py:830 cola/widgets/diff.py:809 +#: cola/widgets/main.py:175 cola/widgets/main.py:810 msgid "Diff" msgstr "Różnica" -#: cola/guicmds.py:185 +#: cola/guicmds.py:184 msgid "Diff Against Commit" msgstr "Różnica względem zmiany" @@ -1488,35 +1504,35 @@ msgstr "Różnica względem zmiany" msgid "Diff Against Predecessor..." msgstr "Różnica wzgl. poprzednika..." -#: cola/widgets/main.py:1159 +#: cola/widgets/main.py:1172 msgid "Diff Mode" msgstr "Tryb różnicy" -#: cola/widgets/diff.py:772 cola/widgets/diff.py:796 +#: cola/widgets/diff.py:800 cola/widgets/diff.py:824 msgid "Diff Options" msgstr "Opcje różnicy" -#: cola/widgets/prefs.py:256 +#: cola/widgets/prefs.py:277 msgid "Diff Tool" msgstr "Narzędzie różnicy" -#: cola/widgets/dag.py:364 +#: cola/widgets/dag.py:363 msgid "Diff selected -> this" msgstr "Różnica zaznaczenia wzgl. tego" -#: cola/widgets/dag.py:358 +#: cola/widgets/dag.py:357 msgid "Diff this -> selected" msgstr "Różnica tego wzgl. zaznaczenia" -#: cola/widgets/main.py:218 +#: cola/widgets/main.py:217 msgid "Diffstat" msgstr "Statystyka różnicy" -#: cola/cmds.py:3262 +#: cola/difftool.py:324 msgid "Difftool" msgstr "Narzędzie różnicy" -#: cola/widgets/clone.py:207 +#: cola/widgets/clone.py:205 msgid "Directory Exists" msgstr "Katalog istnieje" @@ -1524,116 +1540,108 @@ msgstr "Katalog istnieje" msgid "Disable" msgstr "Wyłącz" -#: cola/widgets/prefs.py:180 +#: cola/widgets/prefs.py:202 msgid "Display Untracked Files" msgstr "Wyświetl niezarządzane pliki" -#: cola/cmds.py:2094 +#: cola/widgets/remote.py:176 +msgid "Display remote messages in a separate dialog" +msgstr "" + +#: cola/cmds.py:2045 msgid "Do not update stacked branches" msgstr "Nie uaktualniaj nałożonych gałęzi" -#: cola/widgets/main.py:471 +#: cola/widgets/main.py:484 msgid "Documentation" msgstr "Dokumentacja" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop" msgstr "Porzuć" -#: cola/widgets/stash.py:258 +#: cola/widgets/stash.py:276 msgid "Drop Stash" msgstr "Porzuć przechowalnię" -#: cola/widgets/stash.py:255 +#: cola/widgets/stash.py:273 msgid "Drop Stash?" msgstr "Porzucić przechowalnię?" -#: cola/widgets/stash.py:257 +#: cola/widgets/stash.py:275 #, python-format msgid "Drop the \"%s\" stash?" msgstr "Porzucić przechowalnię \"%s\"?" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop the selected stash" msgstr "Porzuć wybraną przechowalnię" -#: cola/qtutils.py:764 cola/sequenceeditor.py:357 cola/widgets/grep.py:102 +#: cola/qtutils.py:795 cola/sequenceeditor.py:353 cola/widgets/grep.py:100 msgid "Edit" msgstr "Zmień" -#: cola/widgets/diff.py:1019 +#: cola/widgets/diff.py:1058 msgid "Edit Diff Hunk to Revert..." msgstr "Edytuj kawałek różnicy przed jego wycofaniem..." -#: cola/widgets/diff.py:1017 +#: cola/widgets/diff.py:1056 msgid "Edit Diff Hunk to Stage..." msgstr "Edytuj kawałek różnicy przed jego dobraniem..." -#: cola/widgets/diff.py:1062 +#: cola/widgets/diff.py:1124 msgid "Edit Diff Hunk to Unstage..." msgstr "Edytuj kawałek różnicy przed jego odłożeniem..." -#: cola/cmds.py:2166 +#: cola/cmds.py:2117 msgid "Edit Rebase" msgstr "Ustawienia zmiany podstawy" -#: cola/widgets/editremotes.py:36 +#: cola/widgets/editremotes.py:35 msgid "Edit Remotes" msgstr "Zmień zdalne repozytoria" -#: cola/widgets/main.py:298 +#: cola/widgets/main.py:293 msgid "Edit Remotes..." msgstr "Zmień zdalne repozytoria..." -#: cola/widgets/diff.py:1014 +#: cola/widgets/diff.py:1053 msgid "Edit Selected Lines to Revert..." msgstr "Edytuj zaznaczone wiersze przed ich wycofaniem..." -#: cola/widgets/diff.py:1012 +#: cola/widgets/diff.py:1051 msgid "Edit Selected Lines to Stage..." msgstr "Edytuj zaznaczone wiersze przed ich dobraniem..." -#: cola/widgets/diff.py:1059 +#: cola/widgets/diff.py:1122 msgid "Edit Selected Lines to Unstage..." msgstr "Edytuj zaznaczone wiersze przed ich odłożeniem..." -#: cola/widgets/editremotes.py:44 +#: cola/widgets/editremotes.py:43 msgid "Edit remotes by selecting them from the list" msgstr "Zmień repozytoria zdalne poprzez wybranie ich z wykazu" -#: cola/widgets/browse.py:197 cola/widgets/common.py:39 +#: cola/widgets/browse.py:198 cola/widgets/common.py:38 msgid "Edit selected paths" msgstr "Zmień wybraną ścieżkę/ścieżki" #: cola/editpatch.py:45 -msgid "" -"Edit the following patch, which will then be applied to the staging area to" -" stage the changes:" -msgstr "" -"Edytuj następującą łatę, która następnie zostanie nałożona w obszarze" -" dobierania do dobierania zmian:" +msgid "Edit the following patch, which will then be applied to the staging area to stage the changes:" +msgstr "Edytuj następującą łatę, która następnie zostanie nałożona w obszarze dobierania do dobierania zmian:" #: cola/editpatch.py:40 -msgid "" -"Edit the following patch, which will then be applied to the staging area to" -" unstage the changes:" -msgstr "" -"Edytuj następującą łatę, która następnie zostanie nałożona w obszarze" -" dobierania do odłożenia zmian:" +msgid "Edit the following patch, which will then be applied to the staging area to unstage the changes:" +msgstr "Edytuj następującą łatę, która następnie zostanie nałożona w obszarze dobierania do odłożenia zmian:" #: cola/editpatch.py:34 -msgid "" -"Edit the following patch, which will then be applied to the worktree to" -" revert the changes:" -msgstr "" -"Edytuj następującą łatę, która następnie zostanie nałożona na drzewo pracy do" -" wycofania zmian:" +msgid "Edit the following patch, which will then be applied to the worktree to revert the changes:" +msgstr "Edytuj następującą łatę, która następnie zostanie nałożona na drzewo pracy do wycofania zmian:" -#: cola/widgets/main.py:604 +#: cola/widgets/main.py:617 msgid "Edit..." msgstr "Ustawienia..." -#: cola/widgets/prefs.py:253 +#: cola/widgets/prefs.py:274 msgid "Editor" msgstr "Edytor" @@ -1642,153 +1650,158 @@ msgstr "Edytor" msgid "Editor returned %s exit code. Not applying patch." msgstr "Edytor zwrócił %s jako kod wyjścia. Nie nałożono łaty." -#: cola/widgets/prefs.py:167 +#: cola/widgets/prefs.py:190 msgid "Email Address" msgstr "Adres email" -#: cola/widgets/about.py:258 cola/widgets/about.py:401 +#: cola/widgets/about.py:241 cola/widgets/about.py:384 msgid "Email contributor" msgstr "Napisz do współtwórcy" -#: cola/widgets/prefs.py:182 +#: cola/widgets/prefs.py:204 msgid "Enable Gravatar Icons" msgstr "Włącz ikony z Gravatar" -#: cola/widgets/prefs.py:160 +#: cola/widgets/prefs.py:183 msgid "Enable path autocompletion in tools" msgstr "Włącz uzupełnianie ścieżki w narzędziach" -#: cola/widgets/diff.py:768 +#: cola/widgets/diff.py:796 msgid "Enable word wrapping" msgstr "Włącz zawijanie słów" -#: cola/sequenceeditor.py:322 +#: cola/sequenceeditor.py:319 msgid "Enabled" msgstr "Uwzględnione" -#: cola/guicmds.py:333 cola/widgets/branch.py:445 +#: cola/guicmds.py:332 cola/widgets/branch.py:478 msgid "Enter New Branch Name" msgstr "Podaj nazwę nowej gałęzi" -#: cola/guicmds.py:147 +#: cola/guicmds.py:146 msgid "Enter a name for the new bare repo" msgstr "Wpisz nazwę do założenia nowego repozytorium" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Enter a name for the stash" msgstr "Podaj nazwę dla przechowalni" -#: cola/cmds.py:146 cola/cmds.py:176 cola/cmds.py:207 cola/cmds.py:283 -#: cola/cmds.py:292 cola/cmds.py:307 cola/cmds.py:317 cola/cmds.py:460 -#: cola/cmds.py:496 cola/cmds.py:534 cola/cmds.py:633 cola/cmds.py:751 -#: cola/cmds.py:1067 cola/cmds.py:1164 cola/cmds.py:2005 cola/cmds.py:2394 -#: cola/cmds.py:2637 cola/cmds.py:2643 cola/cmds.py:2651 cola/cmds.py:2872 -#: cola/cmds.py:2890 cola/cmds.py:3180 cola/gitcmds.py:984 cola/guicmds.py:157 -#: cola/models/stash.py:70 cola/models/stash.py:87 cola/models/stash.py:108 -#: cola/widgets/bookmarks.py:482 cola/widgets/branch.py:777 +#: cola/widgets/stash.py:216 +msgid "Enter a new name for the stash" +msgstr "" + +#: cola/cmds.py:145 cola/cmds.py:175 cola/cmds.py:206 cola/cmds.py:284 +#: cola/cmds.py:293 cola/cmds.py:308 cola/cmds.py:318 cola/cmds.py:461 +#: cola/cmds.py:497 cola/cmds.py:535 cola/cmds.py:635 cola/cmds.py:753 +#: cola/cmds.py:1068 cola/cmds.py:1165 cola/cmds.py:1956 cola/cmds.py:2345 +#: cola/cmds.py:2579 cola/cmds.py:2585 cola/cmds.py:2593 cola/cmds.py:2818 +#: cola/cmds.py:2836 cola/cmds.py:3125 cola/gitcmds.py:994 cola/guicmds.py:156 +#: cola/models/stash.py:70 cola/models/stash.py:90 cola/models/stash.py:112 +#: cola/models/stash.py:138 cola/widgets/bookmarks.py:481 +#: cola/widgets/branch.py:829 msgid "Error" msgstr "Błąd" -#: cola/widgets/clone.py:191 +#: cola/widgets/clone.py:189 msgid "Error Cloning" msgstr "Błąd pobierania" -#: cola/widgets/createbranch.py:314 +#: cola/widgets/createbranch.py:312 msgid "Error Creating Branch" msgstr "Błąd tworzenia gałęzi" -#: cola/app.py:502 cola/guicmds.py:101 +#: cola/app.py:505 cola/guicmds.py:100 msgid "Error Creating Repository" msgstr "Błąd tworzenia repozytorium" -#: cola/cmds.py:1202 +#: cola/cmds.py:1206 msgid "Error Deleting Remote Branch" msgstr "Błąd usuwania zdalnej gałęzi" -#: cola/cmds.py:1585 +#: cola/cmds.py:1573 msgid "Error Editing File" msgstr "Błąd edytowania pliku" -#: cola/cmds.py:559 +#: cola/cmds.py:560 msgid "Error Launching Blame Viewer" msgstr "Nie można uruchomić przeglądarki autorów" -#: cola/cmds.py:3145 +#: cola/cmds.py:3091 msgid "Error Launching History Browser" msgstr "Nie można uruchomić przeglądarki historii" -#: cola/app.py:489 +#: cola/app.py:492 msgid "Error Opening Repository" msgstr "Błąd otwierania repozytorium" -#: cola/widgets/browse.py:566 +#: cola/models/stash.py:144 +msgid "Error Renaming Stash" +msgstr "" + +#: cola/widgets/browse.py:567 msgid "Error Saving File" msgstr "Błąd podczas zapisu pliku" -#: cola/cmds.py:914 +#: cola/cmds.py:912 #, python-format msgid "Error creating remote \"%s\"" msgstr "Błąd podczas tworzenia zdalnego repozytorium \"%s\"" -#: cola/models/stash.py:197 +#: cola/models/stash.py:233 msgid "Error creating stash" msgstr "Błąd tworzenia przechowalni" -#: cola/cmds.py:1126 +#: cola/cmds.py:1127 #, python-format msgid "Error deleting branch \"%s\"" msgstr "Błąd usuwania gałęzi \"%s\"" -#: cola/cmds.py:932 +#: cola/cmds.py:930 #, python-format msgid "Error deleting remote \"%s\"" msgstr "Błąd usuwania zdalnego repozytorium \"%s\"" -#: cola/cmds.py:956 +#: cola/cmds.py:955 #, python-format msgid "Error renaming \"%(name)s\" to \"%(new_name)s\"" msgstr "Nie udało się przemianować \"%(name)s\" na \"%(new_name)s\"" -#: cola/cmds.py:1771 +#: cola/cmds.py:1722 msgid "Error running prepare-commitmsg hook" msgstr "Nie udało się wykonać haczyka prepare-commitmsg" -#: cola/cmds.py:3043 cola/cmds.py:3089 +#: cola/cmds.py:2989 cola/cmds.py:3035 #, python-format msgid "Error updating submodule %s" msgstr "Nie udało się uaktualnić podmodułu\"%s\"" -#: cola/cmds.py:3125 +#: cola/cmds.py:3071 msgid "Error updating submodules" msgstr "Nie udało się uaktualnić podmodułów" -#: cola/widgets/diff.py:1326 +#: cola/widgets/diff.py:1400 msgid "Error writing patch" msgstr "Błąd zapisywania łaty" -#: cola/cmds.py:1710 +#: cola/cmds.py:1662 msgid "Error: Cannot find commit template" msgstr "Błąd: Nie można znaleźć wzorca opisu zmiany" -#: cola/widgets/stash.py:235 -msgid "Error: Stash exists" -msgstr "Błąd: Przechowalnia istnieje" - -#: cola/cmds.py:1732 +#: cola/cmds.py:1684 msgid "Error: Unconfigured commit template" msgstr "Błąd: Nie ustawiono wzorca opisu zmiany" -#: cola/widgets/clone.py:53 +#: cola/widgets/clone.py:52 #, python-format msgid "Error: could not clone \"%s\"" msgstr "Błąd: nie można pobrać \"%s\"" -#: cola/cmds.py:2835 +#: cola/cmds.py:2781 #, python-format msgid "Error: could not create tag \"%s\"" msgstr "Błąd: nie można utworzyć znacznika \"%s\"" -#: cola/widgets/branch.py:421 +#: cola/widgets/branch.py:433 #, python-format msgid "Executing action %s" msgstr "Wykonywanie działania %s" @@ -1797,475 +1810,464 @@ msgstr "Wykonywanie działania %s" msgid "Exit \"Diff\" mode" msgstr "Wyjdź z trybu \"różnicy\"" -#: cola/widgets/action.py:67 +#: cola/widgets/action.py:81 msgid "Exit Diff" msgstr "Wyjdź z trybu różnicy" -#: cola/widgets/main.py:528 +#: cola/widgets/main.py:541 msgid "Exit Diff Mode" msgstr "Wyjdź z trybu różnicy" -#: cola/widgets/action.py:68 +#: cola/widgets/action.py:81 msgid "Exit Diff mode" msgstr "Wyjdź z trybu różnicy" -#: cola/widgets/recent.py:67 +#: cola/widgets/recent.py:65 msgid "Expand all" msgstr "Rozwiń wszystko" -#: cola/widgets/diff.py:1223 +#: cola/widgets/diff.py:1297 msgid "Export Patch" msgstr "Wyeksportuj łatę" -#: cola/guicmds.py:168 cola/widgets/search.py:75 +#: cola/guicmds.py:167 cola/widgets/search.py:74 msgid "Export Patches" msgstr "Eksportowanie łat" -#: cola/widgets/main.py:273 +#: cola/widgets/main.py:268 msgid "Export Patches..." msgstr "Wyeksportuj łaty..." -#: cola/widgets/main.py:533 +#: cola/widgets/main.py:546 msgid "Expression..." msgstr "Pomiędzy wyrażeniami zmian..." -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Extended Regexp" msgstr "Rozszerzone wyrażenie regularne" -#: cola/widgets/commitmsg.py:612 +#: cola/widgets/commitmsg.py:638 msgid "Extended description..." msgstr "Rozbudowany opis zmiany..." -#: cola/cmds.py:387 +#: cola/cmds.py:388 msgid "Failed to commit and continue applying patches" msgstr "Nie udało się zatwierdzić i kontynuować stosowanie pozostałych łat" -#: cola/cmds.py:403 +#: cola/cmds.py:404 msgid "Failed to continue applying patches after skipping the current patch" msgstr "Nie udało się nałożenie łat po pominięciu bieżącej łaty" -#: cola/widgets/createbranch.py:124 +#: cola/widgets/createbranch.py:122 msgid "Fast Forward Only" msgstr "Wyłącznie przewijając do przodu" -#: cola/widgets/remote.py:177 +#: cola/widgets/remote.py:181 msgid "Fast-forward only" msgstr "Wyłącznie przewinięcie do przodu" -#: cola/widgets/bookmarks.py:91 +#: cola/widgets/bookmarks.py:90 msgid "Favorite repositories" msgstr "Ulubione repozytoria" -#: cola/widgets/main.py:111 +#: cola/widgets/main.py:109 msgid "Favorites" msgstr "Ulubione" -#: cola/widgets/remote.py:673 +#: cola/widgets/remote.py:735 msgid "Fetch" msgstr "Pobierz" -#: cola/widgets/createbranch.py:127 +#: cola/widgets/createbranch.py:125 msgid "Fetch Tracking Branch" msgstr "Pobierz odgórną gałąź" -#: cola/widgets/action.py:63 cola/widgets/main.py:387 +#: cola/widgets/action.py:67 cola/widgets/main.py:384 +msgid "Fetch from one or more remotes using \"git fetch\"" +msgstr "" + +#: cola/widgets/action.py:65 cola/widgets/main.py:383 msgid "Fetch..." msgstr "Pobierz..." -#: cola/widgets/main.py:588 +#: cola/widgets/main.py:601 msgid "File Browser..." msgstr "Przeglądarka plików..." -#: cola/widgets/compare.py:75 +#: cola/widgets/compare.py:74 msgid "File Differences" msgstr "Różniące się pliki" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 msgid "File Saved" msgstr "Zapisano plik" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 #, python-format msgid "File saved to \"%s\"" msgstr "Plik zapisano w \"%s\"" -#: cola/fsmonitor.py:517 -msgid "" -"File system change monitoring: disabled because \"cola.inotify\" is false.\n" -msgstr "" -"Monitorowanie zmiany systemu plików: wyłączone, bo \"cola.inotify\" jest" -" false.\n" +#: cola/fsmonitor.py:528 +msgid "File system change monitoring: disabled because \"cola.inotify\" is false.\n" +msgstr "Monitorowanie zmiany systemu plików: wyłączone, bo \"cola.inotify\" jest false.\n" -#: cola/fsmonitor.py:534 -msgid "" -"File system change monitoring: disabled because libc does not support the" -" inotify system calls.\n" -msgstr "" -"Monitorowanie zmiany systemu plików: wyłączone, bo libc nie obsługuje wywołań" -" systemowych inotify.\n" +#: cola/fsmonitor.py:545 +msgid "File system change monitoring: disabled because libc does not support the inotify system calls.\n" +msgstr "Monitorowanie zmiany systemu plików: wyłączone, bo libc nie obsługuje wywołań systemowych inotify.\n" -#: cola/fsmonitor.py:528 -msgid "" -"File system change monitoring: disabled because pywin32 is not installed.\n" -msgstr "" -"Monitorowanie zmiany systemu plików: wyłączone, bo nie wgrano pywin32.\n" +#: cola/fsmonitor.py:539 +msgid "File system change monitoring: disabled because pywin32 is not installed.\n" +msgstr "Monitorowanie zmiany systemu plików: wyłączone, bo nie wgrano pywin32.\n" -#: cola/fsmonitor.py:181 +#: cola/fsmonitor.py:184 msgid "" -"File system change monitoring: disabled because the limit on the total number" -" of inotify watches was reached. You may be able to increase the limit on" -" the number of watches by running:\n" +"File system change monitoring: disabled because the limit on the total number of inotify watches was reached. You may be able to increase the limit on the number of watches by running:\n" "\n" -" echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf &&" -" sudo sysctl -p\n" +" echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n" msgstr "" -"Monitorowanie zmiany systemu plików: wyłączone, bo osiągnięto górną granicę" -" całkowitej liczby obserwowanych inotify. Możesz zwiększyć tę granicę" -" wykonując:\n" +"Monitorowanie zmiany systemu plików: wyłączone, bo osiągnięto górną granicę całkowitej liczby obserwowanych inotify. Możesz zwiększyć tę granicę wykonując:\n" "\n" -" echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf &&" -" sudo sysctl -p\n" +" echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n" -#: cola/fsmonitor.py:142 +#: cola/fsmonitor.py:145 msgid "File system change monitoring: enabled.\n" msgstr "Monitorowanie zmiany systemu plików: włączone.\n" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Filename" msgstr "Nazwa pliku" -#: cola/widgets/dag.py:755 +#: cola/widgets/dag.py:821 msgid "Files" msgstr "Pliki" -#: cola/widgets/branch.py:785 +#: cola/widgets/branch.py:837 msgid "Filter branches..." msgstr "Odfiltruj gałęzie..." -#: cola/widgets/status.py:1333 +#: cola/widgets/status.py:1334 msgid "Filter paths..." msgstr "Odfiltruj ścieżki..." -#: cola/widgets/finder.py:113 cola/widgets/main.py:312 +#: cola/widgets/finder.py:112 cola/widgets/main.py:307 msgid "Find Files" msgstr "Poszukaj plików" -#: cola/widgets/text.py:388 +#: cola/widgets/text.py:385 msgid "Find in diff" msgstr "Poszukaj w różnicy" -#: cola/widgets/text.py:425 +#: cola/widgets/text.py:422 msgid "Find next item" msgstr "Poszukaj następnej rzeczy" -#: cola/widgets/text.py:431 +#: cola/widgets/text.py:428 msgid "Find previous item" msgstr "Poszukaj poprzedniej rzeczy" -#: cola/widgets/text.py:395 +#: cola/widgets/text.py:392 msgid "Find the next occurrence of the phrase" msgstr "Poszukaj następnego wystąpienia wyrażenia" -#: cola/widgets/text.py:391 +#: cola/widgets/text.py:388 msgid "Find the previous occurrence of the phrase" msgstr "Poszukaj poprzedniego wystąpienia wyrażenia" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Fixed String" msgstr "Stały ciąg znaków" -#: cola/widgets/prefs.py:251 +#: cola/widgets/prefs.py:270 msgid "Fixed-Width Font" msgstr "Czcionka o stałej szerokości" -#: cola/sequenceeditor.py:362 +#: cola/sequenceeditor.py:358 msgid "Fixup" msgstr "Popraw" -#: cola/widgets/commitmsg.py:148 +#: cola/widgets/commitmsg.py:154 msgid "Fixup Previous Commit" msgstr "Popraw wcześniejszą zmianę" -#: cola/themes.py:672 +#: cola/themes.py:684 msgid "Flat dark blue" msgstr "Płaski, ciemny, niebieski" -#: cola/themes.py:693 +#: cola/themes.py:705 msgid "Flat dark green" msgstr "Płaski, ciemny, zielony" -#: cola/themes.py:686 +#: cola/themes.py:698 msgid "Flat dark grey" msgstr "Płaski, ciemny, szary" -#: cola/themes.py:679 +#: cola/themes.py:691 msgid "Flat dark red" msgstr "Płaski, ciemny, czerwony" -#: cola/themes.py:644 +#: cola/themes.py:656 msgid "Flat light blue" msgstr "Płaski, jasny, niebieski" -#: cola/themes.py:665 +#: cola/themes.py:677 msgid "Flat light green" msgstr "Płaski, jasny, zielony" -#: cola/themes.py:658 +#: cola/themes.py:670 msgid "Flat light grey" msgstr "Płaski, jasny, szary" -#: cola/themes.py:651 +#: cola/themes.py:663 msgid "Flat light red" msgstr "Płaski, jasny, czerwony" -#: cola/widgets/startup.py:73 +#: cola/widgets/startup.py:72 msgid "Folder" msgstr "Katalog" -#: cola/widgets/toolbar.py:177 +#: cola/widgets/toolbar.py:181 msgid "Follow System Style" msgstr "Zgodnie z wyglądem systemu" -#: cola/widgets/prefs.py:252 +#: cola/widgets/prefs.py:271 msgid "Font Size" msgstr "Rozmiar czcionki" -#: cola/widgets/remote.py:193 +#: cola/widgets/remote.py:197 msgid "Force" msgstr "Wymuś" -#: cola/widgets/remote.py:617 +#: cola/widgets/remote.py:652 msgid "Force Fetch" msgstr "Wymuś pobranie" -#: cola/widgets/remote.py:614 +#: cola/widgets/remote.py:649 msgid "Force Fetch?" msgstr "Wymusić pobranie?" -#: cola/widgets/remote.py:625 +#: cola/widgets/remote.py:660 msgid "Force Push" msgstr "Wymuś wypchnięcie" -#: cola/widgets/remote.py:619 +#: cola/widgets/remote.py:654 msgid "Force Push?" msgstr "Wymusić wypchnięcie?" -#: cola/widgets/remote.py:616 +#: cola/widgets/remote.py:651 #, python-format msgid "Force fetching from %s?" msgstr "Wymusić pobranie z %s?" -#: cola/widgets/remote.py:624 +#: cola/widgets/remote.py:659 #, python-format msgid "Force push to %s?" msgstr "Wymusić wypchnięcie do %s?" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Format String" msgstr "Sformatowany ciąg znaków" -#: cola/widgets/about.py:430 cola/widgets/about.py:431 +#: cola/widgets/about.py:413 cola/widgets/about.py:414 msgid "French translation" msgstr "Tłumaczenie na francuski" -#: cola/widgets/merge.py:80 +#: cola/widgets/merge.py:78 msgid "GPG-sign the merge commit" msgstr "Podpisz-GPG zmianę scalenia" -#: cola/widgets/prefs.py:344 +#: cola/widgets/prefs.py:364 msgid "GUI theme" msgstr "Ogólny wygląd" -#: cola/widgets/editremotes.py:318 +#: cola/widgets/editremotes.py:317 #, python-format msgid "Gathering info for \"%s\"..." msgstr "Zbieranie informacji dla \"%s\"..." -#: cola/widgets/about.py:420 cola/widgets/about.py:428 -#: cola/widgets/about.py:429 +#: cola/widgets/about.py:403 cola/widgets/about.py:411 +#: cola/widgets/about.py:412 msgid "German translation" msgstr "Tłumaczenie na niemiecki" -#: cola/widgets/main.py:511 +#: cola/widgets/main.py:524 msgid "Get Commit Message Template" msgstr "Pobierz wzorzec opisu zmiany" -#: cola/widgets/dag.py:520 +#: cola/widgets/dag.py:586 msgid "Go Down" msgstr "Przejdź w dół" -#: cola/widgets/dag.py:516 +#: cola/widgets/dag.py:582 msgid "Go Up" msgstr "Przejdź w górę" -#: cola/widgets/dag.py:467 cola/widgets/filelist.py:42 +#: cola/widgets/dag.py:466 cola/widgets/filelist.py:39 msgid "Grab File..." msgstr "Pobierz plik..." -#: cola/widgets/dag.py:782 +#: cola/widgets/dag.py:848 msgid "Graph" msgstr "Graf" -#: cola/widgets/main.py:358 +#: cola/widgets/main.py:353 msgid "Grep" msgstr "Wyszukaj (grep)" -#: cola/widgets/remote.py:662 +#: cola/widgets/remote.py:707 msgid "Have you rebased/pulled lately?" msgstr "Czy ostatnio zmieniłeś podstawę/zaciągnąłeś?" -#: cola/sequenceeditor.py:110 cola/sequenceeditor.py:171 -#: cola/widgets/finder.py:138 cola/widgets/main.py:854 +#: cola/sequenceeditor.py:108 cola/sequenceeditor.py:169 +#: cola/widgets/finder.py:137 cola/widgets/main.py:867 msgid "Help" msgstr "Pomoc" -#: cola/widgets/status.py:1322 +#: cola/widgets/status.py:1323 msgid "Help - Custom Copy Actions" msgstr "Pomoc - Własne działania kopiowania" -#: cola/widgets/finder.py:79 +#: cola/widgets/finder.py:78 msgid "Help - Find Files" msgstr "Pomoc - poszukaj plików" -#: cola/sequenceeditor.py:737 +#: cola/sequenceeditor.py:732 msgid "Help - git-cola-sequence-editor" msgstr "Pomoc - git-cola-sequence-editor" -#: cola/widgets/prefs.py:346 +#: cola/widgets/prefs.py:366 msgid "High DPI" msgstr "Wysokie DPI" -#: cola/gitcmds.py:876 -msgid "" -"Hint: The \"Actions > Abort Cherry-Pick\" menu action can be used to cancel" -" the current cherry-pick." -msgstr "" -"Wskazówka: Menu \"Działania > Przerwij zaciąganie wybiórcze\" można" -" wykorzystać do anulowania bieżącego zaciągania wybiórczego." +#: cola/gitcmds.py:886 +msgid "Hint: The \"Actions > Abort Cherry-Pick\" menu action can be used to cancel the current cherry-pick." +msgstr "Wskazówka: Menu \"Działania > Przerwij zaciąganie wybiórcze\" można wykorzystać do anulowania bieżącego zaciągania wybiórczego." -#: cola/widgets/prefs.py:254 +#: cola/widgets/prefs.py:275 msgid "History Browser" msgstr "Przeglądarka historii" -#: cola/widgets/about.py:427 cola/widgets/about.py:441 +#: cola/widgets/about.py:410 cola/widgets/about.py:424 msgid "Hungarian translation" msgstr "Tłumaczenie na węgierski" -#: cola/widgets/toolbar.py:178 +#: cola/widgets/toolbar.py:182 msgid "Icon Only" msgstr "Tylko ikona" -#: cola/widgets/prefs.py:345 +#: cola/widgets/prefs.py:365 msgid "Icon theme" msgstr "Zestaw ikon" -#: cola/widgets/diff.py:758 +#: cola/widgets/diff.py:787 msgid "Ignore all whitespace" msgstr "Pomiń wszystkie białe znaki" -#: cola/widgets/diff.py:755 +#: cola/widgets/diff.py:785 msgid "Ignore changes in amount of whitespace" msgstr "Pomiń zmiany w liczbie białych znaków" -#: cola/widgets/diff.py:751 +#: cola/widgets/diff.py:782 msgid "Ignore changes in whitespace at EOL" msgstr "Pomiń zmiany w białych znakach na końcu wiersza" -#: cola/widgets/gitignore.py:46 +#: cola/widgets/gitignore.py:45 msgid "Ignore custom pattern" msgstr "Pomiń własny wzorzec" -#: cola/widgets/gitignore.py:44 +#: cola/widgets/gitignore.py:43 msgid "Ignore exact filename" msgstr "Pomiń dokładne nazwy plików" -#: cola/widgets/gitignore.py:32 +#: cola/widgets/gitignore.py:31 msgid "Ignore filename or pattern" msgstr "Pomiń nazwy plików lub wzorce" -#: cola/widgets/status.py:933 +#: cola/widgets/dag.py:498 +msgid "Ignore merge commits" +msgstr "" + +#: cola/widgets/status.py:934 msgid "Ignore..." msgstr "Pomiń..." -#: cola/widgets/remote.py:203 +#: cola/widgets/remote.py:207 msgid "Include tags " msgstr "Ze znacznikami " -#: cola/widgets/prefs.py:349 +#: cola/widgets/prefs.py:369 msgid "Indent Status paths" msgstr "Wetnij ścieżki w oknie stanu" -#: cola/widgets/about.py:419 cola/widgets/about.py:426 +#: cola/widgets/about.py:402 cola/widgets/about.py:409 msgid "Indonesian translation" msgstr "Tłumaczenie na indonezyjski" -#: cola/widgets/main.py:643 +#: cola/widgets/main.py:656 msgid "Initialize Git Annex" msgstr "Przygotuj Git Annex" -#: cola/widgets/main.py:647 +#: cola/widgets/main.py:660 msgid "Initialize Git LFS" msgstr "Przygotuj Git LFS" -#: cola/widgets/clone.py:116 +#: cola/widgets/clone.py:114 msgid "Inititalize submodules" msgstr "Przygotuj podmoduły" -#: cola/widgets/prefs.py:260 +#: cola/widgets/prefs.py:281 msgid "Insert spaces instead of tabs" msgstr "Wstaw odstępy zamiast tabulatorów" -#: cola/cmds.py:2130 +#: cola/widgets/action.py:73 cola/widgets/main.py:402 +msgid "Integrate changes using \"git pull\"" +msgstr "" + +#: cola/cmds.py:2081 msgid "Interactive Rebase" msgstr "Zmień podstawę interaktywnie" -#: cola/cmds.py:2364 +#: cola/cmds.py:2315 msgid "Invalid Revision" msgstr "Nieprawidłowe wydanie" #: cola/editpatch.py:61 -msgid "" -"It is not necessary to update the hunk header lines as they will be" -" regenerated automatically." -msgstr "" -"Nie jest konieczne uaktualnienie wierszy nagłówków kawałka, bo zostaną one" -" napisane samoczynnie." +msgid "It is not necessary to update the hunk header lines as they will be regenerated automatically." +msgstr "Nie jest konieczne uaktualnienie wierszy nagłówków kawałka, bo zostaną one napisane samoczynnie." -#: cola/widgets/about.py:421 cola/widgets/about.py:424 +#: cola/widgets/about.py:404 cola/widgets/about.py:407 msgid "Japanese translation" msgstr "Japońskie tłumaczenie" -#: cola/widgets/prefs.py:262 +#: cola/widgets/prefs.py:283 msgid "Keep *.orig Merge Backups" msgstr "Zachowaj kopie zapasowe *.orig po scaleniu" -#: cola/widgets/stash.py:71 +#: cola/widgets/stash.py:73 msgid "Keep Index" msgstr "Pozostaw indeks" -#: cola/widgets/main.py:477 +#: cola/widgets/main.py:490 msgid "Keyboard Shortcuts" msgstr "Skróty klawiszowe" -#: cola/cmds.py:1608 cola/sequenceeditor.py:165 cola/sequenceeditor.py:338 -#: cola/widgets/dag.py:395 cola/widgets/filelist.py:34 +#: cola/difftool.py:27 cola/sequenceeditor.py:163 cola/sequenceeditor.py:334 +#: cola/widgets/dag.py:394 cola/widgets/filelist.py:31 msgid "Launch Diff Tool" msgstr "Wywołaj narzędzie różnicy" -#: cola/widgets/dag.py:402 +#: cola/widgets/dag.py:401 msgid "Launch Directory Diff Tool" msgstr "Wywołaj narzędzie różnicy na katalogu" -#: cola/cmds.py:1541 cola/cmds.py:1679 cola/widgets/filelist.py:38 +#: cola/cmds.py:1529 cola/cmds.py:1631 cola/widgets/filelist.py:35 msgid "Launch Editor" msgstr "Otwórz w edytorze" -#: cola/cmds.py:1644 +#: cola/cmds.py:1596 msgid "Launch Terminal" msgstr "Otwórz terminal" -#: cola/sequenceeditor.py:166 +#: cola/sequenceeditor.py:164 msgid "" "Launch external diff tool\n" "Shortcut: Ctrl+D" @@ -2273,8 +2275,8 @@ msgstr "" "Wywołaj zewnętrzne narzędzie różnicy\n" "Skrót: Ctrl+D" -#: cola/widgets/diff.py:1005 cola/widgets/diff.py:1051 -#: cola/widgets/status.py:852 cola/widgets/status.py:948 +#: cola/widgets/diff.py:1044 cola/widgets/diff.py:1106 +#: cola/widgets/status.py:853 cola/widgets/status.py:949 msgid "Launch git-cola" msgstr "Uruchom git-cola" @@ -2286,7 +2288,7 @@ msgstr "Uruchom git-difftool względem poprzednich wersji" msgid "Launch git-difftool on the current path" msgstr "Uruchom git-difftool dla bieżącej ścieżki" -#: cola/icons.py:56 +#: cola/icons.py:55 msgid "Light Theme" msgstr "Jasne" @@ -2295,167 +2297,183 @@ msgstr "Jasne" msgid "Lines starting with '%s' will be ignored." msgstr "Wiersze zaczynające na '%s' będą pomijane." -#: cola/widgets/startup.py:74 +#: cola/widgets/startup.py:73 msgid "List" msgstr "Lista" -#: cola/guicmds.py:267 +#: cola/guicmds.py:266 msgid "Load Commit Message" msgstr "Wczytaj opis zmiany" -#: cola/widgets/main.py:339 +#: cola/widgets/main.py:334 msgid "Load Commit Message..." msgstr "Wczytaj opis zmiany..." -#: cola/widgets/commitmsg.py:144 +#: cola/widgets/commitmsg.py:150 msgid "Load Previous Commit Message" msgstr "Wczytaj opis wcześniejszej zmiany" -#: cola/widgets/diff.py:264 +#: cola/widgets/diff.py:265 msgid "Loading..." msgstr "Wczytywanie..." -#: cola/widgets/branch.py:169 cola/widgets/branch.py:240 -#: cola/widgets/branch.py:281 cola/widgets/compare.py:38 -#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/branch.py:173 cola/widgets/branch.py:250 +#: cola/widgets/branch.py:290 cola/widgets/compare.py:37 +#: cola/widgets/compare.py:52 cola/widgets/compare.py:57 msgid "Local" msgstr "Lokalne repozytoria" -#: cola/widgets/cfgactions.py:227 cola/widgets/merge.py:46 -#: cola/widgets/remote.py:138 +#: cola/widgets/cfgactions.py:225 cola/widgets/merge.py:44 +#: cola/widgets/remote.py:136 msgid "Local Branch" msgstr "Lokalna gałąź" -#: cola/widgets/createbranch.py:114 +#: cola/widgets/createbranch.py:112 msgid "Local branch" msgstr "Lokalna gałąź" -#: cola/widgets/dag.py:788 cola/widgets/main.py:651 +#: cola/widgets/dag.py:854 cola/widgets/main.py:664 msgid "Lock Layout" msgstr "Zablokuj układ" -#: cola/widgets/dag.py:750 +#: cola/widgets/dag.py:816 msgid "Log" msgstr "Dziennik" -#: cola/widgets/prefs.py:170 +#: cola/widgets/prefs.py:191 msgid "Log Date Format" msgstr "Zapis daty w dzienniku" -#: cola/widgets/about.py:268 +#: cola/themes.py:769 +msgid "MacOS Aqua dark" +msgstr "" + +#: cola/themes.py:765 +msgid "MacOS Aqua light" +msgstr "" + +#: cola/themes.py:781 +msgid "MacOS Vibrant dark" +msgstr "" + +#: cola/themes.py:775 +msgid "MacOS Vibrant light" +msgstr "" + +#: cola/widgets/about.py:251 msgid "Maintainer (since 2007) and developer" msgstr "Opiekun (od 2007) i programista" -#: cola/widgets/text.py:398 +#: cola/widgets/text.py:395 msgid "Match Case" msgstr "Rozróżniaj wielkość liter" -#: cola/widgets/merge.py:88 +#: cola/widgets/merge.py:86 msgid "Merge" msgstr "Scal" -#: cola/widgets/merge.py:162 +#: cola/widgets/merge.py:160 #, python-format msgid "Merge \"%(revision)s\" into \"%(branch)s\"" msgstr "Scal \"%(revision)s\" z \"%(branch)s\"" -#: cola/widgets/prefs.py:257 +#: cola/widgets/prefs.py:278 msgid "Merge Tool" msgstr "Narzędzie scalania" -#: cola/widgets/prefs.py:171 +#: cola/widgets/prefs.py:193 msgid "Merge Verbosity" msgstr "Szczegółowość przy scalaniu" -#: cola/cmds.py:1829 +#: cola/cmds.py:1780 msgid "Merge failed. Conflict resolution is required." msgstr "Nie udało się scalić. Wymagane jest rozwiązanie sprzeczności." -#: cola/widgets/merge.py:167 +#: cola/widgets/merge.py:165 #, python-format msgid "Merge into \"%s\"" msgstr "Scal z \"%s\"" -#: cola/widgets/branch.py:231 +#: cola/widgets/branch.py:242 msgid "Merge into current branch" msgstr "Scal z bieżącą gałęzią" -#: cola/widgets/main.py:363 +#: cola/widgets/main.py:358 msgid "Merge..." msgstr "Scal..." -#: cola/widgets/main.py:1163 +#: cola/widgets/main.py:1176 msgid "Merging" msgstr "Scalanie" -#: cola/models/browse.py:33 cola/widgets/createtag.py:78 +#: cola/models/browse.py:32 cola/widgets/createtag.py:76 msgid "Message" msgstr "Opis" -#: cola/widgets/commitmsg.py:417 +#: cola/widgets/commitmsg.py:425 msgid "Missing Commit Message" msgstr "Brak opisu zmiany" -#: cola/widgets/createbranch.py:252 +#: cola/widgets/createbranch.py:250 msgid "Missing Data" msgstr "Brakuje danych" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Missing Name" msgstr "Brak nazwy" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Missing Revision" msgstr "Brak wydania" -#: cola/cmds.py:2801 +#: cola/cmds.py:2747 msgid "Missing Tag Message" msgstr "Brak opisu znacznika" -#: cola/models/browse.py:332 cola/widgets/status.py:158 -#: cola/widgets/status.py:631 +#: cola/models/browse.py:331 cola/widgets/status.py:158 +#: cola/widgets/status.py:632 msgid "Modified" msgstr "Zmienione" -#: cola/widgets/commitmsg.py:506 +#: cola/widgets/commitmsg.py:532 msgid "More..." msgstr "Więcej..." -#: cola/widgets/standard.py:243 cola/widgets/status.py:233 +#: cola/widgets/standard.py:242 cola/widgets/status.py:234 msgid "Move Down" msgstr "Przesuń w dół" -#: cola/widgets/standard.py:235 cola/widgets/status.py:225 +#: cola/widgets/standard.py:234 cola/widgets/status.py:226 msgid "Move Up" msgstr "Przesuń w górę" -#: cola/widgets/status.py:300 +#: cola/widgets/status.py:301 msgid "Move files to trash" msgstr "Przenieś plik(i) do kosza" -#: cola/models/browse.py:33 cola/widgets/bookmarks.py:467 -#: cola/widgets/createtag.py:61 cola/widgets/editremotes.py:450 -#: cola/widgets/status.py:1452 cola/widgets/toolbar.py:312 +#: cola/models/browse.py:32 cola/widgets/bookmarks.py:466 +#: cola/widgets/createtag.py:59 cola/widgets/editremotes.py:448 +#: cola/widgets/status.py:1453 cola/widgets/toolbar.py:317 msgid "Name" msgstr "Nazwa" -#: cola/widgets/editremotes.py:434 +#: cola/widgets/editremotes.py:432 msgid "Name for the new remote" msgstr "Nazwa nowego zdalnego repozytorium" -#: cola/guicmds.py:148 cola/widgets/main.py:285 +#: cola/guicmds.py:147 cola/widgets/main.py:280 msgid "New Bare Repository..." msgstr "Nowe repozytorium bez drzewa pracy..." -#: cola/guicmds.py:87 cola/widgets/main.py:280 +#: cola/guicmds.py:86 cola/widgets/main.py:275 msgid "New Repository..." msgstr "Nowe repozytorium..." -#: cola/widgets/main.py:983 +#: cola/widgets/main.py:996 msgid "New Toolbar" msgstr "Dodaj pasek narzędzi" -#: cola/widgets/startup.py:53 +#: cola/widgets/startup.py:52 msgid "New..." msgstr "Nowe..." @@ -2463,15 +2481,19 @@ msgstr "Nowe..." msgid "Next File" msgstr "Następny plik" -#: cola/widgets/createbranch.py:123 cola/widgets/standard.py:1065 +#: cola/widgets/createbranch.py:121 cola/widgets/standard.py:1183 msgid "No" msgstr "Nie" -#: cola/widgets/merge.py:217 cola/widgets/merge.py:227 +#: cola/widgets/merge.py:215 cola/widgets/merge.py:225 msgid "No Revision Specified" msgstr "Nie podano wydania" -#: cola/widgets/commitmsg.py:427 +#: cola/widgets/stash.py:225 +msgid "No change made" +msgstr "" + +#: cola/widgets/commitmsg.py:435 msgid "" "No changes to commit.\n" "\n" @@ -2481,34 +2503,33 @@ msgstr "" "\n" "Aby cokolwiek zatwierdzić, należy dobrać co najmniej 1 plik." -#: cola/widgets/selectcommits.py:118 +#: cola/widgets/selectcommits.py:117 msgid "No commits exist in this branch." msgstr "Brak zmian w tej gałęzi." -#: cola/widgets/merge.py:65 +#: cola/widgets/merge.py:63 msgid "No fast forward" msgstr "Nie przewijaj do przodu" -#: cola/widgets/remote.py:186 +#: cola/widgets/remote.py:190 msgid "No fast-forward" msgstr "Nie przewijaj do przodu" -#: cola/widgets/remote.py:577 +#: cola/widgets/remote.py:612 msgid "No repository selected." msgstr "Nie wybrano repozytorium." -#: cola/widgets/remote.py:615 +#: cola/widgets/remote.py:650 msgid "Non-fast-forward fetch overwrites local history!" msgstr "Pobranie bez przewinięcia do przodu zastępuje lokalną historię!" -#: cola/widgets/remote.py:621 +#: cola/widgets/remote.py:656 msgid "" "Non-fast-forward push overwrites published history!\n" "(Did you pull first?)" -msgstr "" -"Wypchnięcie bez przewinięcia do przodu zastępuje opublikowaną historię!" +msgstr "Wypchnięcie bez przewinięcia do przodu zastępuje opublikowaną historię!" -#: cola/widgets/commitmsg.py:444 +#: cola/widgets/commitmsg.py:452 msgid "Nothing to commit" msgstr "Nie ma nic do zatwierdzenia" @@ -2516,79 +2537,79 @@ msgstr "Nie ma nic do zatwierdzenia" msgid "Nothing to do" msgstr "Nie ma nic do zrobienia" -#: cola/widgets/prefs.py:172 +#: cola/widgets/prefs.py:194 msgid "Number of Diff Context Lines" msgstr "Liczba wierszy otaczających różnicę" -#: cola/widgets/bookmarks.py:79 cola/widgets/bookmarks.py:213 -#: cola/widgets/startup.py:336 +#: cola/widgets/bookmarks.py:78 cola/widgets/bookmarks.py:212 +#: cola/widgets/startup.py:335 msgid "Open" msgstr "Otwórz" -#: cola/widgets/text.py:230 +#: cola/widgets/text.py:228 #, python-format msgid "Open \"%s\"" msgstr "Otwórz \"%s\"" -#: cola/cmds.py:1857 +#: cola/cmds.py:1808 msgid "Open Directory" msgstr "Otwórz katalog" -#: cola/guicmds.py:205 cola/guicmds.py:214 cola/widgets/editremotes.py:473 -#: cola/widgets/startup.py:55 cola/widgets/startup.py:215 +#: cola/guicmds.py:204 cola/guicmds.py:213 cola/widgets/editremotes.py:471 +#: cola/widgets/startup.py:54 cola/widgets/startup.py:214 msgid "Open Git Repository" msgstr "Otwórz repozytorium Git" -#: cola/widgets/submodules.py:49 +#: cola/widgets/submodules.py:48 msgid "Open Parent" msgstr "Otwórz nadrzędny" -#: cola/cmds.py:1877 +#: cola/cmds.py:1828 msgid "Open Parent Directory" msgstr "Otwórz katalog nadrzędny" -#: cola/widgets/main.py:679 +#: cola/widgets/main.py:692 msgid "Open Recent" msgstr "Otwórz z ostatnich" -#: cola/cmds.py:1840 +#: cola/cmds.py:1791 msgid "Open Using Default Application" msgstr "Otwórz w domyślnej aplikacji" -#: cola/cmds.py:1890 +#: cola/cmds.py:1841 msgid "Open Worktree" msgstr "Otwórz drzewo pracy" -#: cola/widgets/bookmarks.py:221 cola/widgets/startup.py:344 +#: cola/widgets/bookmarks.py:220 cola/widgets/startup.py:343 msgid "Open in New Window" msgstr "Otwórz w nowym oknie" -#: cola/widgets/main.py:408 +#: cola/widgets/main.py:415 msgid "Open in New Window..." msgstr "Otwórz w nowym oknie..." -#: cola/widgets/main.py:402 +#: cola/widgets/main.py:409 msgid "Open..." msgstr "Otwórz..." -#: cola/widgets/branch.py:345 +#: cola/widgets/branch.py:354 msgid "Other branches" msgstr "Inne gałęzie" -#: cola/widgets/archive.py:210 +#: cola/widgets/archive.py:208 msgid "Overwrite" msgstr "Zastąp" -#: cola/widgets/archive.py:209 +#: cola/widgets/archive.py:207 #, python-format msgid "Overwrite \"%s\"?" msgstr "Zastąpić \"%s\"?" -#: cola/widgets/archive.py:207 +#: cola/widgets/archive.py:205 msgid "Overwrite File?" msgstr "Zastąpić plik?" -#: cola/widgets/grep.py:144 +#: cola/widgets/grep.py:142 msgid "" "Parse arguments using a shell.\n" "Queries with spaces will require \"double quotes\"." @@ -2596,63 +2617,67 @@ msgstr "" "Przetwórz argumenty przy użyciu powłoki.\n" "Zapytania z odstępami będą wymagać cudzysłowów." -#: cola/models/browse.py:330 +#: cola/models/browse.py:329 msgid "Partially Staged" msgstr "Częściowo dobrany" -#: cola/widgets/main.py:744 +#: cola/widgets/main.py:757 msgid "Paste" msgstr "Wklej" -#: cola/cmds.py:363 +#: cola/cmds.py:364 msgid "Patch failed to apply" msgstr "Nie udało się nałożyć łaty" -#: cola/cmds.py:375 +#: cola/cmds.py:376 msgid "Patch(es) Applied" msgstr "Zastosowano łatę/łaty" -#: cola/widgets/diff.py:1219 cola/widgets/main.py:695 +#: cola/widgets/diff.py:1293 cola/widgets/main.py:708 msgid "Patches" msgstr "Łaty" -#: cola/widgets/prefs.py:173 +#: cola/widgets/prefs.py:195 msgid "Patches Directory" msgstr "Katalog łat" -#: cola/widgets/bookmarks.py:468 cola/widgets/submodules.py:118 +#: cola/widgets/bookmarks.py:467 cola/widgets/submodules.py:117 msgid "Path" msgstr "Ścieżka" -#: cola/widgets/clone.py:112 +#: cola/widgets/clone.py:110 msgid "Path or URL to clone (Env. $VARS okay)" msgstr "Ścieżka lub adres URL do pobrania (Zm. środowiskowe $VARS są OK)" -#: cola/sequenceeditor.py:346 +#: cola/sequenceeditor.py:342 msgid "Pick" msgstr "Użyj" -#: cola/widgets/diff.py:781 +#: cola/widgets/dag.py:490 +msgid "Pickaxe search for changes containing text" +msgstr "" + +#: cola/widgets/diff.py:809 msgid "Pixel XOR" msgstr "Pixel XOR" -#: cola/widgets/createbranch.py:253 +#: cola/widgets/createbranch.py:251 msgid "Please provide both a branch name and revision expression." msgstr "Podaj zarówno nazwę gałęzi jak i wyrażenie wydania." -#: cola/cmds.py:2348 +#: cola/cmds.py:2299 msgid "Please select a file" msgstr "Wybierz plik" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Please specify a name for the new tag." msgstr "Podać nazwę dla nowego znacznika." -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Please specify a revision to tag." msgstr "Podaj wydanie do oznaczenia." -#: cola/widgets/commitmsg.py:410 +#: cola/widgets/commitmsg.py:418 msgid "" "Please supply a commit message.\n" "\n" @@ -2670,253 +2695,260 @@ msgstr "" "- Drugi wiersz: Pusty\n" "- Pozostałe wiersze: Opisz dlaczego ta zmiana jest dobra.\n" -#: cola/cmds.py:653 +#: cola/cmds.py:655 msgid "Point the current branch head to a new commit?" msgstr "Ustawić HEAD bieżącej gałęzi na nowej zmianie?" -#: cola/widgets/about.py:416 +#: cola/widgets/about.py:399 msgid "Polish translation" msgstr "Tłumaczenie na polski" -#: cola/widgets/stash.py:63 cola/widgets/stash.py:111 cola/widgets/stash.py:115 +#: cola/widgets/stash.py:65 cola/widgets/stash.py:114 cola/widgets/stash.py:118 msgid "Pop" msgstr "Pobierz" -#: cola/widgets/main.py:293 cola/widgets/prefs.py:395 +#: cola/widgets/main.py:288 cola/widgets/prefs.py:433 msgid "Preferences" msgstr "Ustawienia" -#: cola/widgets/archive.py:129 +#: cola/widgets/archive.py:127 msgid "Prefix" msgstr "Przedrostek" -#: cola/widgets/main.py:345 +#: cola/widgets/main.py:340 msgid "Prepare Commit Message" msgstr "Przygotuj opis zmiany" -#: cola/widgets/prefs.py:157 +#: cola/widgets/prefs.py:180 msgid "Prevent \"Stage\" from staging all files when nothing is selected" -msgstr "" -"Uniemożliw dobranie wszystkich plików, gdy nie jest zaznaczony żaden plik" +msgstr "Uniemożliw dobranie wszystkich plików, gdy nie jest zaznaczony żaden plik" #: cola/actions.py:65 msgid "Previous File" msgstr "Poprzedni plik" -#: cola/widgets/remote.py:171 +#: cola/widgets/remote.py:169 msgid "Prompt on creation" msgstr "Zapytaj przed stworzeniem" -#: cola/widgets/remote.py:172 +#: cola/widgets/remote.py:170 msgid "Prompt when pushing creates new remote branches" msgstr "Zapytaj, gdy wypchnięcie miałoby utworzyć nową zdalną gałąź" -#: cola/widgets/remote.py:208 +#: cola/widgets/remote.py:212 msgid "Prune " msgstr "Oczyść " -#: cola/widgets/bookmarks.py:255 cola/widgets/startup.py:376 +#: cola/widgets/bookmarks.py:254 cola/widgets/startup.py:375 msgid "Prune Missing Entries" msgstr "Oczyść brakujące wpisy" -#: cola/widgets/branch.py:247 cola/widgets/remote.py:728 +#: cola/widgets/branch.py:256 cola/widgets/remote.py:783 msgid "Pull" msgstr "Zaciągnij" -#: cola/widgets/action.py:65 cola/widgets/main.py:397 +#: cola/widgets/action.py:73 cola/widgets/main.py:401 msgid "Pull..." msgstr "Zaciągnij..." -#: cola/widgets/branch.py:253 cola/widgets/remote.py:593 -#: cola/widgets/remote.py:698 +#: cola/widgets/branch.py:262 cola/widgets/remote.py:628 +#: cola/widgets/remote.py:758 msgid "Push" msgstr "Wypchnij" -#: cola/widgets/action.py:64 cola/widgets/main.py:392 +#: cola/widgets/action.py:70 cola/widgets/main.py:393 +msgid "Push to one or more remotes using \"git push\"" +msgstr "" + +#: cola/widgets/action.py:70 cola/widgets/main.py:392 msgid "Push..." msgstr "Wypchnij..." -#: cola/guicmds.py:252 +#: cola/guicmds.py:251 msgid "Quick Open Repository" msgstr "Szybkie otwieranie repozytoriów" -#: cola/widgets/main.py:660 +#: cola/widgets/main.py:673 msgid "Quick Open..." msgstr "Szybkie otwarcie..." -#: cola/widgets/main.py:355 +#: cola/widgets/main.py:350 msgid "Quit" msgstr "Wyjdź" -#: cola/cmds.py:2144 cola/cmds.py:2180 cola/cmds.py:2181 cola/cmds.py:2194 -#: cola/cmds.py:2195 cola/sequenceeditor.py:158 cola/sequenceeditor.py:199 -#: cola/widgets/main.py:822 cola/widgets/remote.py:211 +#: cola/cmds.py:2095 cola/cmds.py:2131 cola/cmds.py:2132 cola/cmds.py:2145 +#: cola/cmds.py:2146 cola/sequenceeditor.py:156 cola/sequenceeditor.py:197 +#: cola/widgets/main.py:835 cola/widgets/remote.py:215 msgid "Rebase" msgstr "Zmień podstawę" -#: cola/cmds.py:2143 +#: cola/cmds.py:2094 #, python-format msgid "Rebase onto %s" msgstr "Zmień podstawę na %s" -#: cola/cmds.py:2156 +#: cola/cmds.py:2107 msgid "Rebase stopped" msgstr "Zatrzymano zmianę podstawy" -#: cola/widgets/remote.py:210 +#: cola/widgets/remote.py:214 msgid "Rebase the current branch instead of merging" msgstr "Zmień podstawę bieżącej gałęzi zamiast scalić" -#: cola/widgets/dag.py:419 +#: cola/widgets/dag.py:418 msgid "Rebase to this commit" msgstr "Zmień podstawę na tę zmianę" -#: cola/widgets/main.py:1165 +#: cola/widgets/main.py:1178 msgid "Rebasing" msgstr "Zmiana podstawy" -#: cola/widgets/main.py:120 +#: cola/widgets/main.py:118 msgid "Recent" msgstr "Ostatnie" -#: cola/widgets/bookmarks.py:93 +#: cola/widgets/bookmarks.py:92 msgid "Recent repositories" msgstr "Ostatnie repozytoria" -#: cola/widgets/prefs.py:258 +#: cola/widgets/prefs.py:279 msgid "Recent repository count" msgstr "Liczba ostatnich repozytoriów" -#: cola/widgets/recent.py:46 +#: cola/widgets/recent.py:44 msgid "Recently Modified Files" msgstr "Ostatnio zmienone pliki" -#: cola/widgets/main.py:320 +#: cola/widgets/main.py:315 msgid "Recently Modified Files..." msgstr "Ostatnio zmienone pliki..." -#: cola/widgets/stash.py:256 +#: cola/widgets/stash.py:274 msgid "Recovering a dropped stash is not possible." msgstr "Odzyskanie porzuconej przechowalni będzie niemożliwe." -#: cola/widgets/createbranch.py:283 +#: cola/widgets/createbranch.py:281 msgid "Recovering lost commits may not be easy." msgstr "Przywrócenie utraconych zmian może nie być łatwe." -#: cola/widgets/main.py:737 +#: cola/widgets/main.py:750 msgid "Redo" msgstr "Przywróć" -#: cola/widgets/clone.py:121 +#: cola/widgets/clone.py:119 msgid "Reduce commit history to minimum" msgstr "Ogranicz historię zmian do minimum" -#: cola/widgets/submodules.py:121 +#: cola/widgets/submodules.py:120 msgid "Reference Repository" msgstr "Repozytorium odniesienia" -#: cola/widgets/submodules.py:105 +#: cola/widgets/submodules.py:104 msgid "Reference URL" msgstr "Adres URL odniesienia" -#: cola/widgets/submodules.py:106 +#: cola/widgets/submodules.py:105 msgid "Reference repository to use when cloning (optional)" msgstr "Repozytorium odniesienia, używane podczas pobierania (niewymagane)" -#: cola/cmds.py:2222 cola/qtutils.py:770 cola/widgets/action.py:62 -#: cola/widgets/dag.py:792 cola/widgets/editremotes.py:85 -#: cola/widgets/grep.py:105 cola/widgets/recent.py:116 -#: cola/widgets/submodules.py:45 +#: cola/cmds.py:2173 cola/qtutils.py:801 cola/widgets/action.py:63 +#: cola/widgets/dag.py:858 cola/widgets/editremotes.py:84 +#: cola/widgets/grep.py:103 cola/widgets/recent.py:114 +#: cola/widgets/submodules.py:44 msgid "Refresh" msgstr "Odśwież" -#: cola/widgets/remote.py:179 -msgid "" -"Refuse to merge unless the current HEAD is already up-to-date or the merge" -" can be resolved as a fast-forward" -msgstr "" -"Odmów scalenia do chwili uaktualnienia bieżącego HEAD lub rozwiązania" -" scalenia poprzez przewinięcie do przodu." +#: cola/widgets/remote.py:183 +msgid "Refuse to merge unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward" +msgstr "Odmów scalenia do chwili uaktualnienia bieżącego HEAD lub rozwiązania scalenia poprzez przewinięcie do przodu." -#: cola/widgets/branch.py:173 cola/widgets/branch.py:225 -#: cola/widgets/branch.py:269 cola/widgets/branch.py:470 -#: cola/widgets/compare.py:54 cola/widgets/compare.py:59 -#: cola/widgets/remote.py:147 +#: cola/widgets/branch.py:177 cola/widgets/branch.py:236 +#: cola/widgets/branch.py:278 cola/widgets/branch.py:513 +#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/remote.py:145 msgid "Remote" msgstr "Zdalne repozytoria" -#: cola/widgets/remote.py:162 +#: cola/widgets/remote.py:160 msgid "Remote Branch" msgstr "Zdalna gałąź" -#: cola/cmds.py:1196 +#: cola/cmds.py:1197 msgid "Remote Branch Deleted" msgstr "Usunięto zdalną gałąź" -#: cola/widgets/editremotes.py:49 +#: cola/widgets/log.py:99 +msgid "Remote Messages" +msgstr "" + +#: cola/widgets/editremotes.py:48 msgid "Remote git repositories - double-click to rename" msgstr "Zdalne repozytoria git - kliknij dwukrotnie, aby przemianować" -#: cola/cmds.py:1029 cola/widgets/patch.py:107 cola/widgets/patch.py:122 -#: cola/widgets/startup.py:265 cola/widgets/status.py:1382 +#: cola/cmds.py:1030 cola/widgets/diff.py:1701 cola/widgets/diff.py:1716 +#: cola/widgets/startup.py:264 cola/widgets/status.py:1383 msgid "Remove" msgstr "Usuń" -#: cola/cmds.py:1027 +#: cola/cmds.py:1028 #, python-format msgid "Remove %s from the recent list?" msgstr "Usunąć %s z listy ostatnich?" -#: cola/widgets/toolbar.py:316 +#: cola/widgets/toolbar.py:321 msgid "Remove Element" msgstr "Usuń element" -#: cola/widgets/remote.py:206 +#: cola/widgets/remote.py:210 msgid "Remove remote-tracking branches that no longer exist on the remote" msgstr "Usuń gałęzie zdalne, które już nie istnieją w repozytorium zdalnym" -#: cola/widgets/patch.py:109 +#: cola/widgets/diff.py:1703 msgid "Remove selected (Delete)" msgstr "Usuń wybrane (Usuń)" -#: cola/widgets/bookmarks.py:258 cola/widgets/startup.py:379 +#: cola/widgets/bookmarks.py:257 cola/widgets/startup.py:378 msgid "Remove stale entries for repositories that no longer exist" msgstr "Usuń zawisłe wpisy dla repozytoriów, które już nie istnieją" -#: cola/guicmds.py:333 cola/widgets/browse.py:159 +#: cola/guicmds.py:332 cola/widgets/browse.py:159 cola/widgets/stash.py:44 msgid "Rename" msgstr "Przemianuj " -#: cola/cmds.py:1153 +#: cola/cmds.py:1154 #, python-format msgid "Rename \"%s\"" msgstr "Przemianuj \"%s\"" -#: cola/widgets/branch.py:259 +#: cola/widgets/branch.py:268 msgid "Rename Branch" msgstr "Przemianuj gałąź" -#: cola/widgets/main.py:570 +#: cola/widgets/main.py:583 msgid "Rename Branch..." msgstr "Przemianuj gałąź..." -#: cola/guicmds.py:330 +#: cola/guicmds.py:329 msgid "Rename Existing Branch" msgstr "Przemianuj istniejącą gałąź" -#: cola/cmds.py:944 +#: cola/cmds.py:942 msgid "Rename Remote" msgstr "Przemianuj zdalne repozytorium" -#: cola/widgets/bookmarks.py:233 cola/widgets/startup.py:356 +#: cola/widgets/bookmarks.py:232 cola/widgets/startup.py:355 msgid "Rename Repository" msgstr "Przemianuj repozytorium" -#: cola/widgets/branch.py:445 +#: cola/widgets/stash.py:218 +msgid "Rename Stash" +msgstr "" + +#: cola/widgets/branch.py:478 msgid "Rename branch" msgstr "Przemianuj gałąź" -#: cola/cmds.py:945 +#: cola/cmds.py:943 #, python-format msgid "Rename remote \"%(current)s\" to \"%(new)s\"?" msgstr "Przemianuj zdalne repozytorium z \"%(current)s\" na \"%(new)s\"?" @@ -2925,179 +2957,183 @@ msgstr "Przemianuj zdalne repozytorium z \"%(current)s\" na \"%(new)s\"?" msgid "Rename selected paths" msgstr "Przemianuj wybrane ścieżki" -#: cola/app.py:497 cola/widgets/startup.py:262 +#: cola/widgets/stash.py:45 +msgid "Rename the selected stash" +msgstr "" + +#: cola/app.py:500 cola/widgets/startup.py:261 msgid "Repository Not Found" msgstr "Nie znaleziono repozytorium" -#: cola/widgets/browse.py:87 cola/widgets/main.py:1095 +#: cola/widgets/browse.py:87 cola/widgets/main.py:1108 #, python-format msgid "Repository: %s" msgstr "Repozytorium: %s" -#: cola/guicmds.py:351 cola/widgets/createbranch.py:125 cola/widgets/dag.py:331 -#: cola/widgets/editremotes.py:58 cola/widgets/main.py:832 +#: cola/guicmds.py:350 cola/widgets/createbranch.py:123 cola/widgets/dag.py:330 +#: cola/widgets/editremotes.py:57 cola/widgets/main.py:845 msgid "Reset" msgstr "Wyzeruj" -#: cola/widgets/createbranch.py:286 +#: cola/widgets/createbranch.py:284 #, python-format msgid "Reset \"%(branch)s\" to \"%(revision)s\"?" msgstr "Wyzerować \"%(branch)s\" do \"%(revision)s\"?" -#: cola/guicmds.py:359 +#: cola/guicmds.py:358 msgid "Reset All (Keep Unstaged Changes)" msgstr "Wyzeruj wszystko (zachowaj niedobrane zmiany)" -#: cola/cmds.py:655 cola/cmds.py:706 cola/guicmds.py:342 -#: cola/widgets/createbranch.py:295 +#: cola/cmds.py:657 cola/cmds.py:708 cola/guicmds.py:341 +#: cola/widgets/createbranch.py:293 msgid "Reset Branch" msgstr "Wyzeruj gałąź" -#: cola/cmds.py:703 cola/guicmds.py:341 cola/widgets/dag.py:425 -#: cola/widgets/main.py:419 +#: cola/cmds.py:705 cola/guicmds.py:340 cola/widgets/dag.py:424 +#: cola/widgets/main.py:431 msgid "Reset Branch (Soft)" msgstr "Wyzeruj gałąź (miękko)" -#: cola/cmds.py:652 cola/guicmds.py:350 cola/widgets/dag.py:431 -#: cola/widgets/main.py:426 +#: cola/cmds.py:654 cola/guicmds.py:349 cola/widgets/dag.py:430 +#: cola/widgets/main.py:439 msgid "Reset Branch and Stage (Mixed)" msgstr "Wyzeruj gałąź i dobierz (mieszanie)" -#: cola/widgets/createbranch.py:292 +#: cola/widgets/createbranch.py:290 msgid "Reset Branch?" msgstr "Wyzerować gałąź?" -#: cola/widgets/main.py:655 +#: cola/widgets/main.py:668 msgid "Reset Layout" msgstr "Wyzeruj układ" -#: cola/cmds.py:687 +#: cola/cmds.py:689 msgid "Reset Worktree and Reset All?" msgstr "Czy wyzerować drzewo pracy i wszystko?" -#: cola/cmds.py:672 cola/cmds.py:689 cola/cmds.py:723 cola/guicmds.py:360 -#: cola/guicmds.py:373 cola/guicmds.py:382 +#: cola/cmds.py:674 cola/cmds.py:691 cola/cmds.py:725 cola/guicmds.py:359 +#: cola/guicmds.py:372 cola/guicmds.py:381 msgid "Reset and Restore" msgstr "Wyzeruj i przywróć" -#: cola/cmds.py:704 +#: cola/cmds.py:706 msgid "Reset branch?" msgstr "Czy wyzerować gałąź?" -#: cola/widgets/createbranch.py:266 +#: cola/widgets/createbranch.py:264 #, python-format msgid "Resetting \"%(branch)s\" to \"%(revision)s\" will lose commits." msgstr "Wyzerowanie \"%(branch)s\" do \"%(revision)s\" spowoduje utratę zmian." -#: cola/widgets/prefs.py:264 +#: cola/widgets/prefs.py:285 msgid "Resize File Browser columns" msgstr "Zmień rozmiar kolumn przeglądarki plików" -#: cola/widgets/prefs.py:374 +#: cola/widgets/prefs.py:412 msgid "Restart the application after changing appearance settings." msgstr "Uruchom aplikację ponownie po zmianie ustawień wyglądu." -#: cola/cmds.py:757 cola/cmds.py:760 cola/guicmds.py:390 cola/guicmds.py:391 -#: cola/widgets/dag.py:461 cola/widgets/main.py:457 +#: cola/cmds.py:759 cola/cmds.py:762 cola/guicmds.py:389 cola/guicmds.py:390 +#: cola/widgets/dag.py:460 cola/widgets/main.py:471 msgid "Restore Worktree" msgstr "Przywróć drzewo pracy" -#: cola/cmds.py:720 cola/guicmds.py:381 cola/widgets/dag.py:454 -#: cola/widgets/main.py:450 +#: cola/cmds.py:722 cola/guicmds.py:380 cola/widgets/dag.py:453 +#: cola/widgets/main.py:463 msgid "Restore Worktree and Reset All (Hard)" msgstr "Przywróć drzewo i wyzeruj wszystko (twardo)" -#: cola/cmds.py:669 cola/widgets/main.py:434 +#: cola/cmds.py:671 cola/widgets/main.py:447 msgid "Restore Worktree and Reset All (Keep Unstaged Changes)" msgstr "Przywróć drzewo i wyzeruj wszystko (zachowaj niedobrane zmiany)" -#: cola/widgets/dag.py:438 +#: cola/widgets/dag.py:437 msgid "Restore Worktree and Reset All (Keep Unstaged Edits)" msgstr "Przywróć drzewo i wyzeruj wszystko (zachowaj niedobrane zmiany)" -#: cola/cmds.py:686 cola/guicmds.py:372 cola/widgets/dag.py:446 -#: cola/widgets/main.py:442 +#: cola/cmds.py:688 cola/guicmds.py:371 cola/widgets/dag.py:445 +#: cola/widgets/main.py:455 msgid "Restore Worktree and Reset All (Merge)" msgstr "Przywróć drzewo i wyzeruj wszystko (scal)" -#: cola/cmds.py:721 +#: cola/cmds.py:723 msgid "Restore Worktree and Reset All?" msgstr "Czy przywrócić drzewo i wyzerować wszystko?" -#: cola/cmds.py:758 +#: cola/cmds.py:760 #, python-format msgid "Restore Worktree to %s?" msgstr "Czy przywrócić drzewo pracy do %s?" -#: cola/cmds.py:670 +#: cola/cmds.py:672 msgid "Restore worktree, reset, and preserve unstaged edits?" msgstr "Czy przywrócić drzewo pracy, wyzerować i zachować niedobrane zmiany?" -#: cola/widgets/dag.py:390 +#: cola/widgets/dag.py:389 msgid "Revert" msgstr "Wycofaj" -#: cola/widgets/diff.py:1153 +#: cola/widgets/diff.py:1227 msgid "Revert Diff Hunk" msgstr "Wycofaj kawałek różnicy" -#: cola/widgets/diff.py:1018 +#: cola/widgets/diff.py:1057 msgid "Revert Diff Hunk..." msgstr "Wycofaj kawałek różnicy..." -#: cola/widgets/diff.py:1152 +#: cola/widgets/diff.py:1226 msgid "Revert Diff Hunk?" msgstr "Wycofać kawałek różnicy?" -#: cola/widgets/diff.py:1150 +#: cola/widgets/diff.py:1224 msgid "Revert Selected Lines" msgstr "Wycofaj zaznaczone wiersze" -#: cola/widgets/diff.py:1013 +#: cola/widgets/diff.py:1052 msgid "Revert Selected Lines..." msgstr "Wycofaj zaznaczone wiersze..." -#: cola/widgets/diff.py:1149 +#: cola/widgets/diff.py:1223 msgid "Revert Selected Lines?" msgstr "Wycofać zaznaczone wiersze?" -#: cola/cmds.py:2311 +#: cola/cmds.py:2262 msgid "Revert Uncommitted Changes" msgstr "Wycofaj niezatwierdzone zmiany" -#: cola/cmds.py:2305 +#: cola/cmds.py:2256 msgid "Revert Uncommitted Changes?" msgstr "Wycofać niezatwierdzone zmiany?" -#: cola/cmds.py:2298 +#: cola/cmds.py:2249 msgid "Revert Uncommitted Edits..." msgstr "Wycofaj niezatwierdzone zmiany..." -#: cola/cmds.py:2289 +#: cola/cmds.py:2240 msgid "Revert Unstaged Changes" msgstr "Wycofaj niedobrane zmiany" -#: cola/cmds.py:2283 +#: cola/cmds.py:2234 msgid "Revert Unstaged Changes?" msgstr "Wycofać niedobrane zmiany?" -#: cola/cmds.py:2275 +#: cola/cmds.py:2226 msgid "Revert Unstaged Edits..." msgstr "Wycofaj niedobrane zmiany..." -#: cola/cmds.py:598 +#: cola/cmds.py:599 msgid "Revert failed" msgstr "Wycofywanie nie powiodło się" -#: cola/cmds.py:2310 cola/widgets/diff.py:1161 +#: cola/cmds.py:2261 cola/widgets/diff.py:1235 msgid "Revert the uncommitted changes?" msgstr "Wycofać niezatwierdzone zmiany?" -#: cola/cmds.py:2288 +#: cola/cmds.py:2239 msgid "Revert the unstaged changes?" msgstr "Wycofać niedobrane zmiany?" -#: cola/widgets/browse.py:189 +#: cola/widgets/browse.py:190 msgid "Revert uncommitted changes to selected paths" msgstr "Wycofaj niezatwierdzone zmiany w wybranych ścieżkach" @@ -3105,243 +3141,247 @@ msgstr "Wycofaj niezatwierdzone zmiany w wybranych ścieżkach" msgid "Revert unstaged changes to selected paths" msgstr "Wycofaj niezebrane zmiany w wybranych ścieżkach" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Review" msgstr "Przejrzyj" -#: cola/widgets/main.py:583 +#: cola/widgets/main.py:596 msgid "Review..." msgstr "Przejrzyj..." -#: cola/widgets/cfgactions.py:233 cola/widgets/createtag.py:84 +#: cola/widgets/cfgactions.py:231 cola/widgets/createtag.py:82 msgid "Revision" msgstr "Wydanie" -#: cola/widgets/selectcommits.py:62 +#: cola/widgets/selectcommits.py:61 msgid "Revision Expression:" msgstr "Wyrażenie wydania:" -#: cola/widgets/merge.py:39 cola/widgets/merge.py:42 +#: cola/widgets/merge.py:37 cola/widgets/merge.py:40 msgid "Revision to Merge" msgstr "Wydanie do scalenia" -#: cola/sequenceeditor.py:351 +#: cola/sequenceeditor.py:347 msgid "Reword" msgstr "Zmień opis" -#: cola/cmds.py:776 cola/widgets/commitmsg.py:456 +#: cola/cmds.py:778 cola/widgets/commitmsg.py:464 msgid "Rewrite Published Commit?" msgstr "Zmienić opublikowaną zmianę?" -#: cola/widgets/log.py:31 +#: cola/widgets/log.py:31 cola/widgets/log.py:133 msgid "Right-click links to open:" msgstr "Łącza pod prawym do otwarcia:" -#: cola/interaction.py:127 cola/widgets/cfgactions.py:245 +#: cola/interaction.py:125 cola/widgets/cfgactions.py:243 msgid "Run" msgstr "Wykonaj" -#: cola/cmds.py:2341 +#: cola/cmds.py:2292 #, python-format msgid "Run \"%s\"?" msgstr "Uruchom \"%s\"?" -#: cola/interaction.py:124 +#: cola/interaction.py:122 #, python-format msgid "Run %s?" msgstr "Wykonać %s?" -#: cola/interaction.py:125 +#: cola/interaction.py:123 #, python-format msgid "Run the \"%s\" command?" msgstr "Wykonać polecenie \"%s\"?" -#: cola/cmds.py:2380 +#: cola/cmds.py:2331 #, python-format msgid "Running command: %s" msgstr "Wykonywanie polecenia: %s" -#: cola/widgets/about.py:422 +#: cola/widgets/about.py:405 msgid "Russian translation" msgstr "Tłumaczenie na rosyjski" -#: cola/sequenceeditor.py:324 +#: cola/sequenceeditor.py:321 msgid "SHA-1" msgstr "SHA-1" -#: cola/widgets/prefs.py:183 +#: cola/widgets/prefs.py:205 msgid "Safe Mode" msgstr "Tryb bezpieczny" -#: cola/cmds.py:2167 cola/widgets/archive.py:126 cola/widgets/browse.py:609 -#: cola/widgets/editremotes.py:54 cola/widgets/stash.py:52 -#: cola/widgets/status.py:1388 +#: cola/cmds.py:2118 cola/widgets/archive.py:124 cola/widgets/browse.py:610 +#: cola/widgets/editremotes.py:53 cola/widgets/stash.py:54 +#: cola/widgets/status.py:1389 msgid "Save" msgstr "Zapisz" -#: cola/widgets/archive.py:113 +#: cola/widgets/archive.py:111 msgid "Save Archive" msgstr "Zapisz archiwum" -#: cola/widgets/dag.py:382 cola/widgets/main.py:351 +#: cola/widgets/dag.py:381 cola/widgets/main.py:346 msgid "Save As Tarball/Zip..." msgstr "Zapisz jako tarball/zip..." -#: cola/widgets/prefs.py:263 +#: cola/widgets/prefs.py:284 msgid "Save GUI Settings" msgstr "Zachowaj ustawienia interfejsu" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Save Stash" msgstr "Zachowaj przechowalnię" -#: cola/widgets/stash.py:53 +#: cola/widgets/stash.py:55 msgid "Save modified state to new stash" msgstr "Zachowaj zmieniony stan w nowej przechowalni" -#: cola/widgets/browse.py:570 +#: cola/widgets/browse.py:571 #, python-format msgid "Saved \"%(filename)s\" from \"%(ref)s\" to \"%(destination)s\"" msgstr "Zapisano \"%(filename)s\" z \"%(ref)s\" do \"%(destination)s\"" -#: cola/widgets/bookmarks.py:83 cola/widgets/grep.py:98 -#: cola/widgets/search.py:42 cola/widgets/search.py:62 +#: cola/widgets/bookmarks.py:82 cola/widgets/grep.py:96 +#: cola/widgets/search.py:41 cola/widgets/search.py:61 msgid "Search" msgstr "Wyszukaj" -#: cola/widgets/search.py:226 +#: cola/widgets/search.py:225 msgid "Search Authors" msgstr "Wyszukaj autorów" -#: cola/widgets/search.py:224 +#: cola/widgets/search.py:223 msgid "Search Commit Messages" msgstr "Poszukaj opisu zmiany" -#: cola/widgets/search.py:227 +#: cola/widgets/search.py:226 msgid "Search Committers" msgstr "Wyszukaj zmieniających" -#: cola/widgets/search.py:228 +#: cola/widgets/search.py:227 msgid "Search Date Range" msgstr "Wyszukaj zakresu dat" -#: cola/widgets/search.py:225 +#: cola/widgets/search.py:224 msgid "Search Diffs" msgstr "Wyszukaj różnicy" -#: cola/widgets/search.py:222 +#: cola/widgets/search.py:221 msgid "Search by Expression" msgstr "Wyszukaj po wyrażeniu" -#: cola/widgets/search.py:223 +#: cola/widgets/search.py:222 msgid "Search by Path" msgstr "Wyszukaj po ścieżce" -#: cola/widgets/grep.py:124 +#: cola/widgets/dag.py:494 +msgid "Search commit messages" +msgstr "" + +#: cola/widgets/grep.py:122 msgid "Search for a fixed string" msgstr "Wyszukaj stały ciąg znaków" -#: cola/widgets/diff.py:519 cola/widgets/diff.py:1514 +#: cola/widgets/diff.py:526 cola/widgets/diff.py:1576 msgid "Search in Diff" msgstr "Poszukaj w różnicy" -#: cola/guicmds.py:253 cola/widgets/bookmarks.py:62 +#: cola/guicmds.py:252 cola/widgets/bookmarks.py:61 msgid "Search repositories by name..." msgstr "Znajdź repozytorium po nazwie..." -#: cola/widgets/grep.py:122 +#: cola/widgets/grep.py:120 msgid "Search using a POSIX basic regular expression" msgstr "Wyszukaj przy użyciu podstawowego wyrażenia regularnego POSIX" -#: cola/widgets/grep.py:123 +#: cola/widgets/grep.py:121 msgid "Search using a POSIX extended regular expression" msgstr "Wyszukaj przy użyciu rozszerzonego wyrażenia regularnego POSIX" -#: cola/widgets/main.py:493 +#: cola/widgets/main.py:506 msgid "Search..." msgstr "Wyszukaj..." -#: cola/widgets/selectcommits.py:67 +#: cola/widgets/selectcommits.py:66 msgid "Search:" msgstr "Poszukaj:" -#: cola/guicmds.py:330 cola/widgets/selectcommits.py:74 +#: cola/guicmds.py:329 cola/widgets/selectcommits.py:73 msgid "Select" msgstr "Wybierz" -#: cola/widgets/main.py:750 +#: cola/widgets/main.py:763 msgid "Select All" msgstr "Zaznacz wszystko" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Select Branch to Review" msgstr "Wybierz gałąź do przeglądnięcia" -#: cola/widgets/dag.py:1610 +#: cola/widgets/dag.py:1667 msgid "Select Child" msgstr "Wybierz potomnego" -#: cola/widgets/commitmsg.py:512 +#: cola/widgets/commitmsg.py:538 msgid "Select Commit" msgstr "Wybierz zmianę" -#: cola/guicmds.py:137 +#: cola/guicmds.py:136 msgid "Select Directory..." msgstr "Wybierz katalog..." -#: cola/cmds.py:2129 +#: cola/cmds.py:2080 msgid "Select New Upstream" msgstr "Wybierz nową gałąź odgórną" -#: cola/widgets/dag.py:1614 +#: cola/widgets/dag.py:1671 msgid "Select Newest Child" msgstr "Wybierz najnowszego potomnego" -#: cola/widgets/dag.py:1604 +#: cola/widgets/dag.py:1661 msgid "Select Oldest Parent" msgstr "Wybierz najstarszego przodka" -#: cola/widgets/dag.py:1599 +#: cola/widgets/dag.py:1656 msgid "Select Parent" msgstr "Wybierz przodka" -#: cola/widgets/browse.py:525 +#: cola/widgets/browse.py:526 msgid "Select Previous Version" msgstr "Wybierz poprzednią wersję" -#: cola/widgets/clone.py:197 +#: cola/widgets/clone.py:195 msgid "Select a parent directory for the new clone" msgstr "Wybierz katalog nadrzędny do pobrania" -#: cola/widgets/standard.py:756 cola/widgets/standard.py:779 +#: cola/widgets/standard.py:826 cola/widgets/standard.py:848 msgid "Select directory" msgstr "Wybierz katalog" -#: cola/widgets/selectcommits.py:162 +#: cola/widgets/selectcommits.py:161 msgid "Select output dir" msgstr "Wybierz katalog do wyników" -#: cola/widgets/selectcommits.py:183 +#: cola/widgets/selectcommits.py:182 msgid "Select output directory" msgstr "Wybierz katalog do wyników" -#: cola/widgets/patch.py:175 +#: cola/widgets/diff.py:1769 msgid "Select patch file(s)..." msgstr "Wybierz plik(i) łat(y)..." -#: cola/widgets/editremotes.py:437 +#: cola/widgets/editremotes.py:435 msgid "Select repository" msgstr "Wybierz repozytorium" -#: cola/widgets/bookmarks.py:225 cola/widgets/startup.py:348 +#: cola/widgets/bookmarks.py:224 cola/widgets/startup.py:347 msgid "Set Default Repository" msgstr "Ustaw domyślne repozytorium" -#: cola/widgets/branch.py:282 +#: cola/widgets/branch.py:291 msgid "Set Upstream Branch" msgstr "Ustaw gałąź odgórną" -#: cola/widgets/branch.py:72 +#: cola/widgets/branch.py:74 msgid "" "Set the sort order for branches and tags.\n" "Toggle between date-based and version-name-based sorting." @@ -3349,52 +3389,56 @@ msgstr "" "Ustaw porządek szeregowania dla gałęzi i znaczników.\n" "Przełącz pomiędzy szeregowaniem wg daty oraz nazwy wersji." -#: cola/widgets/remote.py:213 +#: cola/widgets/remote.py:217 msgid "Set upstream" msgstr "Zapamiętaj gałąź odgórną" -#: cola/widgets/prefs.py:405 +#: cola/widgets/prefs.py:443 msgid "Settings" msgstr "Ustawienia" -#: cola/widgets/grep.py:142 +#: cola/widgets/grep.py:140 msgid "Shell arguments" msgstr "Argumenty powłoki" -#: cola/sequenceeditor.py:375 +#: cola/sequenceeditor.py:371 msgid "Shift Down" msgstr "Przesuń w dół" -#: cola/sequenceeditor.py:379 +#: cola/sequenceeditor.py:375 msgid "Shift Up" msgstr "Przesuń w górę" -#: cola/widgets/about.py:499 +#: cola/widgets/about.py:482 msgid "Shortcuts" msgstr "Skróty" -#: cola/widgets/prefs.py:179 +#: cola/widgets/prefs.py:201 msgid "Show Diffstat After Merge" msgstr "Pokaż statystykę różnicy po scaleniu" -#: cola/widgets/prefs.py:178 +#: cola/widgets/prefs.py:200 msgid "Show Full Paths in the Window Title" msgstr "Pokaż pełne ścieżki w nazwie okna" -#: cola/sequenceeditor.py:106 cola/widgets/finder.py:187 -#: cola/widgets/status.py:1384 +#: cola/sequenceeditor.py:104 cola/widgets/finder.py:186 +#: cola/widgets/status.py:1385 msgid "Show Help" msgstr "Pokaż pomoc" -#: cola/widgets/filelist.py:30 +#: cola/widgets/filelist.py:27 msgid "Show History" msgstr "Pokaż historię" -#: cola/widgets/prefs.py:348 +#: cola/widgets/prefs.py:368 msgid "Show file counts in Status titles" msgstr "Pokaż liczbę plików w oknie stanu" -#: cola/sequenceeditor.py:171 cola/widgets/finder.py:138 +#: cola/widgets/diff.py:794 +msgid "Show filenames" +msgstr "" + +#: cola/sequenceeditor.py:169 cola/widgets/finder.py:137 msgid "" "Show help\n" "Shortcut: ?" @@ -3402,137 +3446,145 @@ msgstr "" "Pokaż pomoc\n" "Skrót: ?" -#: cola/widgets/diff.py:765 +#: cola/widgets/diff.py:792 msgid "Show line numbers" msgstr "Pokaż numery wierszy" -#: cola/widgets/diff.py:761 +#: cola/widgets/remote.py:175 +msgid "Show remote messages" +msgstr "" + +#: cola/widgets/diff.py:789 msgid "Show whole surrounding functions of changes" msgstr "Pokaż całe funkcje otaczające zmiany" -#: cola/widgets/recent.py:58 +#: cola/widgets/recent.py:56 msgid "Showing changes since" msgstr "Wyświetlanie zmian od" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "Side by side" msgstr "Obok siebie" -#: cola/cmds.py:2512 +#: cola/cmds.py:2463 msgid "Sign Off" msgstr "Podpisz się" -#: cola/widgets/createtag.py:71 +#: cola/widgets/createtag.py:69 msgid "Sign Tag" msgstr "Podpisz znacznik" -#: cola/widgets/commitmsg.py:55 +#: cola/widgets/commitmsg.py:56 msgid "Sign off on this commit" msgstr "Podpisz się pod tą zmianą" -#: cola/widgets/about.py:412 cola/widgets/about.py:425 +#: cola/widgets/about.py:395 cola/widgets/about.py:408 msgid "Simplified Chinese translation" msgstr "Tłumaczenie na uproszczony chiński" -#: cola/cmds.py:2587 +#: cola/cmds.py:2529 msgid "Skip" msgstr "Pomiń" -#: cola/widgets/main.py:264 cola/widgets/main.py:617 +#: cola/widgets/main.py:260 cola/widgets/main.py:630 msgid "Skip Current Patch" msgstr "Pomiń bieżącą łatę" -#: cola/widgets/main.py:267 +#: cola/widgets/main.py:261 msgid "Skip applying the current patch and continue applying patches" msgstr "Pomiń nałożenie bieżącej łaty i kontynuuj stosowanie pozostałych łat" -#: cola/widgets/prefs.py:261 +#: cola/widgets/prefs.py:282 msgid "Sort bookmarks alphabetically" msgstr "Uszereguj zakładki alfabetycznie" -#: cola/widgets/about.py:413 cola/widgets/about.py:436 -#: cola/widgets/about.py:440 +#: cola/widgets/about.py:396 cola/widgets/about.py:419 +#: cola/widgets/about.py:423 msgid "Spanish translation" msgstr "Tłumaczenie na hiszpański" -#: cola/widgets/createtag.py:88 +#: cola/widgets/createtag.py:86 msgid "Specifies the SHA-1 to tag" msgstr "Jest SHA-1 znacznika" -#: cola/widgets/createtag.py:81 +#: cola/widgets/createtag.py:79 msgid "Specifies the tag message" msgstr "Jest opisem znacznika" -#: cola/widgets/createtag.py:65 +#: cola/widgets/createtag.py:63 msgid "Specifies the tag name" msgstr "Jest nazwą znacznika" -#: cola/widgets/spellcheck.py:46 +#: cola/widgets/spellcheck.py:45 msgid "Spelling Suggestions" msgstr "Sprawdź pisownię" -#: cola/sequenceeditor.py:369 cola/widgets/merge.py:58 +#: cola/sequenceeditor.py:365 cola/widgets/merge.py:56 msgid "Squash" msgstr "Złącz" -#: cola/widgets/merge.py:57 +#: cola/widgets/merge.py:55 msgid "Squash the merged commits into a single commit" msgstr "Złącz scalone zmiany w pojedynczą zmianę" -#: cola/cmds.py:2598 cola/widgets/action.py:60 cola/widgets/diff.py:982 +#: cola/cmds.py:2540 cola/widgets/action.py:58 cola/widgets/diff.py:1168 msgid "Stage" msgstr "Dobierz" -#: cola/cmds.py:2753 +#: cola/cmds.py:2699 msgid "Stage / Unstage" msgstr "Dobierz / odłóż" -#: cola/cmds.py:2735 +#: cola/cmds.py:2681 msgid "Stage / Unstage All" msgstr "Dobierz / odłóż wszystkie" -#: cola/widgets/diff.py:1016 +#: cola/widgets/diff.py:1055 msgid "Stage Diff Hunk" msgstr "Dobierz kawałek różnicy" -#: cola/cmds.py:2691 +#: cola/cmds.py:2633 msgid "Stage Modified" msgstr "Dobierz zmienone" -#: cola/cmds.py:2724 +#: cola/cmds.py:2670 msgid "Stage Modified and Untracked" msgstr "Dobierz zmienione i niezarządzane" -#: cola/widgets/status.py:872 cola/widgets/status.py:894 -#: cola/widgets/status.py:962 +#: cola/widgets/status.py:873 cola/widgets/status.py:895 +#: cola/widgets/status.py:963 msgid "Stage Selected" msgstr "Dobierz zaznaczone" -#: cola/widgets/diff.py:1011 +#: cola/widgets/diff.py:1050 msgid "Stage Selected Lines" msgstr "Dobierz zaznaczone wiersze" -#: cola/cmds.py:2702 +#: cola/cmds.py:2644 msgid "Stage Unmerged" msgstr "Dobierz niescalone" -#: cola/cmds.py:2713 +#: cola/cmds.py:2655 msgid "Stage Untracked" msgstr "Dobierz niezarządzane" -#: cola/widgets/commitmsg.py:438 +#: cola/widgets/commitmsg.py:446 msgid "Stage and Commit" msgstr "Zbierz i zatwierdź" -#: cola/widgets/commitmsg.py:435 +#: cola/widgets/commitmsg.py:443 msgid "Stage and commit?" msgstr "Zebrać i zatwierdzić?" -#: cola/cmds.py:2586 +#: cola/widgets/action.py:58 +msgid "Stage changes using \"git add\"" +msgstr "" + +#: cola/cmds.py:2528 msgid "Stage conflicts" msgstr "Dobrać sprzeczności" -#: cola/cmds.py:2577 +#: cola/cmds.py:2519 msgid "Stage conflicts?" msgstr "Dobrać sprzeczności?" @@ -3540,45 +3592,45 @@ msgstr "Dobrać sprzeczności?" msgid "Stage/unstage selected paths for commit" msgstr "Dobierz/odłóż wybraną ścieżkę/ścieżki do zmiany" -#: cola/models/browse.py:334 cola/widgets/status.py:156 -#: cola/widgets/status.py:620 +#: cola/models/browse.py:333 cola/widgets/status.py:156 +#: cola/widgets/status.py:621 msgid "Staged" msgstr "Dobrane" -#: cola/cmds.py:2605 +#: cola/cmds.py:2547 #, python-format msgid "Staging: %s" msgstr "Dobieranie: %s" -#: cola/widgets/main.py:597 +#: cola/widgets/main.py:610 msgid "Start Interactive Rebase..." msgstr "Zmień podstawę interaktywnie..." -#: cola/widgets/createbranch.py:107 +#: cola/widgets/createbranch.py:105 msgid "Starting Revision" msgstr "Wydanie rozpoczynające" -#: cola/widgets/stash.py:40 +#: cola/widgets/stash.py:36 msgid "Stash" msgstr "Przechowalnia" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash Index" msgstr "Przechowaj indeks" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash staged changes only" msgstr "Przechowaj tylko dobrane zmiany" -#: cola/widgets/stash.py:73 +#: cola/widgets/stash.py:75 msgid "Stash unstaged changes only, keeping staged changes" msgstr "Przechowaj tylko niedobrane zmiany, nie dotykając dobranych zmian" -#: cola/widgets/action.py:66 cola/widgets/main.py:414 +#: cola/widgets/action.py:76 cola/widgets/main.py:422 msgid "Stash..." msgstr "Przechowalnia..." -#: cola/models/browse.py:33 cola/widgets/main.py:102 +#: cola/models/browse.py:32 cola/widgets/main.py:100 msgid "Status" msgstr "Stan" @@ -3586,90 +3638,94 @@ msgstr "Stan" msgid "Stop tracking paths" msgstr "Zaprzestań zarządzanie ścieżką/ścieżkami" -#: cola/widgets/submodules.py:82 +#: cola/widgets/submodules.py:81 msgid "Submodule URL (can be relative, ex: ../repo.git)" msgstr "Adres URL podmodułu (może być względny, np.: ../repo.git)" -#: cola/widgets/submodules.py:90 +#: cola/widgets/submodules.py:89 msgid "Submodule branch to track (optional)" msgstr "Gałąź podmodułu do śledzenia (niewymagane)" -#: cola/widgets/submodules.py:86 +#: cola/widgets/submodules.py:85 msgid "Submodule path within the current repository (optional)" msgstr "Ścieżka podmodułu z bieżącym repozytorium (niewymagane)" -#: cola/widgets/main.py:143 cola/widgets/submodules.py:32 +#: cola/widgets/main.py:141 cola/widgets/submodules.py:31 msgid "Submodules" msgstr "Podmoduły" -#: cola/widgets/prefs.py:174 +#: cola/widgets/prefs.py:196 msgid "Summarize Merge Commits" msgstr "Podsumuj zmianę scalenia" -#: cola/sequenceeditor.py:325 cola/widgets/dag.py:506 +#: cola/sequenceeditor.py:322 cola/widgets/dag.py:572 msgid "Summary" msgstr "Nazwa" -#: cola/widgets/prefs.py:168 +#: cola/widgets/prefs.py:273 msgid "Tab Width" msgstr "Szerokość tabulacji" -#: cola/widgets/cfgactions.py:229 cola/widgets/createbranch.py:116 -#: cola/widgets/merge.py:48 +#: cola/widgets/cfgactions.py:227 cola/widgets/createbranch.py:114 +#: cola/widgets/merge.py:46 msgid "Tag" msgstr "Znacznik" -#: cola/cmds.py:2842 +#: cola/cmds.py:2788 msgid "Tag Created" msgstr "Utworzono znacznik" -#: cola/widgets/createtag.py:80 +#: cola/widgets/createtag.py:78 msgid "Tag message..." msgstr "Opis znacznika..." -#: cola/cmds.py:2802 +#: cola/cmds.py:2748 msgid "Tag-signing was requested but the tag message is empty." msgstr "Zażądano podpisania znacznika, lecz opis znacznika jest pusty." -#: cola/widgets/branch.py:179 cola/widgets/branch.py:238 +#: cola/widgets/branch.py:183 cola/widgets/branch.py:248 msgid "Tags" msgstr "Znaczniki" -#: cola/widgets/toolbar.py:180 +#: cola/widgets/action.py:78 cola/widgets/main.py:423 +msgid "Temporarily stash away uncommitted changes using \"git stash\"" +msgstr "" + +#: cola/widgets/toolbar.py:184 msgid "Text Beside Icon" msgstr "Tekst obok ikony" -#: cola/widgets/toolbar.py:179 +#: cola/widgets/toolbar.py:183 msgid "Text Only" msgstr "Tylko tekst" -#: cola/widgets/toolbar.py:181 +#: cola/widgets/toolbar.py:185 msgid "Text Under Icon" msgstr "Tekst pod ikoną" -#: cola/widgets/prefs.py:169 +#: cola/widgets/prefs.py:272 msgid "Text Width" msgstr "Szerokość tekstu" -#: cola/cmds.py:1116 +#: cola/cmds.py:1117 msgid "The branch will be no longer available." msgstr "Po tym gałąź stanie się niedostępna." -#: cola/cmds.py:648 +#: cola/cmds.py:650 #, python-format msgid "The branch will be reset using \"git reset --mixed %s\"" msgstr "Gałąź zostanie wyzerowana przy użyciu \"git reset --mixed %s\"" -#: cola/cmds.py:699 cola/cmds.py:790 +#: cola/cmds.py:701 cola/cmds.py:792 #, python-format msgid "The branch will be reset using \"git reset --soft %s\"" msgstr "Gałąź zostanie wyzerowana przy użyciu \"git reset --soft %s\"" -#: cola/widgets/commitmsg.py:303 +#: cola/widgets/commitmsg.py:311 msgid "The commit message will be cleared." msgstr "Opis zmiany zostanie wyczyszczony." -#: cola/widgets/prefs.py:146 +#: cola/widgets/prefs.py:169 msgid "" "The date-time format used when displaying dates in Git DAG.\n" "This value is passed to git log --date=" @@ -3677,39 +3733,43 @@ msgstr "" "Zapis daty i czasu używany do wyświetlania dat w Git DAG.\n" "Wartość ta będzie przekazywana do git log --date=" -#: cola/widgets/archive.py:208 +#: cola/widgets/archive.py:206 #, python-format msgid "The file \"%s\" exists and will be overwritten." msgstr "Plik %s już istnieje i zostanie zastąpiony." -#: cola/cmds.py:1086 +#: cola/cmds.py:1087 msgid "The following files will be deleted:" msgstr "Zostaną usunięte następujące pliki:" -#: cola/widgets/status.py:1646 +#: cola/widgets/status.py:1647 msgid "The number of leading paths to strip" msgstr "Liczba poprzedzających ścieżek do usunięcia" -#: cola/cmds.py:716 +#: cola/cmds.py:718 #, python-format msgid "The repository will be reset using \"git reset --hard %s\"" msgstr "Repozytorium zostanie wyzerowane przy użyciu \"git reset --hard %s\"" -#: cola/cmds.py:665 +#: cola/cmds.py:667 #, python-format msgid "The repository will be reset using \"git reset --keep %s\"" msgstr "Repozytorium zostanie wyzerowane przy użyciu \"git reset --keep %s\"" -#: cola/cmds.py:682 +#: cola/cmds.py:684 #, python-format msgid "The repository will be reset using \"git reset --merge %s\"" msgstr "Repozytorium zostanie wyzerowane przy użyciu \"git reset --merge %s\"" -#: cola/cmds.py:2365 +#: cola/cmds.py:2316 msgid "The revision expression cannot be empty." msgstr "Wyrażenie wydania nie może być puste." -#: cola/cmds.py:3029 +#: cola/widgets/stash.py:225 +msgid "The stash has not been renamed" +msgstr "" + +#: cola/cmds.py:2975 #, python-format msgid "" "The submodule will be added using\n" @@ -3718,7 +3778,7 @@ msgstr "" "Zostanie dodany podmoduł przy użyciu\n" "\"%s\"" -#: cola/cmds.py:3074 +#: cola/cmds.py:3020 #, python-format msgid "" "The submodule will be updated using\n" @@ -3727,17 +3787,16 @@ msgstr "" "Ten podmoduł zostanie uaktualniony przy użyciu\n" "\"%s\"" -#: cola/cmds.py:736 +#: cola/cmds.py:738 #, python-format msgid "The worktree will be restored using \"git read-tree --reset -u %s\"" -msgstr "" -"Drzewo pracy zostanie przywrócone przy użyciu \"git read-tree --reset -u %s\"" +msgstr "Drzewo pracy zostanie przywrócone przy użyciu \"git read-tree --reset -u %s\"" -#: cola/widgets/commitmsg.py:304 +#: cola/widgets/commitmsg.py:312 msgid "This cannot be undone. Clear commit message?" msgstr "Nie będzie można się z tego wycofać. Czy wyczyścić opis zmiany?" -#: cola/cmds.py:778 cola/widgets/commitmsg.py:458 +#: cola/cmds.py:780 cola/widgets/commitmsg.py:466 msgid "" "This commit has already been published.\n" "This operation will rewrite published history.\n" @@ -3747,7 +3806,7 @@ msgstr "" "Działanie to zmieni opublikowaną historię.\n" "Prawdopodobnie nie chcesz tego." -#: cola/widgets/diff.py:1158 +#: cola/widgets/diff.py:1232 msgid "" "This operation drops uncommitted changes.\n" "These changes cannot be recovered." @@ -3755,7 +3814,7 @@ msgstr "" "To działanie porzuci niezatwierdzone zmiany.\n" "Zmian tych nie będzie można przywrócić." -#: cola/cmds.py:2307 +#: cola/cmds.py:2258 msgid "" "This operation removes uncommitted edits from selected files.\n" "These changes cannot be recovered." @@ -3763,7 +3822,7 @@ msgstr "" "To działanie porzuci niezatwierdzone zmiany.\n" "Zmian tych nie będzie można przywrócić." -#: cola/cmds.py:2285 +#: cola/cmds.py:2236 msgid "" "This operation removes unstaged edits from selected files.\n" "These changes cannot be recovered." @@ -3771,31 +3830,27 @@ msgstr "" "To działanie porzuci niedobrane zmiany.\n" "Nie będzie można ich później odzyskać." -#: cola/cmds.py:475 +#: cola/cmds.py:476 msgid "" -"This operation will replace the selected unmerged files with content from the" -" branch being merged using \"git checkout --theirs\".\n" +"This operation will replace the selected unmerged files with content from the branch being merged using \"git checkout --theirs\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -"To działanie zastąpi zaznaczone, niescalone pliki treścią ze scalanej gałęzi" -" przy użyciu \"git checkout --theirs\".\n" +"To działanie zastąpi zaznaczone, niescalone pliki treścią ze scalanej gałęzi przy użyciu \"git checkout --theirs\".\n" "Utracisz *WSZYSTKIE* niezatwierdzone zmiany.\n" "Odzyskanie ich będzie niemożliwe." -#: cola/cmds.py:513 +#: cola/cmds.py:514 msgid "" -"This operation will replace the selected unmerged files with content from" -" your current branch using \"git checkout --ours\".\n" +"This operation will replace the selected unmerged files with content from your current branch using \"git checkout --ours\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -"To działanie zastąpi zaznaczone, niescalone pliki treścią z twojej obecnej" -" gałęzi przy użyciu \"git checkout --ours\".\n" +"To działanie zastąpi zaznaczone, niescalone pliki treścią z twojej obecnej gałęzi przy użyciu \"git checkout --ours\".\n" "Utracisz *WSZYSTKIE* niezatwierdzone zmiany.\n" "Odzyskanie ich będzie niemożliwe." -#: cola/widgets/main.py:1109 +#: cola/widgets/main.py:1122 msgid "" "This repository has unresolved conflicts after applying a patch.\n" "Resolve conflicts and commit changes." @@ -3803,7 +3858,7 @@ msgstr "" "To repozytorium ma nierozwiązane sprzeczności po nałożeniu łaty.\n" "Rozwiąż sprzeczności i zatwierdź zmiany." -#: cola/widgets/main.py:1102 +#: cola/widgets/main.py:1115 msgid "" "This repository is currently being rebased.\n" "Resolve conflicts, commit changes, and run:\n" @@ -3813,7 +3868,7 @@ msgstr "" "Wyjaśnij sprzeczności, zatwierdź zmiany i wykonaj:\n" " Zmiana podstawy > Dalej" -#: cola/widgets/main.py:1115 +#: cola/widgets/main.py:1128 msgid "" "This repository is in the middle of a cherry-pick.\n" "Resolve conflicts and commit changes." @@ -3821,7 +3876,7 @@ msgstr "" "To repozytorium jest w środku zaciągania wybiórczego.\n" "Wyjaśnij sprzeczności i zatwierdź zmiany." -#: cola/widgets/main.py:1121 +#: cola/widgets/main.py:1134 msgid "" "This repository is in the middle of a merge.\n" "Resolve conflicts and commit changes." @@ -3838,21 +3893,18 @@ msgid "To avoid applying addition lines ('+'), delete them." msgstr "Aby uniknąć nakładania wierszy dodających ('+'), usuń je." #: cola/editpatch.py:55 -msgid "" -"To avoid applying removal lines ('-'), change them to context lines (' ')." -msgstr "" -"Aby uniknąć nakładania wierszy usuwających ('-'), zmień je na wiersze" -" otoczenia (' ')." +msgid "To avoid applying removal lines ('-'), change them to context lines (' ')." +msgstr "Aby uniknąć nakładania wierszy usuwających ('-'), zmień je na wiersze otoczenia (' ')." -#: cola/sequenceeditor.py:342 +#: cola/sequenceeditor.py:338 msgid "Toggle Enabled" msgstr "Uwzględnij/nie uwzględniaj" -#: cola/widgets/diff.py:776 +#: cola/widgets/diff.py:804 msgid "Toggle image diff" msgstr "Przełącz różnicę obrazu" -#: cola/widgets/branch.py:63 +#: cola/widgets/branch.py:65 msgid "Toggle the branches filter" msgstr "Przełącz filtr gałęzi" @@ -3860,51 +3912,51 @@ msgstr "Przełącz filtr gałęzi" msgid "Toggle the paths filter" msgstr "Przełącz filtr ścieżek" -#: cola/widgets/toolbar.py:317 +#: cola/widgets/toolbar.py:322 msgid "Toolbar Style:" msgstr "Wygląd paska narzędzi:" -#: cola/widgets/cfgactions.py:228 cola/widgets/merge.py:47 +#: cola/widgets/cfgactions.py:226 cola/widgets/merge.py:45 msgid "Tracking Branch" msgstr "Odgórna gałąź" -#: cola/widgets/createbranch.py:115 +#: cola/widgets/createbranch.py:113 msgid "Tracking branch" msgstr "Odgórna gałąź" -#: cola/widgets/about.py:408 cola/widgets/about.py:434 -#: cola/widgets/about.py:445 +#: cola/widgets/about.py:391 cola/widgets/about.py:417 +#: cola/widgets/about.py:428 msgid "Traditional Chinese (Taiwan) translation" msgstr "Tłumaczenia na tradycyjny chiński (Tajwan)" -#: cola/widgets/about.py:439 +#: cola/widgets/about.py:422 msgid "Translation" msgstr "Tłumaczenie" -#: cola/widgets/about.py:94 +#: cola/widgets/about.py:92 msgid "Translators" msgstr "Tłumacze" -#: cola/widgets/about.py:418 cola/widgets/about.py:423 -#: cola/widgets/about.py:438 +#: cola/widgets/about.py:401 cola/widgets/about.py:406 +#: cola/widgets/about.py:421 msgid "Turkish translation" msgstr "Tłumaczenie na turecki" -#: cola/widgets/clone.py:109 cola/widgets/editremotes.py:451 -#: cola/widgets/submodules.py:117 +#: cola/widgets/clone.py:107 cola/widgets/editremotes.py:449 +#: cola/widgets/submodules.py:116 msgid "URL" msgstr "Adres URL" -#: cola/widgets/remote.py:463 +#: cola/widgets/remote.py:497 #, python-format msgid "URL: %s" msgstr "Adres URL: %s" -#: cola/widgets/about.py:415 +#: cola/widgets/about.py:398 msgid "Ukranian translation" msgstr "Tłumaczenie na ukraiński" -#: cola/cmds.py:2122 +#: cola/cmds.py:2073 msgid "Unable to rebase" msgstr "Nie można zmienić podstawy" @@ -3913,53 +3965,58 @@ msgstr "Nie można zmienić podstawy" msgid "Unable to set URL for \"%(name)s\" to \"%(url)s\"" msgstr "Nie można ustawić URL dla \"%(name)s\" na \"%(url)s\"" -#: cola/widgets/diff.py:1327 +#: cola/widgets/diff.py:1401 #, python-format msgid "Unable to write patch to \"%s\". Check permissions?" msgstr "Nie udało się zapisać łaty do \"%s\". Czy masz uprawnienia?" -#: cola/widgets/main.py:735 +#: cola/widgets/main.py:748 msgid "Undo" msgstr "Cofnij" -#: cola/cmds.py:783 cola/cmds.py:788 cola/cmds.py:791 cola/widgets/main.py:208 +#: cola/cmds.py:785 cola/cmds.py:790 cola/cmds.py:793 cola/widgets/main.py:207 msgid "Undo Last Commit" msgstr "Wycofaj ostatnią zmianę" -#: cola/cmds.py:789 +#: cola/cmds.py:791 msgid "Undo last commit?" msgstr "Czy wycofać ostatnią zmianę?" -#: cola/cmds.py:782 +#: cola/cmds.py:784 msgid "Undo the published commit?" msgstr "Czy wycofać opublikowaną zmianę?" -#: cola/models/browse.py:328 cola/widgets/status.py:157 -#: cola/widgets/status.py:640 +#: cola/models/browse.py:327 cola/widgets/status.py:157 +#: cola/widgets/status.py:641 msgid "Unmerged" msgstr "Niescalone" -#: cola/cmds.py:2855 cola/widgets/action.py:61 cola/widgets/diff.py:985 +#: cola/cmds.py:2801 cola/widgets/action.py:61 cola/widgets/diff.py:1165 +#: cola/widgets/main.py:212 msgid "Unstage" msgstr "Odłóż" -#: cola/widgets/main.py:203 cola/widgets/status.py:790 +#: cola/widgets/main.py:202 cola/widgets/status.py:791 msgid "Unstage All" msgstr "Odłóż wszystkie" -#: cola/widgets/diff.py:1061 +#: cola/widgets/diff.py:1017 msgid "Unstage Diff Hunk" msgstr "Odłóż kawałek różnicy" -#: cola/widgets/status.py:823 cola/widgets/status.py:858 +#: cola/widgets/status.py:824 cola/widgets/status.py:859 msgid "Unstage Selected" msgstr "Odłóż zaznaczone" -#: cola/widgets/diff.py:1058 +#: cola/widgets/diff.py:1015 msgid "Unstage Selected Lines" msgstr "Odłóż zaznaczone wiersze" -#: cola/cmds.py:2867 +#: cola/widgets/action.py:61 +msgid "Unstage changes using \"git reset\"" +msgstr "" + +#: cola/cmds.py:2813 #, python-format msgid "Unstaging: %s" msgstr "Odkładanie: %s" @@ -3968,86 +4025,84 @@ msgstr "Odkładanie: %s" msgid "Untrack Selected" msgstr "Nie zarządzaj wybranymi" -#: cola/widgets/status.py:159 cola/widgets/status.py:646 +#: cola/widgets/status.py:159 cola/widgets/status.py:647 msgid "Untracked" msgstr "Niezarządzane" -#: cola/cmds.py:1141 cola/cmds.py:2923 +#: cola/cmds.py:1142 cola/cmds.py:2869 #, python-format msgid "Untracking: %s" msgstr "Nie zarządzaj: %s" -#: cola/widgets/main.py:374 +#: cola/widgets/main.py:369 msgid "Update All Submodules..." msgstr "Uaktualnij wszystkie podmoduły..." -#: cola/widgets/createbranch.py:121 +#: cola/widgets/createbranch.py:119 msgid "Update Existing Branch:" msgstr "Uaktualnij bieżącą gałąź:" -#: cola/cmds.py:3075 +#: cola/cmds.py:3021 msgid "Update Submodule" msgstr "Uaktualnij podmoduł" -#: cola/cmds.py:3072 +#: cola/cmds.py:3018 msgid "Update Submodule..." msgstr "Uaktualnij podmoduł..." -#: cola/cmds.py:3111 +#: cola/cmds.py:3057 msgid "Update Submodules" msgstr "Uaktualnij podmoduły" -#: cola/cmds.py:3109 +#: cola/cmds.py:3055 msgid "Update all submodules?" msgstr "Uaktualnić wszystkie podmoduły?" -#: cola/cmds.py:2093 +#: cola/cmds.py:2044 msgid "Update stacked branches" msgstr "Uaktualnij nałożone gałęzie" -#: cola/cmds.py:2085 cola/cmds.py:2092 +#: cola/cmds.py:2036 cola/cmds.py:2043 msgid "Update stacked branches when rebasing?" msgstr "Czy uaktualnić nałożone gałęzie przy zmienianiu podstawy?" -#: cola/cmds.py:3108 +#: cola/cmds.py:3054 msgid "Update submodules..." msgstr "Uaktualnij podmoduły..." -#: cola/widgets/status.py:953 +#: cola/widgets/status.py:954 msgid "Update this submodule" msgstr "Uaktualnij ten podmoduł" -#: cola/cmds.py:3073 +#: cola/cmds.py:3019 msgid "Update this submodule?" msgstr "Uaktualnić ten podmoduł?" -#: cola/widgets/branch.py:421 cola/widgets/createbranch.py:302 -#: cola/widgets/remote.py:135 +#: cola/widgets/branch.py:433 cola/widgets/createbranch.py:300 msgid "Updating" msgstr "Uaktualnianie" -#: cola/widgets/prefs.py:350 +#: cola/widgets/prefs.py:370 msgid "Use a block cursor in diff editors" msgstr "Użyj bloku jako kursora w edytorach różnicy" -#: cola/widgets/prefs.py:154 +#: cola/widgets/prefs.py:177 msgid "Use gravatar.com to lookup icons for author emails" -msgstr "" -"Użyj gravatar.com do poszukiwania ikon autorów na podstawie ich adresów" +msgstr "Użyj gravatar.com do poszukiwania ikon autorów na podstawie ich adresów" -#: cola/widgets/prefs.py:166 +#: cola/widgets/prefs.py:189 msgid "User Name" msgstr "Nazwa użytkownika" -#: cola/widgets/about.py:92 +#: cola/widgets/about.py:90 msgid "Version" msgstr "Wersja" -#: cola/widgets/dag.py:800 cola/widgets/main.py:845 cola/widgets/main.py:966 +#: cola/widgets/dag.py:866 cola/widgets/main.py:858 cola/widgets/main.py:979 msgid "View" msgstr "Widok" -#: cola/widgets/browse.py:137 cola/widgets/status.py:278 +#: cola/widgets/browse.py:137 cola/widgets/status.py:279 msgid "View History..." msgstr "Przejrzyj historię..." @@ -4055,39 +4110,39 @@ msgstr "Przejrzyj historię..." msgid "View history for selected paths" msgstr "Przejrzyj historię dla wybranej ścieżki/ścieżek" -#: cola/widgets/merge.py:54 +#: cola/widgets/branch.py:224 cola/widgets/merge.py:52 msgid "Visualize" msgstr "Zobrazuj" -#: cola/widgets/main.py:488 +#: cola/widgets/main.py:501 msgid "Visualize All Branches..." msgstr "Zobrazuj wszystkie gałęzie..." -#: cola/widgets/main.py:482 +#: cola/widgets/main.py:495 msgid "Visualize Current Branch..." msgstr "Zobrazuj bieżącą gałąź..." -#: cola/widgets/createtag.py:73 +#: cola/widgets/createtag.py:71 msgid "Whether to sign the tag (git tag -s)" msgstr "Określa czy podpisać znacznik (git tag -s)" -#: cola/widgets/text.py:399 +#: cola/widgets/text.py:396 msgid "Whole Words" msgstr "Całe słowa" -#: cola/widgets/commitmsg.py:432 +#: cola/widgets/commitmsg.py:440 msgid "Would you like to stage and commit all modified files?" msgstr "Czy chcesz zebrać i zatwierdzić wszystkie zmienione pliki?" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "XOR" msgstr "XOR" -#: cola/widgets/standard.py:1064 +#: cola/widgets/standard.py:1182 msgid "Yes" msgstr "Tak" -#: cola/cmds.py:256 +#: cola/cmds.py:255 msgid "" "You are in the middle of a merge.\n" "Cannot amend while merging." @@ -4095,36 +4150,36 @@ msgstr "" "Jesteś w środku scalania.\n" "Nie można uzupełniać w trakcie scalania." -#: cola/cmds.py:2123 +#: cola/cmds.py:2074 msgid "You cannot rebase with uncommitted changes." msgstr "Nie można zmieniać podstawy, gdy masz niezatwierdzone zmiany." -#: cola/widgets/merge.py:227 +#: cola/widgets/merge.py:225 msgid "You must specify a revision to merge." msgstr "Musisz podać wydanie do scalenia." -#: cola/widgets/merge.py:217 +#: cola/widgets/merge.py:215 msgid "You must specify a revision to view." msgstr "Musisz podać wydanie do obejrzenia." -#: cola/widgets/dag.py:710 cola/widgets/dag.py:1588 +#: cola/widgets/dag.py:776 cola/widgets/dag.py:1645 msgid "Zoom In" msgstr "Powiększ" -#: cola/widgets/dag.py:706 cola/widgets/dag.py:1594 +#: cola/widgets/dag.py:772 cola/widgets/dag.py:1651 msgid "Zoom Out" msgstr "Pomniejsz" -#: cola/widgets/dag.py:524 cola/widgets/dag.py:714 cola/widgets/dag.py:1596 -#: cola/widgets/diff.py:785 +#: cola/widgets/dag.py:590 cola/widgets/dag.py:780 cola/widgets/dag.py:1653 +#: cola/widgets/diff.py:813 msgid "Zoom to Fit" msgstr "Zmieść" -#: cola/widgets/grep.py:112 +#: cola/widgets/grep.py:110 msgid "command-line arguments" msgstr "argumenty wiersza poleceń" -#: cola/widgets/main.py:932 cola/widgets/main.py:938 +#: cola/widgets/main.py:945 cola/widgets/main.py:951 msgid "error: unable to execute git" msgstr "błąd: nie można uruchomić git" @@ -4133,47 +4188,41 @@ msgstr "błąd: nie można uruchomić git" msgid "exit code %s" msgstr "kod wyjścia %s" -#: cola/app.py:301 +#: cola/app.py:304 #, python-format -msgid "" -"fatal: \"%s\" is not a directory. Please specify a correct --repo ." -msgstr "" -"krytyczny: \"%s\" nie jest katalogiem. Podaj poprawne --repo <ścieżka>." +msgid "fatal: \"%s\" is not a directory. Please specify a correct --repo ." +msgstr "krytyczny: \"%s\" nie jest katalogiem. Podaj poprawne --repo <ścieżka>." -#: cola/widgets/main.py:928 +#: cola/widgets/main.py:941 #, python-format msgid "git cola version %s" msgstr "wersja git coli %s" -#: cola/widgets/startup.py:35 +#: cola/widgets/startup.py:34 msgid "git-cola" msgstr "git-cola" -#: cola/difftool.py:63 +#: cola/difftool.py:82 msgid "git-cola diff" msgstr "Różnica git-cola" -#: cola/widgets/submodules.py:81 +#: cola/widgets/submodules.py:80 msgid "git://git.example.com/repo.git" msgstr "git://git.example.com/repo.git" -#: cola/widgets/grep.py:132 +#: cola/widgets/grep.py:130 msgid "grep result..." msgstr "wyszukaj w wynikach..." -#: cola/widgets/about.py:486 +#: cola/widgets/about.py:469 msgid "hotkeys.html" msgstr "hotkeys.html" -#: cola/widgets/submodules.py:85 +#: cola/widgets/submodules.py:84 msgid "path/to/submodule" msgstr "ściezka/do/podmodułu" -#: cola/cmds.py:2537 -msgid "unknown" -msgstr "nieznany" - -#: cola/widgets/createtag.py:63 +#: cola/widgets/createtag.py:61 msgid "vX.Y.Z" msgstr "vX.Y.Z" @@ -4182,14 +4231,18 @@ msgid "x 1" msgstr "x 1" #: cola/hidpi.py:44 +msgid "x 1.25" +msgstr "" + +#: cola/hidpi.py:45 msgid "x 1.5" msgstr "x 1.5" -#: cola/hidpi.py:45 +#: cola/hidpi.py:46 msgid "x 2" msgstr "x 2" -#: cola/widgets/search.py:53 cola/widgets/search.py:58 +#: cola/widgets/search.py:52 cola/widgets/search.py:57 msgid "yyyy-MM-dd" msgstr "yyyy-MM-dd" @@ -4271,6 +4324,10 @@ msgstr "yyyy-MM-dd" #~ msgid "\"git commit\" returned exit code %s" #~ msgstr "\"git commit\" zwróciło kod wyjścia %s" +#, python-format +#~ msgid "A stash named \"%s\" already exists" +#~ msgstr "Przechowalnia o nazwie \"%s\" już istnieje" + #~ msgid "Already up-to-date." #~ msgstr "Nic nowego." @@ -4290,6 +4347,9 @@ msgstr "yyyy-MM-dd" #~ msgid "Error %s" #~ msgstr "Błędy: %s" +#~ msgid "Error: Stash exists" +#~ msgstr "Błąd: Przechowalnia istnieje" + #~ msgid "Errors: %s" #~ msgstr "Błędy: %s" @@ -4407,3 +4467,6 @@ msgstr "yyyy-MM-dd" #~ msgid "title" #~ msgstr "tytuł" + +#~ msgid "unknown" +#~ msgstr "nieznany" diff --git a/cola/i18n/pt_BR.po b/cola/i18n/pt_BR.po index ff4b9296..bc0eee9e 100644 --- a/cola/i18n/pt_BR.po +++ b/cola/i18n/pt_BR.po @@ -15,7 +15,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.0.8\n" -#: cola/widgets/patch.py:86 +#: cola/widgets/diff.py:1680 msgid "" "\n" "

\n" @@ -31,7 +31,7 @@ msgstr "" "

\n" " " -#: cola/widgets/about.py:455 +#: cola/widgets/about.py:438 #, python-format msgid "" "\n" @@ -84,7 +84,7 @@ msgstr "" "\n" " " -#: cola/widgets/about.py:180 +#: cola/widgets/about.py:182 #, python-format msgid "" "\n" @@ -113,7 +113,7 @@ msgstr "" " \n" " " -#: cola/widgets/about.py:387 +#: cola/widgets/about.py:370 #, python-format msgid "" "\n" @@ -128,7 +128,7 @@ msgstr "" "
\n" " " -#: cola/widgets/status.py:1310 +#: cola/widgets/status.py:1311 #, python-format msgid "" "\n" @@ -153,7 +153,7 @@ msgstr "" " %(basename)s = nome base do arquivo sem extensão\n" " %(ext)s = extensão do arquivo\n" -#: cola/sequenceeditor.py:700 +#: cola/sequenceeditor.py:695 msgid "" "\n" "Commands\n" @@ -192,7 +192,7 @@ msgid "" "ctrl+d = launch difftool\n" msgstr "" -#: cola/widgets/finder.py:65 +#: cola/widgets/finder.py:64 msgid "" "\n" "Keyboard Shortcuts\n" @@ -220,45 +220,71 @@ msgstr "" "As setas para cima e para baixo mudam o foco entre a caixa de entrada\n" "e os resultados.\n" -#: cola/widgets/dag.py:894 +#: cola/widgets/prefs.py:133 +msgid "" +"\n" +"This option determines how the supplied commit message should be\n" +"cleaned up before committing.\n" +"\n" +"The can be strip, whitespace, verbatim, scissors or default.\n" +"\n" +"strip\n" +" Strip leading and trailing empty lines, trailing whitespace,\n" +" commentary and collapse consecutive empty lines.\n" +"\n" +"whitespace\n" +" Same as strip except #commentary is not removed.\n" +"\n" +"verbatim\n" +" Do not change the message at all.\n" +"\n" +"scissors\n" +" Same as whitespace except that everything from (and including) the line\n" +" found below is truncated, if the message is to be edited.\n" +" \"#\" can be customized with core.commentChar.\n" +"\n" +" # ------------------------ >8 ------------------------" +msgstr "" + +#: cola/widgets/dag.py:960 msgid " - DAG" msgstr "Visualizar o Histórico" -#: cola/widgets/recent.py:54 +#: cola/widgets/recent.py:52 msgid " commits ago" msgstr "commits anteriores" -#: cola/cmds.py:1197 +#: cola/cmds.py:1198 #, python-format msgid "\"%(branch)s\" has been deleted from \"%(remote)s\"." msgstr "\"%(branch)s\" foi removida do \"%(remote)s\"." -#: cola/widgets/createbranch.py:316 +#: cola/widgets/createbranch.py:314 #, python-format msgid "\"%(command)s\" returned exit status \"%(status)d\"" msgstr "\"%(command)s\" retornou estado de saída \"%(status)d\"" -#: cola/interaction.py:39 +#: cola/interaction.py:38 #, python-format msgid "\"%(command)s\" returned exit status %(status)d" msgstr "\"%(command)s\" retornou estado de saída %(status)d" -#: cola/guicmds.py:157 +#: cola/guicmds.py:156 #, fuzzy, python-format msgid "\"%s\" already exists" msgstr "Branch \"%s\" já existe." -#: cola/widgets/clone.py:206 +#: cola/widgets/clone.py:204 #, python-format msgid "\"%s\" already exists, cola will create a new directory" msgstr "\"%s\" já existe, o cola já criou um novo diretório" -#: cola/cmds.py:2349 +#: cola/cmds.py:2300 #, python-format msgid "\"%s\" requires a selected file." msgstr "\"%s\" requer um arquivo selecionado" -#: cola/cmds.py:2087 +#: cola/cmds.py:2038 msgid "" "\"git rebase --update-refs\" automatically force-updates any\n" "branches that point to commits that are being rebased.\n" @@ -268,7 +294,11 @@ msgid "" "Using this feature is helpful for \"stacked\" branch workflows." msgstr "" -#: cola/sequenceeditor.py:321 +#: cola/models/stash.py:145 +msgid "\"git stash drop\" did not return a ref to rename." +msgstr "" + +#: cola/sequenceeditor.py:318 msgid "#" msgstr "#" @@ -277,37 +307,37 @@ msgstr "#" msgid "%(project)s: %(branch)s - Browse" msgstr "%(project)s: %(branch)s - Navegar" -#: cola/widgets/dag.py:887 +#: cola/widgets/dag.py:953 #, python-format msgid "%(project)s: %(ref)s - DAG" msgstr "%(project)s: %(ref)s - DAG" -#: cola/models/browse.py:315 +#: cola/models/browse.py:314 #, python-format msgid "%d days ago" msgstr "%d dias atrás" -#: cola/models/browse.py:314 +#: cola/models/browse.py:313 #, python-format msgid "%d hours ago" msgstr "%d horas atrás" -#: cola/models/browse.py:307 cola/models/browse.py:311 +#: cola/models/browse.py:306 cola/models/browse.py:310 #, python-format msgid "%d minutes ago" msgstr "%d minutos atrás" -#: cola/cmds.py:376 +#: cola/cmds.py:377 #, python-format msgid "%d patch(es) applied." msgstr "%d patch(es) foram aplicados." -#: cola/widgets/createbranch.py:281 +#: cola/widgets/createbranch.py:279 #, python-format msgid "%d skipped" msgstr "%d ignorado" -#: cola/cmds.py:2580 +#: cola/cmds.py:2522 #, python-format msgid "" "%s appears to contain merge conflicts.\n" @@ -320,36 +350,36 @@ msgstr "" "Você provavelmente deveria pular este arquivo.\n" "Selecionar o arquivo de qualquer forma?" -#: cola/widgets/startup.py:263 +#: cola/widgets/startup.py:262 #, python-format msgid "%s could not be opened. Remove from bookmarks?" msgstr "" -#: cola/app.py:498 cola/widgets/bookmarks.py:482 +#: cola/app.py:501 cola/widgets/bookmarks.py:481 #, fuzzy, python-format msgid "%s is not a Git repository." msgstr "Entrar no Repositório Git" -#: cola/cmds.py:1015 +#: cola/cmds.py:1016 #, python-format msgid "%s will be removed from your bookmarks." msgstr "%s será removido dos favoritos." -#: cola/cmds.py:1028 +#: cola/cmds.py:1029 #, python-format msgid "%s will be removed from your recent repositories." msgstr "%s será removido dos seu repositórios recentes." -#: cola/cmds.py:1711 +#: cola/cmds.py:1663 #, python-format msgid "%s: No such file or directory." msgstr "%s: Não existe o arquivo ou diretório" -#: cola/widgets/main.py:734 +#: cola/widgets/main.py:747 msgid "&Edit" msgstr "&Editar" -#: cola/widgets/main.py:676 +#: cola/widgets/main.py:689 msgid "&File" msgstr "&Arquivo" @@ -357,43 +387,43 @@ msgstr "&Arquivo" msgid "(Amending)" msgstr "(Modificando)" -#: cola/widgets/compare.py:36 +#: cola/widgets/compare.py:35 msgid "*** Branch Point ***" msgstr "*** Ponto do Branch ***" -#: cola/widgets/compare.py:37 +#: cola/widgets/compare.py:36 msgid "*** Sandbox ***" msgstr "*** Sandbox ***" -#: cola/widgets/diff.py:788 +#: cola/widgets/diff.py:816 msgid "100%" msgstr "100%" -#: cola/widgets/diff.py:789 +#: cola/widgets/diff.py:817 msgid "200%" msgstr "" -#: cola/widgets/diff.py:786 +#: cola/widgets/diff.py:814 msgid "25%" msgstr "" -#: cola/widgets/diff.py:790 +#: cola/widgets/diff.py:818 msgid "400%" msgstr "" -#: cola/widgets/diff.py:787 +#: cola/widgets/diff.py:815 msgid "50%" msgstr "" -#: cola/widgets/diff.py:791 +#: cola/widgets/diff.py:819 msgid "800%" msgstr "" -#: cola/widgets/finder.py:119 +#: cola/widgets/finder.py:118 msgid " ..." msgstr " ..." -#: cola/cmds.py:1734 +#: cola/cmds.py:1686 msgid "" "A commit template has not been configured.\n" "Use \"git config\" to define \"commit.template\"\n" @@ -403,81 +433,76 @@ msgstr "" "Use \"git config\"para definir \"commit.template\"\n" "para que aponte para um template de commit." -#: cola/cmds.py:1784 +#: cola/cmds.py:1735 #, python-format msgid "A hook must be provided at \"%s\"" msgstr "Um hook precisa ser fornecido em \"%s\"" -#: cola/widgets/stash.py:236 -#, python-format -msgid "A stash named \"%s\" already exists" -msgstr "Um nome de stash \"%s\" já existe" - -#: cola/widgets/cfgactions.py:82 cola/widgets/main.py:622 +#: cola/widgets/cfgactions.py:81 cola/widgets/main.py:635 msgid "Abort" msgstr "Abortar" -#: cola/widgets/cfgactions.py:149 cola/widgets/cfgactions.py:155 +#: cola/widgets/cfgactions.py:148 cola/widgets/cfgactions.py:154 msgid "Abort Action" msgstr "Abortar Ação" -#: cola/cmds.py:132 +#: cola/cmds.py:131 msgid "Abort Applying Patch" msgstr "" -#: cola/cmds.py:126 +#: cola/cmds.py:125 msgid "Abort Applying Patch..." msgstr "" -#: cola/widgets/main.py:245 +#: cola/widgets/main.py:244 msgid "Abort Applying Patches..." msgstr "" -#: cola/cmds.py:162 +#: cola/cmds.py:161 msgid "Abort Cherry-Pick" msgstr "" -#: cola/cmds.py:156 cola/widgets/main.py:334 +#: cola/cmds.py:155 cola/widgets/main.py:329 msgid "Abort Cherry-Pick..." msgstr "" -#: cola/cmds.py:193 +#: cola/cmds.py:192 msgid "Abort Merge" msgstr "Abortar Mesclagem" -#: cola/cmds.py:186 cola/widgets/main.py:368 +#: cola/cmds.py:185 cola/widgets/main.py:363 msgid "Abort Merge..." msgstr "Abortar Mesclagem..." -#: cola/widgets/cfgactions.py:154 +#: cola/widgets/cfgactions.py:153 msgid "Abort the action?" msgstr "Abortar a ação?" -#: cola/widgets/main.py:250 +#: cola/widgets/main.py:245 msgid "Abort the current \"git am\" patch session" msgstr "" -#: cola/cmds.py:159 +#: cola/cmds.py:158 msgid "" "Aborting a cherry-pick can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:129 +#: cola/cmds.py:128 msgid "" "Aborting a patch can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:127 +#: cola/cmds.py:126 msgid "Aborting applying the current patch?" msgstr "" -#: cola/cmds.py:157 +#: cola/cmds.py:156 msgid "Aborting the current cherry-pick?" msgstr "" -#: cola/cmds.py:189 +#: cola/cmds.py:188 msgid "" "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." @@ -485,23 +510,23 @@ msgstr "" "Abortando o merge atual irá causar a perda de *TODOS* as mudanças sem um commit. \n" "Não é possível recuperar mudanças sem commit." -#: cola/cmds.py:187 +#: cola/cmds.py:186 msgid "Aborting the current merge?" msgstr "Abordar o merge atual?" -#: cola/widgets/about.py:91 cola/widgets/main.py:517 +#: cola/widgets/about.py:89 cola/widgets/main.py:530 msgid "About" msgstr "Sobre" -#: cola/widgets/about.py:67 +#: cola/widgets/about.py:65 msgid "About git-cola" msgstr "Sobre o git-cola" -#: cola/widgets/bookmarks.py:217 cola/widgets/startup.py:340 +#: cola/widgets/bookmarks.py:216 cola/widgets/startup.py:339 msgid "Accept" msgstr "Aceitar" -#: cola/sequenceeditor.py:159 +#: cola/sequenceeditor.py:157 msgid "" "Accept changes and rebase\n" "Shortcut: Ctrl+Enter" @@ -509,50 +534,50 @@ msgstr "" "Aceitar as mudanças e usar rebase\n" "Atalho: Ctrl+Enter" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Action Name" msgstr "Nome da Ação" -#: cola/sequenceeditor.py:528 cola/widgets/bookmarks.py:321 -#: cola/widgets/branch.py:217 cola/widgets/browse.py:374 -#: cola/widgets/commitmsg.py:99 cola/widgets/dag.py:315 -#: cola/widgets/filelist.py:110 cola/widgets/main.py:95 -#: cola/widgets/main.py:757 cola/widgets/startup.py:436 +#: cola/sequenceeditor.py:524 cola/widgets/bookmarks.py:320 +#: cola/widgets/branch.py:221 cola/widgets/browse.py:375 +#: cola/widgets/commitmsg.py:105 cola/widgets/dag.py:314 +#: cola/widgets/filelist.py:107 cola/widgets/main.py:93 +#: cola/widgets/main.py:770 cola/widgets/startup.py:435 msgid "Actions" msgstr "Ações" -#: cola/widgets/commitmsg.py:101 +#: cola/widgets/commitmsg.py:107 msgid "Actions..." msgstr "Ações..." -#: cola/widgets/bookmarks.py:71 cola/widgets/gitignore.py:64 -#: cola/widgets/patch.py:103 cola/widgets/patch.py:117 -#: cola/widgets/status.py:1381 +#: cola/widgets/bookmarks.py:70 cola/widgets/diff.py:1697 +#: cola/widgets/diff.py:1711 cola/widgets/gitignore.py:63 +#: cola/widgets/status.py:1382 msgid "Add" msgstr "Adicionar" -#: cola/widgets/bookmarks.py:470 +#: cola/widgets/bookmarks.py:469 msgid "Add Favorite" msgstr "Adicionar Favorito" -#: cola/widgets/editremotes.py:374 +#: cola/widgets/editremotes.py:373 msgid "Add Remote" msgstr "Adicionar Remoto" -#: cola/widgets/toolbar.py:315 +#: cola/widgets/toolbar.py:320 msgid "Add Separator" msgstr "Adicionar Separador" -#: cola/cmds.py:3030 cola/widgets/submodules.py:42 -#: cola/widgets/submodules.py:111 +#: cola/cmds.py:2976 cola/widgets/submodules.py:41 +#: cola/widgets/submodules.py:110 msgid "Add Submodule" msgstr "" -#: cola/cmds.py:3027 cola/widgets/main.py:381 +#: cola/cmds.py:2973 cola/widgets/main.py:376 msgid "Add Submodule..." msgstr "" -#: cola/widgets/editremotes.py:62 +#: cola/widgets/editremotes.py:61 msgid "" "Add and remove remote repositories using the \n" "Add(+) and Delete(-) buttons on the left-hand side.\n" @@ -566,98 +591,98 @@ msgstr "" "Repositórios remotos podem ser renomeados, selecionando uma opção da lista\n" "e pressionando a \"enter\", ou clicando duas vezes." -#: cola/widgets/editremotes.py:81 +#: cola/widgets/editremotes.py:80 msgid "Add new remote git repository" msgstr "Adicionar novo repositório git" -#: cola/widgets/patch.py:103 +#: cola/widgets/diff.py:1697 msgid "Add patches (+)" msgstr "Adicionar patches (+)" -#: cola/widgets/editremotes.py:433 +#: cola/widgets/editremotes.py:431 msgid "Add remote" msgstr "Adicionar remoto" -#: cola/cmds.py:3028 +#: cola/cmds.py:2974 msgid "Add this submodule?" msgstr "Adicionar este submódulo?" -#: cola/widgets/gitignore.py:54 +#: cola/widgets/gitignore.py:53 msgid "Add to .gitignore" msgstr "Adicionar ao .gitignore" -#: cola/widgets/status.py:286 +#: cola/widgets/status.py:287 msgid "Add to Git Annex" msgstr "Adicionar ao Git Annex" -#: cola/widgets/status.py:290 +#: cola/widgets/status.py:291 msgid "Add to Git LFS" msgstr "Adicionar ao Git LFS" -#: cola/widgets/gitignore.py:28 +#: cola/widgets/gitignore.py:27 msgid "Add to exclusions" msgstr "" -#: cola/widgets/gitignore.py:55 +#: cola/widgets/gitignore.py:54 msgid "Add to local .git/info/exclude" msgstr "" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Additions" msgstr "Adições" -#: cola/widgets/archive.py:134 +#: cola/widgets/archive.py:132 msgid "Advanced" msgstr "Avançado" -#: cola/widgets/main.py:522 +#: cola/widgets/main.py:535 msgid "Against Commit... (Diff Mode)" msgstr "" -#: cola/models/browse.py:33 +#: cola/models/browse.py:32 msgid "Age" msgstr "Idade" -#: cola/widgets/prefs.py:403 +#: cola/widgets/prefs.py:441 msgid "All Repositories" msgstr "Todos os Repositórios" -#: cola/cmds.py:3110 +#: cola/cmds.py:3056 #, python-format msgid "" "All submodules will be updated using\n" "\"%s\"" msgstr "" -#: cola/widgets/remote.py:195 +#: cola/widgets/remote.py:199 msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care" msgstr "Permitir atualizações non-fast-forward. Usando \"force\" pode fazer com que o repositório perca commits; use com cuidado." -#: cola/widgets/merge.py:61 +#: cola/widgets/merge.py:59 msgid "Always create a merge commit when enabled, even when the merge is a fast-forward update" msgstr "Sempre crie um commit de merge quando habilitado, mesmo quando o merge é uma atualização de fast-forward" -#: cola/cmds.py:221 +#: cola/cmds.py:220 msgid "Amend" msgstr "Alterar" -#: cola/widgets/commitmsg.py:463 +#: cola/widgets/commitmsg.py:471 msgid "Amend Commit" msgstr "Alterar Commit" -#: cola/widgets/commitmsg.py:110 cola/widgets/main.py:194 +#: cola/widgets/commitmsg.py:116 cola/widgets/main.py:193 msgid "Amend Last Commit" msgstr "Alterar o Último Commit" -#: cola/widgets/commitmsg.py:462 +#: cola/widgets/commitmsg.py:470 msgid "Amend the published commit?" msgstr "Alterar o commit publicado ?" -#: cola/widgets/main.py:1157 +#: cola/widgets/main.py:1170 msgid "Amending" msgstr "Alterando" -#: cola/widgets/cfgactions.py:151 +#: cola/widgets/cfgactions.py:150 msgid "" "An action is still running.\n" "Terminating it could result in data loss." @@ -665,7 +690,7 @@ msgstr "" "Uma ação ainda está sendo executada.\n" "Finaliza-la pode resultar em perda de dados." -#: cola/cmds.py:2804 +#: cola/cmds.py:2750 msgid "" "An unsigned, lightweight tag will be created instead.\n" "Create an unsigned tag?" @@ -673,56 +698,56 @@ msgstr "" "Uma tag leve e não assinada será criada.\n" "Criar uma tag não assinada?" -#: cola/widgets/prefs.py:406 +#: cola/widgets/prefs.py:444 msgid "Appearance" msgstr "Aparência" -#: cola/widgets/diff.py:1230 +#: cola/widgets/diff.py:1304 msgid "Append Patch" msgstr "" -#: cola/widgets/diff.py:1299 +#: cola/widgets/diff.py:1373 msgid "Append Patch..." msgstr "" -#: cola/widgets/patch.py:112 cola/widgets/stash.py:48 cola/widgets/stash.py:107 -#: cola/widgets/toolbar.py:323 +#: cola/widgets/diff.py:1706 cola/widgets/stash.py:50 cola/widgets/stash.py:110 +#: cola/widgets/toolbar.py:328 msgid "Apply" msgstr "Aplicar" -#: cola/widgets/patch.py:75 +#: cola/widgets/diff.py:1669 msgid "Apply Patches" msgstr "Aplicar Patches" -#: cola/widgets/main.py:239 +#: cola/widgets/main.py:238 msgid "Apply Patches..." msgstr "Aplicar Patches..." -#: cola/widgets/stash.py:64 +#: cola/widgets/stash.py:66 msgid "Apply and drop the selected stash (git stash pop)" msgstr "Aplicar e cancelar o stash selecionado (git stash pop)" -#: cola/widgets/stash.py:48 +#: cola/widgets/stash.py:50 msgid "Apply the selected stash" msgstr "Aplicar o stash selecionar" -#: cola/widgets/main.py:1167 +#: cola/widgets/main.py:1180 msgid "Applying Patch" msgstr "" -#: cola/widgets/cfgactions.py:207 +#: cola/widgets/cfgactions.py:205 msgid "Arguments" msgstr "Argumentos" -#: cola/qtutils.py:850 +#: cola/qtutils.py:887 msgid "Attach" msgstr "Anexar" -#: cola/models/browse.py:33 cola/models/browse.py:72 cola/widgets/dag.py:506 +#: cola/models/browse.py:32 cola/models/browse.py:71 cola/widgets/dag.py:572 msgid "Author" msgstr "Autor" -#: cola/widgets/about.py:93 +#: cola/widgets/about.py:91 msgid "Authors" msgstr "Autores" @@ -730,44 +755,44 @@ msgstr "Autores" msgid "Auto" msgstr "Automático" -#: cola/widgets/commitmsg.py:137 cola/widgets/prefs.py:259 +#: cola/widgets/commitmsg.py:143 cola/widgets/prefs.py:280 msgid "Auto-Wrap Lines" msgstr "Auto-Quebra de Linhas" -#: cola/widgets/prefs.py:184 +#: cola/widgets/prefs.py:206 msgid "Autocomplete Paths" msgstr "Autocompletar Caminhos" -#: cola/widgets/prefs.py:176 +#: cola/widgets/prefs.py:198 msgid "Automatically Load Commit Message Template" msgstr "Carregar template de mensagens de commit automaticamente" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Basic Regexp" msgstr "Regexp Básico" -#: cola/widgets/prefs.py:255 +#: cola/widgets/prefs.py:276 msgid "Blame Viewer" msgstr "Visualizador de Blame" -#: cola/widgets/browse.py:205 +#: cola/widgets/browse.py:206 #, fuzzy msgid "Blame selected paths" msgstr "Renomear caminhos selecionados" -#: cola/cmds.py:545 cola/widgets/status.py:282 +#: cola/cmds.py:546 cola/widgets/status.py:283 msgid "Blame..." msgstr "Blame..." -#: cola/widgets/prefs.py:347 +#: cola/widgets/prefs.py:367 msgid "Bold on dark headers instead of italic" msgstr "Fonte em negrito com o fundo escuro em vez de cabeçalhos em itálico" -#: cola/widgets/main.py:806 cola/widgets/submodules.py:119 +#: cola/widgets/main.py:819 cola/widgets/submodules.py:118 msgid "Branch" msgstr "Branch" -#: cola/widgets/remote.py:600 +#: cola/widgets/remote.py:635 #, python-format msgid "" "Branch \"%(branch)s\" does not exist in \"%(remote)s\".\n" @@ -776,84 +801,84 @@ msgstr "" "Branch \"%(branch)s\" não existe em \"%(remote)s\".\n" "Um novo branch remoto será publicado." -#: cola/widgets/createbranch.py:258 +#: cola/widgets/createbranch.py:256 #, python-format msgid "Branch \"%s\" already exists." msgstr "Branch \"%s\" já existe." -#: cola/widgets/compare.py:44 +#: cola/widgets/compare.py:43 msgid "Branch Diff Viewer" msgstr "Visualizador de Diff do Branch" -#: cola/widgets/createbranch.py:259 cola/widgets/createbranch.py:271 +#: cola/widgets/createbranch.py:257 cola/widgets/createbranch.py:269 msgid "Branch Exists" msgstr "Branch Existe" -#: cola/widgets/createbranch.py:98 +#: cola/widgets/createbranch.py:96 msgid "Branch Name" msgstr "Nome do Branch" -#: cola/widgets/submodules.py:89 +#: cola/widgets/submodules.py:88 msgid "Branch name" msgstr "Nome do Branch" -#: cola/widgets/browse.py:89 cola/widgets/main.py:1097 +#: cola/widgets/browse.py:89 cola/widgets/main.py:1110 #, python-format msgid "Branch: %s" msgstr "Branch: %s" -#: cola/widgets/branch.py:85 cola/widgets/main.py:131 +#: cola/widgets/branch.py:87 cola/widgets/main.py:129 msgid "Branches" msgstr "Branches" -#: cola/widgets/main.py:538 +#: cola/widgets/main.py:551 msgid "Branches..." msgstr "Branches..." -#: cola/widgets/about.py:414 cola/widgets/about.py:417 -#: cola/widgets/about.py:437 +#: cola/widgets/about.py:397 cola/widgets/about.py:400 +#: cola/widgets/about.py:420 msgid "Brazilian translation" msgstr "Tradução Brasileira" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse" msgstr "Navegar" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse Commits..." msgstr "Navegar nos Commits..." -#: cola/widgets/main.py:499 +#: cola/widgets/main.py:512 msgid "Browse Current Branch..." msgstr "Navegar no Branch Atual..." -#: cola/widgets/main.py:505 +#: cola/widgets/main.py:518 msgid "Browse Other Branch..." msgstr "Navegar em Outro Branch..." -#: cola/widgets/editremotes.py:437 cola/widgets/search.py:46 -#: cola/widgets/startup.py:65 cola/widgets/startup.py:285 +#: cola/widgets/editremotes.py:435 cola/widgets/search.py:45 +#: cola/widgets/startup.py:64 cola/widgets/startup.py:284 msgid "Browse..." msgstr "Navegar..." -#: cola/widgets/main.py:89 +#: cola/widgets/main.py:87 msgid "Browser" msgstr "Navegar" -#: cola/widgets/browse.py:589 +#: cola/widgets/browse.py:590 #, python-format msgid "Browsing %s" msgstr "Navegando %s" -#: cola/widgets/commitmsg.py:118 +#: cola/widgets/commitmsg.py:124 msgid "Bypass Commit Hooks" msgstr "Ignorar Commit Hooks" -#: cola/sequenceeditor.py:175 cola/widgets/standard.py:991 +#: cola/sequenceeditor.py:173 cola/widgets/standard.py:1058 msgid "Cancel" msgstr "Cancelar" -#: cola/sequenceeditor.py:176 +#: cola/sequenceeditor.py:174 msgid "" "Cancel rebase\n" "Shortcut: Ctrl+Q" @@ -861,189 +886,201 @@ msgstr "" "Cancelar rebase\n" "Atalho: Ctrl+Q" -#: cola/cmds.py:254 +#: cola/cmds.py:253 msgid "Cannot Amend" msgstr "Não pode alterar" -#: cola/cmds.py:560 +#: cola/cmds.py:561 #, python-format msgid "Cannot exec \"%s\": please configure a blame viewer" msgstr "Não é possível executar \"%s\": por favor configure o visualizador de blame" -#: cola/cmds.py:3146 +#: cola/cmds.py:3092 #, python-format msgid "Cannot exec \"%s\": please configure a history browser" msgstr "Não é possível executar \"%s\": por favor configure o navegador de histórico" -#: cola/cmds.py:1583 +#: cola/cmds.py:1571 #, python-format msgid "Cannot exec \"%s\": please configure your editor" msgstr "Não é possível executar \"%s\": por favor configure seu editor" -#: cola/models/browse.py:336 +#: cola/models/browse.py:335 msgid "Changed Upstream" msgstr "Upstream Modificado" -#: cola/widgets/prefs.py:186 +#: cola/widgets/prefs.py:208 msgid "Check Published Commits when Amending" msgstr "Verificar commits publicados em Amending" -#: cola/widgets/commitmsg.py:130 +#: cola/widgets/commitmsg.py:136 msgid "Check Spelling" msgstr "Verificar Ortografia" -#: cola/widgets/prefs.py:265 +#: cola/widgets/prefs.py:286 msgid "Check spelling" msgstr "Verificar ortografia" -#: cola/widgets/prefs.py:163 +#: cola/widgets/prefs.py:186 msgid "Check whether a commit has been published when amending" msgstr "" -#: cola/guicmds.py:62 cola/widgets/branch.py:222 +#: cola/guicmds.py:61 cola/widgets/branch.py:233 msgid "Checkout" msgstr "Checkout" -#: cola/widgets/createbranch.py:130 +#: cola/widgets/createbranch.py:128 msgid "Checkout After Creation" msgstr "Checkout depois da criação" -#: cola/guicmds.py:62 cola/widgets/dag.py:410 +#: cola/guicmds.py:61 cola/widgets/dag.py:409 msgid "Checkout Branch" msgstr "Checkout Branch" -#: cola/widgets/dag.py:414 +#: cola/widgets/dag.py:413 msgid "Checkout Detached HEAD" msgstr "Checkout HEAD desanexado" -#: cola/cmds.py:480 cola/cmds.py:518 +#: cola/cmds.py:481 cola/cmds.py:519 msgid "Checkout Files" msgstr "" -#: cola/widgets/branch.py:226 +#: cola/widgets/branch.py:237 msgid "Checkout as new branch" msgstr "Checkout como um novo branch" -#: cola/cmds.py:507 +#: cola/cmds.py:508 msgid "Checkout files from our branch (HEAD)" msgstr "" -#: cola/cmds.py:511 +#: cola/cmds.py:512 msgid "Checkout files from our branch?" msgstr "" -#: cola/cmds.py:469 +#: cola/cmds.py:470 msgid "Checkout files from their branch (MERGE_HEAD)" msgstr "" -#: cola/cmds.py:473 +#: cola/cmds.py:474 msgid "Checkout files from their branch?" msgstr "" -#: cola/widgets/main.py:576 +#: cola/widgets/main.py:589 msgid "Checkout..." msgstr "Checkout..." -#: cola/widgets/dag.py:387 cola/widgets/search.py:79 +#: cola/widgets/dag.py:386 cola/widgets/search.py:78 msgid "Cherry Pick" msgstr "Cherry Pick" -#: cola/guicmds.py:73 +#: cola/guicmds.py:72 msgid "Cherry-Pick Commit" msgstr "Cherry-Pick Commit" -#: cola/widgets/main.py:328 +#: cola/widgets/main.py:323 msgid "Cherry-Pick..." msgstr "Cherry-Pick..." -#: cola/cmds.py:584 +#: cola/cmds.py:585 msgid "Cherry-pick failed" msgstr "" -#: cola/widgets/main.py:1161 +#: cola/widgets/main.py:1174 msgid "Cherry-picking" msgstr "" -#: cola/widgets/diff.py:1247 +#: cola/widgets/diff.py:1321 msgid "Choose Patch..." msgstr "" -#: cola/widgets/search.py:319 +#: cola/widgets/search.py:318 msgid "Choose Paths" msgstr "Escolha os caminhos" -#: cola/widgets/grep.py:116 +#: cola/widgets/grep.py:114 msgid "Choose the \"git grep\" regular expression mode" msgstr "Escolha o modo de expressão regular do \"git grep\"" -#: cola/widgets/bookmarks.py:229 cola/widgets/startup.py:352 +#: cola/widgets/bookmarks.py:228 cola/widgets/startup.py:351 msgid "Clear Default Repository" msgstr "Limpar Repositório Atual" -#: cola/widgets/commitmsg.py:305 +#: cola/widgets/commitmsg.py:313 msgid "Clear commit message" msgstr "Limpar mensagem do commit" -#: cola/widgets/commitmsg.py:302 +#: cola/widgets/commitmsg.py:310 msgid "Clear commit message?" msgstr "Limpar mensagem do Commit?" -#: cola/widgets/commitmsg.py:62 +#: cola/widgets/commitmsg.py:63 msgid "Clear..." msgstr "Limpar..." -#: cola/widgets/clone.py:126 +#: cola/widgets/clone.py:124 msgid "Clone" msgstr "Clonar..." -#: cola/widgets/clone.py:62 cola/widgets/clone.py:104 +#: cola/widgets/clone.py:61 cola/widgets/clone.py:102 #, fuzzy msgid "Clone Repository" msgstr "Clonar Repositório" -#: cola/widgets/main.py:465 cola/widgets/startup.py:58 +#: cola/widgets/main.py:478 cola/widgets/startup.py:57 msgid "Clone..." msgstr "Clonar..." -#: cola/widgets/clone.py:62 +#: cola/widgets/clone.py:61 #, python-format msgid "Cloning repository at %s" msgstr "Clonando repositório em %s" -#: cola/qtutils.py:757 cola/qtutils.py:807 cola/widgets/about.py:508 -#: cola/widgets/remote.py:328 cola/widgets/text.py:1094 +#: cola/qtutils.py:788 cola/qtutils.py:838 cola/widgets/about.py:491 +#: cola/widgets/remote.py:362 cola/widgets/text.py:1090 msgid "Close" msgstr "Fechar" -#: cola/widgets/text.py:402 +#: cola/widgets/remote.py:222 +msgid "Close dialog when completed" +msgstr "" + +#: cola/widgets/remote.py:221 +msgid "Close on completion" +msgstr "" + +#: cola/widgets/text.py:399 msgid "Close the find bar" msgstr "" -#: cola/qtutils.py:623 +#: cola/qtutils.py:651 msgid "Close..." msgstr "Fechar" -#: cola/widgets/recent.py:71 +#: cola/widgets/recent.py:69 msgid "Collapse all" msgstr "Recolher todos" -#: cola/sequenceeditor.py:323 +#: cola/sequenceeditor.py:320 msgid "Command" msgstr "Comando" -#: cola/widgets/main.py:163 cola/widgets/merge.py:74 +#: cola/widgets/main.py:161 cola/widgets/merge.py:72 msgid "Commit" msgstr "Commit" -#: cola/cmds.py:837 +#: cola/widgets/prefs.py:192 +msgid "Commit Message Cleanup" +msgstr "" + +#: cola/widgets/commitmsg.py:495 msgid "Commit failed" msgstr "Falha no Commit" -#: cola/widgets/commitmsg.py:61 +#: cola/widgets/commitmsg.py:62 msgid "Commit staged changes" msgstr "Commit as mudanças selecionadas" -#: cola/widgets/commitmsg.py:93 +#: cola/widgets/commitmsg.py:94 msgid "" "Commit staged changes\n" "Shortcut: Ctrl+Enter" @@ -1051,361 +1088,365 @@ msgstr "" "Commit as mudanças selecionadas\n" "Atalho: Ctrl+Enter" -#: cola/widgets/commitmsg.py:564 +#: cola/widgets/commitmsg.py:590 msgid "Commit summary" msgstr "Descreva resumidamente o que modificou..." -#: cola/widgets/main.py:259 +#: cola/widgets/main.py:253 msgid "Commit the current state and continue applying patches" msgstr "" -#: cola/widgets/merge.py:70 +#: cola/widgets/merge.py:68 msgid "Commit the merge if there are no conflicts. Uncheck to leave the merge uncommitted" msgstr "Commit o merge se não houver conflitos. Desmarque para deixar o merge sem commit." -#: cola/widgets/commitmsg.py:58 cola/widgets/commitmsg.py:95 -#: cola/widgets/main.py:778 cola/widgets/main.py:779 +#: cola/widgets/commitmsg.py:59 cola/widgets/commitmsg.py:96 +#: cola/widgets/main.py:791 cola/widgets/main.py:792 msgid "Commit@@verb" msgstr "Commit@@verbo" -#: cola/difftool.py:78 cola/widgets/compare.py:70 +#: cola/widgets/dag.py:487 +msgid "Commits authored by me" +msgstr "" + +#: cola/difftool.py:97 cola/widgets/compare.py:69 msgid "Compare" msgstr "Comparar" -#: cola/difftool.py:83 +#: cola/difftool.py:102 msgid "Compare All" msgstr "Comparar Todos" -#: cola/widgets/toolbar.py:269 cola/widgets/toolbar.py:306 +#: cola/widgets/toolbar.py:274 cola/widgets/toolbar.py:311 msgid "Configure Toolbar" msgstr "Configurar Barra de Ferramentas" -#: cola/widgets/remote.py:214 +#: cola/widgets/remote.py:218 msgid "Configure the remote branch as the the new upstream" msgstr "Configurar o branch remoto como novo upstream" -#: cola/widgets/main.py:170 +#: cola/widgets/main.py:168 msgid "Console" msgstr "Console" -#: cola/interaction.py:111 cola/widgets/main.py:610 +#: cola/interaction.py:109 cola/widgets/main.py:623 msgid "Continue" msgstr "Continuar" -#: cola/widgets/main.py:255 +#: cola/widgets/main.py:252 msgid "Continue Applying Patches" msgstr "" -#: cola/widgets/bookmarks.py:248 cola/widgets/main.py:742 -#: cola/widgets/startup.py:371 +#: cola/widgets/bookmarks.py:247 cola/widgets/main.py:755 +#: cola/widgets/startup.py:370 msgid "Copy" msgstr "Copiar" -#: cola/widgets/status.py:268 +#: cola/widgets/status.py:269 msgid "Copy Basename to Clipboard" msgstr "Copiar Nome Base para o clipboard" -#: cola/widgets/diff.py:208 +#: cola/widgets/diff.py:209 msgid "Copy Diff" msgstr "" -#: cola/widgets/status.py:745 +#: cola/widgets/status.py:746 msgid "Copy Leading Path to Clipboard" msgstr "Copiar o Caminho Principal para o Clipboard" -#: cola/widgets/status.py:251 +#: cola/widgets/status.py:252 msgid "Copy Path to Clipboard" msgstr "Copiar o Caminho para o Clipboard" -#: cola/widgets/status.py:259 +#: cola/widgets/status.py:260 msgid "Copy Relative Path to Clipboard" msgstr "Copiar Caminho Relativo para o Clipboard" -#: cola/sequenceeditor.py:334 cola/widgets/dag.py:474 +#: cola/sequenceeditor.py:330 cola/widgets/dag.py:473 msgid "Copy SHA-1" msgstr "Copiar SHA-1" -#: cola/widgets/status.py:737 +#: cola/widgets/status.py:738 msgid "Copy..." msgstr "Copiar..." -#: cola/app.py:490 +#: cola/app.py:493 #, python-format msgid "Could not open %s." msgstr "" -#: cola/widgets/clone.py:191 cola/widgets/clone.py:193 +#: cola/widgets/clone.py:189 cola/widgets/clone.py:191 #, python-format msgid "Could not parse Git URL: \"%s\"" msgstr "Não foi possível analisar o URL do Git \"%s\"" -#: cola/app.py:500 +#: cola/app.py:503 msgid "Create" msgstr "" -#: cola/widgets/createbranch.py:86 cola/widgets/createbranch.py:135 -#: cola/widgets/createbranch.py:301 cola/widgets/dag.py:369 +#: cola/widgets/createbranch.py:84 cola/widgets/createbranch.py:133 +#: cola/widgets/createbranch.py:299 cola/widgets/dag.py:368 msgid "Create Branch" msgstr "Criar Branch" -#: cola/widgets/dag.py:373 +#: cola/widgets/dag.py:372 msgid "Create Patch" msgstr "Criar Patch" -#: cola/widgets/remote.py:606 +#: cola/widgets/remote.py:641 msgid "Create Remote Branch" msgstr "Criar Branch Remoto" -#: cola/widgets/commitmsg.py:124 cola/widgets/merge.py:78 +#: cola/widgets/commitmsg.py:130 cola/widgets/merge.py:76 msgid "Create Signed Commit" msgstr "Criar Commit Assinado" -#: cola/widgets/createtag.py:55 cola/widgets/createtag.py:91 -#: cola/widgets/dag.py:377 +#: cola/widgets/createtag.py:53 cola/widgets/createtag.py:89 +#: cola/widgets/dag.py:376 msgid "Create Tag" msgstr "Criar Tag" -#: cola/widgets/main.py:544 +#: cola/widgets/main.py:557 msgid "Create Tag..." msgstr "Criar Tag..." -#: cola/cmds.py:2807 +#: cola/cmds.py:2753 msgid "Create Unsigned Tag" msgstr "Criar Tag Não Assinada." -#: cola/widgets/remote.py:188 +#: cola/widgets/remote.py:192 msgid "Create a merge commit even when the merge resolves as a fast-forward" msgstr "Criar um commit de merge mesmo se o merge resultar em fast-foward" -#: cola/widgets/remote.py:605 +#: cola/widgets/remote.py:640 msgid "Create a new remote branch?" msgstr "Criar um novo branch remoto?" -#: cola/app.py:499 +#: cola/app.py:502 msgid "Create a new repository at that location?" msgstr "" -#: cola/widgets/submodules.py:100 +#: cola/widgets/submodules.py:99 msgid "Create a shallow clone with history truncated to the specified number of revisions. 0 performs a full clone." msgstr "" -#: cola/widgets/main.py:551 +#: cola/widgets/main.py:564 msgid "Create..." msgstr "Criar..." -#: cola/cmds.py:2843 +#: cola/cmds.py:2789 #, python-format msgid "Created a new tag named \"%s\"" msgstr "Criar uma nova tag chamada \"%s\"" -#: cola/widgets/prefs.py:266 +#: cola/widgets/prefs.py:287 msgid "Ctrl+MouseWheel to Zoom" msgstr "" -#: cola/widgets/prefs.py:404 +#: cola/widgets/prefs.py:442 msgid "Current Repository" msgstr "Repositório Atual" -#: cola/widgets/status.py:1371 +#: cola/widgets/status.py:1372 msgid "Custom Copy Actions" msgstr "Ações customizadas de copiar" -#: cola/widgets/status.py:273 +#: cola/widgets/status.py:274 msgid "Customize..." msgstr "Customizar..." -#: cola/widgets/main.py:740 +#: cola/widgets/main.py:753 msgid "Cut" msgstr "Cortar" -#: cola/widgets/about.py:411 cola/widgets/about.py:442 +#: cola/widgets/about.py:394 cola/widgets/about.py:425 msgid "Czech translation" msgstr "" -#: cola/widgets/main.py:592 +#: cola/widgets/main.py:605 msgid "DAG..." msgstr "Visualizar o histórico..." -#: cola/icons.py:55 +#: cola/icons.py:54 msgid "Dark Theme" msgstr "Tema Escuro" -#: cola/widgets/dag.py:506 +#: cola/widgets/dag.py:572 msgid "Date, Time" msgstr "Data, Tempo" -#: cola/icons.py:54 cola/themes.py:637 +#: cola/icons.py:53 cola/themes.py:643 msgid "Default" msgstr "Padrão" -#: cola/widgets/prefs.py:126 +#: cola/widgets/prefs.py:124 msgid "" "Default directory when exporting patches.\n" "Relative paths are relative to the current repository.\n" "Absolute path are used as-is." msgstr "" -#: cola/cmds.py:925 cola/guicmds.py:26 cola/guicmds.py:35 -#: cola/widgets/bookmarks.py:75 cola/widgets/bookmarks.py:251 -#: cola/widgets/main.py:746 cola/widgets/startup.py:373 +#: cola/cmds.py:923 cola/guicmds.py:25 cola/guicmds.py:34 +#: cola/widgets/bookmarks.py:74 cola/widgets/bookmarks.py:250 +#: cola/widgets/main.py:759 cola/widgets/startup.py:372 msgid "Delete" msgstr "Deletar" -#: cola/cmds.py:1088 +#: cola/cmds.py:1089 #, python-format msgid "Delete %d file(s)?" msgstr "Excluir %d arquiv(o)s?" -#: cola/cmds.py:1016 +#: cola/cmds.py:1017 msgid "Delete Bookmark" msgstr "Remover Favorito" -#: cola/cmds.py:1014 +#: cola/cmds.py:1015 msgid "Delete Bookmark?" msgstr "Remover Favorito?" -#: cola/cmds.py:1114 cola/cmds.py:1117 cola/guicmds.py:26 -#: cola/widgets/branch.py:268 +#: cola/cmds.py:1115 cola/cmds.py:1118 cola/guicmds.py:25 +#: cola/widgets/branch.py:277 msgid "Delete Branch" msgstr "Deletar Branch" -#: cola/cmds.py:1089 +#: cola/cmds.py:1090 msgid "Delete Files" msgstr "Excluir Arquivos" -#: cola/widgets/status.py:311 +#: cola/widgets/status.py:312 msgid "Delete Files..." msgstr "Excluir Arquiv(o)s..." -#: cola/cmds.py:1085 +#: cola/cmds.py:1086 msgid "Delete Files?" msgstr "Excluir Arquivos?" -#: cola/cmds.py:922 +#: cola/cmds.py:920 msgid "Delete Remote" msgstr "Deletar Remoto ?" -#: cola/guicmds.py:35 cola/widgets/branch.py:270 +#: cola/guicmds.py:34 cola/widgets/branch.py:279 msgid "Delete Remote Branch" msgstr "Remover Branch Remoto" -#: cola/widgets/main.py:564 +#: cola/widgets/main.py:577 msgid "Delete Remote Branch..." msgstr "Remover Branch Remoto..." -#: cola/widgets/toolbar.py:271 +#: cola/widgets/toolbar.py:276 msgid "Delete Toolbar" msgstr "Remover barra de ferramentas" -#: cola/cmds.py:1115 +#: cola/cmds.py:1116 #, python-format msgid "Delete branch \"%s\"?" msgstr "Remover branch \"%s\"?" -#: cola/widgets/editremotes.py:88 +#: cola/widgets/editremotes.py:87 msgid "Delete remote" msgstr "Deletar Repositórios Remotos" -#: cola/cmds.py:924 +#: cola/cmds.py:922 #, python-format msgid "Delete remote \"%s\"" msgstr "Remover remoto \"%s\"" -#: cola/cmds.py:923 +#: cola/cmds.py:921 msgid "Delete remote?" msgstr "Remover remoto?" -#: cola/widgets/main.py:558 +#: cola/widgets/main.py:571 msgid "Delete..." msgstr "Deletar..." -#: cola/cmds.py:1067 +#: cola/cmds.py:1068 #, python-format msgid "Deleting \"%s\" failed" msgstr "A deleção de \"%s\" falhou" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Deletions" msgstr "Deleções" -#: cola/widgets/submodules.py:120 +#: cola/widgets/submodules.py:119 msgid "Depth" msgstr "" -#: cola/qtutils.py:811 cola/qtutils.py:852 +#: cola/qtutils.py:842 cola/qtutils.py:889 msgid "Detach" msgstr "Desanexar" -#: cola/widgets/prefs.py:181 +#: cola/widgets/prefs.py:203 msgid "Detect Conflict Markers" msgstr "Detectar Marcadores de Conflitos" -#: cola/widgets/prefs.py:151 +#: cola/widgets/prefs.py:174 msgid "Detect conflict markers in unmerged files" msgstr "Detectar marcadores de conflitos em arquivos que não entraram no merge" -#: cola/widgets/about.py:271 cola/widgets/about.py:274 -#: cola/widgets/about.py:277 cola/widgets/about.py:278 -#: cola/widgets/about.py:279 cola/widgets/about.py:280 -#: cola/widgets/about.py:281 cola/widgets/about.py:282 -#: cola/widgets/about.py:283 cola/widgets/about.py:284 -#: cola/widgets/about.py:285 cola/widgets/about.py:286 -#: cola/widgets/about.py:287 cola/widgets/about.py:288 -#: cola/widgets/about.py:289 cola/widgets/about.py:290 -#: cola/widgets/about.py:291 cola/widgets/about.py:292 -#: cola/widgets/about.py:293 cola/widgets/about.py:294 -#: cola/widgets/about.py:295 cola/widgets/about.py:296 -#: cola/widgets/about.py:297 cola/widgets/about.py:298 -#: cola/widgets/about.py:299 cola/widgets/about.py:300 -#: cola/widgets/about.py:301 cola/widgets/about.py:302 -#: cola/widgets/about.py:303 cola/widgets/about.py:304 -#: cola/widgets/about.py:305 cola/widgets/about.py:306 -#: cola/widgets/about.py:307 cola/widgets/about.py:308 -#: cola/widgets/about.py:309 cola/widgets/about.py:310 -#: cola/widgets/about.py:311 cola/widgets/about.py:312 -#: cola/widgets/about.py:313 cola/widgets/about.py:314 -#: cola/widgets/about.py:315 cola/widgets/about.py:316 -#: cola/widgets/about.py:317 cola/widgets/about.py:318 -#: cola/widgets/about.py:319 cola/widgets/about.py:320 -#: cola/widgets/about.py:321 cola/widgets/about.py:322 -#: cola/widgets/about.py:323 cola/widgets/about.py:324 -#: cola/widgets/about.py:325 cola/widgets/about.py:326 -#: cola/widgets/about.py:327 cola/widgets/about.py:328 -#: cola/widgets/about.py:329 cola/widgets/about.py:330 -#: cola/widgets/about.py:331 cola/widgets/about.py:332 -#: cola/widgets/about.py:333 cola/widgets/about.py:334 -#: cola/widgets/about.py:335 cola/widgets/about.py:336 -#: cola/widgets/about.py:337 cola/widgets/about.py:338 -#: cola/widgets/about.py:339 cola/widgets/about.py:340 -#: cola/widgets/about.py:341 cola/widgets/about.py:342 -#: cola/widgets/about.py:343 cola/widgets/about.py:344 -#: cola/widgets/about.py:345 cola/widgets/about.py:346 -#: cola/widgets/about.py:347 cola/widgets/about.py:348 -#: cola/widgets/about.py:349 cola/widgets/about.py:350 -#: cola/widgets/about.py:351 cola/widgets/about.py:352 -#: cola/widgets/about.py:353 cola/widgets/about.py:354 -#: cola/widgets/about.py:355 cola/widgets/about.py:356 -#: cola/widgets/about.py:357 cola/widgets/about.py:358 -#: cola/widgets/about.py:359 cola/widgets/about.py:360 -#: cola/widgets/about.py:361 cola/widgets/about.py:362 -#: cola/widgets/about.py:363 cola/widgets/about.py:364 -#: cola/widgets/about.py:365 cola/widgets/about.py:366 -#: cola/widgets/about.py:367 cola/widgets/about.py:368 -#: cola/widgets/about.py:369 cola/widgets/about.py:370 -#: cola/widgets/about.py:371 cola/widgets/about.py:372 -#: cola/widgets/about.py:373 cola/widgets/about.py:374 -#: cola/widgets/about.py:375 cola/widgets/about.py:376 -#: cola/widgets/about.py:377 cola/widgets/about.py:378 -#: cola/widgets/about.py:379 cola/widgets/about.py:380 +#: cola/widgets/about.py:254 cola/widgets/about.py:257 +#: cola/widgets/about.py:260 cola/widgets/about.py:261 +#: cola/widgets/about.py:262 cola/widgets/about.py:263 +#: cola/widgets/about.py:264 cola/widgets/about.py:265 +#: cola/widgets/about.py:266 cola/widgets/about.py:267 +#: cola/widgets/about.py:268 cola/widgets/about.py:269 +#: cola/widgets/about.py:270 cola/widgets/about.py:271 +#: cola/widgets/about.py:272 cola/widgets/about.py:273 +#: cola/widgets/about.py:274 cola/widgets/about.py:275 +#: cola/widgets/about.py:276 cola/widgets/about.py:277 +#: cola/widgets/about.py:278 cola/widgets/about.py:279 +#: cola/widgets/about.py:280 cola/widgets/about.py:281 +#: cola/widgets/about.py:282 cola/widgets/about.py:283 +#: cola/widgets/about.py:284 cola/widgets/about.py:285 +#: cola/widgets/about.py:286 cola/widgets/about.py:287 +#: cola/widgets/about.py:288 cola/widgets/about.py:289 +#: cola/widgets/about.py:290 cola/widgets/about.py:291 +#: cola/widgets/about.py:292 cola/widgets/about.py:293 +#: cola/widgets/about.py:294 cola/widgets/about.py:295 +#: cola/widgets/about.py:296 cola/widgets/about.py:297 +#: cola/widgets/about.py:298 cola/widgets/about.py:299 +#: cola/widgets/about.py:300 cola/widgets/about.py:301 +#: cola/widgets/about.py:302 cola/widgets/about.py:303 +#: cola/widgets/about.py:304 cola/widgets/about.py:305 +#: cola/widgets/about.py:306 cola/widgets/about.py:307 +#: cola/widgets/about.py:308 cola/widgets/about.py:309 +#: cola/widgets/about.py:310 cola/widgets/about.py:311 +#: cola/widgets/about.py:312 cola/widgets/about.py:313 +#: cola/widgets/about.py:314 cola/widgets/about.py:315 +#: cola/widgets/about.py:316 cola/widgets/about.py:317 +#: cola/widgets/about.py:318 cola/widgets/about.py:319 +#: cola/widgets/about.py:320 cola/widgets/about.py:321 +#: cola/widgets/about.py:322 cola/widgets/about.py:323 +#: cola/widgets/about.py:324 cola/widgets/about.py:325 +#: cola/widgets/about.py:326 cola/widgets/about.py:327 +#: cola/widgets/about.py:328 cola/widgets/about.py:329 +#: cola/widgets/about.py:330 cola/widgets/about.py:331 +#: cola/widgets/about.py:332 cola/widgets/about.py:333 +#: cola/widgets/about.py:334 cola/widgets/about.py:335 +#: cola/widgets/about.py:336 cola/widgets/about.py:337 +#: cola/widgets/about.py:338 cola/widgets/about.py:339 +#: cola/widgets/about.py:340 cola/widgets/about.py:341 +#: cola/widgets/about.py:342 cola/widgets/about.py:343 +#: cola/widgets/about.py:344 cola/widgets/about.py:345 +#: cola/widgets/about.py:346 cola/widgets/about.py:347 +#: cola/widgets/about.py:348 cola/widgets/about.py:349 +#: cola/widgets/about.py:350 cola/widgets/about.py:351 +#: cola/widgets/about.py:352 cola/widgets/about.py:353 +#: cola/widgets/about.py:354 cola/widgets/about.py:355 +#: cola/widgets/about.py:356 cola/widgets/about.py:357 +#: cola/widgets/about.py:358 cola/widgets/about.py:359 +#: cola/widgets/about.py:360 cola/widgets/about.py:361 +#: cola/widgets/about.py:362 cola/widgets/about.py:363 msgid "Developer" msgstr "Desenvolvedor" -#: cola/guicmds.py:185 cola/widgets/dag.py:764 cola/widgets/diff.py:781 -#: cola/widgets/main.py:177 cola/widgets/main.py:797 +#: cola/guicmds.py:184 cola/widgets/dag.py:830 cola/widgets/diff.py:809 +#: cola/widgets/main.py:175 cola/widgets/main.py:810 msgid "Diff" msgstr "Compare" -#: cola/guicmds.py:185 +#: cola/guicmds.py:184 msgid "Diff Against Commit" msgstr "" @@ -1413,36 +1454,36 @@ msgstr "" msgid "Diff Against Predecessor..." msgstr "Comparar com o antecessor" -#: cola/widgets/main.py:1159 +#: cola/widgets/main.py:1172 msgid "Diff Mode" msgstr "" -#: cola/widgets/diff.py:772 cola/widgets/diff.py:796 +#: cola/widgets/diff.py:800 cola/widgets/diff.py:824 msgid "Diff Options" msgstr "Opções de Comparação" -#: cola/widgets/prefs.py:256 +#: cola/widgets/prefs.py:277 msgid "Diff Tool" msgstr "Ferramenta de Comparação" -#: cola/widgets/dag.py:364 +#: cola/widgets/dag.py:363 msgid "Diff selected -> this" msgstr "Comparar selecionado -> esse" -#: cola/widgets/dag.py:358 +#: cola/widgets/dag.py:357 msgid "Diff this -> selected" msgstr "Comparar esse -> selecionado" -#: cola/widgets/main.py:218 +#: cola/widgets/main.py:217 msgid "Diffstat" msgstr "Compare Modificações (Antes/Depois)" -#: cola/cmds.py:3262 +#: cola/difftool.py:324 #, fuzzy msgid "Difftool" msgstr "Ferramenta de Comparação" -#: cola/widgets/clone.py:207 +#: cola/widgets/clone.py:205 msgid "Directory Exists" msgstr "Diretório Existe" @@ -1450,85 +1491,89 @@ msgstr "Diretório Existe" msgid "Disable" msgstr "" -#: cola/widgets/prefs.py:180 +#: cola/widgets/prefs.py:202 msgid "Display Untracked Files" msgstr "Exibir Arquivos não Controlados" -#: cola/cmds.py:2094 +#: cola/widgets/remote.py:176 +msgid "Display remote messages in a separate dialog" +msgstr "" + +#: cola/cmds.py:2045 msgid "Do not update stacked branches" msgstr "" -#: cola/widgets/main.py:471 +#: cola/widgets/main.py:484 msgid "Documentation" msgstr "Documentação" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop" msgstr "Cancelar" -#: cola/widgets/stash.py:258 +#: cola/widgets/stash.py:276 msgid "Drop Stash" msgstr "Cancelar o Stash" -#: cola/widgets/stash.py:255 +#: cola/widgets/stash.py:273 msgid "Drop Stash?" msgstr "Cancelar o Stash?" -#: cola/widgets/stash.py:257 +#: cola/widgets/stash.py:275 #, python-format msgid "Drop the \"%s\" stash?" msgstr "Cancelar o \"%s\" stash?" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop the selected stash" msgstr "Cancelar o stash selecionado" -#: cola/qtutils.py:764 cola/sequenceeditor.py:357 cola/widgets/grep.py:102 +#: cola/qtutils.py:795 cola/sequenceeditor.py:353 cola/widgets/grep.py:100 #, fuzzy msgid "Edit" msgstr "&Editar" -#: cola/widgets/diff.py:1019 +#: cola/widgets/diff.py:1058 msgid "Edit Diff Hunk to Revert..." msgstr "" -#: cola/widgets/diff.py:1017 +#: cola/widgets/diff.py:1056 msgid "Edit Diff Hunk to Stage..." msgstr "" -#: cola/widgets/diff.py:1062 +#: cola/widgets/diff.py:1124 msgid "Edit Diff Hunk to Unstage..." msgstr "" -#: cola/cmds.py:2166 +#: cola/cmds.py:2117 msgid "Edit Rebase" msgstr "Editar Rebase" -#: cola/widgets/editremotes.py:36 +#: cola/widgets/editremotes.py:35 msgid "Edit Remotes" msgstr "Editar Repositórios Remotos" -#: cola/widgets/main.py:298 +#: cola/widgets/main.py:293 msgid "Edit Remotes..." msgstr "Editar Repositórios Remotos..." -#: cola/widgets/diff.py:1014 +#: cola/widgets/diff.py:1053 msgid "Edit Selected Lines to Revert..." msgstr "" -#: cola/widgets/diff.py:1012 +#: cola/widgets/diff.py:1051 msgid "Edit Selected Lines to Stage..." msgstr "" -#: cola/widgets/diff.py:1059 +#: cola/widgets/diff.py:1122 msgid "Edit Selected Lines to Unstage..." msgstr "" -#: cola/widgets/editremotes.py:44 +#: cola/widgets/editremotes.py:43 msgid "Edit remotes by selecting them from the list" msgstr "Editar os remotos os selecionando na lista" -#: cola/widgets/browse.py:197 cola/widgets/common.py:39 +#: cola/widgets/browse.py:198 cola/widgets/common.py:38 msgid "Edit selected paths" msgstr "Editar caminhos selecionados" @@ -1544,11 +1589,11 @@ msgstr "" msgid "Edit the following patch, which will then be applied to the worktree to revert the changes:" msgstr "" -#: cola/widgets/main.py:604 +#: cola/widgets/main.py:617 msgid "Edit..." msgstr "Editar..." -#: cola/widgets/prefs.py:253 +#: cola/widgets/prefs.py:274 msgid "Editor" msgstr "Editor" @@ -1557,154 +1602,159 @@ msgstr "Editor" msgid "Editor returned %s exit code. Not applying patch." msgstr "" -#: cola/widgets/prefs.py:167 +#: cola/widgets/prefs.py:190 msgid "Email Address" msgstr "Endereço de Email" -#: cola/widgets/about.py:258 cola/widgets/about.py:401 +#: cola/widgets/about.py:241 cola/widgets/about.py:384 msgid "Email contributor" msgstr "Email do Contribuidor" -#: cola/widgets/prefs.py:182 +#: cola/widgets/prefs.py:204 msgid "Enable Gravatar Icons" msgstr "" -#: cola/widgets/prefs.py:160 +#: cola/widgets/prefs.py:183 msgid "Enable path autocompletion in tools" msgstr "Habilitar autocomplete de caminhos em ferramentas" -#: cola/widgets/diff.py:768 +#: cola/widgets/diff.py:796 msgid "Enable word wrapping" msgstr "" -#: cola/sequenceeditor.py:322 +#: cola/sequenceeditor.py:319 msgid "Enabled" msgstr "Habilitado" -#: cola/guicmds.py:333 cola/widgets/branch.py:445 +#: cola/guicmds.py:332 cola/widgets/branch.py:478 msgid "Enter New Branch Name" msgstr "Digite o nome do novo Branch" -#: cola/guicmds.py:147 +#: cola/guicmds.py:146 msgid "Enter a name for the new bare repo" msgstr "Digite o nome para o novo repo vazio" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Enter a name for the stash" msgstr "Digite o nome para o stash" -#: cola/cmds.py:146 cola/cmds.py:176 cola/cmds.py:207 cola/cmds.py:283 -#: cola/cmds.py:292 cola/cmds.py:307 cola/cmds.py:317 cola/cmds.py:460 -#: cola/cmds.py:496 cola/cmds.py:534 cola/cmds.py:633 cola/cmds.py:751 -#: cola/cmds.py:1067 cola/cmds.py:1164 cola/cmds.py:2005 cola/cmds.py:2394 -#: cola/cmds.py:2637 cola/cmds.py:2643 cola/cmds.py:2651 cola/cmds.py:2872 -#: cola/cmds.py:2890 cola/cmds.py:3180 cola/gitcmds.py:984 cola/guicmds.py:157 -#: cola/models/stash.py:70 cola/models/stash.py:87 cola/models/stash.py:108 -#: cola/widgets/bookmarks.py:482 cola/widgets/branch.py:777 +#: cola/widgets/stash.py:216 +msgid "Enter a new name for the stash" +msgstr "" + +#: cola/cmds.py:145 cola/cmds.py:175 cola/cmds.py:206 cola/cmds.py:284 +#: cola/cmds.py:293 cola/cmds.py:308 cola/cmds.py:318 cola/cmds.py:461 +#: cola/cmds.py:497 cola/cmds.py:535 cola/cmds.py:635 cola/cmds.py:753 +#: cola/cmds.py:1068 cola/cmds.py:1165 cola/cmds.py:1956 cola/cmds.py:2345 +#: cola/cmds.py:2579 cola/cmds.py:2585 cola/cmds.py:2593 cola/cmds.py:2818 +#: cola/cmds.py:2836 cola/cmds.py:3125 cola/gitcmds.py:994 cola/guicmds.py:156 +#: cola/models/stash.py:70 cola/models/stash.py:90 cola/models/stash.py:112 +#: cola/models/stash.py:138 cola/widgets/bookmarks.py:481 +#: cola/widgets/branch.py:829 msgid "Error" msgstr "Erro" -#: cola/widgets/clone.py:191 +#: cola/widgets/clone.py:189 msgid "Error Cloning" msgstr "Erro ao Clonar" -#: cola/widgets/createbranch.py:314 +#: cola/widgets/createbranch.py:312 msgid "Error Creating Branch" msgstr "Erro ao Criar Branch" -#: cola/app.py:502 cola/guicmds.py:101 +#: cola/app.py:505 cola/guicmds.py:100 msgid "Error Creating Repository" msgstr "Erro ao Criar Repositório" -#: cola/cmds.py:1202 +#: cola/cmds.py:1206 msgid "Error Deleting Remote Branch" msgstr "Erro Removendo Branch Remoto" -#: cola/cmds.py:1585 +#: cola/cmds.py:1573 msgid "Error Editing File" msgstr "Erro Editando Arquivo" -#: cola/cmds.py:559 +#: cola/cmds.py:560 msgid "Error Launching Blame Viewer" msgstr "Erro Lançando o Visualizador de Blame" -#: cola/cmds.py:3145 +#: cola/cmds.py:3091 msgid "Error Launching History Browser" msgstr "Erro Lançando o Visualizador de Histórico" -#: cola/app.py:489 +#: cola/app.py:492 msgid "Error Opening Repository" msgstr "" -#: cola/widgets/browse.py:566 +#: cola/models/stash.py:144 +msgid "Error Renaming Stash" +msgstr "" + +#: cola/widgets/browse.py:567 msgid "Error Saving File" msgstr "" -#: cola/cmds.py:914 +#: cola/cmds.py:912 #, python-format msgid "Error creating remote \"%s\"" msgstr "Erro criando o remoto \"%s\"" -#: cola/models/stash.py:197 +#: cola/models/stash.py:233 msgid "Error creating stash" msgstr "Erro ao criar o stash" -#: cola/cmds.py:1126 +#: cola/cmds.py:1127 #, python-format msgid "Error deleting branch \"%s\"" msgstr "Erro ao remover branch \"%s\"" -#: cola/cmds.py:932 +#: cola/cmds.py:930 #, python-format msgid "Error deleting remote \"%s\"" msgstr "Erro removendo o remoto \"%s\"" -#: cola/cmds.py:956 +#: cola/cmds.py:955 #, python-format msgid "Error renaming \"%(name)s\" to \"%(new_name)s\"" msgstr "Erro renomeando \"%(name)s\" para \"%(new_name)s\"" -#: cola/cmds.py:1771 +#: cola/cmds.py:1722 msgid "Error running prepare-commitmsg hook" msgstr "Erro executando prepare-commitmsg hook" -#: cola/cmds.py:3043 cola/cmds.py:3089 +#: cola/cmds.py:2989 cola/cmds.py:3035 #, fuzzy, python-format msgid "Error updating submodule %s" msgstr "Erro criando o remoto \"%s\"" -#: cola/cmds.py:3125 +#: cola/cmds.py:3071 #, fuzzy msgid "Error updating submodules" msgstr "Erro Editando Arquivo" -#: cola/widgets/diff.py:1326 +#: cola/widgets/diff.py:1400 msgid "Error writing patch" msgstr "" -#: cola/cmds.py:1710 +#: cola/cmds.py:1662 msgid "Error: Cannot find commit template" msgstr "Erro: Não foi possível encontrar o template do commit" -#: cola/widgets/stash.py:235 -msgid "Error: Stash exists" -msgstr "Erro: Stash já existe" - -#: cola/cmds.py:1732 +#: cola/cmds.py:1684 msgid "Error: Unconfigured commit template" msgstr "Erro: Template do Commit não foi configurado" -#: cola/widgets/clone.py:53 +#: cola/widgets/clone.py:52 #, python-format msgid "Error: could not clone \"%s\"" msgstr "Erro: não é possível clonar \"%s\"" -#: cola/cmds.py:2835 +#: cola/cmds.py:2781 #, python-format msgid "Error: could not create tag \"%s\"" msgstr "Erro: não foi possível criar tag \"%s\"" -#: cola/widgets/branch.py:421 +#: cola/widgets/branch.py:433 #, python-format msgid "Executing action %s" msgstr "Executando ação \"%s\"" @@ -1713,113 +1763,117 @@ msgstr "Executando ação \"%s\"" msgid "Exit \"Diff\" mode" msgstr "" -#: cola/widgets/action.py:67 +#: cola/widgets/action.py:81 msgid "Exit Diff" msgstr "" -#: cola/widgets/main.py:528 +#: cola/widgets/main.py:541 msgid "Exit Diff Mode" msgstr "" -#: cola/widgets/action.py:68 +#: cola/widgets/action.py:81 msgid "Exit Diff mode" msgstr "" -#: cola/widgets/recent.py:67 +#: cola/widgets/recent.py:65 msgid "Expand all" msgstr "Expandir tudo" -#: cola/widgets/diff.py:1223 +#: cola/widgets/diff.py:1297 msgid "Export Patch" msgstr "" -#: cola/guicmds.py:168 cola/widgets/search.py:75 +#: cola/guicmds.py:167 cola/widgets/search.py:74 msgid "Export Patches" msgstr "Exportar Patches" -#: cola/widgets/main.py:273 +#: cola/widgets/main.py:268 msgid "Export Patches..." msgstr "Exportar Patches..." -#: cola/widgets/main.py:533 +#: cola/widgets/main.py:546 msgid "Expression..." msgstr "Expressão" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Extended Regexp" msgstr "Regexp Extendido" -#: cola/widgets/commitmsg.py:612 +#: cola/widgets/commitmsg.py:638 msgid "Extended description..." msgstr "Descreva em detalhes o que modificou..." -#: cola/cmds.py:387 +#: cola/cmds.py:388 msgid "Failed to commit and continue applying patches" msgstr "" -#: cola/cmds.py:403 +#: cola/cmds.py:404 msgid "Failed to continue applying patches after skipping the current patch" msgstr "" -#: cola/widgets/createbranch.py:124 +#: cola/widgets/createbranch.py:122 msgid "Fast Forward Only" msgstr "Somente Fast Forward" -#: cola/widgets/remote.py:177 +#: cola/widgets/remote.py:181 msgid "Fast-forward only" msgstr "Somente Fast Forward" -#: cola/widgets/bookmarks.py:91 +#: cola/widgets/bookmarks.py:90 msgid "Favorite repositories" msgstr "Repositórios Favoritos" -#: cola/widgets/main.py:111 +#: cola/widgets/main.py:109 msgid "Favorites" msgstr "Favoritos" -#: cola/widgets/remote.py:673 +#: cola/widgets/remote.py:735 msgid "Fetch" msgstr "Fetch" -#: cola/widgets/createbranch.py:127 +#: cola/widgets/createbranch.py:125 msgid "Fetch Tracking Branch" msgstr "" -#: cola/widgets/action.py:63 cola/widgets/main.py:387 +#: cola/widgets/action.py:67 cola/widgets/main.py:384 +msgid "Fetch from one or more remotes using \"git fetch\"" +msgstr "" + +#: cola/widgets/action.py:65 cola/widgets/main.py:383 msgid "Fetch..." msgstr "Fetch..." -#: cola/widgets/main.py:588 +#: cola/widgets/main.py:601 msgid "File Browser..." msgstr "Navegador de Arquivos..." -#: cola/widgets/compare.py:75 +#: cola/widgets/compare.py:74 msgid "File Differences" msgstr "Diferença de Arquivos" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 msgid "File Saved" msgstr "Arquivo Salvo" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 #, python-format msgid "File saved to \"%s\"" msgstr "Arquivo salvo em \"%s\"" -#: cola/fsmonitor.py:517 +#: cola/fsmonitor.py:528 #, fuzzy msgid "File system change monitoring: disabled because \"cola.inotify\" is false.\n" msgstr "inotify está desativado por causa \"cola.inotift\" is false\n" -#: cola/fsmonitor.py:534 +#: cola/fsmonitor.py:545 msgid "File system change monitoring: disabled because libc does not support the inotify system calls.\n" msgstr "Monitoramento de alterações do sistema de arquivos: desabilitado porque libc não suporta chamadas do sistema inotify.\n" -#: cola/fsmonitor.py:528 +#: cola/fsmonitor.py:539 msgid "File system change monitoring: disabled because pywin32 is not installed.\n" msgstr "Monitoramento de alterações do sistema de arquivos: desabilitado porque pywin32 não foi instalado.\n" -#: cola/fsmonitor.py:181 +#: cola/fsmonitor.py:184 msgid "" "File system change monitoring: disabled because the limit on the total number of inotify watches was reached. You may be able to increase the limit on the number of watches by running:\n" "\n" @@ -1829,296 +1883,304 @@ msgstr "" "\n" " echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n" -#: cola/fsmonitor.py:142 +#: cola/fsmonitor.py:145 msgid "File system change monitoring: enabled.\n" msgstr "Monitoramento de alterações do sistema de arquivos: habilitado.\n" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Filename" msgstr "Nome do Arquivo" -#: cola/widgets/dag.py:755 +#: cola/widgets/dag.py:821 msgid "Files" msgstr "Arquivos" -#: cola/widgets/branch.py:785 +#: cola/widgets/branch.py:837 msgid "Filter branches..." msgstr "Filtrar branches..." -#: cola/widgets/status.py:1333 +#: cola/widgets/status.py:1334 msgid "Filter paths..." msgstr "Filtrar caminhos..." -#: cola/widgets/finder.py:113 cola/widgets/main.py:312 +#: cola/widgets/finder.py:112 cola/widgets/main.py:307 msgid "Find Files" msgstr "Procurar Arquivos" -#: cola/widgets/text.py:388 +#: cola/widgets/text.py:385 msgid "Find in diff" msgstr "" -#: cola/widgets/text.py:425 +#: cola/widgets/text.py:422 msgid "Find next item" msgstr "" -#: cola/widgets/text.py:431 +#: cola/widgets/text.py:428 msgid "Find previous item" msgstr "" -#: cola/widgets/text.py:395 +#: cola/widgets/text.py:392 msgid "Find the next occurrence of the phrase" msgstr "" -#: cola/widgets/text.py:391 +#: cola/widgets/text.py:388 msgid "Find the previous occurrence of the phrase" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Fixed String" msgstr "String Fixa" -#: cola/widgets/prefs.py:251 +#: cola/widgets/prefs.py:270 msgid "Fixed-Width Font" msgstr "Fonte de Largura Fixa" -#: cola/sequenceeditor.py:362 +#: cola/sequenceeditor.py:358 msgid "Fixup" msgstr "" -#: cola/widgets/commitmsg.py:148 +#: cola/widgets/commitmsg.py:154 msgid "Fixup Previous Commit" msgstr "Fixup Commit Anterior" -#: cola/themes.py:672 +#: cola/themes.py:684 msgid "Flat dark blue" msgstr "Flat dark blue" -#: cola/themes.py:693 +#: cola/themes.py:705 msgid "Flat dark green" msgstr "Flat dark green" -#: cola/themes.py:686 +#: cola/themes.py:698 msgid "Flat dark grey" msgstr "Flat dark grey" -#: cola/themes.py:679 +#: cola/themes.py:691 msgid "Flat dark red" msgstr "Flat dark red" -#: cola/themes.py:644 +#: cola/themes.py:656 msgid "Flat light blue" msgstr "Flat light blue" -#: cola/themes.py:665 +#: cola/themes.py:677 msgid "Flat light green" msgstr "Flat light green" -#: cola/themes.py:658 +#: cola/themes.py:670 msgid "Flat light grey" msgstr "Flat light grey" -#: cola/themes.py:651 +#: cola/themes.py:663 msgid "Flat light red" msgstr "Flat light red" -#: cola/widgets/startup.py:73 +#: cola/widgets/startup.py:72 msgid "Folder" msgstr "" -#: cola/widgets/toolbar.py:177 +#: cola/widgets/toolbar.py:181 msgid "Follow System Style" msgstr "" -#: cola/widgets/prefs.py:252 +#: cola/widgets/prefs.py:271 msgid "Font Size" msgstr "Tamanho de Fonte" -#: cola/widgets/remote.py:193 +#: cola/widgets/remote.py:197 msgid "Force" msgstr "Forçar" -#: cola/widgets/remote.py:617 +#: cola/widgets/remote.py:652 msgid "Force Fetch" msgstr "Forçar Fetch" -#: cola/widgets/remote.py:614 +#: cola/widgets/remote.py:649 msgid "Force Fetch?" msgstr "Forçar Fetch?" -#: cola/widgets/remote.py:625 +#: cola/widgets/remote.py:660 msgid "Force Push" msgstr "Forçar Push" -#: cola/widgets/remote.py:619 +#: cola/widgets/remote.py:654 msgid "Force Push?" msgstr "Forçar Push?" -#: cola/widgets/remote.py:616 +#: cola/widgets/remote.py:651 #, python-format msgid "Force fetching from %s?" msgstr "Forçar fetch de %s?" -#: cola/widgets/remote.py:624 +#: cola/widgets/remote.py:659 #, python-format msgid "Force push to %s?" msgstr "Forçar push para %s?" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Format String" msgstr "Formatar String" -#: cola/widgets/about.py:430 cola/widgets/about.py:431 +#: cola/widgets/about.py:413 cola/widgets/about.py:414 msgid "French translation" msgstr "Tradução francesa" -#: cola/widgets/merge.py:80 +#: cola/widgets/merge.py:78 msgid "GPG-sign the merge commit" msgstr "Assinar com GPG o Commit de Merge" -#: cola/widgets/prefs.py:344 +#: cola/widgets/prefs.py:364 msgid "GUI theme" msgstr "" -#: cola/widgets/editremotes.py:318 +#: cola/widgets/editremotes.py:317 #, python-format msgid "Gathering info for \"%s\"..." msgstr "Reunindo Informação de \"%s\"..." -#: cola/widgets/about.py:420 cola/widgets/about.py:428 -#: cola/widgets/about.py:429 +#: cola/widgets/about.py:403 cola/widgets/about.py:411 +#: cola/widgets/about.py:412 msgid "German translation" msgstr "Tradução alemã" -#: cola/widgets/main.py:511 +#: cola/widgets/main.py:524 msgid "Get Commit Message Template" msgstr "Obter Template da Mensagem do Commit" -#: cola/widgets/dag.py:520 +#: cola/widgets/dag.py:586 msgid "Go Down" msgstr "Descer" -#: cola/widgets/dag.py:516 +#: cola/widgets/dag.py:582 msgid "Go Up" msgstr "Subir" -#: cola/widgets/dag.py:467 cola/widgets/filelist.py:42 +#: cola/widgets/dag.py:466 cola/widgets/filelist.py:39 msgid "Grab File..." msgstr "Arquivo Grab" -#: cola/widgets/dag.py:782 +#: cola/widgets/dag.py:848 msgid "Graph" msgstr "Gráfico" -#: cola/widgets/main.py:358 +#: cola/widgets/main.py:353 msgid "Grep" msgstr "Grep" -#: cola/widgets/remote.py:662 +#: cola/widgets/remote.py:707 msgid "Have you rebased/pulled lately?" msgstr "Você tem usado rebase/pull recentemente?" -#: cola/sequenceeditor.py:110 cola/sequenceeditor.py:171 -#: cola/widgets/finder.py:138 cola/widgets/main.py:854 +#: cola/sequenceeditor.py:108 cola/sequenceeditor.py:169 +#: cola/widgets/finder.py:137 cola/widgets/main.py:867 msgid "Help" msgstr "Ajuda" -#: cola/widgets/status.py:1322 +#: cola/widgets/status.py:1323 msgid "Help - Custom Copy Actions" msgstr "Ajuda - Ações de Copia Customizadas" -#: cola/widgets/finder.py:79 +#: cola/widgets/finder.py:78 msgid "Help - Find Files" msgstr "Ajuda - Procurar Arquivos" -#: cola/sequenceeditor.py:737 +#: cola/sequenceeditor.py:732 msgid "Help - git-cola-sequence-editor" msgstr "Ajuda - git-cola-sequence-editor" -#: cola/widgets/prefs.py:346 +#: cola/widgets/prefs.py:366 msgid "High DPI" msgstr "DPI Alto" -#: cola/gitcmds.py:876 +#: cola/gitcmds.py:886 msgid "Hint: The \"Actions > Abort Cherry-Pick\" menu action can be used to cancel the current cherry-pick." msgstr "" -#: cola/widgets/prefs.py:254 +#: cola/widgets/prefs.py:275 msgid "History Browser" msgstr "Navegador de Histórico" -#: cola/widgets/about.py:427 cola/widgets/about.py:441 +#: cola/widgets/about.py:410 cola/widgets/about.py:424 msgid "Hungarian translation" msgstr "" -#: cola/widgets/toolbar.py:178 +#: cola/widgets/toolbar.py:182 msgid "Icon Only" msgstr "" -#: cola/widgets/prefs.py:345 +#: cola/widgets/prefs.py:365 msgid "Icon theme" msgstr "" -#: cola/widgets/diff.py:758 +#: cola/widgets/diff.py:787 msgid "Ignore all whitespace" msgstr "Ignorar todos espaços em branco." -#: cola/widgets/diff.py:755 +#: cola/widgets/diff.py:785 msgid "Ignore changes in amount of whitespace" msgstr "Ignorar alterações na quantidade de espaço em branco" -#: cola/widgets/diff.py:751 +#: cola/widgets/diff.py:782 msgid "Ignore changes in whitespace at EOL" msgstr "Ignorar alterações no espaço em branco no EOL (Fim da Linha)" -#: cola/widgets/gitignore.py:46 +#: cola/widgets/gitignore.py:45 msgid "Ignore custom pattern" msgstr "Ignorar padrão customizado" -#: cola/widgets/gitignore.py:44 +#: cola/widgets/gitignore.py:43 msgid "Ignore exact filename" msgstr "Ignorar nome exato do arquivo" -#: cola/widgets/gitignore.py:32 +#: cola/widgets/gitignore.py:31 msgid "Ignore filename or pattern" msgstr "Ignorar nome do arquivo ou padrão" -#: cola/widgets/status.py:933 +#: cola/widgets/dag.py:498 +msgid "Ignore merge commits" +msgstr "" + +#: cola/widgets/status.py:934 msgid "Ignore..." msgstr "Ignorar..." -#: cola/widgets/remote.py:203 +#: cola/widgets/remote.py:207 msgid "Include tags " msgstr "Incluir tags" -#: cola/widgets/prefs.py:349 +#: cola/widgets/prefs.py:369 msgid "Indent Status paths" msgstr "" -#: cola/widgets/about.py:419 cola/widgets/about.py:426 +#: cola/widgets/about.py:402 cola/widgets/about.py:409 msgid "Indonesian translation" msgstr "" -#: cola/widgets/main.py:643 +#: cola/widgets/main.py:656 msgid "Initialize Git Annex" msgstr "Inicializar Git Annex" -#: cola/widgets/main.py:647 +#: cola/widgets/main.py:660 msgid "Initialize Git LFS" msgstr "Inicializar Git LFS" -#: cola/widgets/clone.py:116 +#: cola/widgets/clone.py:114 msgid "Inititalize submodules" msgstr "Inicializar submódulos" -#: cola/widgets/prefs.py:260 +#: cola/widgets/prefs.py:281 msgid "Insert spaces instead of tabs" msgstr "Inserir espaços em vez de tabs" -#: cola/cmds.py:2130 +#: cola/widgets/action.py:73 cola/widgets/main.py:402 +msgid "Integrate changes using \"git pull\"" +msgstr "" + +#: cola/cmds.py:2081 msgid "Interactive Rebase" msgstr "Rebase Interativo" -#: cola/cmds.py:2364 +#: cola/cmds.py:2315 msgid "Invalid Revision" msgstr "Revisão Inválida" @@ -2126,40 +2188,40 @@ msgstr "Revisão Inválida" msgid "It is not necessary to update the hunk header lines as they will be regenerated automatically." msgstr "" -#: cola/widgets/about.py:421 cola/widgets/about.py:424 +#: cola/widgets/about.py:404 cola/widgets/about.py:407 msgid "Japanese translation" msgstr "" -#: cola/widgets/prefs.py:262 +#: cola/widgets/prefs.py:283 msgid "Keep *.orig Merge Backups" msgstr "Manter *.orig na Mesclagem de Backups" -#: cola/widgets/stash.py:71 +#: cola/widgets/stash.py:73 msgid "Keep Index" msgstr "Manter Índice" -#: cola/widgets/main.py:477 +#: cola/widgets/main.py:490 msgid "Keyboard Shortcuts" msgstr "Teclas de Atalho" -#: cola/cmds.py:1608 cola/sequenceeditor.py:165 cola/sequenceeditor.py:338 -#: cola/widgets/dag.py:395 cola/widgets/filelist.py:34 +#: cola/difftool.py:27 cola/sequenceeditor.py:163 cola/sequenceeditor.py:334 +#: cola/widgets/dag.py:394 cola/widgets/filelist.py:31 msgid "Launch Diff Tool" msgstr "Iniciar a Ferramenta de Comparação" -#: cola/widgets/dag.py:402 +#: cola/widgets/dag.py:401 msgid "Launch Directory Diff Tool" msgstr "Iniciar a Ferramenta de Comparação na Pasta" -#: cola/cmds.py:1541 cola/cmds.py:1679 cola/widgets/filelist.py:38 +#: cola/cmds.py:1529 cola/cmds.py:1631 cola/widgets/filelist.py:35 msgid "Launch Editor" msgstr "Iniciar Editor" -#: cola/cmds.py:1644 +#: cola/cmds.py:1596 msgid "Launch Terminal" msgstr "Iniciar Terminal" -#: cola/sequenceeditor.py:166 +#: cola/sequenceeditor.py:164 msgid "" "Launch external diff tool\n" "Shortcut: Ctrl+D" @@ -2167,8 +2229,8 @@ msgstr "" "Atalho para lançar a ferramenta de comparação externa:\n" "Ctrl+D" -#: cola/widgets/diff.py:1005 cola/widgets/diff.py:1051 -#: cola/widgets/status.py:852 cola/widgets/status.py:948 +#: cola/widgets/diff.py:1044 cola/widgets/diff.py:1106 +#: cola/widgets/status.py:853 cola/widgets/status.py:949 msgid "Launch git-cola" msgstr "Iniciar git-cola" @@ -2180,7 +2242,7 @@ msgstr "Iniciar git-difftool contra as versões anteriores" msgid "Launch git-difftool on the current path" msgstr "Iniciar git-difftool no caminho atual" -#: cola/icons.py:56 +#: cola/icons.py:55 msgid "Light Theme" msgstr "" @@ -2189,169 +2251,185 @@ msgstr "" msgid "Lines starting with '%s' will be ignored." msgstr "" -#: cola/widgets/startup.py:74 +#: cola/widgets/startup.py:73 msgid "List" msgstr "" -#: cola/guicmds.py:267 +#: cola/guicmds.py:266 msgid "Load Commit Message" msgstr "Carregar a Mensagem do Commit" -#: cola/widgets/main.py:339 +#: cola/widgets/main.py:334 msgid "Load Commit Message..." msgstr "Carregar a Mensagem do Commit..." -#: cola/widgets/commitmsg.py:144 +#: cola/widgets/commitmsg.py:150 msgid "Load Previous Commit Message" msgstr "Carregar Mensagem Anterior do Commit..." -#: cola/widgets/diff.py:264 +#: cola/widgets/diff.py:265 msgid "Loading..." msgstr "Carregando..." -#: cola/widgets/branch.py:169 cola/widgets/branch.py:240 -#: cola/widgets/branch.py:281 cola/widgets/compare.py:38 -#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/branch.py:173 cola/widgets/branch.py:250 +#: cola/widgets/branch.py:290 cola/widgets/compare.py:37 +#: cola/widgets/compare.py:52 cola/widgets/compare.py:57 msgid "Local" msgstr "" -#: cola/widgets/cfgactions.py:227 cola/widgets/merge.py:46 -#: cola/widgets/remote.py:138 +#: cola/widgets/cfgactions.py:225 cola/widgets/merge.py:44 +#: cola/widgets/remote.py:136 msgid "Local Branch" msgstr "Branch Local" -#: cola/widgets/createbranch.py:114 +#: cola/widgets/createbranch.py:112 msgid "Local branch" msgstr "Branch local" -#: cola/widgets/dag.py:788 cola/widgets/main.py:651 +#: cola/widgets/dag.py:854 cola/widgets/main.py:664 msgid "Lock Layout" msgstr "Trancar Layout" -#: cola/widgets/dag.py:750 +#: cola/widgets/dag.py:816 msgid "Log" msgstr "" -#: cola/widgets/prefs.py:170 +#: cola/widgets/prefs.py:191 msgid "Log Date Format" msgstr "" -#: cola/widgets/about.py:268 +#: cola/themes.py:769 +msgid "MacOS Aqua dark" +msgstr "" + +#: cola/themes.py:765 +msgid "MacOS Aqua light" +msgstr "" + +#: cola/themes.py:781 +msgid "MacOS Vibrant dark" +msgstr "" + +#: cola/themes.py:775 +msgid "MacOS Vibrant light" +msgstr "" + +#: cola/widgets/about.py:251 msgid "Maintainer (since 2007) and developer" msgstr "Mantenedor (desde 2007) e desenvolvedor" -#: cola/widgets/text.py:398 +#: cola/widgets/text.py:395 msgid "Match Case" msgstr "" -#: cola/widgets/merge.py:88 +#: cola/widgets/merge.py:86 msgid "Merge" msgstr "Merge" -#: cola/widgets/merge.py:162 +#: cola/widgets/merge.py:160 #, python-format msgid "Merge \"%(revision)s\" into \"%(branch)s\"" msgstr "Merge \"%(revision)s\" em \"%(branch)s\"" -#: cola/widgets/prefs.py:257 +#: cola/widgets/prefs.py:278 msgid "Merge Tool" msgstr "Ferramenta de Merge" -#: cola/widgets/prefs.py:171 +#: cola/widgets/prefs.py:193 msgid "Merge Verbosity" msgstr "Verbosidade do Merge" -#: cola/cmds.py:1829 +#: cola/cmds.py:1780 msgid "Merge failed. Conflict resolution is required." msgstr "Falha no Merge. Necessário resolução de Conflitos." -#: cola/widgets/merge.py:167 +#: cola/widgets/merge.py:165 #, python-format msgid "Merge into \"%s\"" msgstr "Merge em \"%s\"" -#: cola/widgets/branch.py:231 +#: cola/widgets/branch.py:242 #, fuzzy msgid "Merge into current branch" msgstr "Procurar Branch Atual..." -#: cola/widgets/main.py:363 +#: cola/widgets/main.py:358 msgid "Merge..." msgstr "Merge..." -#: cola/widgets/main.py:1163 +#: cola/widgets/main.py:1176 msgid "Merging" msgstr "" -#: cola/models/browse.py:33 cola/widgets/createtag.py:78 +#: cola/models/browse.py:32 cola/widgets/createtag.py:76 msgid "Message" msgstr "Mensagem" -#: cola/widgets/commitmsg.py:417 +#: cola/widgets/commitmsg.py:425 msgid "Missing Commit Message" msgstr "Mensagem do Commit em Falta" -#: cola/widgets/createbranch.py:252 +#: cola/widgets/createbranch.py:250 msgid "Missing Data" msgstr "Data em Falta" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Missing Name" msgstr "Nome em falta" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Missing Revision" msgstr "Falta a Revisão" -#: cola/cmds.py:2801 +#: cola/cmds.py:2747 msgid "Missing Tag Message" msgstr "Falta a mensagem da tag" -#: cola/models/browse.py:332 cola/widgets/status.py:158 -#: cola/widgets/status.py:631 +#: cola/models/browse.py:331 cola/widgets/status.py:158 +#: cola/widgets/status.py:632 msgid "Modified" msgstr "Modificado" -#: cola/widgets/commitmsg.py:506 +#: cola/widgets/commitmsg.py:532 msgid "More..." msgstr "Mais..." -#: cola/widgets/standard.py:243 cola/widgets/status.py:233 +#: cola/widgets/standard.py:242 cola/widgets/status.py:234 msgid "Move Down" msgstr "Mover para Baixo" -#: cola/widgets/standard.py:235 cola/widgets/status.py:225 +#: cola/widgets/standard.py:234 cola/widgets/status.py:226 msgid "Move Up" msgstr "Mover para cima" -#: cola/widgets/status.py:300 +#: cola/widgets/status.py:301 msgid "Move files to trash" msgstr "Mover arquivos para lixeira" -#: cola/models/browse.py:33 cola/widgets/bookmarks.py:467 -#: cola/widgets/createtag.py:61 cola/widgets/editremotes.py:450 -#: cola/widgets/status.py:1452 cola/widgets/toolbar.py:312 +#: cola/models/browse.py:32 cola/widgets/bookmarks.py:466 +#: cola/widgets/createtag.py:59 cola/widgets/editremotes.py:448 +#: cola/widgets/status.py:1453 cola/widgets/toolbar.py:317 msgid "Name" msgstr "Nome" -#: cola/widgets/editremotes.py:434 +#: cola/widgets/editremotes.py:432 msgid "Name for the new remote" msgstr "Nome do novo remoto" -#: cola/guicmds.py:148 cola/widgets/main.py:285 +#: cola/guicmds.py:147 cola/widgets/main.py:280 #, fuzzy msgid "New Bare Repository..." msgstr "Novo Repositório" -#: cola/guicmds.py:87 cola/widgets/main.py:280 +#: cola/guicmds.py:86 cola/widgets/main.py:275 msgid "New Repository..." msgstr "Novo Repositório" -#: cola/widgets/main.py:983 +#: cola/widgets/main.py:996 msgid "New Toolbar" msgstr "Adicionar Barra de Ferramentas" -#: cola/widgets/startup.py:53 +#: cola/widgets/startup.py:52 msgid "New..." msgstr "Novo" @@ -2359,15 +2437,19 @@ msgstr "Novo" msgid "Next File" msgstr "Próximo Arquivo" -#: cola/widgets/createbranch.py:123 cola/widgets/standard.py:1065 +#: cola/widgets/createbranch.py:121 cola/widgets/standard.py:1183 msgid "No" msgstr "Não" -#: cola/widgets/merge.py:217 cola/widgets/merge.py:227 +#: cola/widgets/merge.py:215 cola/widgets/merge.py:225 msgid "No Revision Specified" msgstr "Nenhuma revisão foi especificada" -#: cola/widgets/commitmsg.py:427 +#: cola/widgets/stash.py:225 +msgid "No change made" +msgstr "" + +#: cola/widgets/commitmsg.py:435 msgid "" "No changes to commit.\n" "\n" @@ -2377,27 +2459,27 @@ msgstr "" "\n" "Você precisa selecionar pelo menos 1 arquivo antes de realizar um Commit." -#: cola/widgets/selectcommits.py:118 +#: cola/widgets/selectcommits.py:117 msgid "No commits exist in this branch." msgstr "Não existe confirmações no branch" -#: cola/widgets/merge.py:65 +#: cola/widgets/merge.py:63 msgid "No fast forward" msgstr "Sem Fast Forward" -#: cola/widgets/remote.py:186 +#: cola/widgets/remote.py:190 msgid "No fast-forward" msgstr "Sem Fast Forward" -#: cola/widgets/remote.py:577 +#: cola/widgets/remote.py:612 msgid "No repository selected." msgstr "Nenhum repositório selecionado" -#: cola/widgets/remote.py:615 +#: cola/widgets/remote.py:650 msgid "Non-fast-forward fetch overwrites local history!" msgstr "Fetch sem Fast Forward reescreve o histórico local !" -#: cola/widgets/remote.py:621 +#: cola/widgets/remote.py:656 msgid "" "Non-fast-forward push overwrites published history!\n" "(Did you pull first?)" @@ -2405,7 +2487,7 @@ msgstr "" "Push sem Fast-Forward reescreve o histórico publicado !\n" "(Você deu pull primeiro ?)" -#: cola/widgets/commitmsg.py:444 +#: cola/widgets/commitmsg.py:452 msgid "Nothing to commit" msgstr "Nada para comitar" @@ -2413,81 +2495,81 @@ msgstr "Nada para comitar" msgid "Nothing to do" msgstr "Nada a fazer" -#: cola/widgets/prefs.py:172 +#: cola/widgets/prefs.py:194 msgid "Number of Diff Context Lines" msgstr "Número de Comparações no Contexto de Linhas" -#: cola/widgets/bookmarks.py:79 cola/widgets/bookmarks.py:213 -#: cola/widgets/startup.py:336 +#: cola/widgets/bookmarks.py:78 cola/widgets/bookmarks.py:212 +#: cola/widgets/startup.py:335 msgid "Open" msgstr "Abrir" -#: cola/widgets/text.py:230 +#: cola/widgets/text.py:228 #, python-format msgid "Open \"%s\"" msgstr "" -#: cola/cmds.py:1857 +#: cola/cmds.py:1808 msgid "Open Directory" msgstr "" -#: cola/guicmds.py:205 cola/guicmds.py:214 cola/widgets/editremotes.py:473 -#: cola/widgets/startup.py:55 cola/widgets/startup.py:215 +#: cola/guicmds.py:204 cola/guicmds.py:213 cola/widgets/editremotes.py:471 +#: cola/widgets/startup.py:54 cola/widgets/startup.py:214 msgid "Open Git Repository" msgstr "Abrir o Repositório Git" -#: cola/widgets/submodules.py:49 +#: cola/widgets/submodules.py:48 #, fuzzy msgid "Open Parent" msgstr "Aberto Recentemente" -#: cola/cmds.py:1877 +#: cola/cmds.py:1828 msgid "Open Parent Directory" msgstr "Abrir Pasta Pai" -#: cola/widgets/main.py:679 +#: cola/widgets/main.py:692 msgid "Open Recent" msgstr "Aberto Recentemente" -#: cola/cmds.py:1840 +#: cola/cmds.py:1791 msgid "Open Using Default Application" msgstr "Abrir usando aplicação padrão" -#: cola/cmds.py:1890 +#: cola/cmds.py:1841 msgid "Open Worktree" msgstr "" -#: cola/widgets/bookmarks.py:221 cola/widgets/startup.py:344 +#: cola/widgets/bookmarks.py:220 cola/widgets/startup.py:343 msgid "Open in New Window" msgstr "Abrir em uma Nova Janela" -#: cola/widgets/main.py:408 +#: cola/widgets/main.py:415 msgid "Open in New Window..." msgstr "Abrir em uma Nova Janela" -#: cola/widgets/main.py:402 +#: cola/widgets/main.py:409 msgid "Open..." msgstr "Abrir" -#: cola/widgets/branch.py:345 +#: cola/widgets/branch.py:354 #, fuzzy msgid "Other branches" msgstr "Redefinir..." -#: cola/widgets/archive.py:210 +#: cola/widgets/archive.py:208 msgid "Overwrite" msgstr "Sobrescrever" -#: cola/widgets/archive.py:209 +#: cola/widgets/archive.py:207 #, python-format msgid "Overwrite \"%s\"?" msgstr "Sobrescrever \"%s\"?" -#: cola/widgets/archive.py:207 +#: cola/widgets/archive.py:205 msgid "Overwrite File?" msgstr "Sobrescrever Arquivo?" -#: cola/widgets/grep.py:144 +#: cola/widgets/grep.py:142 msgid "" "Parse arguments using a shell.\n" "Queries with spaces will require \"double quotes\"." @@ -2495,63 +2577,67 @@ msgstr "" "Analisar argumento usando um shell.\n" "Consultas com espaços precisam de \"aspas duplas\"." -#: cola/models/browse.py:330 +#: cola/models/browse.py:329 msgid "Partially Staged" msgstr "Stage Parcial" -#: cola/widgets/main.py:744 +#: cola/widgets/main.py:757 msgid "Paste" msgstr "Colar" -#: cola/cmds.py:363 +#: cola/cmds.py:364 msgid "Patch failed to apply" msgstr "" -#: cola/cmds.py:375 +#: cola/cmds.py:376 msgid "Patch(es) Applied" msgstr "Patch(s) Aplicados" -#: cola/widgets/diff.py:1219 cola/widgets/main.py:695 +#: cola/widgets/diff.py:1293 cola/widgets/main.py:708 msgid "Patches" msgstr "" -#: cola/widgets/prefs.py:173 +#: cola/widgets/prefs.py:195 msgid "Patches Directory" msgstr "" -#: cola/widgets/bookmarks.py:468 cola/widgets/submodules.py:118 +#: cola/widgets/bookmarks.py:467 cola/widgets/submodules.py:117 msgid "Path" msgstr "Caminho" -#: cola/widgets/clone.py:112 +#: cola/widgets/clone.py:110 msgid "Path or URL to clone (Env. $VARS okay)" msgstr "Caminho ou URL para clonar (Env. $VARS okay)" -#: cola/sequenceeditor.py:346 +#: cola/sequenceeditor.py:342 msgid "Pick" msgstr "Usar Commit" -#: cola/widgets/diff.py:781 +#: cola/widgets/dag.py:490 +msgid "Pickaxe search for changes containing text" +msgstr "" + +#: cola/widgets/diff.py:809 msgid "Pixel XOR" msgstr "" -#: cola/widgets/createbranch.py:253 +#: cola/widgets/createbranch.py:251 msgid "Please provide both a branch name and revision expression." msgstr "Por favor, forneça um nome ao branch e expressão revisão" -#: cola/cmds.py:2348 +#: cola/cmds.py:2299 msgid "Please select a file" msgstr "Por favor selecione um arquivo" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Please specify a name for the new tag." msgstr "Por favor especifique um nome para a nova tag." -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Please specify a revision to tag." msgstr "Por favor especifique a revisão da tag." -#: cola/widgets/commitmsg.py:410 +#: cola/widgets/commitmsg.py:418 msgid "" "Please supply a commit message.\n" "\n" @@ -2569,31 +2655,31 @@ msgstr "" "- Segunda linha: Branco\n" "- Linhas Remanescentes: Descreva porque esta mudança é boa.\n" -#: cola/cmds.py:653 +#: cola/cmds.py:655 msgid "Point the current branch head to a new commit?" msgstr "Apontar o HEAD do branch atual para um novo commit?" -#: cola/widgets/about.py:416 +#: cola/widgets/about.py:399 msgid "Polish translation" msgstr "" -#: cola/widgets/stash.py:63 cola/widgets/stash.py:111 cola/widgets/stash.py:115 +#: cola/widgets/stash.py:65 cola/widgets/stash.py:114 cola/widgets/stash.py:118 msgid "Pop" msgstr "" -#: cola/widgets/main.py:293 cola/widgets/prefs.py:395 +#: cola/widgets/main.py:288 cola/widgets/prefs.py:433 msgid "Preferences" msgstr "Preferências" -#: cola/widgets/archive.py:129 +#: cola/widgets/archive.py:127 msgid "Prefix" msgstr "Prefixo" -#: cola/widgets/main.py:345 +#: cola/widgets/main.py:340 msgid "Prepare Commit Message" msgstr "Preparar Mensagem do Commit" -#: cola/widgets/prefs.py:157 +#: cola/widgets/prefs.py:180 msgid "Prevent \"Stage\" from staging all files when nothing is selected" msgstr "Previnir \"Stage\" de selecionar todos arquivos quando nada é selecionado" @@ -2601,218 +2687,230 @@ msgstr "Previnir \"Stage\" de selecionar todos arquivos quando nada é seleciona msgid "Previous File" msgstr "Arquivo Anterior" -#: cola/widgets/remote.py:171 +#: cola/widgets/remote.py:169 msgid "Prompt on creation" msgstr "Perguntar ao Criar" -#: cola/widgets/remote.py:172 +#: cola/widgets/remote.py:170 msgid "Prompt when pushing creates new remote branches" msgstr "Perguntar quando push criar novo branch" -#: cola/widgets/remote.py:208 +#: cola/widgets/remote.py:212 msgid "Prune " msgstr "" -#: cola/widgets/bookmarks.py:255 cola/widgets/startup.py:376 +#: cola/widgets/bookmarks.py:254 cola/widgets/startup.py:375 msgid "Prune Missing Entries" msgstr "" -#: cola/widgets/branch.py:247 cola/widgets/remote.py:728 +#: cola/widgets/branch.py:256 cola/widgets/remote.py:783 #, fuzzy msgid "Pull" msgstr "Puxar..." -#: cola/widgets/action.py:65 cola/widgets/main.py:397 +#: cola/widgets/action.py:73 cola/widgets/main.py:401 msgid "Pull..." msgstr "Pull..." -#: cola/widgets/branch.py:253 cola/widgets/remote.py:593 -#: cola/widgets/remote.py:698 +#: cola/widgets/branch.py:262 cola/widgets/remote.py:628 +#: cola/widgets/remote.py:758 msgid "Push" msgstr "Push" -#: cola/widgets/action.py:64 cola/widgets/main.py:392 +#: cola/widgets/action.py:70 cola/widgets/main.py:393 +msgid "Push to one or more remotes using \"git push\"" +msgstr "" + +#: cola/widgets/action.py:70 cola/widgets/main.py:392 msgid "Push..." msgstr "Push..." -#: cola/guicmds.py:252 +#: cola/guicmds.py:251 msgid "Quick Open Repository" msgstr "" -#: cola/widgets/main.py:660 +#: cola/widgets/main.py:673 msgid "Quick Open..." msgstr "" -#: cola/widgets/main.py:355 +#: cola/widgets/main.py:350 msgid "Quit" msgstr "Sair" -#: cola/cmds.py:2144 cola/cmds.py:2180 cola/cmds.py:2181 cola/cmds.py:2194 -#: cola/cmds.py:2195 cola/sequenceeditor.py:158 cola/sequenceeditor.py:199 -#: cola/widgets/main.py:822 cola/widgets/remote.py:211 +#: cola/cmds.py:2095 cola/cmds.py:2131 cola/cmds.py:2132 cola/cmds.py:2145 +#: cola/cmds.py:2146 cola/sequenceeditor.py:156 cola/sequenceeditor.py:197 +#: cola/widgets/main.py:835 cola/widgets/remote.py:215 msgid "Rebase" msgstr "Rebase" -#: cola/cmds.py:2143 +#: cola/cmds.py:2094 #, python-format msgid "Rebase onto %s" msgstr "Rebase em %s" -#: cola/cmds.py:2156 +#: cola/cmds.py:2107 msgid "Rebase stopped" msgstr "Rebase parou" -#: cola/widgets/remote.py:210 +#: cola/widgets/remote.py:214 msgid "Rebase the current branch instead of merging" msgstr "Rebase o branch atual em vez de merge" -#: cola/widgets/dag.py:419 +#: cola/widgets/dag.py:418 msgid "Rebase to this commit" msgstr "" -#: cola/widgets/main.py:1165 +#: cola/widgets/main.py:1178 msgid "Rebasing" msgstr "Rebasing" -#: cola/widgets/main.py:120 +#: cola/widgets/main.py:118 msgid "Recent" msgstr "Recente" -#: cola/widgets/bookmarks.py:93 +#: cola/widgets/bookmarks.py:92 msgid "Recent repositories" msgstr "Repositórios Recentes" -#: cola/widgets/prefs.py:258 +#: cola/widgets/prefs.py:279 msgid "Recent repository count" msgstr "Contagem de Repositórios Recentes" -#: cola/widgets/recent.py:46 +#: cola/widgets/recent.py:44 msgid "Recently Modified Files" msgstr "Arquivos Modificados Recentemente" -#: cola/widgets/main.py:320 +#: cola/widgets/main.py:315 msgid "Recently Modified Files..." msgstr "Arquivos Modificados Recentemente" -#: cola/widgets/stash.py:256 +#: cola/widgets/stash.py:274 msgid "Recovering a dropped stash is not possible." msgstr "Recuperação de uma stash derrubada não é possível" -#: cola/widgets/createbranch.py:283 +#: cola/widgets/createbranch.py:281 msgid "Recovering lost commits may not be easy." msgstr "Recuperar commits perdidos pode não ser fácil." -#: cola/widgets/main.py:737 +#: cola/widgets/main.py:750 msgid "Redo" msgstr "Refazer" -#: cola/widgets/clone.py:121 +#: cola/widgets/clone.py:119 msgid "Reduce commit history to minimum" msgstr "Reduzir histórico de commits para o minimo" -#: cola/widgets/submodules.py:121 +#: cola/widgets/submodules.py:120 msgid "Reference Repository" msgstr "" -#: cola/widgets/submodules.py:105 +#: cola/widgets/submodules.py:104 msgid "Reference URL" msgstr "" -#: cola/widgets/submodules.py:106 +#: cola/widgets/submodules.py:105 msgid "Reference repository to use when cloning (optional)" msgstr "" -#: cola/cmds.py:2222 cola/qtutils.py:770 cola/widgets/action.py:62 -#: cola/widgets/dag.py:792 cola/widgets/editremotes.py:85 -#: cola/widgets/grep.py:105 cola/widgets/recent.py:116 -#: cola/widgets/submodules.py:45 +#: cola/cmds.py:2173 cola/qtutils.py:801 cola/widgets/action.py:63 +#: cola/widgets/dag.py:858 cola/widgets/editremotes.py:84 +#: cola/widgets/grep.py:103 cola/widgets/recent.py:114 +#: cola/widgets/submodules.py:44 msgid "Refresh" msgstr "Recarregar" -#: cola/widgets/remote.py:179 +#: cola/widgets/remote.py:183 msgid "Refuse to merge unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward" msgstr "Recusar merge a menos que o HEAD atual já esteja atualizado ou o merge pode ser resolvido como fast-forward" -#: cola/widgets/branch.py:173 cola/widgets/branch.py:225 -#: cola/widgets/branch.py:269 cola/widgets/branch.py:470 -#: cola/widgets/compare.py:54 cola/widgets/compare.py:59 -#: cola/widgets/remote.py:147 +#: cola/widgets/branch.py:177 cola/widgets/branch.py:236 +#: cola/widgets/branch.py:278 cola/widgets/branch.py:513 +#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/remote.py:145 msgid "Remote" msgstr "Remoto" -#: cola/widgets/remote.py:162 +#: cola/widgets/remote.py:160 msgid "Remote Branch" msgstr "Branch Remoto" -#: cola/cmds.py:1196 +#: cola/cmds.py:1197 msgid "Remote Branch Deleted" msgstr "Branch Remoto Removido" -#: cola/widgets/editremotes.py:49 +#: cola/widgets/log.py:99 +msgid "Remote Messages" +msgstr "" + +#: cola/widgets/editremotes.py:48 msgid "Remote git repositories - double-click to rename" msgstr "Repositórios Remotos - duplo click para renomear" -#: cola/cmds.py:1029 cola/widgets/patch.py:107 cola/widgets/patch.py:122 -#: cola/widgets/startup.py:265 cola/widgets/status.py:1382 +#: cola/cmds.py:1030 cola/widgets/diff.py:1701 cola/widgets/diff.py:1716 +#: cola/widgets/startup.py:264 cola/widgets/status.py:1383 msgid "Remove" msgstr "Remover" -#: cola/cmds.py:1027 +#: cola/cmds.py:1028 #, python-format msgid "Remove %s from the recent list?" msgstr "Remover %s da lista de recentes ?" -#: cola/widgets/toolbar.py:316 +#: cola/widgets/toolbar.py:321 msgid "Remove Element" msgstr "Remover Elemento" -#: cola/widgets/remote.py:206 +#: cola/widgets/remote.py:210 msgid "Remove remote-tracking branches that no longer exist on the remote" msgstr "Remover rastreamento remoto de branchs que não existem mais no remoto " -#: cola/widgets/patch.py:109 +#: cola/widgets/diff.py:1703 msgid "Remove selected (Delete)" msgstr "Remover selecionado" -#: cola/widgets/bookmarks.py:258 cola/widgets/startup.py:379 +#: cola/widgets/bookmarks.py:257 cola/widgets/startup.py:378 msgid "Remove stale entries for repositories that no longer exist" msgstr "" -#: cola/guicmds.py:333 cola/widgets/browse.py:159 +#: cola/guicmds.py:332 cola/widgets/browse.py:159 cola/widgets/stash.py:44 msgid "Rename" msgstr "Renomear" -#: cola/cmds.py:1153 +#: cola/cmds.py:1154 #, python-format msgid "Rename \"%s\"" msgstr "Renomear \"%s\"" -#: cola/widgets/branch.py:259 +#: cola/widgets/branch.py:268 msgid "Rename Branch" msgstr "Renomear Branch" -#: cola/widgets/main.py:570 +#: cola/widgets/main.py:583 #, fuzzy msgid "Rename Branch..." msgstr "Branch Remoto" -#: cola/guicmds.py:330 +#: cola/guicmds.py:329 msgid "Rename Existing Branch" msgstr "Renomear Branch Existente" -#: cola/cmds.py:944 +#: cola/cmds.py:942 msgid "Rename Remote" msgstr "Renomear Remoto" -#: cola/widgets/bookmarks.py:233 cola/widgets/startup.py:356 +#: cola/widgets/bookmarks.py:232 cola/widgets/startup.py:355 msgid "Rename Repository" msgstr "Renomear Repositório" -#: cola/widgets/branch.py:445 +#: cola/widgets/stash.py:218 +msgid "Rename Stash" +msgstr "" + +#: cola/widgets/branch.py:478 msgid "Rename branch" msgstr "Renomear branch" -#: cola/cmds.py:945 +#: cola/cmds.py:943 #, python-format msgid "Rename remote \"%(current)s\" to \"%(new)s\"?" msgstr "Renomear remoto de \"%(current)s\" para \"%(new)s\"?" @@ -2821,180 +2919,184 @@ msgstr "Renomear remoto de \"%(current)s\" para \"%(new)s\"?" msgid "Rename selected paths" msgstr "Renomear caminhos selecionados" -#: cola/app.py:497 cola/widgets/startup.py:262 +#: cola/widgets/stash.py:45 +msgid "Rename the selected stash" +msgstr "" + +#: cola/app.py:500 cola/widgets/startup.py:261 msgid "Repository Not Found" msgstr "" -#: cola/widgets/browse.py:87 cola/widgets/main.py:1095 +#: cola/widgets/browse.py:87 cola/widgets/main.py:1108 #, python-format msgid "Repository: %s" msgstr "Repositório: %s" -#: cola/guicmds.py:351 cola/widgets/createbranch.py:125 cola/widgets/dag.py:331 -#: cola/widgets/editremotes.py:58 cola/widgets/main.py:832 +#: cola/guicmds.py:350 cola/widgets/createbranch.py:123 cola/widgets/dag.py:330 +#: cola/widgets/editremotes.py:57 cola/widgets/main.py:845 msgid "Reset" msgstr "Resetar" -#: cola/widgets/createbranch.py:286 +#: cola/widgets/createbranch.py:284 #, python-format msgid "Reset \"%(branch)s\" to \"%(revision)s\"?" msgstr "Resetar \"%(branch)s\" to \"%(revision)s\"?" -#: cola/guicmds.py:359 +#: cola/guicmds.py:358 msgid "Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/cmds.py:655 cola/cmds.py:706 cola/guicmds.py:342 -#: cola/widgets/createbranch.py:295 +#: cola/cmds.py:657 cola/cmds.py:708 cola/guicmds.py:341 +#: cola/widgets/createbranch.py:293 msgid "Reset Branch" msgstr "Resetar Branch" -#: cola/cmds.py:703 cola/guicmds.py:341 cola/widgets/dag.py:425 -#: cola/widgets/main.py:419 +#: cola/cmds.py:705 cola/guicmds.py:340 cola/widgets/dag.py:424 +#: cola/widgets/main.py:431 msgid "Reset Branch (Soft)" msgstr "" -#: cola/cmds.py:652 cola/guicmds.py:350 cola/widgets/dag.py:431 -#: cola/widgets/main.py:426 +#: cola/cmds.py:654 cola/guicmds.py:349 cola/widgets/dag.py:430 +#: cola/widgets/main.py:439 msgid "Reset Branch and Stage (Mixed)" msgstr "" -#: cola/widgets/createbranch.py:292 +#: cola/widgets/createbranch.py:290 msgid "Reset Branch?" msgstr "Resetar Branch?" -#: cola/widgets/main.py:655 +#: cola/widgets/main.py:668 msgid "Reset Layout" msgstr "" -#: cola/cmds.py:687 +#: cola/cmds.py:689 msgid "Reset Worktree and Reset All?" msgstr "" -#: cola/cmds.py:672 cola/cmds.py:689 cola/cmds.py:723 cola/guicmds.py:360 -#: cola/guicmds.py:373 cola/guicmds.py:382 +#: cola/cmds.py:674 cola/cmds.py:691 cola/cmds.py:725 cola/guicmds.py:359 +#: cola/guicmds.py:372 cola/guicmds.py:381 msgid "Reset and Restore" msgstr "" -#: cola/cmds.py:704 +#: cola/cmds.py:706 msgid "Reset branch?" msgstr "" -#: cola/widgets/createbranch.py:266 +#: cola/widgets/createbranch.py:264 #, python-format msgid "Resetting \"%(branch)s\" to \"%(revision)s\" will lose commits." msgstr "Resetar \"%(branch)s\" para \"%(revision)s\" irá perder commits." -#: cola/widgets/prefs.py:264 +#: cola/widgets/prefs.py:285 msgid "Resize File Browser columns" msgstr "" -#: cola/widgets/prefs.py:374 +#: cola/widgets/prefs.py:412 msgid "Restart the application after changing appearance settings." msgstr "A alteração de aparência necessita reiniciar a aplicação." -#: cola/cmds.py:757 cola/cmds.py:760 cola/guicmds.py:390 cola/guicmds.py:391 -#: cola/widgets/dag.py:461 cola/widgets/main.py:457 +#: cola/cmds.py:759 cola/cmds.py:762 cola/guicmds.py:389 cola/guicmds.py:390 +#: cola/widgets/dag.py:460 cola/widgets/main.py:471 msgid "Restore Worktree" msgstr "" -#: cola/cmds.py:720 cola/guicmds.py:381 cola/widgets/dag.py:454 -#: cola/widgets/main.py:450 +#: cola/cmds.py:722 cola/guicmds.py:380 cola/widgets/dag.py:453 +#: cola/widgets/main.py:463 msgid "Restore Worktree and Reset All (Hard)" msgstr "" -#: cola/cmds.py:669 cola/widgets/main.py:434 +#: cola/cmds.py:671 cola/widgets/main.py:447 msgid "Restore Worktree and Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/widgets/dag.py:438 +#: cola/widgets/dag.py:437 msgid "Restore Worktree and Reset All (Keep Unstaged Edits)" msgstr "" -#: cola/cmds.py:686 cola/guicmds.py:372 cola/widgets/dag.py:446 -#: cola/widgets/main.py:442 +#: cola/cmds.py:688 cola/guicmds.py:371 cola/widgets/dag.py:445 +#: cola/widgets/main.py:455 msgid "Restore Worktree and Reset All (Merge)" msgstr "" -#: cola/cmds.py:721 +#: cola/cmds.py:723 msgid "Restore Worktree and Reset All?" msgstr "" -#: cola/cmds.py:758 +#: cola/cmds.py:760 #, python-format msgid "Restore Worktree to %s?" msgstr "" -#: cola/cmds.py:670 +#: cola/cmds.py:672 msgid "Restore worktree, reset, and preserve unstaged edits?" msgstr "" -#: cola/widgets/dag.py:390 +#: cola/widgets/dag.py:389 msgid "Revert" msgstr "Reverter" -#: cola/widgets/diff.py:1153 +#: cola/widgets/diff.py:1227 msgid "Revert Diff Hunk" msgstr "Reverter pedaço do Diff" -#: cola/widgets/diff.py:1018 +#: cola/widgets/diff.py:1057 msgid "Revert Diff Hunk..." msgstr "Reverter pedaço do Diff..." -#: cola/widgets/diff.py:1152 +#: cola/widgets/diff.py:1226 msgid "Revert Diff Hunk?" msgstr "Reverter pedaço do Diff ?" -#: cola/widgets/diff.py:1150 +#: cola/widgets/diff.py:1224 msgid "Revert Selected Lines" msgstr "Reverter Linhas Selecionadas" -#: cola/widgets/diff.py:1013 +#: cola/widgets/diff.py:1052 msgid "Revert Selected Lines..." msgstr "Reverter Linhas Selecionadas..." -#: cola/widgets/diff.py:1149 +#: cola/widgets/diff.py:1223 msgid "Revert Selected Lines?" msgstr "Reverter Linhas Selecionadas?" -#: cola/cmds.py:2311 +#: cola/cmds.py:2262 msgid "Revert Uncommitted Changes" msgstr "Reverter Mudanças sem Commit" -#: cola/cmds.py:2305 +#: cola/cmds.py:2256 msgid "Revert Uncommitted Changes?" msgstr "Reverter Mudanças sem Commit?" -#: cola/cmds.py:2298 +#: cola/cmds.py:2249 #, fuzzy msgid "Revert Uncommitted Edits..." msgstr "Reverter edições Uncommitted" -#: cola/cmds.py:2289 +#: cola/cmds.py:2240 msgid "Revert Unstaged Changes" msgstr "Reverter Mudanças sem Stage" -#: cola/cmds.py:2283 +#: cola/cmds.py:2234 msgid "Revert Unstaged Changes?" msgstr "Reverter Mudanças sem Stage?" -#: cola/cmds.py:2275 +#: cola/cmds.py:2226 msgid "Revert Unstaged Edits..." msgstr "Reverter Edições Unstaged" -#: cola/cmds.py:598 +#: cola/cmds.py:599 msgid "Revert failed" msgstr "" -#: cola/cmds.py:2310 cola/widgets/diff.py:1161 +#: cola/cmds.py:2261 cola/widgets/diff.py:1235 msgid "Revert the uncommitted changes?" msgstr "Reverter as mudanças sem Commit?" -#: cola/cmds.py:2288 +#: cola/cmds.py:2239 msgid "Revert the unstaged changes?" msgstr "Reverter as mudanças sem stage?" -#: cola/widgets/browse.py:189 +#: cola/widgets/browse.py:190 msgid "Revert uncommitted changes to selected paths" msgstr "Reverter as mudanças sem Commit nos caminhos selecionados" @@ -3002,299 +3104,307 @@ msgstr "Reverter as mudanças sem Commit nos caminhos selecionados" msgid "Revert unstaged changes to selected paths" msgstr "Reverter as mudanças sem Stage nos caminhos selecionados" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Review" msgstr "Revisar" -#: cola/widgets/main.py:583 +#: cola/widgets/main.py:596 msgid "Review..." msgstr "Revisar..." -#: cola/widgets/cfgactions.py:233 cola/widgets/createtag.py:84 +#: cola/widgets/cfgactions.py:231 cola/widgets/createtag.py:82 msgid "Revision" msgstr "Revisão" -#: cola/widgets/selectcommits.py:62 +#: cola/widgets/selectcommits.py:61 msgid "Revision Expression:" msgstr "Revisar Expressões" -#: cola/widgets/merge.py:39 cola/widgets/merge.py:42 +#: cola/widgets/merge.py:37 cola/widgets/merge.py:40 msgid "Revision to Merge" msgstr "Revisão para Merge" -#: cola/sequenceeditor.py:351 +#: cola/sequenceeditor.py:347 msgid "Reword" msgstr "Reescrever" -#: cola/cmds.py:776 cola/widgets/commitmsg.py:456 +#: cola/cmds.py:778 cola/widgets/commitmsg.py:464 msgid "Rewrite Published Commit?" msgstr "Reescrever Commit Publicado?" -#: cola/widgets/log.py:31 +#: cola/widgets/log.py:31 cola/widgets/log.py:133 msgid "Right-click links to open:" msgstr "" -#: cola/interaction.py:127 cola/widgets/cfgactions.py:245 +#: cola/interaction.py:125 cola/widgets/cfgactions.py:243 msgid "Run" msgstr "Executar" -#: cola/cmds.py:2341 +#: cola/cmds.py:2292 #, python-format msgid "Run \"%s\"?" msgstr "Executar \"%s\"?" -#: cola/interaction.py:124 +#: cola/interaction.py:122 #, python-format msgid "Run %s?" msgstr "Executar %s?" -#: cola/interaction.py:125 +#: cola/interaction.py:123 #, python-format msgid "Run the \"%s\" command?" msgstr "Executar o comando \"%s\"?" -#: cola/cmds.py:2380 +#: cola/cmds.py:2331 #, python-format msgid "Running command: %s" msgstr "Executando o comando: %s" -#: cola/widgets/about.py:422 +#: cola/widgets/about.py:405 msgid "Russian translation" msgstr "Tradução russa" -#: cola/sequenceeditor.py:324 +#: cola/sequenceeditor.py:321 msgid "SHA-1" msgstr "SHA-1" -#: cola/widgets/prefs.py:183 +#: cola/widgets/prefs.py:205 msgid "Safe Mode" msgstr "Modo Seguro" -#: cola/cmds.py:2167 cola/widgets/archive.py:126 cola/widgets/browse.py:609 -#: cola/widgets/editremotes.py:54 cola/widgets/stash.py:52 -#: cola/widgets/status.py:1388 +#: cola/cmds.py:2118 cola/widgets/archive.py:124 cola/widgets/browse.py:610 +#: cola/widgets/editremotes.py:53 cola/widgets/stash.py:54 +#: cola/widgets/status.py:1389 msgid "Save" msgstr "Salvar" -#: cola/widgets/archive.py:113 +#: cola/widgets/archive.py:111 msgid "Save Archive" msgstr "Salvar Arquivo" -#: cola/widgets/dag.py:382 cola/widgets/main.py:351 +#: cola/widgets/dag.py:381 cola/widgets/main.py:346 msgid "Save As Tarball/Zip..." msgstr "Salvar Como Tarball/Zip..." -#: cola/widgets/prefs.py:263 +#: cola/widgets/prefs.py:284 msgid "Save GUI Settings" msgstr "Salvar Configuração da GUI" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Save Stash" msgstr "Salvar o Stash" -#: cola/widgets/stash.py:53 +#: cola/widgets/stash.py:55 msgid "Save modified state to new stash" msgstr "Salvar o estágio modificado do novo stash" -#: cola/widgets/browse.py:570 +#: cola/widgets/browse.py:571 #, python-format msgid "Saved \"%(filename)s\" from \"%(ref)s\" to \"%(destination)s\"" msgstr "\"%(filename)s\" salvo de \"%(ref)s\" para \"%(destination)s\"" -#: cola/widgets/bookmarks.py:83 cola/widgets/grep.py:98 -#: cola/widgets/search.py:42 cola/widgets/search.py:62 +#: cola/widgets/bookmarks.py:82 cola/widgets/grep.py:96 +#: cola/widgets/search.py:41 cola/widgets/search.py:61 msgid "Search" msgstr "Pesquisar" -#: cola/widgets/search.py:226 +#: cola/widgets/search.py:225 msgid "Search Authors" msgstr "Pesquisar por Autores" -#: cola/widgets/search.py:224 +#: cola/widgets/search.py:223 msgid "Search Commit Messages" msgstr "Pesquisar por Mensagens de Commit" -#: cola/widgets/search.py:227 +#: cola/widgets/search.py:226 msgid "Search Committers" msgstr "Pesquisar por responsáveis do Commit" -#: cola/widgets/search.py:228 +#: cola/widgets/search.py:227 msgid "Search Date Range" msgstr "Pesquisar por Intervalo de Data" -#: cola/widgets/search.py:225 +#: cola/widgets/search.py:224 msgid "Search Diffs" msgstr "Pesquisar por Diffs" -#: cola/widgets/search.py:222 +#: cola/widgets/search.py:221 msgid "Search by Expression" msgstr "Pesquisar pela Expressão" -#: cola/widgets/search.py:223 +#: cola/widgets/search.py:222 msgid "Search by Path" msgstr "Pesquisar pelo Caminho" -#: cola/widgets/grep.py:124 +#: cola/widgets/dag.py:494 +msgid "Search commit messages" +msgstr "" + +#: cola/widgets/grep.py:122 msgid "Search for a fixed string" msgstr "Pesquisar por uma String Fixa" -#: cola/widgets/diff.py:519 cola/widgets/diff.py:1514 +#: cola/widgets/diff.py:526 cola/widgets/diff.py:1576 msgid "Search in Diff" msgstr "" -#: cola/guicmds.py:253 cola/widgets/bookmarks.py:62 +#: cola/guicmds.py:252 cola/widgets/bookmarks.py:61 msgid "Search repositories by name..." msgstr "" -#: cola/widgets/grep.py:122 +#: cola/widgets/grep.py:120 msgid "Search using a POSIX basic regular expression" msgstr "Procurar usando expressão regular básica POSIX" -#: cola/widgets/grep.py:123 +#: cola/widgets/grep.py:121 msgid "Search using a POSIX extended regular expression" msgstr "Procurar usando expressão regular extendida POSIX" -#: cola/widgets/main.py:493 +#: cola/widgets/main.py:506 msgid "Search..." msgstr "Pesquisar..." -#: cola/widgets/selectcommits.py:67 +#: cola/widgets/selectcommits.py:66 msgid "Search:" msgstr "" -#: cola/guicmds.py:330 cola/widgets/selectcommits.py:74 +#: cola/guicmds.py:329 cola/widgets/selectcommits.py:73 msgid "Select" msgstr "Selecionar" -#: cola/widgets/main.py:750 +#: cola/widgets/main.py:763 msgid "Select All" msgstr "Selecionar Tudo" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Select Branch to Review" msgstr "Selecionar Branch para Revisar" -#: cola/widgets/dag.py:1610 +#: cola/widgets/dag.py:1667 msgid "Select Child" msgstr "Selecionar Filho" -#: cola/widgets/commitmsg.py:512 +#: cola/widgets/commitmsg.py:538 msgid "Select Commit" msgstr "Selecionar Commit" -#: cola/guicmds.py:137 +#: cola/guicmds.py:136 #, fuzzy msgid "Select Directory..." msgstr "Selecionar Repositório" -#: cola/cmds.py:2129 +#: cola/cmds.py:2080 msgid "Select New Upstream" msgstr "Selecionar Novo Upstream" -#: cola/widgets/dag.py:1614 +#: cola/widgets/dag.py:1671 msgid "Select Newest Child" msgstr "Selecionar Filho mais novo" -#: cola/widgets/dag.py:1604 +#: cola/widgets/dag.py:1661 msgid "Select Oldest Parent" msgstr "Selecionar Pai mais velho" -#: cola/widgets/dag.py:1599 +#: cola/widgets/dag.py:1656 msgid "Select Parent" msgstr "Selecionar Pai" -#: cola/widgets/browse.py:525 +#: cola/widgets/browse.py:526 msgid "Select Previous Version" msgstr "Selecionar Versão Anterior" -#: cola/widgets/clone.py:197 +#: cola/widgets/clone.py:195 msgid "Select a parent directory for the new clone" msgstr "Selecionar um diretório pai para o novo clone" -#: cola/widgets/standard.py:756 cola/widgets/standard.py:779 +#: cola/widgets/standard.py:826 cola/widgets/standard.py:848 msgid "Select directory" msgstr "" -#: cola/widgets/selectcommits.py:162 +#: cola/widgets/selectcommits.py:161 msgid "Select output dir" msgstr "Selecionar pasta de saída" -#: cola/widgets/selectcommits.py:183 +#: cola/widgets/selectcommits.py:182 msgid "Select output directory" msgstr "Selecionar pasta de saída" -#: cola/widgets/patch.py:175 +#: cola/widgets/diff.py:1769 #, fuzzy msgid "Select patch file(s)..." msgstr "Excluir %d arquiv(o)s?" -#: cola/widgets/editremotes.py:437 +#: cola/widgets/editremotes.py:435 #, fuzzy msgid "Select repository" msgstr "Selecionar Repositório" -#: cola/widgets/bookmarks.py:225 cola/widgets/startup.py:348 +#: cola/widgets/bookmarks.py:224 cola/widgets/startup.py:347 msgid "Set Default Repository" msgstr "Definir Repositório Padrão" -#: cola/widgets/branch.py:282 +#: cola/widgets/branch.py:291 msgid "Set Upstream Branch" msgstr "Definir Branch Upstream" -#: cola/widgets/branch.py:72 +#: cola/widgets/branch.py:74 msgid "" "Set the sort order for branches and tags.\n" "Toggle between date-based and version-name-based sorting." msgstr "" -#: cola/widgets/remote.py:213 +#: cola/widgets/remote.py:217 msgid "Set upstream" msgstr "Definir Upstream" -#: cola/widgets/prefs.py:405 +#: cola/widgets/prefs.py:443 msgid "Settings" msgstr "Configurações" -#: cola/widgets/grep.py:142 +#: cola/widgets/grep.py:140 msgid "Shell arguments" msgstr "Argumentos do Shell" -#: cola/sequenceeditor.py:375 +#: cola/sequenceeditor.py:371 msgid "Shift Down" msgstr "Shift Para Baixo" -#: cola/sequenceeditor.py:379 +#: cola/sequenceeditor.py:375 msgid "Shift Up" msgstr "Shift Para Cima" -#: cola/widgets/about.py:499 +#: cola/widgets/about.py:482 msgid "Shortcuts" msgstr "Atalhos" -#: cola/widgets/prefs.py:179 +#: cola/widgets/prefs.py:201 msgid "Show Diffstat After Merge" msgstr "Mostrar o Status de Comparação após Mesclagem" -#: cola/widgets/prefs.py:178 +#: cola/widgets/prefs.py:200 msgid "Show Full Paths in the Window Title" msgstr "Mostrar Caminhos Completos no Titulo da Janela" -#: cola/sequenceeditor.py:106 cola/widgets/finder.py:187 -#: cola/widgets/status.py:1384 +#: cola/sequenceeditor.py:104 cola/widgets/finder.py:186 +#: cola/widgets/status.py:1385 #, fuzzy msgid "Show Help" msgstr "Ajuda" -#: cola/widgets/filelist.py:30 +#: cola/widgets/filelist.py:27 #, fuzzy msgid "Show History" msgstr "Ver Histórico..." -#: cola/widgets/prefs.py:348 +#: cola/widgets/prefs.py:368 msgid "Show file counts in Status titles" msgstr "Exibe número de arquivos no título de status" -#: cola/sequenceeditor.py:171 cola/widgets/finder.py:138 +#: cola/widgets/diff.py:794 +msgid "Show filenames" +msgstr "" + +#: cola/sequenceeditor.py:169 cola/widgets/finder.py:137 msgid "" "Show help\n" "Shortcut: ?" @@ -3302,137 +3412,145 @@ msgstr "" "Mostrar Ajuda\n" "Atalho: ?" -#: cola/widgets/diff.py:765 +#: cola/widgets/diff.py:792 msgid "Show line numbers" msgstr "Mostrar numero das linhas" -#: cola/widgets/diff.py:761 +#: cola/widgets/remote.py:175 +msgid "Show remote messages" +msgstr "" + +#: cola/widgets/diff.py:789 msgid "Show whole surrounding functions of changes" msgstr "Mostrar função pai inteira" -#: cola/widgets/recent.py:58 +#: cola/widgets/recent.py:56 msgid "Showing changes since" msgstr "Mostrar mudanças desde" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "Side by side" msgstr "Lado a Lado" -#: cola/cmds.py:2512 +#: cola/cmds.py:2463 msgid "Sign Off" msgstr "Não Assinar" -#: cola/widgets/createtag.py:71 +#: cola/widgets/createtag.py:69 msgid "Sign Tag" msgstr "Assinar a Tag" -#: cola/widgets/commitmsg.py:55 +#: cola/widgets/commitmsg.py:56 msgid "Sign off on this commit" msgstr "Cancelar Assinatura desse Commit" -#: cola/widgets/about.py:412 cola/widgets/about.py:425 +#: cola/widgets/about.py:395 cola/widgets/about.py:408 msgid "Simplified Chinese translation" msgstr "" -#: cola/cmds.py:2587 +#: cola/cmds.py:2529 msgid "Skip" msgstr "Pular" -#: cola/widgets/main.py:264 cola/widgets/main.py:617 +#: cola/widgets/main.py:260 cola/widgets/main.py:630 msgid "Skip Current Patch" msgstr "Pular Path Atual" -#: cola/widgets/main.py:267 +#: cola/widgets/main.py:261 msgid "Skip applying the current patch and continue applying patches" msgstr "" -#: cola/widgets/prefs.py:261 +#: cola/widgets/prefs.py:282 msgid "Sort bookmarks alphabetically" msgstr "Ordenar favoritos alfabeticamente" -#: cola/widgets/about.py:413 cola/widgets/about.py:436 -#: cola/widgets/about.py:440 +#: cola/widgets/about.py:396 cola/widgets/about.py:419 +#: cola/widgets/about.py:423 msgid "Spanish translation" msgstr "Trandução espanhola" -#: cola/widgets/createtag.py:88 +#: cola/widgets/createtag.py:86 msgid "Specifies the SHA-1 to tag" msgstr "Especificar o SHA-1 para a Tag" -#: cola/widgets/createtag.py:81 +#: cola/widgets/createtag.py:79 msgid "Specifies the tag message" msgstr "Especifique a mensagem da tag" -#: cola/widgets/createtag.py:65 +#: cola/widgets/createtag.py:63 msgid "Specifies the tag name" msgstr "Especifique o nome da tag" -#: cola/widgets/spellcheck.py:46 +#: cola/widgets/spellcheck.py:45 msgid "Spelling Suggestions" msgstr "Sugestões de Ortografia" -#: cola/sequenceeditor.py:369 cola/widgets/merge.py:58 +#: cola/sequenceeditor.py:365 cola/widgets/merge.py:56 msgid "Squash" msgstr "Squash" -#: cola/widgets/merge.py:57 +#: cola/widgets/merge.py:55 msgid "Squash the merged commits into a single commit" msgstr "Unir os commits mesclados em um commit único" -#: cola/cmds.py:2598 cola/widgets/action.py:60 cola/widgets/diff.py:982 +#: cola/cmds.py:2540 cola/widgets/action.py:58 cola/widgets/diff.py:1168 msgid "Stage" msgstr "Estágio" -#: cola/cmds.py:2753 +#: cola/cmds.py:2699 msgid "Stage / Unstage" msgstr "Estágio / Sem estágio " -#: cola/cmds.py:2735 +#: cola/cmds.py:2681 msgid "Stage / Unstage All" msgstr "" -#: cola/widgets/diff.py:1016 +#: cola/widgets/diff.py:1055 msgid "Stage Diff Hunk" msgstr "Reverter pedaço do Diff" -#: cola/cmds.py:2691 +#: cola/cmds.py:2633 msgid "Stage Modified" msgstr "Stage Modificado" -#: cola/cmds.py:2724 +#: cola/cmds.py:2670 msgid "Stage Modified and Untracked" msgstr "" -#: cola/widgets/status.py:872 cola/widgets/status.py:894 -#: cola/widgets/status.py:962 +#: cola/widgets/status.py:873 cola/widgets/status.py:895 +#: cola/widgets/status.py:963 msgid "Stage Selected" msgstr "Stage Selecionado" -#: cola/widgets/diff.py:1011 +#: cola/widgets/diff.py:1050 msgid "Stage Selected Lines" msgstr "Stage Linhas Selecionadas" -#: cola/cmds.py:2702 +#: cola/cmds.py:2644 msgid "Stage Unmerged" msgstr "" -#: cola/cmds.py:2713 +#: cola/cmds.py:2655 msgid "Stage Untracked" msgstr "" -#: cola/widgets/commitmsg.py:438 +#: cola/widgets/commitmsg.py:446 msgid "Stage and Commit" msgstr "Stage e Commit" -#: cola/widgets/commitmsg.py:435 +#: cola/widgets/commitmsg.py:443 msgid "Stage and commit?" msgstr "Stage e Commit?" -#: cola/cmds.py:2586 +#: cola/widgets/action.py:58 +msgid "Stage changes using \"git add\"" +msgstr "" + +#: cola/cmds.py:2528 msgid "Stage conflicts" msgstr "Conflitos no Stage" -#: cola/cmds.py:2577 +#: cola/cmds.py:2519 #, fuzzy msgid "Stage conflicts?" msgstr "Stage Modificado" @@ -3441,45 +3559,45 @@ msgstr "Stage Modificado" msgid "Stage/unstage selected paths for commit" msgstr "Stage/unstage os caminhos selecionados para o Commit" -#: cola/models/browse.py:334 cola/widgets/status.py:156 -#: cola/widgets/status.py:620 +#: cola/models/browse.py:333 cola/widgets/status.py:156 +#: cola/widgets/status.py:621 msgid "Staged" msgstr "" -#: cola/cmds.py:2605 +#: cola/cmds.py:2547 #, python-format msgid "Staging: %s" msgstr "" -#: cola/widgets/main.py:597 +#: cola/widgets/main.py:610 msgid "Start Interactive Rebase..." msgstr "Iniciar Rebase Interativo..." -#: cola/widgets/createbranch.py:107 +#: cola/widgets/createbranch.py:105 msgid "Starting Revision" msgstr "Iniciar Revisão" -#: cola/widgets/stash.py:40 +#: cola/widgets/stash.py:36 msgid "Stash" msgstr "Stash" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash Index" msgstr "Stash Índice" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash staged changes only" msgstr "Stage somente mudanças selecionadas" -#: cola/widgets/stash.py:73 +#: cola/widgets/stash.py:75 msgid "Stash unstaged changes only, keeping staged changes" msgstr "Stash somente em mudanças não selecionadas, mantendo mudanças selecionadas" -#: cola/widgets/action.py:66 cola/widgets/main.py:414 +#: cola/widgets/action.py:76 cola/widgets/main.py:422 msgid "Stash..." msgstr "" -#: cola/models/browse.py:33 cola/widgets/main.py:102 +#: cola/models/browse.py:32 cola/widgets/main.py:100 msgid "Status" msgstr "" @@ -3487,152 +3605,160 @@ msgstr "" msgid "Stop tracking paths" msgstr "Parar rastreamento de caminhos" -#: cola/widgets/submodules.py:82 +#: cola/widgets/submodules.py:81 msgid "Submodule URL (can be relative, ex: ../repo.git)" msgstr "" -#: cola/widgets/submodules.py:90 +#: cola/widgets/submodules.py:89 msgid "Submodule branch to track (optional)" msgstr "" -#: cola/widgets/submodules.py:86 +#: cola/widgets/submodules.py:85 msgid "Submodule path within the current repository (optional)" msgstr "" -#: cola/widgets/main.py:143 cola/widgets/submodules.py:32 +#: cola/widgets/main.py:141 cola/widgets/submodules.py:31 msgid "Submodules" msgstr "Submódulos" -#: cola/widgets/prefs.py:174 +#: cola/widgets/prefs.py:196 msgid "Summarize Merge Commits" msgstr "Resumir os Commits de Merge" -#: cola/sequenceeditor.py:325 cola/widgets/dag.py:506 +#: cola/sequenceeditor.py:322 cola/widgets/dag.py:572 msgid "Summary" msgstr "Sumário" -#: cola/widgets/prefs.py:168 +#: cola/widgets/prefs.py:273 msgid "Tab Width" msgstr "Largura da Aba" -#: cola/widgets/cfgactions.py:229 cola/widgets/createbranch.py:116 -#: cola/widgets/merge.py:48 +#: cola/widgets/cfgactions.py:227 cola/widgets/createbranch.py:114 +#: cola/widgets/merge.py:46 msgid "Tag" msgstr "" -#: cola/cmds.py:2842 +#: cola/cmds.py:2788 msgid "Tag Created" msgstr "Tag Criada" -#: cola/widgets/createtag.py:80 +#: cola/widgets/createtag.py:78 msgid "Tag message..." msgstr "Mensagem da Tag..." -#: cola/cmds.py:2802 +#: cola/cmds.py:2748 msgid "Tag-signing was requested but the tag message is empty." msgstr "A assinatura de tags foi solicitada, mas a mensagem da tag está vazia." -#: cola/widgets/branch.py:179 cola/widgets/branch.py:238 +#: cola/widgets/branch.py:183 cola/widgets/branch.py:248 msgid "Tags" msgstr "" -#: cola/widgets/toolbar.py:180 +#: cola/widgets/action.py:78 cola/widgets/main.py:423 +msgid "Temporarily stash away uncommitted changes using \"git stash\"" +msgstr "" + +#: cola/widgets/toolbar.py:184 msgid "Text Beside Icon" msgstr "" -#: cola/widgets/toolbar.py:179 +#: cola/widgets/toolbar.py:183 msgid "Text Only" msgstr "" -#: cola/widgets/toolbar.py:181 +#: cola/widgets/toolbar.py:185 msgid "Text Under Icon" msgstr "" -#: cola/widgets/prefs.py:169 +#: cola/widgets/prefs.py:272 msgid "Text Width" msgstr "Largura do Texto" -#: cola/cmds.py:1116 +#: cola/cmds.py:1117 msgid "The branch will be no longer available." msgstr "O branch não ficará mais disponível" -#: cola/cmds.py:648 +#: cola/cmds.py:650 #, python-format msgid "The branch will be reset using \"git reset --mixed %s\"" msgstr "O branch será resetado usando \"git reset --mixed %s\"" -#: cola/cmds.py:699 cola/cmds.py:790 +#: cola/cmds.py:701 cola/cmds.py:792 #, python-format msgid "The branch will be reset using \"git reset --soft %s\"" msgstr "O branch será resetado usando \"git reset --soft %s\"" -#: cola/widgets/commitmsg.py:303 +#: cola/widgets/commitmsg.py:311 #, fuzzy msgid "The commit message will be cleared." msgstr "Os arquivos a seguir serão apagados:" -#: cola/widgets/prefs.py:146 +#: cola/widgets/prefs.py:169 msgid "" "The date-time format used when displaying dates in Git DAG.\n" "This value is passed to git log --date=" msgstr "" -#: cola/widgets/archive.py:208 +#: cola/widgets/archive.py:206 #, python-format msgid "The file \"%s\" exists and will be overwritten." msgstr "O arquivo \"%s\" existe e será sobrescrito." -#: cola/cmds.py:1086 +#: cola/cmds.py:1087 msgid "The following files will be deleted:" msgstr "Os arquivos a seguir serão apagados:" -#: cola/widgets/status.py:1646 +#: cola/widgets/status.py:1647 msgid "The number of leading paths to strip" msgstr "" -#: cola/cmds.py:716 +#: cola/cmds.py:718 #, python-format msgid "The repository will be reset using \"git reset --hard %s\"" msgstr "" -#: cola/cmds.py:665 +#: cola/cmds.py:667 #, python-format msgid "The repository will be reset using \"git reset --keep %s\"" msgstr "" -#: cola/cmds.py:682 +#: cola/cmds.py:684 #, python-format msgid "The repository will be reset using \"git reset --merge %s\"" msgstr "" -#: cola/cmds.py:2365 +#: cola/cmds.py:2316 msgid "The revision expression cannot be empty." msgstr "A revisão da expressão não pode ser vazia" -#: cola/cmds.py:3029 +#: cola/widgets/stash.py:225 +msgid "The stash has not been renamed" +msgstr "" + +#: cola/cmds.py:2975 #, python-format msgid "" "The submodule will be added using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:3074 +#: cola/cmds.py:3020 #, python-format msgid "" "The submodule will be updated using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:736 +#: cola/cmds.py:738 #, python-format msgid "The worktree will be restored using \"git read-tree --reset -u %s\"" msgstr "" -#: cola/widgets/commitmsg.py:304 +#: cola/widgets/commitmsg.py:312 msgid "This cannot be undone. Clear commit message?" msgstr "Isso não pode ser feito. Limpar mensagem do commit ?" -#: cola/cmds.py:778 cola/widgets/commitmsg.py:458 +#: cola/cmds.py:780 cola/widgets/commitmsg.py:466 msgid "" "This commit has already been published.\n" "This operation will rewrite published history.\n" @@ -3642,7 +3768,7 @@ msgstr "" "Essa operação irá sobrescrever a história publicada.\n" "Você provavelmente não deseja fazer isso." -#: cola/widgets/diff.py:1158 +#: cola/widgets/diff.py:1232 msgid "" "This operation drops uncommitted changes.\n" "These changes cannot be recovered." @@ -3650,7 +3776,7 @@ msgstr "" "Essa operação cancela mudanças sem commit.\n" "Essas mudanças não podem ser recuperadas." -#: cola/cmds.py:2307 +#: cola/cmds.py:2258 msgid "" "This operation removes uncommitted edits from selected files.\n" "These changes cannot be recovered." @@ -3658,7 +3784,7 @@ msgstr "" "Essa operação remove edições sem commit dos arquivos selecionados.\n" "Essas mudanças não podem ser recuperadas." -#: cola/cmds.py:2285 +#: cola/cmds.py:2236 msgid "" "This operation removes unstaged edits from selected files.\n" "These changes cannot be recovered." @@ -3666,27 +3792,27 @@ msgstr "" "Essa operação remove edições sem stage dos arquivos selecionados.\n" "Essas mudanças não podem ser recuperadas." -#: cola/cmds.py:475 +#: cola/cmds.py:476 msgid "" "This operation will replace the selected unmerged files with content from the branch being merged using \"git checkout --theirs\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:513 +#: cola/cmds.py:514 msgid "" "This operation will replace the selected unmerged files with content from your current branch using \"git checkout --ours\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/widgets/main.py:1109 +#: cola/widgets/main.py:1122 msgid "" "This repository has unresolved conflicts after applying a patch.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1102 +#: cola/widgets/main.py:1115 msgid "" "This repository is currently being rebased.\n" "Resolve conflicts, commit changes, and run:\n" @@ -3696,13 +3822,13 @@ msgstr "" "Resolva os conflitos, comite as mudanças, e execute:\n" " Rebase > Continuar" -#: cola/widgets/main.py:1115 +#: cola/widgets/main.py:1128 msgid "" "This repository is in the middle of a cherry-pick.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1121 +#: cola/widgets/main.py:1134 msgid "" "This repository is in the middle of a merge.\n" "Resolve conflicts and commit changes." @@ -3722,15 +3848,15 @@ msgstr "" msgid "To avoid applying removal lines ('-'), change them to context lines (' ')." msgstr "" -#: cola/sequenceeditor.py:342 +#: cola/sequenceeditor.py:338 msgid "Toggle Enabled" msgstr "Alternar Habilitado" -#: cola/widgets/diff.py:776 +#: cola/widgets/diff.py:804 msgid "Toggle image diff" msgstr "" -#: cola/widgets/branch.py:63 +#: cola/widgets/branch.py:65 msgid "Toggle the branches filter" msgstr "Alternar os filtros dos branches" @@ -3738,51 +3864,51 @@ msgstr "Alternar os filtros dos branches" msgid "Toggle the paths filter" msgstr "Alterar os caminhos do filtro" -#: cola/widgets/toolbar.py:317 +#: cola/widgets/toolbar.py:322 msgid "Toolbar Style:" msgstr "" -#: cola/widgets/cfgactions.py:228 cola/widgets/merge.py:47 +#: cola/widgets/cfgactions.py:226 cola/widgets/merge.py:45 msgid "Tracking Branch" msgstr "Rastreando Branch" -#: cola/widgets/createbranch.py:115 +#: cola/widgets/createbranch.py:113 msgid "Tracking branch" msgstr "Rastreando branch" -#: cola/widgets/about.py:408 cola/widgets/about.py:434 -#: cola/widgets/about.py:445 +#: cola/widgets/about.py:391 cola/widgets/about.py:417 +#: cola/widgets/about.py:428 msgid "Traditional Chinese (Taiwan) translation" msgstr "" -#: cola/widgets/about.py:439 +#: cola/widgets/about.py:422 msgid "Translation" msgstr "" -#: cola/widgets/about.py:94 +#: cola/widgets/about.py:92 msgid "Translators" msgstr "Tradutores" -#: cola/widgets/about.py:418 cola/widgets/about.py:423 -#: cola/widgets/about.py:438 +#: cola/widgets/about.py:401 cola/widgets/about.py:406 +#: cola/widgets/about.py:421 msgid "Turkish translation" msgstr "" -#: cola/widgets/clone.py:109 cola/widgets/editremotes.py:451 -#: cola/widgets/submodules.py:117 +#: cola/widgets/clone.py:107 cola/widgets/editremotes.py:449 +#: cola/widgets/submodules.py:116 msgid "URL" msgstr "" -#: cola/widgets/remote.py:463 +#: cola/widgets/remote.py:497 #, python-format msgid "URL: %s" msgstr "" -#: cola/widgets/about.py:415 +#: cola/widgets/about.py:398 msgid "Ukranian translation" msgstr "" -#: cola/cmds.py:2122 +#: cola/cmds.py:2073 msgid "Unable to rebase" msgstr "Incapaz de realizar Rebase" @@ -3791,53 +3917,58 @@ msgstr "Incapaz de realizar Rebase" msgid "Unable to set URL for \"%(name)s\" to \"%(url)s\"" msgstr "Incapaz de modificar a URL de \"%(name)s\" para \"%(url)s\"" -#: cola/widgets/diff.py:1327 +#: cola/widgets/diff.py:1401 #, python-format msgid "Unable to write patch to \"%s\". Check permissions?" msgstr "" -#: cola/widgets/main.py:735 +#: cola/widgets/main.py:748 msgid "Undo" msgstr "Desfazer" -#: cola/cmds.py:783 cola/cmds.py:788 cola/cmds.py:791 cola/widgets/main.py:208 +#: cola/cmds.py:785 cola/cmds.py:790 cola/cmds.py:793 cola/widgets/main.py:207 msgid "Undo Last Commit" msgstr "" -#: cola/cmds.py:789 +#: cola/cmds.py:791 msgid "Undo last commit?" msgstr "" -#: cola/cmds.py:782 +#: cola/cmds.py:784 msgid "Undo the published commit?" msgstr "" -#: cola/models/browse.py:328 cola/widgets/status.py:157 -#: cola/widgets/status.py:640 +#: cola/models/browse.py:327 cola/widgets/status.py:157 +#: cola/widgets/status.py:641 msgid "Unmerged" msgstr "" -#: cola/cmds.py:2855 cola/widgets/action.py:61 cola/widgets/diff.py:985 +#: cola/cmds.py:2801 cola/widgets/action.py:61 cola/widgets/diff.py:1165 +#: cola/widgets/main.py:212 msgid "Unstage" msgstr "Unstage" -#: cola/widgets/main.py:203 cola/widgets/status.py:790 +#: cola/widgets/main.py:202 cola/widgets/status.py:791 msgid "Unstage All" msgstr "Unstage em Todos" -#: cola/widgets/diff.py:1061 +#: cola/widgets/diff.py:1017 msgid "Unstage Diff Hunk" msgstr "Unstage pedaço do Diff" -#: cola/widgets/status.py:823 cola/widgets/status.py:858 +#: cola/widgets/status.py:824 cola/widgets/status.py:859 msgid "Unstage Selected" msgstr "Unstage Selecionados" -#: cola/widgets/diff.py:1058 +#: cola/widgets/diff.py:1015 msgid "Unstage Selected Lines" msgstr "Unstage Linhas Selecionadas" -#: cola/cmds.py:2867 +#: cola/widgets/action.py:61 +msgid "Unstage changes using \"git reset\"" +msgstr "" + +#: cola/cmds.py:2813 #, python-format msgid "Unstaging: %s" msgstr "" @@ -3846,89 +3977,88 @@ msgstr "" msgid "Untrack Selected" msgstr "Remover rastreio do selecionado" -#: cola/widgets/status.py:159 cola/widgets/status.py:646 +#: cola/widgets/status.py:159 cola/widgets/status.py:647 msgid "Untracked" msgstr "Não rastreado" -#: cola/cmds.py:1141 cola/cmds.py:2923 +#: cola/cmds.py:1142 cola/cmds.py:2869 #, python-format msgid "Untracking: %s" msgstr "Removendo rastreio: %s" -#: cola/widgets/main.py:374 +#: cola/widgets/main.py:369 msgid "Update All Submodules..." msgstr "" -#: cola/widgets/createbranch.py:121 +#: cola/widgets/createbranch.py:119 msgid "Update Existing Branch:" msgstr "Atualizar Branch Existente:" -#: cola/cmds.py:3075 +#: cola/cmds.py:3021 msgid "Update Submodule" msgstr "" -#: cola/cmds.py:3072 +#: cola/cmds.py:3018 msgid "Update Submodule..." msgstr "" -#: cola/cmds.py:3111 +#: cola/cmds.py:3057 #, fuzzy msgid "Update Submodules" msgstr "Inicializar Submódulos" -#: cola/cmds.py:3109 +#: cola/cmds.py:3055 #, fuzzy msgid "Update all submodules?" msgstr "Inicializar submódulos" -#: cola/cmds.py:2093 +#: cola/cmds.py:2044 msgid "Update stacked branches" msgstr "" -#: cola/cmds.py:2085 cola/cmds.py:2092 +#: cola/cmds.py:2036 cola/cmds.py:2043 msgid "Update stacked branches when rebasing?" msgstr "" -#: cola/cmds.py:3108 +#: cola/cmds.py:3054 #, fuzzy msgid "Update submodules..." msgstr "Inicializar submódulos" -#: cola/widgets/status.py:953 +#: cola/widgets/status.py:954 #, fuzzy msgid "Update this submodule" msgstr "Inicializar submódulos" -#: cola/cmds.py:3073 +#: cola/cmds.py:3019 msgid "Update this submodule?" msgstr "Atualizar este submódulo?" -#: cola/widgets/branch.py:421 cola/widgets/createbranch.py:302 -#: cola/widgets/remote.py:135 +#: cola/widgets/branch.py:433 cola/widgets/createbranch.py:300 msgid "Updating" msgstr "Atualizando" -#: cola/widgets/prefs.py:350 +#: cola/widgets/prefs.py:370 msgid "Use a block cursor in diff editors" msgstr "" -#: cola/widgets/prefs.py:154 +#: cola/widgets/prefs.py:177 msgid "Use gravatar.com to lookup icons for author emails" msgstr "" -#: cola/widgets/prefs.py:166 +#: cola/widgets/prefs.py:189 msgid "User Name" msgstr "Nome do Usuário" -#: cola/widgets/about.py:92 +#: cola/widgets/about.py:90 msgid "Version" msgstr "Versão" -#: cola/widgets/dag.py:800 cola/widgets/main.py:845 cola/widgets/main.py:966 +#: cola/widgets/dag.py:866 cola/widgets/main.py:858 cola/widgets/main.py:979 msgid "View" msgstr "Ver" -#: cola/widgets/browse.py:137 cola/widgets/status.py:278 +#: cola/widgets/browse.py:137 cola/widgets/status.py:279 msgid "View History..." msgstr "Ver Histórico..." @@ -3936,39 +4066,39 @@ msgstr "Ver Histórico..." msgid "View history for selected paths" msgstr "Ver histórico dos caminhos selecionados" -#: cola/widgets/merge.py:54 +#: cola/widgets/branch.py:224 cola/widgets/merge.py:52 msgid "Visualize" msgstr "Visualizar" -#: cola/widgets/main.py:488 +#: cola/widgets/main.py:501 msgid "Visualize All Branches..." msgstr "Visualizar todos os Branches..." -#: cola/widgets/main.py:482 +#: cola/widgets/main.py:495 msgid "Visualize Current Branch..." msgstr "Visualizar Branch Atual..." -#: cola/widgets/createtag.py:73 +#: cola/widgets/createtag.py:71 msgid "Whether to sign the tag (git tag -s)" msgstr "Se assinar a tag (git tag -s)" -#: cola/widgets/text.py:399 +#: cola/widgets/text.py:396 msgid "Whole Words" msgstr "" -#: cola/widgets/commitmsg.py:432 +#: cola/widgets/commitmsg.py:440 msgid "Would you like to stage and commit all modified files?" msgstr "Gostaria de stage e commit todos os arquivos modificados ?" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "XOR" msgstr "" -#: cola/widgets/standard.py:1064 +#: cola/widgets/standard.py:1182 msgid "Yes" msgstr "Sim" -#: cola/cmds.py:256 +#: cola/cmds.py:255 msgid "" "You are in the middle of a merge.\n" "Cannot amend while merging." @@ -3976,36 +4106,36 @@ msgstr "" "Você está no meio de um merge.\n" "Você não pode modificar durante o merge." -#: cola/cmds.py:2123 +#: cola/cmds.py:2074 msgid "You cannot rebase with uncommitted changes." msgstr "Você não pode usar rebase com mudanças sem commit." -#: cola/widgets/merge.py:227 +#: cola/widgets/merge.py:225 msgid "You must specify a revision to merge." msgstr "Você precisa especificar uma revisão para o merge." -#: cola/widgets/merge.py:217 +#: cola/widgets/merge.py:215 msgid "You must specify a revision to view." msgstr "Você precisa especificar uma revisão para visualizar." -#: cola/widgets/dag.py:710 cola/widgets/dag.py:1588 +#: cola/widgets/dag.py:776 cola/widgets/dag.py:1645 msgid "Zoom In" msgstr "Aumentar o Zoom" -#: cola/widgets/dag.py:706 cola/widgets/dag.py:1594 +#: cola/widgets/dag.py:772 cola/widgets/dag.py:1651 msgid "Zoom Out" msgstr "Reduzir o Zoom" -#: cola/widgets/dag.py:524 cola/widgets/dag.py:714 cola/widgets/dag.py:1596 -#: cola/widgets/diff.py:785 +#: cola/widgets/dag.py:590 cola/widgets/dag.py:780 cola/widgets/dag.py:1653 +#: cola/widgets/diff.py:813 msgid "Zoom to Fit" msgstr "Zoom para Ajustar" -#: cola/widgets/grep.py:112 +#: cola/widgets/grep.py:110 msgid "command-line arguments" msgstr "Argumentos da linha de comando" -#: cola/widgets/main.py:932 cola/widgets/main.py:938 +#: cola/widgets/main.py:945 cola/widgets/main.py:951 msgid "error: unable to execute git" msgstr "erro: incapaz de executar git" @@ -4014,45 +4144,41 @@ msgstr "erro: incapaz de executar git" msgid "exit code %s" msgstr "Código de Saída %s" -#: cola/app.py:301 +#: cola/app.py:304 #, python-format msgid "fatal: \"%s\" is not a directory. Please specify a correct --repo ." msgstr "fatal: \"%s\" não é um diretório. Por favor especifique um caminho correto --repo ." -#: cola/widgets/main.py:928 +#: cola/widgets/main.py:941 #, python-format msgid "git cola version %s" msgstr "Versão do Git Cola %s" -#: cola/widgets/startup.py:35 +#: cola/widgets/startup.py:34 msgid "git-cola" msgstr "" -#: cola/difftool.py:63 +#: cola/difftool.py:82 msgid "git-cola diff" msgstr "" -#: cola/widgets/submodules.py:81 +#: cola/widgets/submodules.py:80 msgid "git://git.example.com/repo.git" msgstr "" -#: cola/widgets/grep.py:132 +#: cola/widgets/grep.py:130 msgid "grep result..." msgstr "resultados do grep..." -#: cola/widgets/about.py:486 +#: cola/widgets/about.py:469 msgid "hotkeys.html" msgstr "" -#: cola/widgets/submodules.py:85 +#: cola/widgets/submodules.py:84 msgid "path/to/submodule" msgstr "" -#: cola/cmds.py:2537 -msgid "unknown" -msgstr "desconhecido" - -#: cola/widgets/createtag.py:63 +#: cola/widgets/createtag.py:61 msgid "vX.Y.Z" msgstr "" @@ -4061,14 +4187,18 @@ msgid "x 1" msgstr "" #: cola/hidpi.py:44 -msgid "x 1.5" +msgid "x 1.25" msgstr "" #: cola/hidpi.py:45 +msgid "x 1.5" +msgstr "" + +#: cola/hidpi.py:46 msgid "x 2" msgstr "" -#: cola/widgets/search.py:53 cola/widgets/search.py:58 +#: cola/widgets/search.py:52 cola/widgets/search.py:57 msgid "yyyy-MM-dd" msgstr "" @@ -4143,6 +4273,10 @@ msgstr "" #~ "ctrl+q = cancelar e abortar o rebase\n" #~ "ctrl+d = lançar ferramenta de comparação\n" +#, python-format +#~ msgid "A stash named \"%s\" already exists" +#~ msgstr "Um nome de stash \"%s\" já existe" + #~ msgid "Already up-to-date." #~ msgstr "Até a data" @@ -4168,6 +4302,9 @@ msgstr "" #~ msgid "Error %s" #~ msgstr "Erros: %s" +#~ msgid "Error: Stash exists" +#~ msgstr "Erro: Stash já existe" + #~ msgid "Errors: %s" #~ msgstr "Erros: %s" @@ -4272,3 +4409,6 @@ msgstr "" #~ msgid "Updating..." #~ msgstr "Atualização..." + +#~ msgid "unknown" +#~ msgstr "desconhecido" diff --git a/cola/i18n/ru.po b/cola/i18n/ru.po index a999b25a..1588f575 100644 --- a/cola/i18n/ru.po +++ b/cola/i18n/ru.po @@ -18,7 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cola/widgets/patch.py:86 +#: cola/widgets/diff.py:1680 msgid "" "\n" "

\n" @@ -34,7 +34,7 @@ msgstr "" "

\n" " " -#: cola/widgets/about.py:455 +#: cola/widgets/about.py:438 #, python-format msgid "" "\n" @@ -63,7 +63,7 @@ msgid "" " " msgstr "" -#: cola/widgets/about.py:180 +#: cola/widgets/about.py:182 #, python-format msgid "" "\n" @@ -80,7 +80,7 @@ msgid "" " " msgstr "" -#: cola/widgets/about.py:387 +#: cola/widgets/about.py:370 #, python-format msgid "" "\n" @@ -90,7 +90,7 @@ msgid "" " " msgstr "" -#: cola/widgets/status.py:1310 +#: cola/widgets/status.py:1311 #, python-format msgid "" "\n" @@ -105,7 +105,7 @@ msgid "" " %(ext)s = file extension\n" msgstr "" -#: cola/sequenceeditor.py:700 +#: cola/sequenceeditor.py:695 msgid "" "\n" "Commands\n" @@ -144,7 +144,7 @@ msgid "" "ctrl+d = launch difftool\n" msgstr "" -#: cola/widgets/finder.py:65 +#: cola/widgets/finder.py:64 #, fuzzy msgid "" "\n" @@ -173,45 +173,71 @@ msgstr "" "Стрелки вверх и вниз переключают фокус между полем для ввода текста\n" "и результатом.\n" -#: cola/widgets/dag.py:894 +#: cola/widgets/prefs.py:133 +msgid "" +"\n" +"This option determines how the supplied commit message should be\n" +"cleaned up before committing.\n" +"\n" +"The can be strip, whitespace, verbatim, scissors or default.\n" +"\n" +"strip\n" +" Strip leading and trailing empty lines, trailing whitespace,\n" +" commentary and collapse consecutive empty lines.\n" +"\n" +"whitespace\n" +" Same as strip except #commentary is not removed.\n" +"\n" +"verbatim\n" +" Do not change the message at all.\n" +"\n" +"scissors\n" +" Same as whitespace except that everything from (and including) the line\n" +" found below is truncated, if the message is to be edited.\n" +" \"#\" can be customized with core.commentChar.\n" +"\n" +" # ------------------------ >8 ------------------------" +msgstr "" + +#: cola/widgets/dag.py:960 msgid " - DAG" msgstr "" -#: cola/widgets/recent.py:54 +#: cola/widgets/recent.py:52 msgid " commits ago" msgstr " коммитов назад" -#: cola/cmds.py:1197 +#: cola/cmds.py:1198 #, python-format msgid "\"%(branch)s\" has been deleted from \"%(remote)s\"." msgstr "\"%(branch)s\" была удалена из \"%(remote)s\"." -#: cola/widgets/createbranch.py:316 +#: cola/widgets/createbranch.py:314 #, python-format msgid "\"%(command)s\" returned exit status \"%(status)d\"" msgstr "\"%(command)s\" завершилась с кодом \"%(status)d\"" -#: cola/interaction.py:39 +#: cola/interaction.py:38 #, python-format msgid "\"%(command)s\" returned exit status %(status)d" msgstr "\"%(command)s\" завершилась с кодом %(status)d" -#: cola/guicmds.py:157 +#: cola/guicmds.py:156 #, fuzzy, python-format msgid "\"%s\" already exists" msgstr "Ветвь \"%s\" уже существует." -#: cola/widgets/clone.py:206 +#: cola/widgets/clone.py:204 #, python-format msgid "\"%s\" already exists, cola will create a new directory" msgstr "\"%s\" уже существует, cole создаст новый каталог" -#: cola/cmds.py:2349 +#: cola/cmds.py:2300 #, python-format msgid "\"%s\" requires a selected file." msgstr "Для \"%s\" требуется выбрать файл." -#: cola/cmds.py:2087 +#: cola/cmds.py:2038 msgid "" "\"git rebase --update-refs\" automatically force-updates any\n" "branches that point to commits that are being rebased.\n" @@ -221,7 +247,11 @@ msgid "" "Using this feature is helpful for \"stacked\" branch workflows." msgstr "" -#: cola/sequenceeditor.py:321 +#: cola/models/stash.py:145 +msgid "\"git stash drop\" did not return a ref to rename." +msgstr "" + +#: cola/sequenceeditor.py:318 msgid "#" msgstr "" @@ -230,37 +260,37 @@ msgstr "" msgid "%(project)s: %(branch)s - Browse" msgstr "" -#: cola/widgets/dag.py:887 +#: cola/widgets/dag.py:953 #, python-format msgid "%(project)s: %(ref)s - DAG" msgstr "" -#: cola/models/browse.py:315 +#: cola/models/browse.py:314 #, python-format msgid "%d days ago" msgstr "%d дней назад" -#: cola/models/browse.py:314 +#: cola/models/browse.py:313 #, python-format msgid "%d hours ago" msgstr "%d часов назад" -#: cola/models/browse.py:307 cola/models/browse.py:311 +#: cola/models/browse.py:306 cola/models/browse.py:310 #, python-format msgid "%d minutes ago" msgstr "%d минут назад" -#: cola/cmds.py:376 +#: cola/cmds.py:377 #, python-format msgid "%d patch(es) applied." msgstr "%d патч(ей) применено." -#: cola/widgets/createbranch.py:281 +#: cola/widgets/createbranch.py:279 #, python-format msgid "%d skipped" msgstr "%d пропущенно" -#: cola/cmds.py:2580 +#: cola/cmds.py:2522 #, python-format msgid "" "%s appears to contain merge conflicts.\n" @@ -273,36 +303,36 @@ msgstr "" "Скорее всего вы должны пропустить этот файл.\n" "Зафиксировать в любом случае?" -#: cola/widgets/startup.py:263 +#: cola/widgets/startup.py:262 #, python-format msgid "%s could not be opened. Remove from bookmarks?" msgstr "" -#: cola/app.py:498 cola/widgets/bookmarks.py:482 +#: cola/app.py:501 cola/widgets/bookmarks.py:481 #, python-format msgid "%s is not a Git repository." msgstr "%s не является git репозиторием." -#: cola/cmds.py:1015 +#: cola/cmds.py:1016 #, python-format msgid "%s will be removed from your bookmarks." msgstr "%s будет удален из ваших закладок" -#: cola/cmds.py:1028 +#: cola/cmds.py:1029 #, python-format msgid "%s will be removed from your recent repositories." msgstr "%s будет удален из вашего последнего репозитория." -#: cola/cmds.py:1711 +#: cola/cmds.py:1663 #, python-format msgid "%s: No such file or directory." msgstr "%s: нет такого файла или каталога" -#: cola/widgets/main.py:734 +#: cola/widgets/main.py:747 msgid "&Edit" msgstr "Редактировать" -#: cola/widgets/main.py:676 +#: cola/widgets/main.py:689 msgid "&File" msgstr "Файл" @@ -310,43 +340,43 @@ msgstr "Файл" msgid "(Amending)" msgstr "(Отмена коммита)" -#: cola/widgets/compare.py:36 +#: cola/widgets/compare.py:35 msgid "*** Branch Point ***" msgstr "" -#: cola/widgets/compare.py:37 +#: cola/widgets/compare.py:36 msgid "*** Sandbox ***" msgstr "" -#: cola/widgets/diff.py:788 +#: cola/widgets/diff.py:816 msgid "100%" msgstr "" -#: cola/widgets/diff.py:789 +#: cola/widgets/diff.py:817 msgid "200%" msgstr "" -#: cola/widgets/diff.py:786 +#: cola/widgets/diff.py:814 msgid "25%" msgstr "" -#: cola/widgets/diff.py:790 +#: cola/widgets/diff.py:818 msgid "400%" msgstr "" -#: cola/widgets/diff.py:787 +#: cola/widgets/diff.py:815 msgid "50%" msgstr "" -#: cola/widgets/diff.py:791 +#: cola/widgets/diff.py:819 msgid "800%" msgstr "" -#: cola/widgets/finder.py:119 +#: cola/widgets/finder.py:118 msgid " ..." msgstr "" -#: cola/cmds.py:1734 +#: cola/cmds.py:1686 msgid "" "A commit template has not been configured.\n" "Use \"git config\" to define \"commit.template\"\n" @@ -356,81 +386,76 @@ msgstr "" "Используйте \"git config\" для определения \"commit.template\"\n" "так, чтобы он указывал на шаблон коммита." -#: cola/cmds.py:1784 +#: cola/cmds.py:1735 #, python-format msgid "A hook must be provided at \"%s\"" msgstr "" -#: cola/widgets/stash.py:236 -#, python-format -msgid "A stash named \"%s\" already exists" -msgstr "Заначка (stash) с именем '%s' уже существует." - -#: cola/widgets/cfgactions.py:82 cola/widgets/main.py:622 +#: cola/widgets/cfgactions.py:81 cola/widgets/main.py:635 msgid "Abort" msgstr "Отменить" -#: cola/widgets/cfgactions.py:149 cola/widgets/cfgactions.py:155 +#: cola/widgets/cfgactions.py:148 cola/widgets/cfgactions.py:154 msgid "Abort Action" msgstr "Отмена действия" -#: cola/cmds.py:132 +#: cola/cmds.py:131 msgid "Abort Applying Patch" msgstr "" -#: cola/cmds.py:126 +#: cola/cmds.py:125 msgid "Abort Applying Patch..." msgstr "" -#: cola/widgets/main.py:245 +#: cola/widgets/main.py:244 msgid "Abort Applying Patches..." msgstr "" -#: cola/cmds.py:162 +#: cola/cmds.py:161 msgid "Abort Cherry-Pick" msgstr "" -#: cola/cmds.py:156 cola/widgets/main.py:334 +#: cola/cmds.py:155 cola/widgets/main.py:329 msgid "Abort Cherry-Pick..." msgstr "" -#: cola/cmds.py:193 +#: cola/cmds.py:192 msgid "Abort Merge" msgstr "Прервать слияние" -#: cola/cmds.py:186 cola/widgets/main.py:368 +#: cola/cmds.py:185 cola/widgets/main.py:363 msgid "Abort Merge..." msgstr "Прервать слияние..." -#: cola/widgets/cfgactions.py:154 +#: cola/widgets/cfgactions.py:153 msgid "Abort the action?" msgstr "Отменить действие?" -#: cola/widgets/main.py:250 +#: cola/widgets/main.py:245 msgid "Abort the current \"git am\" patch session" msgstr "" -#: cola/cmds.py:159 +#: cola/cmds.py:158 msgid "" "Aborting a cherry-pick can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:129 +#: cola/cmds.py:128 msgid "" "Aborting a patch can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:127 +#: cola/cmds.py:126 msgid "Aborting applying the current patch?" msgstr "" -#: cola/cmds.py:157 +#: cola/cmds.py:156 msgid "Aborting the current cherry-pick?" msgstr "" -#: cola/cmds.py:189 +#: cola/cmds.py:188 msgid "" "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." @@ -438,23 +463,23 @@ msgstr "" "Прерывание объединения приведет к потере *ВСЕХ* незакомиченных изменений.\n" "Восстановить незакомиченные изменения будет невозможно." -#: cola/cmds.py:187 +#: cola/cmds.py:186 msgid "Aborting the current merge?" msgstr "Отменить текущее слияние?" -#: cola/widgets/about.py:91 cola/widgets/main.py:517 +#: cola/widgets/about.py:89 cola/widgets/main.py:530 msgid "About" msgstr "О программе" -#: cola/widgets/about.py:67 +#: cola/widgets/about.py:65 msgid "About git-cola" msgstr "О git-cola" -#: cola/widgets/bookmarks.py:217 cola/widgets/startup.py:340 +#: cola/widgets/bookmarks.py:216 cola/widgets/startup.py:339 msgid "Accept" msgstr "" -#: cola/sequenceeditor.py:159 +#: cola/sequenceeditor.py:157 #, fuzzy msgid "" "Accept changes and rebase\n" @@ -463,52 +488,52 @@ msgstr "" "Закоммитить подготовленные изменения\n" "Ctrl+Enter" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 #, fuzzy msgid "Action Name" msgstr "Настройки" -#: cola/sequenceeditor.py:528 cola/widgets/bookmarks.py:321 -#: cola/widgets/branch.py:217 cola/widgets/browse.py:374 -#: cola/widgets/commitmsg.py:99 cola/widgets/dag.py:315 -#: cola/widgets/filelist.py:110 cola/widgets/main.py:95 -#: cola/widgets/main.py:757 cola/widgets/startup.py:436 +#: cola/sequenceeditor.py:524 cola/widgets/bookmarks.py:320 +#: cola/widgets/branch.py:221 cola/widgets/browse.py:375 +#: cola/widgets/commitmsg.py:105 cola/widgets/dag.py:314 +#: cola/widgets/filelist.py:107 cola/widgets/main.py:93 +#: cola/widgets/main.py:770 cola/widgets/startup.py:435 msgid "Actions" msgstr "Действия" -#: cola/widgets/commitmsg.py:101 +#: cola/widgets/commitmsg.py:107 msgid "Actions..." msgstr "Действия..." -#: cola/widgets/bookmarks.py:71 cola/widgets/gitignore.py:64 -#: cola/widgets/patch.py:103 cola/widgets/patch.py:117 -#: cola/widgets/status.py:1381 +#: cola/widgets/bookmarks.py:70 cola/widgets/diff.py:1697 +#: cola/widgets/diff.py:1711 cola/widgets/gitignore.py:63 +#: cola/widgets/status.py:1382 msgid "Add" msgstr "Добавить" -#: cola/widgets/bookmarks.py:470 +#: cola/widgets/bookmarks.py:469 #, fuzzy msgid "Add Favorite" msgstr "Избранное" -#: cola/widgets/editremotes.py:374 +#: cola/widgets/editremotes.py:373 msgid "Add Remote" msgstr "Добавить внешний репозиторий" -#: cola/widgets/toolbar.py:315 +#: cola/widgets/toolbar.py:320 msgid "Add Separator" msgstr "" -#: cola/cmds.py:3030 cola/widgets/submodules.py:42 -#: cola/widgets/submodules.py:111 +#: cola/cmds.py:2976 cola/widgets/submodules.py:41 +#: cola/widgets/submodules.py:110 msgid "Add Submodule" msgstr "" -#: cola/cmds.py:3027 cola/widgets/main.py:381 +#: cola/cmds.py:2973 cola/widgets/main.py:376 msgid "Add Submodule..." msgstr "" -#: cola/widgets/editremotes.py:62 +#: cola/widgets/editremotes.py:61 msgid "" "Add and remove remote repositories using the \n" "Add(+) and Delete(-) buttons on the left-hand side.\n" @@ -522,99 +547,99 @@ msgstr "" "Можно переименовать репозиторий выбрав его из списка\n" "и нажав \"enter\", или с помощью двойного клика." -#: cola/widgets/editremotes.py:81 +#: cola/widgets/editremotes.py:80 msgid "Add new remote git repository" msgstr "Добавить внешний репозиторий" -#: cola/widgets/patch.py:103 +#: cola/widgets/diff.py:1697 msgid "Add patches (+)" msgstr "Добавить патчи (+)" -#: cola/widgets/editremotes.py:433 +#: cola/widgets/editremotes.py:431 msgid "Add remote" msgstr "Добавить внешний репозиторий" -#: cola/cmds.py:3028 +#: cola/cmds.py:2974 msgid "Add this submodule?" msgstr "" -#: cola/widgets/gitignore.py:54 +#: cola/widgets/gitignore.py:53 msgid "Add to .gitignore" msgstr "Добавить в .gitignore" -#: cola/widgets/status.py:286 +#: cola/widgets/status.py:287 #, fuzzy msgid "Add to Git Annex" msgstr "Добавить в .gitignore" -#: cola/widgets/status.py:290 +#: cola/widgets/status.py:291 msgid "Add to Git LFS" msgstr "" -#: cola/widgets/gitignore.py:28 +#: cola/widgets/gitignore.py:27 msgid "Add to exclusions" msgstr "" -#: cola/widgets/gitignore.py:55 +#: cola/widgets/gitignore.py:54 msgid "Add to local .git/info/exclude" msgstr "" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Additions" msgstr "Добавлено строк" -#: cola/widgets/archive.py:134 +#: cola/widgets/archive.py:132 msgid "Advanced" msgstr "Дополнительно" -#: cola/widgets/main.py:522 +#: cola/widgets/main.py:535 msgid "Against Commit... (Diff Mode)" msgstr "" -#: cola/models/browse.py:33 +#: cola/models/browse.py:32 msgid "Age" msgstr "Возраст" -#: cola/widgets/prefs.py:403 +#: cola/widgets/prefs.py:441 msgid "All Repositories" msgstr "Все репозитории" -#: cola/cmds.py:3110 +#: cola/cmds.py:3056 #, python-format msgid "" "All submodules will be updated using\n" "\"%s\"" msgstr "" -#: cola/widgets/remote.py:195 +#: cola/widgets/remote.py:199 msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care" msgstr "" -#: cola/widgets/merge.py:61 +#: cola/widgets/merge.py:59 msgid "Always create a merge commit when enabled, even when the merge is a fast-forward update" msgstr "Если эта опция активна, то даже при слиянии в режиме fast-forward update будет создан отдельный (merge) коммит" -#: cola/cmds.py:221 +#: cola/cmds.py:220 msgid "Amend" msgstr "Отмена коммита" -#: cola/widgets/commitmsg.py:463 +#: cola/widgets/commitmsg.py:471 msgid "Amend Commit" msgstr "Отменить коммит" -#: cola/widgets/commitmsg.py:110 cola/widgets/main.py:194 +#: cola/widgets/commitmsg.py:116 cola/widgets/main.py:193 msgid "Amend Last Commit" msgstr "Отменить последний коммит" -#: cola/widgets/commitmsg.py:462 +#: cola/widgets/commitmsg.py:470 msgid "Amend the published commit?" msgstr "Отменить опубликованный коммит?" -#: cola/widgets/main.py:1157 +#: cola/widgets/main.py:1170 msgid "Amending" msgstr "Отмена коммита" -#: cola/widgets/cfgactions.py:151 +#: cola/widgets/cfgactions.py:150 msgid "" "An action is still running.\n" "Terminating it could result in data loss." @@ -622,7 +647,7 @@ msgstr "" "Команда до сих пор выполняется.\n" "Отмена приведет к потере данных." -#: cola/cmds.py:2804 +#: cola/cmds.py:2750 msgid "" "An unsigned, lightweight tag will be created instead.\n" "Create an unsigned tag?" @@ -630,57 +655,57 @@ msgstr "" "Будет создан неподписанный, легкий тег.\n" "Создать неподписанный тег??" -#: cola/widgets/prefs.py:406 +#: cola/widgets/prefs.py:444 msgid "Appearance" msgstr "" -#: cola/widgets/diff.py:1230 +#: cola/widgets/diff.py:1304 msgid "Append Patch" msgstr "" -#: cola/widgets/diff.py:1299 +#: cola/widgets/diff.py:1373 msgid "Append Patch..." msgstr "" -#: cola/widgets/patch.py:112 cola/widgets/stash.py:48 cola/widgets/stash.py:107 -#: cola/widgets/toolbar.py:323 +#: cola/widgets/diff.py:1706 cola/widgets/stash.py:50 cola/widgets/stash.py:110 +#: cola/widgets/toolbar.py:328 msgid "Apply" msgstr "Применить" -#: cola/widgets/patch.py:75 +#: cola/widgets/diff.py:1669 msgid "Apply Patches" msgstr "Применить патчи" -#: cola/widgets/main.py:239 +#: cola/widgets/main.py:238 msgid "Apply Patches..." msgstr "Применить патчи..." -#: cola/widgets/stash.py:64 +#: cola/widgets/stash.py:66 #, fuzzy msgid "Apply and drop the selected stash (git stash pop)" msgstr "Применить выбранные заначки (stash)" -#: cola/widgets/stash.py:48 +#: cola/widgets/stash.py:50 msgid "Apply the selected stash" msgstr "Применить выбранные заначки (stash)" -#: cola/widgets/main.py:1167 +#: cola/widgets/main.py:1180 msgid "Applying Patch" msgstr "" -#: cola/widgets/cfgactions.py:207 +#: cola/widgets/cfgactions.py:205 msgid "Arguments" msgstr "Аргументы" -#: cola/qtutils.py:850 +#: cola/qtutils.py:887 msgid "Attach" msgstr "Прикрепить" -#: cola/models/browse.py:33 cola/models/browse.py:72 cola/widgets/dag.py:506 +#: cola/models/browse.py:32 cola/models/browse.py:71 cola/widgets/dag.py:572 msgid "Author" msgstr "Автор" -#: cola/widgets/about.py:93 +#: cola/widgets/about.py:91 #, fuzzy msgid "Authors" msgstr "Автор" @@ -689,46 +714,46 @@ msgstr "Автор" msgid "Auto" msgstr "" -#: cola/widgets/commitmsg.py:137 cola/widgets/prefs.py:259 +#: cola/widgets/commitmsg.py:143 cola/widgets/prefs.py:280 msgid "Auto-Wrap Lines" msgstr "Авто перенос строчек" -#: cola/widgets/prefs.py:184 +#: cola/widgets/prefs.py:206 msgid "Autocomplete Paths" msgstr "" -#: cola/widgets/prefs.py:176 +#: cola/widgets/prefs.py:198 msgid "Automatically Load Commit Message Template" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Basic Regexp" msgstr "Базовый синтаксис" -#: cola/widgets/prefs.py:255 +#: cola/widgets/prefs.py:276 #, fuzzy msgid "Blame Viewer" msgstr "Просмотр файла" -#: cola/widgets/browse.py:205 +#: cola/widgets/browse.py:206 #, fuzzy msgid "Blame selected paths" msgstr "Редактировать выбранный путь(и)" -#: cola/cmds.py:545 cola/widgets/status.py:282 +#: cola/cmds.py:546 cola/widgets/status.py:283 #, fuzzy msgid "Blame..." msgstr "Переименовать..." -#: cola/widgets/prefs.py:347 +#: cola/widgets/prefs.py:367 msgid "Bold on dark headers instead of italic" msgstr "" -#: cola/widgets/main.py:806 cola/widgets/submodules.py:119 +#: cola/widgets/main.py:819 cola/widgets/submodules.py:118 msgid "Branch" msgstr "Ветвь" -#: cola/widgets/remote.py:600 +#: cola/widgets/remote.py:635 #, python-format msgid "" "Branch \"%(branch)s\" does not exist in \"%(remote)s\".\n" @@ -737,85 +762,85 @@ msgstr "" "Ветвь \"%(branch)s\" не существует в \"%(remote)s\".\n" "Будет добавлена новая внешняя ветвь." -#: cola/widgets/createbranch.py:258 +#: cola/widgets/createbranch.py:256 #, python-format msgid "Branch \"%s\" already exists." msgstr "Ветвь \"%s\" уже существует." -#: cola/widgets/compare.py:44 +#: cola/widgets/compare.py:43 msgid "Branch Diff Viewer" msgstr "" -#: cola/widgets/createbranch.py:259 cola/widgets/createbranch.py:271 +#: cola/widgets/createbranch.py:257 cola/widgets/createbranch.py:269 msgid "Branch Exists" msgstr "Ветвь существует" -#: cola/widgets/createbranch.py:98 +#: cola/widgets/createbranch.py:96 msgid "Branch Name" msgstr "Название ветви" -#: cola/widgets/submodules.py:89 +#: cola/widgets/submodules.py:88 msgid "Branch name" msgstr "" -#: cola/widgets/browse.py:89 cola/widgets/main.py:1097 +#: cola/widgets/browse.py:89 cola/widgets/main.py:1110 #, python-format msgid "Branch: %s" msgstr "Ветвь: %s" -#: cola/widgets/branch.py:85 cola/widgets/main.py:131 +#: cola/widgets/branch.py:87 cola/widgets/main.py:129 #, fuzzy msgid "Branches" msgstr "Ветвь" -#: cola/widgets/main.py:538 +#: cola/widgets/main.py:551 msgid "Branches..." msgstr "Ветви..." -#: cola/widgets/about.py:414 cola/widgets/about.py:417 -#: cola/widgets/about.py:437 +#: cola/widgets/about.py:397 cola/widgets/about.py:400 +#: cola/widgets/about.py:420 msgid "Brazilian translation" msgstr "" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse" msgstr "Показать" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse Commits..." msgstr "Показать коммиты..." -#: cola/widgets/main.py:499 +#: cola/widgets/main.py:512 msgid "Browse Current Branch..." msgstr "Просмотреть текущую ветвь..." -#: cola/widgets/main.py:505 +#: cola/widgets/main.py:518 msgid "Browse Other Branch..." msgstr "Просмотреть другие ветви..." -#: cola/widgets/editremotes.py:437 cola/widgets/search.py:46 -#: cola/widgets/startup.py:65 cola/widgets/startup.py:285 +#: cola/widgets/editremotes.py:435 cola/widgets/search.py:45 +#: cola/widgets/startup.py:64 cola/widgets/startup.py:284 msgid "Browse..." msgstr "Показать..." -#: cola/widgets/main.py:89 +#: cola/widgets/main.py:87 msgid "Browser" msgstr "Просомтрщик" -#: cola/widgets/browse.py:589 +#: cola/widgets/browse.py:590 #, python-format msgid "Browsing %s" msgstr "Просмотр %s" -#: cola/widgets/commitmsg.py:118 +#: cola/widgets/commitmsg.py:124 msgid "Bypass Commit Hooks" msgstr "" -#: cola/sequenceeditor.py:175 cola/widgets/standard.py:991 +#: cola/sequenceeditor.py:173 cola/widgets/standard.py:1058 msgid "Cancel" msgstr "Отменить" -#: cola/sequenceeditor.py:176 +#: cola/sequenceeditor.py:174 #, fuzzy msgid "" "Cancel rebase\n" @@ -824,195 +849,207 @@ msgstr "" "Закоммитить подготовленные изменения\n" "Ctrl+Enter" -#: cola/cmds.py:254 +#: cola/cmds.py:253 msgid "Cannot Amend" msgstr "Нельзя отменить коммит" -#: cola/cmds.py:560 +#: cola/cmds.py:561 #, fuzzy, python-format msgid "Cannot exec \"%s\": please configure a blame viewer" msgstr "Не удалось запустить \"%s\": пожалуйста, настройте ваш редактор" -#: cola/cmds.py:3146 +#: cola/cmds.py:3092 #, python-format msgid "Cannot exec \"%s\": please configure a history browser" msgstr "Неполучилось выполнить \"%s\": пожалуйста, настройте просмотрщик истории" -#: cola/cmds.py:1583 +#: cola/cmds.py:1571 #, python-format msgid "Cannot exec \"%s\": please configure your editor" msgstr "Не удалось запустить \"%s\": пожалуйста, настройте ваш редактор" -#: cola/models/browse.py:336 +#: cola/models/browse.py:335 msgid "Changed Upstream" msgstr "" -#: cola/widgets/prefs.py:186 +#: cola/widgets/prefs.py:208 msgid "Check Published Commits when Amending" msgstr "" -#: cola/widgets/commitmsg.py:130 +#: cola/widgets/commitmsg.py:136 msgid "Check Spelling" msgstr "Проверить правописание" -#: cola/widgets/prefs.py:265 +#: cola/widgets/prefs.py:286 #, fuzzy msgid "Check spelling" msgstr "Проверить правописание" -#: cola/widgets/prefs.py:163 +#: cola/widgets/prefs.py:186 msgid "Check whether a commit has been published when amending" msgstr "" -#: cola/guicmds.py:62 cola/widgets/branch.py:222 +#: cola/guicmds.py:61 cola/widgets/branch.py:233 msgid "Checkout" msgstr "Перейти" -#: cola/widgets/createbranch.py:130 +#: cola/widgets/createbranch.py:128 msgid "Checkout After Creation" msgstr "После создания сделать текущей ветвью" -#: cola/guicmds.py:62 cola/widgets/dag.py:410 +#: cola/guicmds.py:61 cola/widgets/dag.py:409 msgid "Checkout Branch" msgstr "Перейти на ветвь" -#: cola/widgets/dag.py:414 +#: cola/widgets/dag.py:413 #, fuzzy msgid "Checkout Detached HEAD" msgstr "Перейти на ветвь" -#: cola/cmds.py:480 cola/cmds.py:518 +#: cola/cmds.py:481 cola/cmds.py:519 msgid "Checkout Files" msgstr "" -#: cola/widgets/branch.py:226 +#: cola/widgets/branch.py:237 #, fuzzy msgid "Checkout as new branch" msgstr "Перейти на ветвь" -#: cola/cmds.py:507 +#: cola/cmds.py:508 msgid "Checkout files from our branch (HEAD)" msgstr "" -#: cola/cmds.py:511 +#: cola/cmds.py:512 msgid "Checkout files from our branch?" msgstr "" -#: cola/cmds.py:469 +#: cola/cmds.py:470 msgid "Checkout files from their branch (MERGE_HEAD)" msgstr "" -#: cola/cmds.py:473 +#: cola/cmds.py:474 msgid "Checkout files from their branch?" msgstr "" -#: cola/widgets/main.py:576 +#: cola/widgets/main.py:589 msgid "Checkout..." msgstr "Перейти..." -#: cola/widgets/dag.py:387 cola/widgets/search.py:79 +#: cola/widgets/dag.py:386 cola/widgets/search.py:78 msgid "Cherry Pick" msgstr "" -#: cola/guicmds.py:73 +#: cola/guicmds.py:72 #, fuzzy msgid "Cherry-Pick Commit" msgstr "Cherry-Pick коммит" -#: cola/widgets/main.py:328 +#: cola/widgets/main.py:323 #, fuzzy msgid "Cherry-Pick..." msgstr "Перейти..." -#: cola/cmds.py:584 +#: cola/cmds.py:585 msgid "Cherry-pick failed" msgstr "" -#: cola/widgets/main.py:1161 +#: cola/widgets/main.py:1174 msgid "Cherry-picking" msgstr "" -#: cola/widgets/diff.py:1247 +#: cola/widgets/diff.py:1321 msgid "Choose Patch..." msgstr "" -#: cola/widgets/search.py:319 +#: cola/widgets/search.py:318 msgid "Choose Paths" msgstr "Выберите путь" -#: cola/widgets/grep.py:116 +#: cola/widgets/grep.py:114 msgid "Choose the \"git grep\" regular expression mode" msgstr "Выберите тип синтаксиса для \"git grep\"" -#: cola/widgets/bookmarks.py:229 cola/widgets/startup.py:352 +#: cola/widgets/bookmarks.py:228 cola/widgets/startup.py:351 #, fuzzy msgid "Clear Default Repository" msgstr "Текущий репозиторий" -#: cola/widgets/commitmsg.py:305 +#: cola/widgets/commitmsg.py:313 msgid "Clear commit message" msgstr "Очистить комментарий к коммиту" -#: cola/widgets/commitmsg.py:302 +#: cola/widgets/commitmsg.py:310 msgid "Clear commit message?" msgstr "Очистить комментарий к коммиту?" -#: cola/widgets/commitmsg.py:62 +#: cola/widgets/commitmsg.py:63 msgid "Clear..." msgstr "Очистить..." -#: cola/widgets/clone.py:126 +#: cola/widgets/clone.py:124 msgid "Clone" msgstr "Склонировать" -#: cola/widgets/clone.py:62 cola/widgets/clone.py:104 +#: cola/widgets/clone.py:61 cola/widgets/clone.py:102 msgid "Clone Repository" msgstr "Клонировать репозиторий" -#: cola/widgets/main.py:465 cola/widgets/startup.py:58 +#: cola/widgets/main.py:478 cola/widgets/startup.py:57 msgid "Clone..." msgstr "Клонировать..." -#: cola/widgets/clone.py:62 +#: cola/widgets/clone.py:61 #, python-format msgid "Cloning repository at %s" msgstr "Клонировать существующий репозиторий в %s" -#: cola/qtutils.py:757 cola/qtutils.py:807 cola/widgets/about.py:508 -#: cola/widgets/remote.py:328 cola/widgets/text.py:1094 +#: cola/qtutils.py:788 cola/qtutils.py:838 cola/widgets/about.py:491 +#: cola/widgets/remote.py:362 cola/widgets/text.py:1090 msgid "Close" msgstr "Закрыть" -#: cola/widgets/text.py:402 +#: cola/widgets/remote.py:222 +msgid "Close dialog when completed" +msgstr "" + +#: cola/widgets/remote.py:221 +msgid "Close on completion" +msgstr "" + +#: cola/widgets/text.py:399 msgid "Close the find bar" msgstr "" -#: cola/qtutils.py:623 +#: cola/qtutils.py:651 msgid "Close..." msgstr "Закрыть..." -#: cola/widgets/recent.py:71 +#: cola/widgets/recent.py:69 msgid "Collapse all" msgstr "Свернуть все" -#: cola/sequenceeditor.py:323 +#: cola/sequenceeditor.py:320 #, fuzzy msgid "Command" msgstr "Описание коммита" -#: cola/widgets/main.py:163 cola/widgets/merge.py:74 +#: cola/widgets/main.py:161 cola/widgets/merge.py:72 msgid "Commit" msgstr "Описание коммита" -#: cola/cmds.py:837 +#: cola/widgets/prefs.py:192 +msgid "Commit Message Cleanup" +msgstr "" + +#: cola/widgets/commitmsg.py:495 msgid "Commit failed" msgstr "Не удалось закоммитить" -#: cola/widgets/commitmsg.py:61 +#: cola/widgets/commitmsg.py:62 msgid "Commit staged changes" msgstr "Закоммитить подготовленные изменения" -#: cola/widgets/commitmsg.py:93 +#: cola/widgets/commitmsg.py:94 msgid "" "Commit staged changes\n" "Shortcut: Ctrl+Enter" @@ -1020,369 +1057,373 @@ msgstr "" "Закоммитить подготовленные изменения\n" "Ctrl+Enter" -#: cola/widgets/commitmsg.py:564 +#: cola/widgets/commitmsg.py:590 msgid "Commit summary" msgstr "Краткое описание коммита" -#: cola/widgets/main.py:259 +#: cola/widgets/main.py:253 msgid "Commit the current state and continue applying patches" msgstr "" -#: cola/widgets/merge.py:70 +#: cola/widgets/merge.py:68 msgid "Commit the merge if there are no conflicts. Uncheck to leave the merge uncommitted" msgstr "Закоммитить слияние, если нет конфликтов. Снимите отметку, чтобы оставить слияние незакомиченным" -#: cola/widgets/commitmsg.py:58 cola/widgets/commitmsg.py:95 -#: cola/widgets/main.py:778 cola/widgets/main.py:779 +#: cola/widgets/commitmsg.py:59 cola/widgets/commitmsg.py:96 +#: cola/widgets/main.py:791 cola/widgets/main.py:792 msgid "Commit@@verb" msgstr "" -#: cola/difftool.py:78 cola/widgets/compare.py:70 +#: cola/widgets/dag.py:487 +msgid "Commits authored by me" +msgstr "" + +#: cola/difftool.py:97 cola/widgets/compare.py:69 msgid "Compare" msgstr "Сравнить" -#: cola/difftool.py:83 +#: cola/difftool.py:102 #, fuzzy msgid "Compare All" msgstr "Сравнить" -#: cola/widgets/toolbar.py:269 cola/widgets/toolbar.py:306 +#: cola/widgets/toolbar.py:274 cola/widgets/toolbar.py:311 msgid "Configure Toolbar" msgstr "" -#: cola/widgets/remote.py:214 +#: cola/widgets/remote.py:218 msgid "Configure the remote branch as the the new upstream" msgstr "" -#: cola/widgets/main.py:170 +#: cola/widgets/main.py:168 msgid "Console" msgstr "Консоль" -#: cola/interaction.py:111 cola/widgets/main.py:610 +#: cola/interaction.py:109 cola/widgets/main.py:623 msgid "Continue" msgstr "Продолжить" -#: cola/widgets/main.py:255 +#: cola/widgets/main.py:252 msgid "Continue Applying Patches" msgstr "" -#: cola/widgets/bookmarks.py:248 cola/widgets/main.py:742 -#: cola/widgets/startup.py:371 +#: cola/widgets/bookmarks.py:247 cola/widgets/main.py:755 +#: cola/widgets/startup.py:370 msgid "Copy" msgstr "Копировать" -#: cola/widgets/status.py:268 +#: cola/widgets/status.py:269 #, fuzzy msgid "Copy Basename to Clipboard" msgstr "Копировать путь в буфер" -#: cola/widgets/diff.py:208 +#: cola/widgets/diff.py:209 msgid "Copy Diff" msgstr "" -#: cola/widgets/status.py:745 +#: cola/widgets/status.py:746 #, fuzzy msgid "Copy Leading Path to Clipboard" msgstr "Копировать относительный путь в буфер" -#: cola/widgets/status.py:251 +#: cola/widgets/status.py:252 msgid "Copy Path to Clipboard" msgstr "Копировать путь в буфер" -#: cola/widgets/status.py:259 +#: cola/widgets/status.py:260 msgid "Copy Relative Path to Clipboard" msgstr "Копировать относительный путь в буфер" -#: cola/sequenceeditor.py:334 cola/widgets/dag.py:474 +#: cola/sequenceeditor.py:330 cola/widgets/dag.py:473 msgid "Copy SHA-1" msgstr "Копировать SHA-1" -#: cola/widgets/status.py:737 +#: cola/widgets/status.py:738 #, fuzzy msgid "Copy..." msgstr "Копировать" -#: cola/app.py:490 +#: cola/app.py:493 #, python-format msgid "Could not open %s." msgstr "" -#: cola/widgets/clone.py:191 cola/widgets/clone.py:193 +#: cola/widgets/clone.py:189 cola/widgets/clone.py:191 #, python-format msgid "Could not parse Git URL: \"%s\"" msgstr "Неполучилось разобрать Git URL: \"%s\"" -#: cola/app.py:500 +#: cola/app.py:503 msgid "Create" msgstr "" -#: cola/widgets/createbranch.py:86 cola/widgets/createbranch.py:135 -#: cola/widgets/createbranch.py:301 cola/widgets/dag.py:369 +#: cola/widgets/createbranch.py:84 cola/widgets/createbranch.py:133 +#: cola/widgets/createbranch.py:299 cola/widgets/dag.py:368 msgid "Create Branch" msgstr "Создать ветвь" -#: cola/widgets/dag.py:373 +#: cola/widgets/dag.py:372 msgid "Create Patch" msgstr "Создать патч" -#: cola/widgets/remote.py:606 +#: cola/widgets/remote.py:641 msgid "Create Remote Branch" msgstr "Создать внешнюю ветвь" -#: cola/widgets/commitmsg.py:124 cola/widgets/merge.py:78 +#: cola/widgets/commitmsg.py:130 cola/widgets/merge.py:76 msgid "Create Signed Commit" msgstr "Создать подписанный коммит" -#: cola/widgets/createtag.py:55 cola/widgets/createtag.py:91 -#: cola/widgets/dag.py:377 +#: cola/widgets/createtag.py:53 cola/widgets/createtag.py:89 +#: cola/widgets/dag.py:376 msgid "Create Tag" msgstr "Создать тег" -#: cola/widgets/main.py:544 +#: cola/widgets/main.py:557 msgid "Create Tag..." msgstr "Создать тег..." -#: cola/cmds.py:2807 +#: cola/cmds.py:2753 msgid "Create Unsigned Tag" msgstr "Создать неподписанный тег" -#: cola/widgets/remote.py:188 +#: cola/widgets/remote.py:192 #, fuzzy msgid "Create a merge commit even when the merge resolves as a fast-forward" msgstr "Если эта опция активна, то даже при слиянии в режиме fast-forward update будет создан отдельный (merge) коммит" -#: cola/widgets/remote.py:605 +#: cola/widgets/remote.py:640 msgid "Create a new remote branch?" msgstr "Создать новую внешнюю ветвь?" -#: cola/app.py:499 +#: cola/app.py:502 msgid "Create a new repository at that location?" msgstr "" -#: cola/widgets/submodules.py:100 +#: cola/widgets/submodules.py:99 msgid "Create a shallow clone with history truncated to the specified number of revisions. 0 performs a full clone." msgstr "" -#: cola/widgets/main.py:551 +#: cola/widgets/main.py:564 msgid "Create..." msgstr "Создать..." -#: cola/cmds.py:2843 +#: cola/cmds.py:2789 #, python-format msgid "Created a new tag named \"%s\"" msgstr "Создан новый тег с именем \"%s\"" -#: cola/widgets/prefs.py:266 +#: cola/widgets/prefs.py:287 msgid "Ctrl+MouseWheel to Zoom" msgstr "" -#: cola/widgets/prefs.py:404 +#: cola/widgets/prefs.py:442 msgid "Current Repository" msgstr "Текущий репозиторий" -#: cola/widgets/status.py:1371 +#: cola/widgets/status.py:1372 msgid "Custom Copy Actions" msgstr "" -#: cola/widgets/status.py:273 +#: cola/widgets/status.py:274 #, fuzzy msgid "Customize..." msgstr "Закрыть..." -#: cola/widgets/main.py:740 +#: cola/widgets/main.py:753 msgid "Cut" msgstr "Вырезать" -#: cola/widgets/about.py:411 cola/widgets/about.py:442 +#: cola/widgets/about.py:394 cola/widgets/about.py:425 msgid "Czech translation" msgstr "" -#: cola/widgets/main.py:592 +#: cola/widgets/main.py:605 msgid "DAG..." msgstr "" -#: cola/icons.py:55 +#: cola/icons.py:54 msgid "Dark Theme" msgstr "" -#: cola/widgets/dag.py:506 +#: cola/widgets/dag.py:572 msgid "Date, Time" msgstr "Дата, Время" -#: cola/icons.py:54 cola/themes.py:637 +#: cola/icons.py:53 cola/themes.py:643 #, fuzzy msgid "Default" msgstr "Восстановить настройки по умолчанию" -#: cola/widgets/prefs.py:126 +#: cola/widgets/prefs.py:124 msgid "" "Default directory when exporting patches.\n" "Relative paths are relative to the current repository.\n" "Absolute path are used as-is." msgstr "" -#: cola/cmds.py:925 cola/guicmds.py:26 cola/guicmds.py:35 -#: cola/widgets/bookmarks.py:75 cola/widgets/bookmarks.py:251 -#: cola/widgets/main.py:746 cola/widgets/startup.py:373 +#: cola/cmds.py:923 cola/guicmds.py:25 cola/guicmds.py:34 +#: cola/widgets/bookmarks.py:74 cola/widgets/bookmarks.py:250 +#: cola/widgets/main.py:759 cola/widgets/startup.py:372 msgid "Delete" msgstr "Удалить" -#: cola/cmds.py:1088 +#: cola/cmds.py:1089 #, python-format msgid "Delete %d file(s)?" msgstr "Удалить %d файл(ы)?" -#: cola/cmds.py:1016 +#: cola/cmds.py:1017 msgid "Delete Bookmark" msgstr "Удалить закладку" -#: cola/cmds.py:1014 +#: cola/cmds.py:1015 msgid "Delete Bookmark?" msgstr "Удалить закладку?" -#: cola/cmds.py:1114 cola/cmds.py:1117 cola/guicmds.py:26 -#: cola/widgets/branch.py:268 +#: cola/cmds.py:1115 cola/cmds.py:1118 cola/guicmds.py:25 +#: cola/widgets/branch.py:277 msgid "Delete Branch" msgstr "Удалить ветвь" -#: cola/cmds.py:1089 +#: cola/cmds.py:1090 msgid "Delete Files" msgstr "Удалить файлы" -#: cola/widgets/status.py:311 +#: cola/widgets/status.py:312 msgid "Delete Files..." msgstr "Удалить файл(ы)..." -#: cola/cmds.py:1085 +#: cola/cmds.py:1086 msgid "Delete Files?" msgstr "Удалить файлы?" -#: cola/cmds.py:922 +#: cola/cmds.py:920 msgid "Delete Remote" msgstr "Удалить внешнюю ветвь" -#: cola/guicmds.py:35 cola/widgets/branch.py:270 +#: cola/guicmds.py:34 cola/widgets/branch.py:279 msgid "Delete Remote Branch" msgstr "Удалить внешнюю ветвь" -#: cola/widgets/main.py:564 +#: cola/widgets/main.py:577 msgid "Delete Remote Branch..." msgstr "Удалить внешнюю ветвь..." -#: cola/widgets/toolbar.py:271 +#: cola/widgets/toolbar.py:276 #, fuzzy msgid "Delete Toolbar" msgstr "Удалить закладку" -#: cola/cmds.py:1115 +#: cola/cmds.py:1116 #, python-format msgid "Delete branch \"%s\"?" msgstr "" -#: cola/widgets/editremotes.py:88 +#: cola/widgets/editremotes.py:87 msgid "Delete remote" msgstr "Удалить внешний репозиторий" -#: cola/cmds.py:924 +#: cola/cmds.py:922 #, python-format msgid "Delete remote \"%s\"" msgstr "Удалить внешнюю ветвь \"%s\"" -#: cola/cmds.py:923 +#: cola/cmds.py:921 msgid "Delete remote?" msgstr "Удалить внешнюю ветвь?" -#: cola/widgets/main.py:558 +#: cola/widgets/main.py:571 msgid "Delete..." msgstr "Удалить..." -#: cola/cmds.py:1067 +#: cola/cmds.py:1068 #, python-format msgid "Deleting \"%s\" failed" msgstr "Не удалось удалить \"%s\"" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Deletions" msgstr "Удалено строк" -#: cola/widgets/submodules.py:120 +#: cola/widgets/submodules.py:119 msgid "Depth" msgstr "" -#: cola/qtutils.py:811 cola/qtutils.py:852 +#: cola/qtutils.py:842 cola/qtutils.py:889 msgid "Detach" msgstr "Открепить" -#: cola/widgets/prefs.py:181 +#: cola/widgets/prefs.py:203 msgid "Detect Conflict Markers" msgstr "Обнаруживать отметки о конфликтах" -#: cola/widgets/prefs.py:151 +#: cola/widgets/prefs.py:174 msgid "Detect conflict markers in unmerged files" msgstr "Обнаруживать отметки о конфликтах в неслитых файлах" -#: cola/widgets/about.py:271 cola/widgets/about.py:274 -#: cola/widgets/about.py:277 cola/widgets/about.py:278 -#: cola/widgets/about.py:279 cola/widgets/about.py:280 -#: cola/widgets/about.py:281 cola/widgets/about.py:282 -#: cola/widgets/about.py:283 cola/widgets/about.py:284 -#: cola/widgets/about.py:285 cola/widgets/about.py:286 -#: cola/widgets/about.py:287 cola/widgets/about.py:288 -#: cola/widgets/about.py:289 cola/widgets/about.py:290 -#: cola/widgets/about.py:291 cola/widgets/about.py:292 -#: cola/widgets/about.py:293 cola/widgets/about.py:294 -#: cola/widgets/about.py:295 cola/widgets/about.py:296 -#: cola/widgets/about.py:297 cola/widgets/about.py:298 -#: cola/widgets/about.py:299 cola/widgets/about.py:300 -#: cola/widgets/about.py:301 cola/widgets/about.py:302 -#: cola/widgets/about.py:303 cola/widgets/about.py:304 -#: cola/widgets/about.py:305 cola/widgets/about.py:306 -#: cola/widgets/about.py:307 cola/widgets/about.py:308 -#: cola/widgets/about.py:309 cola/widgets/about.py:310 -#: cola/widgets/about.py:311 cola/widgets/about.py:312 -#: cola/widgets/about.py:313 cola/widgets/about.py:314 -#: cola/widgets/about.py:315 cola/widgets/about.py:316 -#: cola/widgets/about.py:317 cola/widgets/about.py:318 -#: cola/widgets/about.py:319 cola/widgets/about.py:320 -#: cola/widgets/about.py:321 cola/widgets/about.py:322 -#: cola/widgets/about.py:323 cola/widgets/about.py:324 -#: cola/widgets/about.py:325 cola/widgets/about.py:326 -#: cola/widgets/about.py:327 cola/widgets/about.py:328 -#: cola/widgets/about.py:329 cola/widgets/about.py:330 -#: cola/widgets/about.py:331 cola/widgets/about.py:332 -#: cola/widgets/about.py:333 cola/widgets/about.py:334 -#: cola/widgets/about.py:335 cola/widgets/about.py:336 -#: cola/widgets/about.py:337 cola/widgets/about.py:338 -#: cola/widgets/about.py:339 cola/widgets/about.py:340 -#: cola/widgets/about.py:341 cola/widgets/about.py:342 -#: cola/widgets/about.py:343 cola/widgets/about.py:344 -#: cola/widgets/about.py:345 cola/widgets/about.py:346 -#: cola/widgets/about.py:347 cola/widgets/about.py:348 -#: cola/widgets/about.py:349 cola/widgets/about.py:350 -#: cola/widgets/about.py:351 cola/widgets/about.py:352 -#: cola/widgets/about.py:353 cola/widgets/about.py:354 -#: cola/widgets/about.py:355 cola/widgets/about.py:356 -#: cola/widgets/about.py:357 cola/widgets/about.py:358 -#: cola/widgets/about.py:359 cola/widgets/about.py:360 -#: cola/widgets/about.py:361 cola/widgets/about.py:362 -#: cola/widgets/about.py:363 cola/widgets/about.py:364 -#: cola/widgets/about.py:365 cola/widgets/about.py:366 -#: cola/widgets/about.py:367 cola/widgets/about.py:368 -#: cola/widgets/about.py:369 cola/widgets/about.py:370 -#: cola/widgets/about.py:371 cola/widgets/about.py:372 -#: cola/widgets/about.py:373 cola/widgets/about.py:374 -#: cola/widgets/about.py:375 cola/widgets/about.py:376 -#: cola/widgets/about.py:377 cola/widgets/about.py:378 -#: cola/widgets/about.py:379 cola/widgets/about.py:380 +#: cola/widgets/about.py:254 cola/widgets/about.py:257 +#: cola/widgets/about.py:260 cola/widgets/about.py:261 +#: cola/widgets/about.py:262 cola/widgets/about.py:263 +#: cola/widgets/about.py:264 cola/widgets/about.py:265 +#: cola/widgets/about.py:266 cola/widgets/about.py:267 +#: cola/widgets/about.py:268 cola/widgets/about.py:269 +#: cola/widgets/about.py:270 cola/widgets/about.py:271 +#: cola/widgets/about.py:272 cola/widgets/about.py:273 +#: cola/widgets/about.py:274 cola/widgets/about.py:275 +#: cola/widgets/about.py:276 cola/widgets/about.py:277 +#: cola/widgets/about.py:278 cola/widgets/about.py:279 +#: cola/widgets/about.py:280 cola/widgets/about.py:281 +#: cola/widgets/about.py:282 cola/widgets/about.py:283 +#: cola/widgets/about.py:284 cola/widgets/about.py:285 +#: cola/widgets/about.py:286 cola/widgets/about.py:287 +#: cola/widgets/about.py:288 cola/widgets/about.py:289 +#: cola/widgets/about.py:290 cola/widgets/about.py:291 +#: cola/widgets/about.py:292 cola/widgets/about.py:293 +#: cola/widgets/about.py:294 cola/widgets/about.py:295 +#: cola/widgets/about.py:296 cola/widgets/about.py:297 +#: cola/widgets/about.py:298 cola/widgets/about.py:299 +#: cola/widgets/about.py:300 cola/widgets/about.py:301 +#: cola/widgets/about.py:302 cola/widgets/about.py:303 +#: cola/widgets/about.py:304 cola/widgets/about.py:305 +#: cola/widgets/about.py:306 cola/widgets/about.py:307 +#: cola/widgets/about.py:308 cola/widgets/about.py:309 +#: cola/widgets/about.py:310 cola/widgets/about.py:311 +#: cola/widgets/about.py:312 cola/widgets/about.py:313 +#: cola/widgets/about.py:314 cola/widgets/about.py:315 +#: cola/widgets/about.py:316 cola/widgets/about.py:317 +#: cola/widgets/about.py:318 cola/widgets/about.py:319 +#: cola/widgets/about.py:320 cola/widgets/about.py:321 +#: cola/widgets/about.py:322 cola/widgets/about.py:323 +#: cola/widgets/about.py:324 cola/widgets/about.py:325 +#: cola/widgets/about.py:326 cola/widgets/about.py:327 +#: cola/widgets/about.py:328 cola/widgets/about.py:329 +#: cola/widgets/about.py:330 cola/widgets/about.py:331 +#: cola/widgets/about.py:332 cola/widgets/about.py:333 +#: cola/widgets/about.py:334 cola/widgets/about.py:335 +#: cola/widgets/about.py:336 cola/widgets/about.py:337 +#: cola/widgets/about.py:338 cola/widgets/about.py:339 +#: cola/widgets/about.py:340 cola/widgets/about.py:341 +#: cola/widgets/about.py:342 cola/widgets/about.py:343 +#: cola/widgets/about.py:344 cola/widgets/about.py:345 +#: cola/widgets/about.py:346 cola/widgets/about.py:347 +#: cola/widgets/about.py:348 cola/widgets/about.py:349 +#: cola/widgets/about.py:350 cola/widgets/about.py:351 +#: cola/widgets/about.py:352 cola/widgets/about.py:353 +#: cola/widgets/about.py:354 cola/widgets/about.py:355 +#: cola/widgets/about.py:356 cola/widgets/about.py:357 +#: cola/widgets/about.py:358 cola/widgets/about.py:359 +#: cola/widgets/about.py:360 cola/widgets/about.py:361 +#: cola/widgets/about.py:362 cola/widgets/about.py:363 msgid "Developer" msgstr "" -#: cola/guicmds.py:185 cola/widgets/dag.py:764 cola/widgets/diff.py:781 -#: cola/widgets/main.py:177 cola/widgets/main.py:797 +#: cola/guicmds.py:184 cola/widgets/dag.py:830 cola/widgets/diff.py:809 +#: cola/widgets/main.py:175 cola/widgets/main.py:810 msgid "Diff" msgstr "Сравнение" -#: cola/guicmds.py:185 +#: cola/guicmds.py:184 msgid "Diff Against Commit" msgstr "" @@ -1390,36 +1431,36 @@ msgstr "" msgid "Diff Against Predecessor..." msgstr "" -#: cola/widgets/main.py:1159 +#: cola/widgets/main.py:1172 msgid "Diff Mode" msgstr "" -#: cola/widgets/diff.py:772 cola/widgets/diff.py:796 +#: cola/widgets/diff.py:800 cola/widgets/diff.py:824 msgid "Diff Options" msgstr "Настройки сравнения" -#: cola/widgets/prefs.py:256 +#: cola/widgets/prefs.py:277 msgid "Diff Tool" msgstr "Программа сравнения" -#: cola/widgets/dag.py:364 +#: cola/widgets/dag.py:363 msgid "Diff selected -> this" msgstr "Сравнить выделенное состояние с текущим" -#: cola/widgets/dag.py:358 +#: cola/widgets/dag.py:357 msgid "Diff this -> selected" msgstr "Сравнить текущее состояние с выделенным" -#: cola/widgets/main.py:218 +#: cola/widgets/main.py:217 msgid "Diffstat" msgstr "Список различий" -#: cola/cmds.py:3262 +#: cola/difftool.py:324 #, fuzzy msgid "Difftool" msgstr "Программа сравнения" -#: cola/widgets/clone.py:207 +#: cola/widgets/clone.py:205 msgid "Directory Exists" msgstr "Каталог существует" @@ -1427,85 +1468,89 @@ msgstr "Каталог существует" msgid "Disable" msgstr "" -#: cola/widgets/prefs.py:180 +#: cola/widgets/prefs.py:202 msgid "Display Untracked Files" msgstr "Показывать не добавленные в контроль версий файлы" -#: cola/cmds.py:2094 +#: cola/widgets/remote.py:176 +msgid "Display remote messages in a separate dialog" +msgstr "" + +#: cola/cmds.py:2045 msgid "Do not update stacked branches" msgstr "" -#: cola/widgets/main.py:471 +#: cola/widgets/main.py:484 msgid "Documentation" msgstr "Документация" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop" msgstr "Удалить" -#: cola/widgets/stash.py:258 +#: cola/widgets/stash.py:276 msgid "Drop Stash" msgstr "Удалить заначку (stash)" -#: cola/widgets/stash.py:255 +#: cola/widgets/stash.py:273 msgid "Drop Stash?" msgstr "Удалить заначку (stash)?" -#: cola/widgets/stash.py:257 +#: cola/widgets/stash.py:275 #, python-format msgid "Drop the \"%s\" stash?" msgstr "Удалить заначку (stash) \"%s\"" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop the selected stash" msgstr "Удалить выбранную заначку (stash)" -#: cola/qtutils.py:764 cola/sequenceeditor.py:357 cola/widgets/grep.py:102 +#: cola/qtutils.py:795 cola/sequenceeditor.py:353 cola/widgets/grep.py:100 #, fuzzy msgid "Edit" msgstr "Редактировать" -#: cola/widgets/diff.py:1019 +#: cola/widgets/diff.py:1058 msgid "Edit Diff Hunk to Revert..." msgstr "" -#: cola/widgets/diff.py:1017 +#: cola/widgets/diff.py:1056 msgid "Edit Diff Hunk to Stage..." msgstr "" -#: cola/widgets/diff.py:1062 +#: cola/widgets/diff.py:1124 msgid "Edit Diff Hunk to Unstage..." msgstr "" -#: cola/cmds.py:2166 +#: cola/cmds.py:2117 msgid "Edit Rebase" msgstr "Редактировать перемещение (rebase)" -#: cola/widgets/editremotes.py:36 +#: cola/widgets/editremotes.py:35 msgid "Edit Remotes" msgstr "Редактировать внешние репозитории" -#: cola/widgets/main.py:298 +#: cola/widgets/main.py:293 msgid "Edit Remotes..." msgstr "Редактировать внешние репозитории..." -#: cola/widgets/diff.py:1014 +#: cola/widgets/diff.py:1053 msgid "Edit Selected Lines to Revert..." msgstr "" -#: cola/widgets/diff.py:1012 +#: cola/widgets/diff.py:1051 msgid "Edit Selected Lines to Stage..." msgstr "" -#: cola/widgets/diff.py:1059 +#: cola/widgets/diff.py:1122 msgid "Edit Selected Lines to Unstage..." msgstr "" -#: cola/widgets/editremotes.py:44 +#: cola/widgets/editremotes.py:43 msgid "Edit remotes by selecting them from the list" msgstr "" -#: cola/widgets/browse.py:197 cola/widgets/common.py:39 +#: cola/widgets/browse.py:198 cola/widgets/common.py:38 msgid "Edit selected paths" msgstr "Редактировать выбранный путь(и)" @@ -1521,11 +1566,11 @@ msgstr "" msgid "Edit the following patch, which will then be applied to the worktree to revert the changes:" msgstr "" -#: cola/widgets/main.py:604 +#: cola/widgets/main.py:617 msgid "Edit..." msgstr "Редактировать..." -#: cola/widgets/prefs.py:253 +#: cola/widgets/prefs.py:274 msgid "Editor" msgstr "Редактор" @@ -1534,159 +1579,164 @@ msgstr "Редактор" msgid "Editor returned %s exit code. Not applying patch." msgstr "" -#: cola/widgets/prefs.py:167 +#: cola/widgets/prefs.py:190 msgid "Email Address" msgstr "Адрес электронной почты" -#: cola/widgets/about.py:258 cola/widgets/about.py:401 +#: cola/widgets/about.py:241 cola/widgets/about.py:384 msgid "Email contributor" msgstr "" -#: cola/widgets/prefs.py:182 +#: cola/widgets/prefs.py:204 msgid "Enable Gravatar Icons" msgstr "" -#: cola/widgets/prefs.py:160 +#: cola/widgets/prefs.py:183 msgid "Enable path autocompletion in tools" msgstr "" -#: cola/widgets/diff.py:768 +#: cola/widgets/diff.py:796 msgid "Enable word wrapping" msgstr "" -#: cola/sequenceeditor.py:322 +#: cola/sequenceeditor.py:319 msgid "Enabled" msgstr "" -#: cola/guicmds.py:333 cola/widgets/branch.py:445 +#: cola/guicmds.py:332 cola/widgets/branch.py:478 #, fuzzy msgid "Enter New Branch Name" msgstr "Введите новое имя ветви" -#: cola/guicmds.py:147 +#: cola/guicmds.py:146 #, fuzzy msgid "Enter a name for the new bare repo" msgstr "Введите имя для заначки (stash)" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Enter a name for the stash" msgstr "Введите имя для заначки (stash)" -#: cola/cmds.py:146 cola/cmds.py:176 cola/cmds.py:207 cola/cmds.py:283 -#: cola/cmds.py:292 cola/cmds.py:307 cola/cmds.py:317 cola/cmds.py:460 -#: cola/cmds.py:496 cola/cmds.py:534 cola/cmds.py:633 cola/cmds.py:751 -#: cola/cmds.py:1067 cola/cmds.py:1164 cola/cmds.py:2005 cola/cmds.py:2394 -#: cola/cmds.py:2637 cola/cmds.py:2643 cola/cmds.py:2651 cola/cmds.py:2872 -#: cola/cmds.py:2890 cola/cmds.py:3180 cola/gitcmds.py:984 cola/guicmds.py:157 -#: cola/models/stash.py:70 cola/models/stash.py:87 cola/models/stash.py:108 -#: cola/widgets/bookmarks.py:482 cola/widgets/branch.py:777 +#: cola/widgets/stash.py:216 +msgid "Enter a new name for the stash" +msgstr "" + +#: cola/cmds.py:145 cola/cmds.py:175 cola/cmds.py:206 cola/cmds.py:284 +#: cola/cmds.py:293 cola/cmds.py:308 cola/cmds.py:318 cola/cmds.py:461 +#: cola/cmds.py:497 cola/cmds.py:535 cola/cmds.py:635 cola/cmds.py:753 +#: cola/cmds.py:1068 cola/cmds.py:1165 cola/cmds.py:1956 cola/cmds.py:2345 +#: cola/cmds.py:2579 cola/cmds.py:2585 cola/cmds.py:2593 cola/cmds.py:2818 +#: cola/cmds.py:2836 cola/cmds.py:3125 cola/gitcmds.py:994 cola/guicmds.py:156 +#: cola/models/stash.py:70 cola/models/stash.py:90 cola/models/stash.py:112 +#: cola/models/stash.py:138 cola/widgets/bookmarks.py:481 +#: cola/widgets/branch.py:829 msgid "Error" msgstr "Ошибка" -#: cola/widgets/clone.py:191 +#: cola/widgets/clone.py:189 msgid "Error Cloning" msgstr "Ошибка клонирования" -#: cola/widgets/createbranch.py:314 +#: cola/widgets/createbranch.py:312 msgid "Error Creating Branch" msgstr "При создании ветви возникла ошибка" -#: cola/app.py:502 cola/guicmds.py:101 +#: cola/app.py:505 cola/guicmds.py:100 msgid "Error Creating Repository" msgstr "Не удалось создать репозиторий" -#: cola/cmds.py:1202 +#: cola/cmds.py:1206 msgid "Error Deleting Remote Branch" msgstr "Не удалось удалить внешную ветвь" -#: cola/cmds.py:1585 +#: cola/cmds.py:1573 msgid "Error Editing File" msgstr "Ошибка редактирования файла" -#: cola/cmds.py:559 +#: cola/cmds.py:560 #, fuzzy msgid "Error Launching Blame Viewer" msgstr "Ошибка запуска Просмотрщика истории" -#: cola/cmds.py:3145 +#: cola/cmds.py:3091 msgid "Error Launching History Browser" msgstr "Ошибка запуска Просмотрщика истории" -#: cola/app.py:489 +#: cola/app.py:492 msgid "Error Opening Repository" msgstr "" -#: cola/widgets/browse.py:566 +#: cola/models/stash.py:144 +msgid "Error Renaming Stash" +msgstr "" + +#: cola/widgets/browse.py:567 msgid "Error Saving File" msgstr "" -#: cola/cmds.py:914 +#: cola/cmds.py:912 #, python-format msgid "Error creating remote \"%s\"" msgstr "Не удалось создать внешную ветвь \"%s\"" -#: cola/models/stash.py:197 +#: cola/models/stash.py:233 #, fuzzy msgid "Error creating stash" msgstr "При создании ветви возникла ошибка" -#: cola/cmds.py:1126 +#: cola/cmds.py:1127 #, python-format msgid "Error deleting branch \"%s\"" msgstr "" -#: cola/cmds.py:932 +#: cola/cmds.py:930 #, python-format msgid "Error deleting remote \"%s\"" msgstr "Не удалось удалить внешнюю ветвь \"%s\"" -#: cola/cmds.py:956 +#: cola/cmds.py:955 #, fuzzy, python-format msgid "Error renaming \"%(name)s\" to \"%(new_name)s\"" msgstr "Добавить тег \"%(revision)s\" к \"%(name)s\"" -#: cola/cmds.py:1771 +#: cola/cmds.py:1722 #, fuzzy msgid "Error running prepare-commitmsg hook" msgstr "Вызов программы поддержки репозитория pre-commit..." -#: cola/cmds.py:3043 cola/cmds.py:3089 +#: cola/cmds.py:2989 cola/cmds.py:3035 #, fuzzy, python-format msgid "Error updating submodule %s" msgstr "Не удалось создать внешную ветвь \"%s\"" -#: cola/cmds.py:3125 +#: cola/cmds.py:3071 #, fuzzy msgid "Error updating submodules" msgstr "Ошибка редактирования файла" -#: cola/widgets/diff.py:1326 +#: cola/widgets/diff.py:1400 msgid "Error writing patch" msgstr "" -#: cola/cmds.py:1710 +#: cola/cmds.py:1662 msgid "Error: Cannot find commit template" msgstr "Ошибка: Не получается найти шаблон коммита" -#: cola/widgets/stash.py:235 -msgid "Error: Stash exists" -msgstr "Ошибка: заначка (stash) уже существует" - -#: cola/cmds.py:1732 +#: cola/cmds.py:1684 msgid "Error: Unconfigured commit template" msgstr "Ошибка: шаблон коммита не настроен" -#: cola/widgets/clone.py:53 +#: cola/widgets/clone.py:52 #, python-format msgid "Error: could not clone \"%s\"" msgstr "Ошибка: не получилось клонировать \"%s\"" -#: cola/cmds.py:2835 +#: cola/cmds.py:2781 #, python-format msgid "Error: could not create tag \"%s\"" msgstr "Ошибка: не получилось создать тег \"%s\"" -#: cola/widgets/branch.py:421 +#: cola/widgets/branch.py:433 #, fuzzy, python-format msgid "Executing action %s" msgstr "Словарь вернут к %s." @@ -1695,416 +1745,428 @@ msgstr "Словарь вернут к %s." msgid "Exit \"Diff\" mode" msgstr "" -#: cola/widgets/action.py:67 +#: cola/widgets/action.py:81 msgid "Exit Diff" msgstr "" -#: cola/widgets/main.py:528 +#: cola/widgets/main.py:541 msgid "Exit Diff Mode" msgstr "" -#: cola/widgets/action.py:68 +#: cola/widgets/action.py:81 msgid "Exit Diff mode" msgstr "" -#: cola/widgets/recent.py:67 +#: cola/widgets/recent.py:65 msgid "Expand all" msgstr "Развернуть все" -#: cola/widgets/diff.py:1223 +#: cola/widgets/diff.py:1297 msgid "Export Patch" msgstr "" -#: cola/guicmds.py:168 cola/widgets/search.py:75 +#: cola/guicmds.py:167 cola/widgets/search.py:74 msgid "Export Patches" msgstr "Экспортировать патчи" -#: cola/widgets/main.py:273 +#: cola/widgets/main.py:268 msgid "Export Patches..." msgstr "Экспортировать патчи..." -#: cola/widgets/main.py:533 +#: cola/widgets/main.py:546 msgid "Expression..." msgstr "Выражения..." -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Extended Regexp" msgstr "Расширенный синтаксис" -#: cola/widgets/commitmsg.py:612 +#: cola/widgets/commitmsg.py:638 msgid "Extended description..." msgstr "Расширенное описание..." -#: cola/cmds.py:387 +#: cola/cmds.py:388 msgid "Failed to commit and continue applying patches" msgstr "" -#: cola/cmds.py:403 +#: cola/cmds.py:404 msgid "Failed to continue applying patches after skipping the current patch" msgstr "" -#: cola/widgets/createbranch.py:124 +#: cola/widgets/createbranch.py:122 msgid "Fast Forward Only" msgstr "Только Fast Forward" -#: cola/widgets/remote.py:177 +#: cola/widgets/remote.py:181 #, fuzzy msgid "Fast-forward only" msgstr "Только Fast Forward" -#: cola/widgets/bookmarks.py:91 +#: cola/widgets/bookmarks.py:90 msgid "Favorite repositories" msgstr "Избранные репозитории" -#: cola/widgets/main.py:111 +#: cola/widgets/main.py:109 msgid "Favorites" msgstr "Избранное" -#: cola/widgets/remote.py:673 +#: cola/widgets/remote.py:735 msgid "Fetch" msgstr "Получить все (fetch)" -#: cola/widgets/createbranch.py:127 +#: cola/widgets/createbranch.py:125 msgid "Fetch Tracking Branch" msgstr "Получить отслеживаемую ветвь" -#: cola/widgets/action.py:63 cola/widgets/main.py:387 +#: cola/widgets/action.py:67 cola/widgets/main.py:384 +msgid "Fetch from one or more remotes using \"git fetch\"" +msgstr "" + +#: cola/widgets/action.py:65 cola/widgets/main.py:383 msgid "Fetch..." msgstr "Скачать все ветки (fetch)..." -#: cola/widgets/main.py:588 +#: cola/widgets/main.py:601 msgid "File Browser..." msgstr "Файловый менеджер..." -#: cola/widgets/compare.py:75 +#: cola/widgets/compare.py:74 msgid "File Differences" msgstr "Сравнение файлов" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 msgid "File Saved" msgstr "Файл сохранен" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 #, python-format msgid "File saved to \"%s\"" msgstr "Файл сохранен в \"%s\"" -#: cola/fsmonitor.py:517 +#: cola/fsmonitor.py:528 #, fuzzy msgid "File system change monitoring: disabled because \"cola.inotify\" is false.\n" msgstr "inotify отключены, потому что \"cola.inotify\" имеет значение \"false\"\n" -#: cola/fsmonitor.py:534 +#: cola/fsmonitor.py:545 msgid "File system change monitoring: disabled because libc does not support the inotify system calls.\n" msgstr "" -#: cola/fsmonitor.py:528 +#: cola/fsmonitor.py:539 msgid "File system change monitoring: disabled because pywin32 is not installed.\n" msgstr "" -#: cola/fsmonitor.py:181 +#: cola/fsmonitor.py:184 msgid "" "File system change monitoring: disabled because the limit on the total number of inotify watches was reached. You may be able to increase the limit on the number of watches by running:\n" "\n" " echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n" msgstr "" -#: cola/fsmonitor.py:142 +#: cola/fsmonitor.py:145 msgid "File system change monitoring: enabled.\n" msgstr "" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Filename" msgstr "Имя файла" -#: cola/widgets/dag.py:755 +#: cola/widgets/dag.py:821 msgid "Files" msgstr "Файлы" -#: cola/widgets/branch.py:785 +#: cola/widgets/branch.py:837 #, fuzzy msgid "Filter branches..." msgstr "Фильтр путей..." -#: cola/widgets/status.py:1333 +#: cola/widgets/status.py:1334 msgid "Filter paths..." msgstr "Фильтр путей..." -#: cola/widgets/finder.py:113 cola/widgets/main.py:312 +#: cola/widgets/finder.py:112 cola/widgets/main.py:307 msgid "Find Files" msgstr "Поиск файлов" -#: cola/widgets/text.py:388 +#: cola/widgets/text.py:385 msgid "Find in diff" msgstr "" -#: cola/widgets/text.py:425 +#: cola/widgets/text.py:422 msgid "Find next item" msgstr "" -#: cola/widgets/text.py:431 +#: cola/widgets/text.py:428 msgid "Find previous item" msgstr "" -#: cola/widgets/text.py:395 +#: cola/widgets/text.py:392 msgid "Find the next occurrence of the phrase" msgstr "" -#: cola/widgets/text.py:391 +#: cola/widgets/text.py:388 msgid "Find the previous occurrence of the phrase" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Fixed String" msgstr "Фиксированная строка" -#: cola/widgets/prefs.py:251 +#: cola/widgets/prefs.py:270 msgid "Fixed-Width Font" msgstr "Шрифт с фиксированной шириной" -#: cola/sequenceeditor.py:362 +#: cola/sequenceeditor.py:358 msgid "Fixup" msgstr "" -#: cola/widgets/commitmsg.py:148 +#: cola/widgets/commitmsg.py:154 msgid "Fixup Previous Commit" msgstr "Исправить предыдущий коммит" -#: cola/themes.py:672 +#: cola/themes.py:684 msgid "Flat dark blue" msgstr "" -#: cola/themes.py:693 +#: cola/themes.py:705 msgid "Flat dark green" msgstr "" -#: cola/themes.py:686 +#: cola/themes.py:698 msgid "Flat dark grey" msgstr "" -#: cola/themes.py:679 +#: cola/themes.py:691 msgid "Flat dark red" msgstr "" -#: cola/themes.py:644 +#: cola/themes.py:656 msgid "Flat light blue" msgstr "" -#: cola/themes.py:665 +#: cola/themes.py:677 msgid "Flat light green" msgstr "" -#: cola/themes.py:658 +#: cola/themes.py:670 msgid "Flat light grey" msgstr "" -#: cola/themes.py:651 +#: cola/themes.py:663 msgid "Flat light red" msgstr "" -#: cola/widgets/startup.py:73 +#: cola/widgets/startup.py:72 msgid "Folder" msgstr "" -#: cola/widgets/toolbar.py:177 +#: cola/widgets/toolbar.py:181 msgid "Follow System Style" msgstr "" -#: cola/widgets/prefs.py:252 +#: cola/widgets/prefs.py:271 msgid "Font Size" msgstr "Размер шрифта" -#: cola/widgets/remote.py:193 +#: cola/widgets/remote.py:197 #, fuzzy msgid "Force" msgstr "Перезаписать все (push)" -#: cola/widgets/remote.py:617 +#: cola/widgets/remote.py:652 msgid "Force Fetch" msgstr "Перезаписать все (fetch)" -#: cola/widgets/remote.py:614 +#: cola/widgets/remote.py:649 msgid "Force Fetch?" msgstr "Перезаписать все (fetch)?" -#: cola/widgets/remote.py:625 +#: cola/widgets/remote.py:660 msgid "Force Push" msgstr "Перезаписать все (push)" -#: cola/widgets/remote.py:619 +#: cola/widgets/remote.py:654 msgid "Force Push?" msgstr "Перезаписать все (push)?" -#: cola/widgets/remote.py:616 +#: cola/widgets/remote.py:651 #, python-format msgid "Force fetching from %s?" msgstr "Перезаписать (fetch) все из %s " -#: cola/widgets/remote.py:624 +#: cola/widgets/remote.py:659 #, python-format msgid "Force push to %s?" msgstr "Перезаписать все (push) в %s?" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 #, fuzzy msgid "Format String" msgstr "Фиксированная строка" -#: cola/widgets/about.py:430 cola/widgets/about.py:431 +#: cola/widgets/about.py:413 cola/widgets/about.py:414 msgid "French translation" msgstr "" -#: cola/widgets/merge.py:80 +#: cola/widgets/merge.py:78 msgid "GPG-sign the merge commit" msgstr "" -#: cola/widgets/prefs.py:344 +#: cola/widgets/prefs.py:364 msgid "GUI theme" msgstr "" -#: cola/widgets/editremotes.py:318 +#: cola/widgets/editremotes.py:317 #, python-format msgid "Gathering info for \"%s\"..." msgstr "Получение информации о \"%s\"..." -#: cola/widgets/about.py:420 cola/widgets/about.py:428 -#: cola/widgets/about.py:429 +#: cola/widgets/about.py:403 cola/widgets/about.py:411 +#: cola/widgets/about.py:412 msgid "German translation" msgstr "" -#: cola/widgets/main.py:511 +#: cola/widgets/main.py:524 msgid "Get Commit Message Template" msgstr "Получить шаблон комментария к коммиту" -#: cola/widgets/dag.py:520 +#: cola/widgets/dag.py:586 msgid "Go Down" msgstr "Вниз" -#: cola/widgets/dag.py:516 +#: cola/widgets/dag.py:582 msgid "Go Up" msgstr "Вверх" -#: cola/widgets/dag.py:467 cola/widgets/filelist.py:42 +#: cola/widgets/dag.py:466 cola/widgets/filelist.py:39 msgid "Grab File..." msgstr "Захватить файл..." -#: cola/widgets/dag.py:782 +#: cola/widgets/dag.py:848 msgid "Graph" msgstr "График" -#: cola/widgets/main.py:358 +#: cola/widgets/main.py:353 msgid "Grep" msgstr "Поиск подстроки (git grep)" -#: cola/widgets/remote.py:662 +#: cola/widgets/remote.py:707 msgid "Have you rebased/pulled lately?" msgstr "Вы недавно выполняли rebase/pull?" -#: cola/sequenceeditor.py:110 cola/sequenceeditor.py:171 -#: cola/widgets/finder.py:138 cola/widgets/main.py:854 +#: cola/sequenceeditor.py:108 cola/sequenceeditor.py:169 +#: cola/widgets/finder.py:137 cola/widgets/main.py:867 msgid "Help" msgstr "Помощь" -#: cola/widgets/status.py:1322 +#: cola/widgets/status.py:1323 msgid "Help - Custom Copy Actions" msgstr "" -#: cola/widgets/finder.py:79 +#: cola/widgets/finder.py:78 msgid "Help - Find Files" msgstr "Помощь - Поиск файлов" -#: cola/sequenceeditor.py:737 +#: cola/sequenceeditor.py:732 msgid "Help - git-cola-sequence-editor" msgstr "" -#: cola/widgets/prefs.py:346 +#: cola/widgets/prefs.py:366 msgid "High DPI" msgstr "" -#: cola/gitcmds.py:876 +#: cola/gitcmds.py:886 msgid "Hint: The \"Actions > Abort Cherry-Pick\" menu action can be used to cancel the current cherry-pick." msgstr "" -#: cola/widgets/prefs.py:254 +#: cola/widgets/prefs.py:275 msgid "History Browser" msgstr "Просмотрщик истории" -#: cola/widgets/about.py:427 cola/widgets/about.py:441 +#: cola/widgets/about.py:410 cola/widgets/about.py:424 msgid "Hungarian translation" msgstr "" -#: cola/widgets/toolbar.py:178 +#: cola/widgets/toolbar.py:182 msgid "Icon Only" msgstr "" -#: cola/widgets/prefs.py:345 +#: cola/widgets/prefs.py:365 msgid "Icon theme" msgstr "" -#: cola/widgets/diff.py:758 +#: cola/widgets/diff.py:787 msgid "Ignore all whitespace" msgstr "Игнорировать все пробелы" -#: cola/widgets/diff.py:755 +#: cola/widgets/diff.py:785 msgid "Ignore changes in amount of whitespace" msgstr "" -#: cola/widgets/diff.py:751 +#: cola/widgets/diff.py:782 msgid "Ignore changes in whitespace at EOL" msgstr "" -#: cola/widgets/gitignore.py:46 +#: cola/widgets/gitignore.py:45 msgid "Ignore custom pattern" msgstr "" -#: cola/widgets/gitignore.py:44 +#: cola/widgets/gitignore.py:43 #, fuzzy msgid "Ignore exact filename" msgstr "Игнорировать все пробелы" -#: cola/widgets/gitignore.py:32 +#: cola/widgets/gitignore.py:31 msgid "Ignore filename or pattern" msgstr "" -#: cola/widgets/status.py:933 +#: cola/widgets/dag.py:498 +msgid "Ignore merge commits" +msgstr "" + +#: cola/widgets/status.py:934 msgid "Ignore..." msgstr "" -#: cola/widgets/remote.py:203 +#: cola/widgets/remote.py:207 msgid "Include tags " msgstr "Включая теги" -#: cola/widgets/prefs.py:349 +#: cola/widgets/prefs.py:369 msgid "Indent Status paths" msgstr "" -#: cola/widgets/about.py:419 cola/widgets/about.py:426 +#: cola/widgets/about.py:402 cola/widgets/about.py:409 msgid "Indonesian translation" msgstr "" -#: cola/widgets/main.py:643 +#: cola/widgets/main.py:656 #, fuzzy msgid "Initialize Git Annex" msgstr "Инициализация..." -#: cola/widgets/main.py:647 +#: cola/widgets/main.py:660 #, fuzzy msgid "Initialize Git LFS" msgstr "Инициализация..." -#: cola/widgets/clone.py:116 +#: cola/widgets/clone.py:114 msgid "Inititalize submodules" msgstr "" -#: cola/widgets/prefs.py:260 +#: cola/widgets/prefs.py:281 msgid "Insert spaces instead of tabs" msgstr "" -#: cola/cmds.py:2130 +#: cola/widgets/action.py:73 cola/widgets/main.py:402 +msgid "Integrate changes using \"git pull\"" +msgstr "" + +#: cola/cmds.py:2081 msgid "Interactive Rebase" msgstr "Интерактивное перемещение (rebase)" -#: cola/cmds.py:2364 +#: cola/cmds.py:2315 msgid "Invalid Revision" msgstr "Неверная версия" @@ -2112,48 +2174,48 @@ msgstr "Неверная версия" msgid "It is not necessary to update the hunk header lines as they will be regenerated automatically." msgstr "" -#: cola/widgets/about.py:421 cola/widgets/about.py:424 +#: cola/widgets/about.py:404 cola/widgets/about.py:407 msgid "Japanese translation" msgstr "" -#: cola/widgets/prefs.py:262 +#: cola/widgets/prefs.py:283 msgid "Keep *.orig Merge Backups" msgstr "" -#: cola/widgets/stash.py:71 +#: cola/widgets/stash.py:73 msgid "Keep Index" msgstr "Сохранить индекс" -#: cola/widgets/main.py:477 +#: cola/widgets/main.py:490 msgid "Keyboard Shortcuts" msgstr "Горячие клавиши" -#: cola/cmds.py:1608 cola/sequenceeditor.py:165 cola/sequenceeditor.py:338 -#: cola/widgets/dag.py:395 cola/widgets/filelist.py:34 +#: cola/difftool.py:27 cola/sequenceeditor.py:163 cola/sequenceeditor.py:334 +#: cola/widgets/dag.py:394 cola/widgets/filelist.py:31 msgid "Launch Diff Tool" msgstr "Запустить средство сравнения" -#: cola/widgets/dag.py:402 +#: cola/widgets/dag.py:401 #, fuzzy msgid "Launch Directory Diff Tool" msgstr "Запустить средство сравнения" -#: cola/cmds.py:1541 cola/cmds.py:1679 cola/widgets/filelist.py:38 +#: cola/cmds.py:1529 cola/cmds.py:1631 cola/widgets/filelist.py:35 msgid "Launch Editor" msgstr "Запустить редактор" -#: cola/cmds.py:1644 +#: cola/cmds.py:1596 msgid "Launch Terminal" msgstr "Запустить терминал" -#: cola/sequenceeditor.py:166 +#: cola/sequenceeditor.py:164 msgid "" "Launch external diff tool\n" "Shortcut: Ctrl+D" msgstr "" -#: cola/widgets/diff.py:1005 cola/widgets/diff.py:1051 -#: cola/widgets/status.py:852 cola/widgets/status.py:948 +#: cola/widgets/diff.py:1044 cola/widgets/diff.py:1106 +#: cola/widgets/status.py:853 cola/widgets/status.py:949 msgid "Launch git-cola" msgstr "Запустить git-cola" @@ -2167,7 +2229,7 @@ msgstr "Сравнить c помощью git-difftool с предыдущей msgid "Launch git-difftool on the current path" msgstr "Запустить git-difftool по выбранному пути" -#: cola/icons.py:56 +#: cola/icons.py:55 msgid "Light Theme" msgstr "" @@ -2176,169 +2238,185 @@ msgstr "" msgid "Lines starting with '%s' will be ignored." msgstr "" -#: cola/widgets/startup.py:74 +#: cola/widgets/startup.py:73 msgid "List" msgstr "" -#: cola/guicmds.py:267 +#: cola/guicmds.py:266 msgid "Load Commit Message" msgstr "Загрузить комментарий к коммиту" -#: cola/widgets/main.py:339 +#: cola/widgets/main.py:334 msgid "Load Commit Message..." msgstr "Загрузить комментарий к коммиту..." -#: cola/widgets/commitmsg.py:144 +#: cola/widgets/commitmsg.py:150 msgid "Load Previous Commit Message" msgstr "Загрузить комментарий к предыдущему коммиту" -#: cola/widgets/diff.py:264 +#: cola/widgets/diff.py:265 msgid "Loading..." msgstr "Загрузка..." -#: cola/widgets/branch.py:169 cola/widgets/branch.py:240 -#: cola/widgets/branch.py:281 cola/widgets/compare.py:38 -#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/branch.py:173 cola/widgets/branch.py:250 +#: cola/widgets/branch.py:290 cola/widgets/compare.py:37 +#: cola/widgets/compare.py:52 cola/widgets/compare.py:57 msgid "Local" msgstr "" -#: cola/widgets/cfgactions.py:227 cola/widgets/merge.py:46 -#: cola/widgets/remote.py:138 +#: cola/widgets/cfgactions.py:225 cola/widgets/merge.py:44 +#: cola/widgets/remote.py:136 msgid "Local Branch" msgstr "Локальная ветвь:" -#: cola/widgets/createbranch.py:114 +#: cola/widgets/createbranch.py:112 msgid "Local branch" msgstr "Локальная ветвь:" -#: cola/widgets/dag.py:788 cola/widgets/main.py:651 +#: cola/widgets/dag.py:854 cola/widgets/main.py:664 msgid "Lock Layout" msgstr "Зафиксировать панели" -#: cola/widgets/dag.py:750 +#: cola/widgets/dag.py:816 msgid "Log" msgstr "Лог" -#: cola/widgets/prefs.py:170 +#: cola/widgets/prefs.py:191 msgid "Log Date Format" msgstr "" -#: cola/widgets/about.py:268 +#: cola/themes.py:769 +msgid "MacOS Aqua dark" +msgstr "" + +#: cola/themes.py:765 +msgid "MacOS Aqua light" +msgstr "" + +#: cola/themes.py:781 +msgid "MacOS Vibrant dark" +msgstr "" + +#: cola/themes.py:775 +msgid "MacOS Vibrant light" +msgstr "" + +#: cola/widgets/about.py:251 msgid "Maintainer (since 2007) and developer" msgstr "" -#: cola/widgets/text.py:398 +#: cola/widgets/text.py:395 msgid "Match Case" msgstr "" -#: cola/widgets/merge.py:88 +#: cola/widgets/merge.py:86 msgid "Merge" msgstr "Слияние (merge)" -#: cola/widgets/merge.py:162 +#: cola/widgets/merge.py:160 #, python-format msgid "Merge \"%(revision)s\" into \"%(branch)s\"" msgstr "Объединить (merge) \"%(revision)s\" в \"%(branch)s\"" -#: cola/widgets/prefs.py:257 +#: cola/widgets/prefs.py:278 msgid "Merge Tool" msgstr "Программа слияния (merge)" -#: cola/widgets/prefs.py:171 +#: cola/widgets/prefs.py:193 msgid "Merge Verbosity" msgstr "Уровень детальности сообщений при объединении" -#: cola/cmds.py:1829 +#: cola/cmds.py:1780 msgid "Merge failed. Conflict resolution is required." msgstr "Не удалось завершить объединение. Требуется разрешение конфликта." -#: cola/widgets/merge.py:167 +#: cola/widgets/merge.py:165 #, python-format msgid "Merge into \"%s\"" msgstr "Объединить (merge) с \"%s\"" -#: cola/widgets/branch.py:231 +#: cola/widgets/branch.py:242 #, fuzzy msgid "Merge into current branch" msgstr "Просмотреть текущую ветвь..." -#: cola/widgets/main.py:363 +#: cola/widgets/main.py:358 msgid "Merge..." msgstr "Слияние (merge)..." -#: cola/widgets/main.py:1163 +#: cola/widgets/main.py:1176 msgid "Merging" msgstr "Слияние" -#: cola/models/browse.py:33 cola/widgets/createtag.py:78 +#: cola/models/browse.py:32 cola/widgets/createtag.py:76 msgid "Message" msgstr "Сообщение" -#: cola/widgets/commitmsg.py:417 +#: cola/widgets/commitmsg.py:425 msgid "Missing Commit Message" msgstr "Отсутсвует комментарий к коммиту" -#: cola/widgets/createbranch.py:252 +#: cola/widgets/createbranch.py:250 msgid "Missing Data" msgstr "Отсутствуют данные" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Missing Name" msgstr "Отсутствует имя" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Missing Revision" msgstr "Версия не найдена" -#: cola/cmds.py:2801 +#: cola/cmds.py:2747 msgid "Missing Tag Message" msgstr "Отсутсвует описание тега" -#: cola/models/browse.py:332 cola/widgets/status.py:158 -#: cola/widgets/status.py:631 +#: cola/models/browse.py:331 cola/widgets/status.py:158 +#: cola/widgets/status.py:632 msgid "Modified" msgstr "Изменено" -#: cola/widgets/commitmsg.py:506 +#: cola/widgets/commitmsg.py:532 msgid "More..." msgstr "Далее..." -#: cola/widgets/standard.py:243 cola/widgets/status.py:233 +#: cola/widgets/standard.py:242 cola/widgets/status.py:234 msgid "Move Down" msgstr "Опуститься вниз" -#: cola/widgets/standard.py:235 cola/widgets/status.py:225 +#: cola/widgets/standard.py:234 cola/widgets/status.py:226 msgid "Move Up" msgstr "Подняться вверх" -#: cola/widgets/status.py:300 +#: cola/widgets/status.py:301 msgid "Move files to trash" msgstr "Удалить файл(ы) в корзину" -#: cola/models/browse.py:33 cola/widgets/bookmarks.py:467 -#: cola/widgets/createtag.py:61 cola/widgets/editremotes.py:450 -#: cola/widgets/status.py:1452 cola/widgets/toolbar.py:312 +#: cola/models/browse.py:32 cola/widgets/bookmarks.py:466 +#: cola/widgets/createtag.py:59 cola/widgets/editremotes.py:448 +#: cola/widgets/status.py:1453 cola/widgets/toolbar.py:317 msgid "Name" msgstr "Имя:" -#: cola/widgets/editremotes.py:434 +#: cola/widgets/editremotes.py:432 msgid "Name for the new remote" msgstr "Имя нового внешнего репозитория" -#: cola/guicmds.py:148 cola/widgets/main.py:285 +#: cola/guicmds.py:147 cola/widgets/main.py:280 #, fuzzy msgid "New Bare Repository..." msgstr "Новый репозиторий..." -#: cola/guicmds.py:87 cola/widgets/main.py:280 +#: cola/guicmds.py:86 cola/widgets/main.py:275 msgid "New Repository..." msgstr "Новый репозиторий..." -#: cola/widgets/main.py:983 +#: cola/widgets/main.py:996 msgid "New Toolbar" msgstr "" -#: cola/widgets/startup.py:53 +#: cola/widgets/startup.py:52 msgid "New..." msgstr "Новый..." @@ -2346,15 +2424,19 @@ msgstr "Новый..." msgid "Next File" msgstr "Следующий файл" -#: cola/widgets/createbranch.py:123 cola/widgets/standard.py:1065 +#: cola/widgets/createbranch.py:121 cola/widgets/standard.py:1183 msgid "No" msgstr "Нет" -#: cola/widgets/merge.py:217 cola/widgets/merge.py:227 +#: cola/widgets/merge.py:215 cola/widgets/merge.py:225 msgid "No Revision Specified" msgstr "Версия не указана" -#: cola/widgets/commitmsg.py:427 +#: cola/widgets/stash.py:225 +msgid "No change made" +msgstr "" + +#: cola/widgets/commitmsg.py:435 msgid "" "No changes to commit.\n" "\n" @@ -2364,27 +2446,27 @@ msgstr "" "\n" "Добавить к коммиту хотя бы один файл перед созданием коммита." -#: cola/widgets/selectcommits.py:118 +#: cola/widgets/selectcommits.py:117 msgid "No commits exist in this branch." msgstr "В данной ветке не существует коммитов" -#: cola/widgets/merge.py:65 +#: cola/widgets/merge.py:63 msgid "No fast forward" msgstr "" -#: cola/widgets/remote.py:186 +#: cola/widgets/remote.py:190 msgid "No fast-forward" msgstr "" -#: cola/widgets/remote.py:577 +#: cola/widgets/remote.py:612 msgid "No repository selected." msgstr "Не указан репозиторий." -#: cola/widgets/remote.py:615 +#: cola/widgets/remote.py:650 msgid "Non-fast-forward fetch overwrites local history!" msgstr "Non-fast-forward fetch перепишет локальную историю!" -#: cola/widgets/remote.py:621 +#: cola/widgets/remote.py:656 msgid "" "Non-fast-forward push overwrites published history!\n" "(Did you pull first?)" @@ -2392,7 +2474,7 @@ msgstr "" "Non-fast-forward push перепишет историю на сервере!\n" "(Вы выполнили pull?)" -#: cola/widgets/commitmsg.py:444 +#: cola/widgets/commitmsg.py:452 msgid "Nothing to commit" msgstr "Отсуствуют измения для коммита" @@ -2400,81 +2482,81 @@ msgstr "Отсуствуют измения для коммита" msgid "Nothing to do" msgstr "Нечего делать" -#: cola/widgets/prefs.py:172 +#: cola/widgets/prefs.py:194 msgid "Number of Diff Context Lines" msgstr "Число строк в контексте сравнения" -#: cola/widgets/bookmarks.py:79 cola/widgets/bookmarks.py:213 -#: cola/widgets/startup.py:336 +#: cola/widgets/bookmarks.py:78 cola/widgets/bookmarks.py:212 +#: cola/widgets/startup.py:335 msgid "Open" msgstr "Открыть" -#: cola/widgets/text.py:230 +#: cola/widgets/text.py:228 #, python-format msgid "Open \"%s\"" msgstr "" -#: cola/cmds.py:1857 +#: cola/cmds.py:1808 msgid "Open Directory" msgstr "Открыть каталог" -#: cola/guicmds.py:205 cola/guicmds.py:214 cola/widgets/editremotes.py:473 -#: cola/widgets/startup.py:55 cola/widgets/startup.py:215 +#: cola/guicmds.py:204 cola/guicmds.py:213 cola/widgets/editremotes.py:471 +#: cola/widgets/startup.py:54 cola/widgets/startup.py:214 msgid "Open Git Repository" msgstr "Открыть Git репозиторий" -#: cola/widgets/submodules.py:49 +#: cola/widgets/submodules.py:48 #, fuzzy msgid "Open Parent" msgstr "Открыть последний" -#: cola/cmds.py:1877 +#: cola/cmds.py:1828 msgid "Open Parent Directory" msgstr "Открыть родительский каталог" -#: cola/widgets/main.py:679 +#: cola/widgets/main.py:692 msgid "Open Recent" msgstr "Открыть последний" -#: cola/cmds.py:1840 +#: cola/cmds.py:1791 msgid "Open Using Default Application" msgstr "Открыть, используя приложение по умолчанию" -#: cola/cmds.py:1890 +#: cola/cmds.py:1841 msgid "Open Worktree" msgstr "Открыть рабочий каталог" -#: cola/widgets/bookmarks.py:221 cola/widgets/startup.py:344 +#: cola/widgets/bookmarks.py:220 cola/widgets/startup.py:343 msgid "Open in New Window" msgstr "Открыть в новом окне" -#: cola/widgets/main.py:408 +#: cola/widgets/main.py:415 msgid "Open in New Window..." msgstr "Открыть в новом окне..." -#: cola/widgets/main.py:402 +#: cola/widgets/main.py:409 msgid "Open..." msgstr "Открыть..." -#: cola/widgets/branch.py:345 +#: cola/widgets/branch.py:354 #, fuzzy msgid "Other branches" msgstr "Фильтр путей..." -#: cola/widgets/archive.py:210 +#: cola/widgets/archive.py:208 msgid "Overwrite" msgstr "Перезаписать" -#: cola/widgets/archive.py:209 +#: cola/widgets/archive.py:207 #, python-format msgid "Overwrite \"%s\"?" msgstr "Перезаписать \"%s\"?" -#: cola/widgets/archive.py:207 +#: cola/widgets/archive.py:205 msgid "Overwrite File?" msgstr "Перезаписать файл?" -#: cola/widgets/grep.py:144 +#: cola/widgets/grep.py:142 msgid "" "Parse arguments using a shell.\n" "Queries with spaces will require \"double quotes\"." @@ -2482,63 +2564,67 @@ msgstr "" "Разбор аргументов с помощью шелла.\n" "Запросы с пробелами должны быть в \"двойных кавычках\"." -#: cola/models/browse.py:330 +#: cola/models/browse.py:329 msgid "Partially Staged" msgstr "Частично добавлено к коммиту" -#: cola/widgets/main.py:744 +#: cola/widgets/main.py:757 msgid "Paste" msgstr "Вставить" -#: cola/cmds.py:363 +#: cola/cmds.py:364 msgid "Patch failed to apply" msgstr "" -#: cola/cmds.py:375 +#: cola/cmds.py:376 msgid "Patch(es) Applied" msgstr "Патчи применены" -#: cola/widgets/diff.py:1219 cola/widgets/main.py:695 +#: cola/widgets/diff.py:1293 cola/widgets/main.py:708 msgid "Patches" msgstr "" -#: cola/widgets/prefs.py:173 +#: cola/widgets/prefs.py:195 msgid "Patches Directory" msgstr "" -#: cola/widgets/bookmarks.py:468 cola/widgets/submodules.py:118 +#: cola/widgets/bookmarks.py:467 cola/widgets/submodules.py:117 msgid "Path" msgstr "" -#: cola/widgets/clone.py:112 +#: cola/widgets/clone.py:110 msgid "Path or URL to clone (Env. $VARS okay)" msgstr "Путь или URL для клонирования (Env. $VARS okay)" -#: cola/sequenceeditor.py:346 +#: cola/sequenceeditor.py:342 msgid "Pick" msgstr "" -#: cola/widgets/diff.py:781 +#: cola/widgets/dag.py:490 +msgid "Pickaxe search for changes containing text" +msgstr "" + +#: cola/widgets/diff.py:809 msgid "Pixel XOR" msgstr "" -#: cola/widgets/createbranch.py:253 +#: cola/widgets/createbranch.py:251 msgid "Please provide both a branch name and revision expression." msgstr "Пожалуйста, предоставьте имя ветви и версию" -#: cola/cmds.py:2348 +#: cola/cmds.py:2299 msgid "Please select a file" msgstr "Пожалуйста, выберите файл" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Please specify a name for the new tag." msgstr "Укажите имя для нового тега" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Please specify a revision to tag." msgstr "Пожалуйста, укажите версию для тега." -#: cola/widgets/commitmsg.py:410 +#: cola/widgets/commitmsg.py:418 msgid "" "Please supply a commit message.\n" "\n" @@ -2556,32 +2642,32 @@ msgstr "" "- Вторая строка пустая\n" "- Оставшиеся строки: опишите, что дают ваши изменения.\n" -#: cola/cmds.py:653 +#: cola/cmds.py:655 msgid "Point the current branch head to a new commit?" msgstr "" -#: cola/widgets/about.py:416 +#: cola/widgets/about.py:399 msgid "Polish translation" msgstr "" -#: cola/widgets/stash.py:63 cola/widgets/stash.py:111 cola/widgets/stash.py:115 +#: cola/widgets/stash.py:65 cola/widgets/stash.py:114 cola/widgets/stash.py:118 msgid "Pop" msgstr "" -#: cola/widgets/main.py:293 cola/widgets/prefs.py:395 +#: cola/widgets/main.py:288 cola/widgets/prefs.py:433 msgid "Preferences" msgstr "Настройки" -#: cola/widgets/archive.py:129 +#: cola/widgets/archive.py:127 msgid "Prefix" msgstr "Префикс" -#: cola/widgets/main.py:345 +#: cola/widgets/main.py:340 #, fuzzy msgid "Prepare Commit Message" msgstr "Поиск комментария к коммиту" -#: cola/widgets/prefs.py:157 +#: cola/widgets/prefs.py:180 msgid "Prevent \"Stage\" from staging all files when nothing is selected" msgstr "" @@ -2589,224 +2675,236 @@ msgstr "" msgid "Previous File" msgstr "Предыдущий файл" -#: cola/widgets/remote.py:171 +#: cola/widgets/remote.py:169 msgid "Prompt on creation" msgstr "" -#: cola/widgets/remote.py:172 +#: cola/widgets/remote.py:170 #, fuzzy msgid "Prompt when pushing creates new remote branches" msgstr "Создать новую внешнюю ветвь?" -#: cola/widgets/remote.py:208 +#: cola/widgets/remote.py:212 #, fuzzy msgid "Prune " msgstr "Чистка" -#: cola/widgets/bookmarks.py:255 cola/widgets/startup.py:376 +#: cola/widgets/bookmarks.py:254 cola/widgets/startup.py:375 msgid "Prune Missing Entries" msgstr "" -#: cola/widgets/branch.py:247 cola/widgets/remote.py:728 +#: cola/widgets/branch.py:256 cola/widgets/remote.py:783 msgid "Pull" msgstr "Получить (pull)" -#: cola/widgets/action.py:65 cola/widgets/main.py:397 +#: cola/widgets/action.py:73 cola/widgets/main.py:401 msgid "Pull..." msgstr "Получить (pull)..." -#: cola/widgets/branch.py:253 cola/widgets/remote.py:593 -#: cola/widgets/remote.py:698 +#: cola/widgets/branch.py:262 cola/widgets/remote.py:628 +#: cola/widgets/remote.py:758 msgid "Push" msgstr "Отправить (push)" -#: cola/widgets/action.py:64 cola/widgets/main.py:392 +#: cola/widgets/action.py:70 cola/widgets/main.py:393 +msgid "Push to one or more remotes using \"git push\"" +msgstr "" + +#: cola/widgets/action.py:70 cola/widgets/main.py:392 msgid "Push..." msgstr "Отправить (push)..." -#: cola/guicmds.py:252 +#: cola/guicmds.py:251 msgid "Quick Open Repository" msgstr "" -#: cola/widgets/main.py:660 +#: cola/widgets/main.py:673 msgid "Quick Open..." msgstr "" -#: cola/widgets/main.py:355 +#: cola/widgets/main.py:350 msgid "Quit" msgstr "Выход" -#: cola/cmds.py:2144 cola/cmds.py:2180 cola/cmds.py:2181 cola/cmds.py:2194 -#: cola/cmds.py:2195 cola/sequenceeditor.py:158 cola/sequenceeditor.py:199 -#: cola/widgets/main.py:822 cola/widgets/remote.py:211 +#: cola/cmds.py:2095 cola/cmds.py:2131 cola/cmds.py:2132 cola/cmds.py:2145 +#: cola/cmds.py:2146 cola/sequenceeditor.py:156 cola/sequenceeditor.py:197 +#: cola/widgets/main.py:835 cola/widgets/remote.py:215 msgid "Rebase" msgstr "Переместить (rebase)" -#: cola/cmds.py:2143 +#: cola/cmds.py:2094 #, python-format msgid "Rebase onto %s" msgstr "Переместить (rebase) в %s" -#: cola/cmds.py:2156 +#: cola/cmds.py:2107 #, fuzzy msgid "Rebase stopped" msgstr "Переместить (rebase) " -#: cola/widgets/remote.py:210 +#: cola/widgets/remote.py:214 msgid "Rebase the current branch instead of merging" msgstr "" -#: cola/widgets/dag.py:419 +#: cola/widgets/dag.py:418 msgid "Rebase to this commit" msgstr "" -#: cola/widgets/main.py:1165 +#: cola/widgets/main.py:1178 msgid "Rebasing" msgstr "Перемещение" -#: cola/widgets/main.py:120 +#: cola/widgets/main.py:118 msgid "Recent" msgstr "Недавнее" -#: cola/widgets/bookmarks.py:93 +#: cola/widgets/bookmarks.py:92 msgid "Recent repositories" msgstr "Недавние репозитории" -#: cola/widgets/prefs.py:258 +#: cola/widgets/prefs.py:279 #, fuzzy msgid "Recent repository count" msgstr "Недавние репозитории" -#: cola/widgets/recent.py:46 +#: cola/widgets/recent.py:44 msgid "Recently Modified Files" msgstr "Недавно измененные файлы" -#: cola/widgets/main.py:320 +#: cola/widgets/main.py:315 msgid "Recently Modified Files..." msgstr "Недавно измененные файлы..." -#: cola/widgets/stash.py:256 +#: cola/widgets/stash.py:274 msgid "Recovering a dropped stash is not possible." msgstr "Восстановить удаленные заначки (stash) будет невозможно" -#: cola/widgets/createbranch.py:283 +#: cola/widgets/createbranch.py:281 msgid "Recovering lost commits may not be easy." msgstr "Восстановить потерянные коммиты будет сложно." -#: cola/widgets/main.py:737 +#: cola/widgets/main.py:750 msgid "Redo" msgstr "Повторить" -#: cola/widgets/clone.py:121 +#: cola/widgets/clone.py:119 msgid "Reduce commit history to minimum" msgstr "" -#: cola/widgets/submodules.py:121 +#: cola/widgets/submodules.py:120 msgid "Reference Repository" msgstr "" -#: cola/widgets/submodules.py:105 +#: cola/widgets/submodules.py:104 msgid "Reference URL" msgstr "" -#: cola/widgets/submodules.py:106 +#: cola/widgets/submodules.py:105 msgid "Reference repository to use when cloning (optional)" msgstr "" -#: cola/cmds.py:2222 cola/qtutils.py:770 cola/widgets/action.py:62 -#: cola/widgets/dag.py:792 cola/widgets/editremotes.py:85 -#: cola/widgets/grep.py:105 cola/widgets/recent.py:116 -#: cola/widgets/submodules.py:45 +#: cola/cmds.py:2173 cola/qtutils.py:801 cola/widgets/action.py:63 +#: cola/widgets/dag.py:858 cola/widgets/editremotes.py:84 +#: cola/widgets/grep.py:103 cola/widgets/recent.py:114 +#: cola/widgets/submodules.py:44 msgid "Refresh" msgstr "Обновить" -#: cola/widgets/remote.py:179 +#: cola/widgets/remote.py:183 msgid "Refuse to merge unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward" msgstr "" -#: cola/widgets/branch.py:173 cola/widgets/branch.py:225 -#: cola/widgets/branch.py:269 cola/widgets/branch.py:470 -#: cola/widgets/compare.py:54 cola/widgets/compare.py:59 -#: cola/widgets/remote.py:147 +#: cola/widgets/branch.py:177 cola/widgets/branch.py:236 +#: cola/widgets/branch.py:278 cola/widgets/branch.py:513 +#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/remote.py:145 msgid "Remote" msgstr "Внешние репозитории" -#: cola/widgets/remote.py:162 +#: cola/widgets/remote.py:160 msgid "Remote Branch" msgstr "Внешняя ветвь" -#: cola/cmds.py:1196 +#: cola/cmds.py:1197 msgid "Remote Branch Deleted" msgstr "Внешняя ветвь удалена" -#: cola/widgets/editremotes.py:49 +#: cola/widgets/log.py:99 +msgid "Remote Messages" +msgstr "" + +#: cola/widgets/editremotes.py:48 msgid "Remote git repositories - double-click to rename" msgstr "Внешний репозиторий git - двойной клик для переименования" -#: cola/cmds.py:1029 cola/widgets/patch.py:107 cola/widgets/patch.py:122 -#: cola/widgets/startup.py:265 cola/widgets/status.py:1382 +#: cola/cmds.py:1030 cola/widgets/diff.py:1701 cola/widgets/diff.py:1716 +#: cola/widgets/startup.py:264 cola/widgets/status.py:1383 msgid "Remove" msgstr "Удалить" -#: cola/cmds.py:1027 +#: cola/cmds.py:1028 #, python-format msgid "Remove %s from the recent list?" msgstr "Удалить %s из списка последних изменений?" -#: cola/widgets/toolbar.py:316 +#: cola/widgets/toolbar.py:321 #, fuzzy msgid "Remove Element" msgstr "Удалить" -#: cola/widgets/remote.py:206 +#: cola/widgets/remote.py:210 msgid "Remove remote-tracking branches that no longer exist on the remote" msgstr "" -#: cola/widgets/patch.py:109 +#: cola/widgets/diff.py:1703 msgid "Remove selected (Delete)" msgstr "Удалить выбранное (Delete)" -#: cola/widgets/bookmarks.py:258 cola/widgets/startup.py:379 +#: cola/widgets/bookmarks.py:257 cola/widgets/startup.py:378 msgid "Remove stale entries for repositories that no longer exist" msgstr "" -#: cola/guicmds.py:333 cola/widgets/browse.py:159 +#: cola/guicmds.py:332 cola/widgets/browse.py:159 cola/widgets/stash.py:44 msgid "Rename" msgstr "Переименовать" -#: cola/cmds.py:1153 +#: cola/cmds.py:1154 #, fuzzy, python-format msgid "Rename \"%s\"" msgstr "Переименовать" -#: cola/widgets/branch.py:259 +#: cola/widgets/branch.py:268 #, fuzzy msgid "Rename Branch" msgstr "Переименовать ветвь..." -#: cola/widgets/main.py:570 +#: cola/widgets/main.py:583 msgid "Rename Branch..." msgstr "Переименовать ветвь..." -#: cola/guicmds.py:330 +#: cola/guicmds.py:329 msgid "Rename Existing Branch" msgstr "Переименовать существующую ветвь:" -#: cola/cmds.py:944 +#: cola/cmds.py:942 msgid "Rename Remote" msgstr "Переименовать внешнюю ветвь" -#: cola/widgets/bookmarks.py:233 cola/widgets/startup.py:356 +#: cola/widgets/bookmarks.py:232 cola/widgets/startup.py:355 #, fuzzy msgid "Rename Repository" msgstr "Клонировать репозиторий" -#: cola/widgets/branch.py:445 +#: cola/widgets/stash.py:218 +msgid "Rename Stash" +msgstr "" + +#: cola/widgets/branch.py:478 #, fuzzy msgid "Rename branch" msgstr "Переименовать ветвь..." -#: cola/cmds.py:945 +#: cola/cmds.py:943 #, python-format msgid "Rename remote \"%(current)s\" to \"%(new)s\"?" msgstr "Переименовать внешнюю ветвь \"%(current)s\" на \"%(new)s\"?" @@ -2816,179 +2914,183 @@ msgstr "Переименовать внешнюю ветвь \"%(current)s\" н msgid "Rename selected paths" msgstr "Редактировать выбранный путь(и)" -#: cola/app.py:497 cola/widgets/startup.py:262 +#: cola/widgets/stash.py:45 +msgid "Rename the selected stash" +msgstr "" + +#: cola/app.py:500 cola/widgets/startup.py:261 msgid "Repository Not Found" msgstr "" -#: cola/widgets/browse.py:87 cola/widgets/main.py:1095 +#: cola/widgets/browse.py:87 cola/widgets/main.py:1108 #, python-format msgid "Repository: %s" msgstr "Репозиторий: %s" -#: cola/guicmds.py:351 cola/widgets/createbranch.py:125 cola/widgets/dag.py:331 -#: cola/widgets/editremotes.py:58 cola/widgets/main.py:832 +#: cola/guicmds.py:350 cola/widgets/createbranch.py:123 cola/widgets/dag.py:330 +#: cola/widgets/editremotes.py:57 cola/widgets/main.py:845 msgid "Reset" msgstr "Сброс" -#: cola/widgets/createbranch.py:286 +#: cola/widgets/createbranch.py:284 #, python-format msgid "Reset \"%(branch)s\" to \"%(revision)s\"?" msgstr "Сбросить (reset) \"%(branch)s\" к \"%(revision)s\"?" -#: cola/guicmds.py:359 +#: cola/guicmds.py:358 msgid "Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/cmds.py:655 cola/cmds.py:706 cola/guicmds.py:342 -#: cola/widgets/createbranch.py:295 +#: cola/cmds.py:657 cola/cmds.py:708 cola/guicmds.py:341 +#: cola/widgets/createbranch.py:293 msgid "Reset Branch" msgstr "Сбросить (reset) ветвь" -#: cola/cmds.py:703 cola/guicmds.py:341 cola/widgets/dag.py:425 -#: cola/widgets/main.py:419 +#: cola/cmds.py:705 cola/guicmds.py:340 cola/widgets/dag.py:424 +#: cola/widgets/main.py:431 msgid "Reset Branch (Soft)" msgstr "" -#: cola/cmds.py:652 cola/guicmds.py:350 cola/widgets/dag.py:431 -#: cola/widgets/main.py:426 +#: cola/cmds.py:654 cola/guicmds.py:349 cola/widgets/dag.py:430 +#: cola/widgets/main.py:439 msgid "Reset Branch and Stage (Mixed)" msgstr "" -#: cola/widgets/createbranch.py:292 +#: cola/widgets/createbranch.py:290 msgid "Reset Branch?" msgstr "Сбросить (reset) ветвь?" -#: cola/widgets/main.py:655 +#: cola/widgets/main.py:668 msgid "Reset Layout" msgstr "" -#: cola/cmds.py:687 +#: cola/cmds.py:689 msgid "Reset Worktree and Reset All?" msgstr "" -#: cola/cmds.py:672 cola/cmds.py:689 cola/cmds.py:723 cola/guicmds.py:360 -#: cola/guicmds.py:373 cola/guicmds.py:382 +#: cola/cmds.py:674 cola/cmds.py:691 cola/cmds.py:725 cola/guicmds.py:359 +#: cola/guicmds.py:372 cola/guicmds.py:381 msgid "Reset and Restore" msgstr "" -#: cola/cmds.py:704 +#: cola/cmds.py:706 msgid "Reset branch?" msgstr "" -#: cola/widgets/createbranch.py:266 +#: cola/widgets/createbranch.py:264 #, python-format msgid "Resetting \"%(branch)s\" to \"%(revision)s\" will lose commits." msgstr "Сброс \"%(branch)s\" в \"%(revision)s\" приведет к потере коммитов." -#: cola/widgets/prefs.py:264 +#: cola/widgets/prefs.py:285 msgid "Resize File Browser columns" msgstr "" -#: cola/widgets/prefs.py:374 +#: cola/widgets/prefs.py:412 msgid "Restart the application after changing appearance settings." msgstr "" -#: cola/cmds.py:757 cola/cmds.py:760 cola/guicmds.py:390 cola/guicmds.py:391 -#: cola/widgets/dag.py:461 cola/widgets/main.py:457 +#: cola/cmds.py:759 cola/cmds.py:762 cola/guicmds.py:389 cola/guicmds.py:390 +#: cola/widgets/dag.py:460 cola/widgets/main.py:471 msgid "Restore Worktree" msgstr "" -#: cola/cmds.py:720 cola/guicmds.py:381 cola/widgets/dag.py:454 -#: cola/widgets/main.py:450 +#: cola/cmds.py:722 cola/guicmds.py:380 cola/widgets/dag.py:453 +#: cola/widgets/main.py:463 msgid "Restore Worktree and Reset All (Hard)" msgstr "" -#: cola/cmds.py:669 cola/widgets/main.py:434 +#: cola/cmds.py:671 cola/widgets/main.py:447 msgid "Restore Worktree and Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/widgets/dag.py:438 +#: cola/widgets/dag.py:437 msgid "Restore Worktree and Reset All (Keep Unstaged Edits)" msgstr "" -#: cola/cmds.py:686 cola/guicmds.py:372 cola/widgets/dag.py:446 -#: cola/widgets/main.py:442 +#: cola/cmds.py:688 cola/guicmds.py:371 cola/widgets/dag.py:445 +#: cola/widgets/main.py:455 msgid "Restore Worktree and Reset All (Merge)" msgstr "" -#: cola/cmds.py:721 +#: cola/cmds.py:723 msgid "Restore Worktree and Reset All?" msgstr "" -#: cola/cmds.py:758 +#: cola/cmds.py:760 #, python-format msgid "Restore Worktree to %s?" msgstr "" -#: cola/cmds.py:670 +#: cola/cmds.py:672 msgid "Restore worktree, reset, and preserve unstaged edits?" msgstr "" -#: cola/widgets/dag.py:390 +#: cola/widgets/dag.py:389 msgid "Revert" msgstr "" -#: cola/widgets/diff.py:1153 +#: cola/widgets/diff.py:1227 msgid "Revert Diff Hunk" msgstr "Откатить изменения в этой части" -#: cola/widgets/diff.py:1018 +#: cola/widgets/diff.py:1057 msgid "Revert Diff Hunk..." msgstr "Откатить изменения в этой части" -#: cola/widgets/diff.py:1152 +#: cola/widgets/diff.py:1226 msgid "Revert Diff Hunk?" msgstr "Откатить изменения в этой части?" -#: cola/widgets/diff.py:1150 +#: cola/widgets/diff.py:1224 msgid "Revert Selected Lines" msgstr "Отменить изменения в выбранных линиях" -#: cola/widgets/diff.py:1013 +#: cola/widgets/diff.py:1052 msgid "Revert Selected Lines..." msgstr "Откатить выделенные линии..." -#: cola/widgets/diff.py:1149 +#: cola/widgets/diff.py:1223 msgid "Revert Selected Lines?" msgstr "Отменить изменения в выбранных линиях?" -#: cola/cmds.py:2311 +#: cola/cmds.py:2262 msgid "Revert Uncommitted Changes" msgstr "Отменить незакомиченные изменения" -#: cola/cmds.py:2305 +#: cola/cmds.py:2256 msgid "Revert Uncommitted Changes?" msgstr "Отменить незакомиченные изменения?" -#: cola/cmds.py:2298 +#: cola/cmds.py:2249 msgid "Revert Uncommitted Edits..." msgstr "Отменить незакомиченные изменения..." -#: cola/cmds.py:2289 +#: cola/cmds.py:2240 msgid "Revert Unstaged Changes" msgstr "Откатить изменения" -#: cola/cmds.py:2283 +#: cola/cmds.py:2234 msgid "Revert Unstaged Changes?" msgstr "Откатить изменения?" -#: cola/cmds.py:2275 +#: cola/cmds.py:2226 msgid "Revert Unstaged Edits..." msgstr "Откатить изменения..." -#: cola/cmds.py:598 +#: cola/cmds.py:599 msgid "Revert failed" msgstr "" -#: cola/cmds.py:2310 cola/widgets/diff.py:1161 +#: cola/cmds.py:2261 cola/widgets/diff.py:1235 msgid "Revert the uncommitted changes?" msgstr "Отменить незакомиченные изменения?" -#: cola/cmds.py:2288 +#: cola/cmds.py:2239 msgid "Revert the unstaged changes?" msgstr "Откатить изменения?" -#: cola/widgets/browse.py:189 +#: cola/widgets/browse.py:190 #, fuzzy msgid "Revert uncommitted changes to selected paths" msgstr "Отменить незакомиченные изменения по выбранным путям." @@ -2998,306 +3100,314 @@ msgstr "Отменить незакомиченные изменения по в msgid "Revert unstaged changes to selected paths" msgstr "Отменить незафиксированные изменения по выбранным путям." -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Review" msgstr "Просмотр" -#: cola/widgets/main.py:583 +#: cola/widgets/main.py:596 msgid "Review..." msgstr "Просмотр..." -#: cola/widgets/cfgactions.py:233 cola/widgets/createtag.py:84 +#: cola/widgets/cfgactions.py:231 cola/widgets/createtag.py:82 msgid "Revision" msgstr "Версия" -#: cola/widgets/selectcommits.py:62 +#: cola/widgets/selectcommits.py:61 msgid "Revision Expression:" msgstr "Выражение для определения версии:" -#: cola/widgets/merge.py:39 cola/widgets/merge.py:42 +#: cola/widgets/merge.py:37 cola/widgets/merge.py:40 msgid "Revision to Merge" msgstr "Версия для объединения" -#: cola/sequenceeditor.py:351 +#: cola/sequenceeditor.py:347 msgid "Reword" msgstr "" -#: cola/cmds.py:776 cola/widgets/commitmsg.py:456 +#: cola/cmds.py:778 cola/widgets/commitmsg.py:464 msgid "Rewrite Published Commit?" msgstr "Переписать опубликованный коммит?" -#: cola/widgets/log.py:31 +#: cola/widgets/log.py:31 cola/widgets/log.py:133 msgid "Right-click links to open:" msgstr "" -#: cola/interaction.py:127 cola/widgets/cfgactions.py:245 +#: cola/interaction.py:125 cola/widgets/cfgactions.py:243 msgid "Run" msgstr "Запустить" -#: cola/cmds.py:2341 +#: cola/cmds.py:2292 #, python-format msgid "Run \"%s\"?" msgstr "Запустить \"%s\"?" -#: cola/interaction.py:124 +#: cola/interaction.py:122 #, python-format msgid "Run %s?" msgstr "Запустить %s?" -#: cola/interaction.py:125 +#: cola/interaction.py:123 #, python-format msgid "Run the \"%s\" command?" msgstr "Выполнить комманду \"%s\"?" -#: cola/cmds.py:2380 +#: cola/cmds.py:2331 #, python-format msgid "Running command: %s" msgstr "Запуск комманды: %s" -#: cola/widgets/about.py:422 +#: cola/widgets/about.py:405 msgid "Russian translation" msgstr "" -#: cola/sequenceeditor.py:324 +#: cola/sequenceeditor.py:321 #, fuzzy msgid "SHA-1" msgstr "Копировать SHA-1" -#: cola/widgets/prefs.py:183 +#: cola/widgets/prefs.py:205 #, fuzzy msgid "Safe Mode" msgstr "Добавить к коммиту измененые файлы" -#: cola/cmds.py:2167 cola/widgets/archive.py:126 cola/widgets/browse.py:609 -#: cola/widgets/editremotes.py:54 cola/widgets/stash.py:52 -#: cola/widgets/status.py:1388 +#: cola/cmds.py:2118 cola/widgets/archive.py:124 cola/widgets/browse.py:610 +#: cola/widgets/editremotes.py:53 cola/widgets/stash.py:54 +#: cola/widgets/status.py:1389 msgid "Save" msgstr "Сохранить" -#: cola/widgets/archive.py:113 +#: cola/widgets/archive.py:111 msgid "Save Archive" msgstr "Сохранить архив" -#: cola/widgets/dag.py:382 cola/widgets/main.py:351 +#: cola/widgets/dag.py:381 cola/widgets/main.py:346 msgid "Save As Tarball/Zip..." msgstr "Сохранить как архив..." -#: cola/widgets/prefs.py:263 +#: cola/widgets/prefs.py:284 msgid "Save GUI Settings" msgstr "Сохранить настройки интерфейса" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Save Stash" msgstr "Сохранить заначку (stash)" -#: cola/widgets/stash.py:53 +#: cola/widgets/stash.py:55 msgid "Save modified state to new stash" msgstr "Сохранить измененное состояние в новую заначку (stash)" -#: cola/widgets/browse.py:570 +#: cola/widgets/browse.py:571 #, python-format msgid "Saved \"%(filename)s\" from \"%(ref)s\" to \"%(destination)s\"" msgstr "Сохранен \"%(filename)s\" из \"%(ref)s\" в \"%(destination)s\"" -#: cola/widgets/bookmarks.py:83 cola/widgets/grep.py:98 -#: cola/widgets/search.py:42 cola/widgets/search.py:62 +#: cola/widgets/bookmarks.py:82 cola/widgets/grep.py:96 +#: cola/widgets/search.py:41 cola/widgets/search.py:61 msgid "Search" msgstr "Поиск" -#: cola/widgets/search.py:226 +#: cola/widgets/search.py:225 msgid "Search Authors" msgstr "Поиск авторов" -#: cola/widgets/search.py:224 +#: cola/widgets/search.py:223 msgid "Search Commit Messages" msgstr "Поиск комментария к коммиту" -#: cola/widgets/search.py:227 +#: cola/widgets/search.py:226 msgid "Search Committers" msgstr "Поиск авторов коммитов" -#: cola/widgets/search.py:228 +#: cola/widgets/search.py:227 msgid "Search Date Range" msgstr "Поиск по диапазону дат" -#: cola/widgets/search.py:225 +#: cola/widgets/search.py:224 msgid "Search Diffs" msgstr "Поиск различий" -#: cola/widgets/search.py:222 +#: cola/widgets/search.py:221 msgid "Search by Expression" msgstr "Поиск по выражению" -#: cola/widgets/search.py:223 +#: cola/widgets/search.py:222 msgid "Search by Path" msgstr "Поиск по пути" -#: cola/widgets/grep.py:124 +#: cola/widgets/dag.py:494 +msgid "Search commit messages" +msgstr "" + +#: cola/widgets/grep.py:122 msgid "Search for a fixed string" msgstr "Искать фиксированную строку" -#: cola/widgets/diff.py:519 cola/widgets/diff.py:1514 +#: cola/widgets/diff.py:526 cola/widgets/diff.py:1576 msgid "Search in Diff" msgstr "" -#: cola/guicmds.py:253 cola/widgets/bookmarks.py:62 +#: cola/guicmds.py:252 cola/widgets/bookmarks.py:61 msgid "Search repositories by name..." msgstr "" -#: cola/widgets/grep.py:122 +#: cola/widgets/grep.py:120 msgid "Search using a POSIX basic regular expression" msgstr "" -#: cola/widgets/grep.py:123 +#: cola/widgets/grep.py:121 msgid "Search using a POSIX extended regular expression" msgstr "" -#: cola/widgets/main.py:493 +#: cola/widgets/main.py:506 msgid "Search..." msgstr "Поиск..." -#: cola/widgets/selectcommits.py:67 +#: cola/widgets/selectcommits.py:66 msgid "Search:" msgstr "" -#: cola/guicmds.py:330 cola/widgets/selectcommits.py:74 +#: cola/guicmds.py:329 cola/widgets/selectcommits.py:73 msgid "Select" msgstr "Выбрать" -#: cola/widgets/main.py:750 +#: cola/widgets/main.py:763 msgid "Select All" msgstr "Выделить все" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Select Branch to Review" msgstr "Выбрать ветвь для просмотра" -#: cola/widgets/dag.py:1610 +#: cola/widgets/dag.py:1667 msgid "Select Child" msgstr "Выбрать наследника" -#: cola/widgets/commitmsg.py:512 +#: cola/widgets/commitmsg.py:538 msgid "Select Commit" msgstr "Выбрать коммит" -#: cola/guicmds.py:137 +#: cola/guicmds.py:136 #, fuzzy msgid "Select Directory..." msgstr "Выбрать репозиторий..." -#: cola/cmds.py:2129 +#: cola/cmds.py:2080 #, fuzzy msgid "Select New Upstream" msgstr "Выбрать" -#: cola/widgets/dag.py:1614 +#: cola/widgets/dag.py:1671 msgid "Select Newest Child" msgstr "Выбрать нового наследника" -#: cola/widgets/dag.py:1604 +#: cola/widgets/dag.py:1661 msgid "Select Oldest Parent" msgstr "Выбрать самого старшего родителя" -#: cola/widgets/dag.py:1599 +#: cola/widgets/dag.py:1656 msgid "Select Parent" msgstr "Выбрать родителя" -#: cola/widgets/browse.py:525 +#: cola/widgets/browse.py:526 msgid "Select Previous Version" msgstr "Выбрать предыдущую версию" -#: cola/widgets/clone.py:197 +#: cola/widgets/clone.py:195 msgid "Select a parent directory for the new clone" msgstr "Выберите родительский каталог для новой копии" -#: cola/widgets/standard.py:756 cola/widgets/standard.py:779 +#: cola/widgets/standard.py:826 cola/widgets/standard.py:848 msgid "Select directory" msgstr "" -#: cola/widgets/selectcommits.py:162 +#: cola/widgets/selectcommits.py:161 #, fuzzy msgid "Select output dir" msgstr "Выбрать коммит" -#: cola/widgets/selectcommits.py:183 +#: cola/widgets/selectcommits.py:182 #, fuzzy msgid "Select output directory" msgstr "Выбрать репозиторий..." -#: cola/widgets/patch.py:175 +#: cola/widgets/diff.py:1769 #, fuzzy msgid "Select patch file(s)..." msgstr "Выбрать файл(ы) патча..." -#: cola/widgets/editremotes.py:437 +#: cola/widgets/editremotes.py:435 #, fuzzy msgid "Select repository" msgstr "Выбрать репозиторий..." -#: cola/widgets/bookmarks.py:225 cola/widgets/startup.py:348 +#: cola/widgets/bookmarks.py:224 cola/widgets/startup.py:347 #, fuzzy msgid "Set Default Repository" msgstr "Выбрать репозиторий..." -#: cola/widgets/branch.py:282 +#: cola/widgets/branch.py:291 #, fuzzy msgid "Set Upstream Branch" msgstr "Выбрать" -#: cola/widgets/branch.py:72 +#: cola/widgets/branch.py:74 msgid "" "Set the sort order for branches and tags.\n" "Toggle between date-based and version-name-based sorting." msgstr "" -#: cola/widgets/remote.py:213 +#: cola/widgets/remote.py:217 #, fuzzy msgid "Set upstream" msgstr "Выбрать" -#: cola/widgets/prefs.py:405 +#: cola/widgets/prefs.py:443 msgid "Settings" msgstr "Настройки" -#: cola/widgets/grep.py:142 +#: cola/widgets/grep.py:140 msgid "Shell arguments" msgstr "Ручной ввод аргументов \"git grep\"" -#: cola/sequenceeditor.py:375 +#: cola/sequenceeditor.py:371 msgid "Shift Down" msgstr "" -#: cola/sequenceeditor.py:379 +#: cola/sequenceeditor.py:375 msgid "Shift Up" msgstr "" -#: cola/widgets/about.py:499 +#: cola/widgets/about.py:482 msgid "Shortcuts" msgstr "Горячие клавиши" -#: cola/widgets/prefs.py:179 +#: cola/widgets/prefs.py:201 msgid "Show Diffstat After Merge" msgstr "Показать отчет об изменениях после объединения" -#: cola/widgets/prefs.py:178 +#: cola/widgets/prefs.py:200 msgid "Show Full Paths in the Window Title" msgstr "" -#: cola/sequenceeditor.py:106 cola/widgets/finder.py:187 -#: cola/widgets/status.py:1384 +#: cola/sequenceeditor.py:104 cola/widgets/finder.py:186 +#: cola/widgets/status.py:1385 msgid "Show Help" msgstr "Показать справку" -#: cola/widgets/filelist.py:30 +#: cola/widgets/filelist.py:27 #, fuzzy msgid "Show History" msgstr "Показать историю" -#: cola/widgets/prefs.py:348 +#: cola/widgets/prefs.py:368 msgid "Show file counts in Status titles" msgstr "" -#: cola/sequenceeditor.py:171 cola/widgets/finder.py:138 +#: cola/widgets/diff.py:794 +msgid "Show filenames" +msgstr "" + +#: cola/sequenceeditor.py:169 cola/widgets/finder.py:137 msgid "" "Show help\n" "Shortcut: ?" @@ -3305,138 +3415,146 @@ msgstr "" "Показать помощь\n" "Горячая клавиша: ?" -#: cola/widgets/diff.py:765 +#: cola/widgets/diff.py:792 msgid "Show line numbers" msgstr "" -#: cola/widgets/diff.py:761 +#: cola/widgets/remote.py:175 +msgid "Show remote messages" +msgstr "" + +#: cola/widgets/diff.py:789 msgid "Show whole surrounding functions of changes" msgstr "" -#: cola/widgets/recent.py:58 +#: cola/widgets/recent.py:56 msgid "Showing changes since" msgstr "Показать изменения с" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "Side by side" msgstr "" -#: cola/cmds.py:2512 +#: cola/cmds.py:2463 msgid "Sign Off" msgstr "Подписать" -#: cola/widgets/createtag.py:71 +#: cola/widgets/createtag.py:69 msgid "Sign Tag" msgstr "Подписать тег" -#: cola/widgets/commitmsg.py:55 +#: cola/widgets/commitmsg.py:56 msgid "Sign off on this commit" msgstr "Подписаться под этим коммитом" -#: cola/widgets/about.py:412 cola/widgets/about.py:425 +#: cola/widgets/about.py:395 cola/widgets/about.py:408 msgid "Simplified Chinese translation" msgstr "" -#: cola/cmds.py:2587 +#: cola/cmds.py:2529 msgid "Skip" msgstr "Пропустить" -#: cola/widgets/main.py:264 cola/widgets/main.py:617 +#: cola/widgets/main.py:260 cola/widgets/main.py:630 msgid "Skip Current Patch" msgstr "Пропустить текущий патч" -#: cola/widgets/main.py:267 +#: cola/widgets/main.py:261 msgid "Skip applying the current patch and continue applying patches" msgstr "" -#: cola/widgets/prefs.py:261 +#: cola/widgets/prefs.py:282 msgid "Sort bookmarks alphabetically" msgstr "Сортировать закладки по алфавиту" -#: cola/widgets/about.py:413 cola/widgets/about.py:436 -#: cola/widgets/about.py:440 +#: cola/widgets/about.py:396 cola/widgets/about.py:419 +#: cola/widgets/about.py:423 msgid "Spanish translation" msgstr "" -#: cola/widgets/createtag.py:88 +#: cola/widgets/createtag.py:86 msgid "Specifies the SHA-1 to tag" msgstr "Укажите SHA-1 для тега" -#: cola/widgets/createtag.py:81 +#: cola/widgets/createtag.py:79 msgid "Specifies the tag message" msgstr "Укажите описание тега" -#: cola/widgets/createtag.py:65 +#: cola/widgets/createtag.py:63 msgid "Specifies the tag name" msgstr "Укажите имя тега" -#: cola/widgets/spellcheck.py:46 +#: cola/widgets/spellcheck.py:45 #, fuzzy msgid "Spelling Suggestions" msgstr "Советы по правописанию" -#: cola/sequenceeditor.py:369 cola/widgets/merge.py:58 +#: cola/sequenceeditor.py:365 cola/widgets/merge.py:56 msgid "Squash" msgstr "Объединить (squash)" -#: cola/widgets/merge.py:57 +#: cola/widgets/merge.py:55 msgid "Squash the merged commits into a single commit" msgstr "Объединить слитые коммиты в один коммит" -#: cola/cmds.py:2598 cola/widgets/action.py:60 cola/widgets/diff.py:982 +#: cola/cmds.py:2540 cola/widgets/action.py:58 cola/widgets/diff.py:1168 msgid "Stage" msgstr "Добавить к коммиту" -#: cola/cmds.py:2753 +#: cola/cmds.py:2699 msgid "Stage / Unstage" msgstr "Добавить / Убрать" -#: cola/cmds.py:2735 +#: cola/cmds.py:2681 msgid "Stage / Unstage All" msgstr "" -#: cola/widgets/diff.py:1016 +#: cola/widgets/diff.py:1055 msgid "Stage Diff Hunk" msgstr "Добавить эту часть к коммиту" -#: cola/cmds.py:2691 +#: cola/cmds.py:2633 msgid "Stage Modified" msgstr "Добавить к коммиту измененые файлы" -#: cola/cmds.py:2724 +#: cola/cmds.py:2670 msgid "Stage Modified and Untracked" msgstr "" -#: cola/widgets/status.py:872 cola/widgets/status.py:894 -#: cola/widgets/status.py:962 +#: cola/widgets/status.py:873 cola/widgets/status.py:895 +#: cola/widgets/status.py:963 msgid "Stage Selected" msgstr "Добавить к коммиту" -#: cola/widgets/diff.py:1011 +#: cola/widgets/diff.py:1050 msgid "Stage Selected Lines" msgstr "Добавить к коммиту выделенные линии" -#: cola/cmds.py:2702 +#: cola/cmds.py:2644 msgid "Stage Unmerged" msgstr "Подготовить не слитые" -#: cola/cmds.py:2713 +#: cola/cmds.py:2655 msgid "Stage Untracked" msgstr "Добавить к коммиту не отслеживаемые файлы" -#: cola/widgets/commitmsg.py:438 +#: cola/widgets/commitmsg.py:446 msgid "Stage and Commit" msgstr "Добавить к коммиту и закоммитить" -#: cola/widgets/commitmsg.py:435 +#: cola/widgets/commitmsg.py:443 msgid "Stage and commit?" msgstr "Добавить к коммиту и закоммитить?" -#: cola/cmds.py:2586 +#: cola/widgets/action.py:58 +msgid "Stage changes using \"git add\"" +msgstr "" + +#: cola/cmds.py:2528 msgid "Stage conflicts" msgstr "Конфликты добавления к коммиту" -#: cola/cmds.py:2577 +#: cola/cmds.py:2519 msgid "Stage conflicts?" msgstr "Добавить к коммиту конфликтующие файлы?" @@ -3444,48 +3562,48 @@ msgstr "Добавить к коммиту конфликтующие файлы msgid "Stage/unstage selected paths for commit" msgstr "Добавить/убрать выбранные пути к/из коммита" -#: cola/models/browse.py:334 cola/widgets/status.py:156 -#: cola/widgets/status.py:620 +#: cola/models/browse.py:333 cola/widgets/status.py:156 +#: cola/widgets/status.py:621 msgid "Staged" msgstr "Подготовленно к коммиту" -#: cola/cmds.py:2605 +#: cola/cmds.py:2547 #, python-format msgid "Staging: %s" msgstr "Добавление к коммиту: %s" -#: cola/widgets/main.py:597 +#: cola/widgets/main.py:610 msgid "Start Interactive Rebase..." msgstr "Начать интерактивное перемещение (rebase)..." -#: cola/widgets/createbranch.py:107 +#: cola/widgets/createbranch.py:105 msgid "Starting Revision" msgstr "Начальная версия" -#: cola/widgets/stash.py:40 +#: cola/widgets/stash.py:36 msgid "Stash" msgstr "Спрятать (stash)" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 #, fuzzy msgid "Stash Index" msgstr "Спрятать (stash)" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 #, fuzzy msgid "Stash staged changes only" msgstr "Закоммитить подготовленные изменения" -#: cola/widgets/stash.py:73 +#: cola/widgets/stash.py:75 #, fuzzy msgid "Stash unstaged changes only, keeping staged changes" msgstr "Отменить незафиксированные изменения по выбранным путям." -#: cola/widgets/action.py:66 cola/widgets/main.py:414 +#: cola/widgets/action.py:76 cola/widgets/main.py:422 msgid "Stash..." msgstr "Спрятать (stash)..." -#: cola/models/browse.py:33 cola/widgets/main.py:102 +#: cola/models/browse.py:32 cola/widgets/main.py:100 msgid "Status" msgstr "Статус" @@ -3493,151 +3611,159 @@ msgstr "Статус" msgid "Stop tracking paths" msgstr "" -#: cola/widgets/submodules.py:82 +#: cola/widgets/submodules.py:81 msgid "Submodule URL (can be relative, ex: ../repo.git)" msgstr "" -#: cola/widgets/submodules.py:90 +#: cola/widgets/submodules.py:89 msgid "Submodule branch to track (optional)" msgstr "" -#: cola/widgets/submodules.py:86 +#: cola/widgets/submodules.py:85 msgid "Submodule path within the current repository (optional)" msgstr "" -#: cola/widgets/main.py:143 cola/widgets/submodules.py:32 +#: cola/widgets/main.py:141 cola/widgets/submodules.py:31 msgid "Submodules" msgstr "" -#: cola/widgets/prefs.py:174 +#: cola/widgets/prefs.py:196 msgid "Summarize Merge Commits" msgstr "" -#: cola/sequenceeditor.py:325 cola/widgets/dag.py:506 +#: cola/sequenceeditor.py:322 cola/widgets/dag.py:572 msgid "Summary" msgstr "Описание" -#: cola/widgets/prefs.py:168 +#: cola/widgets/prefs.py:273 msgid "Tab Width" msgstr "Ширина табов" -#: cola/widgets/cfgactions.py:229 cola/widgets/createbranch.py:116 -#: cola/widgets/merge.py:48 +#: cola/widgets/cfgactions.py:227 cola/widgets/createbranch.py:114 +#: cola/widgets/merge.py:46 msgid "Tag" msgstr "Тег" -#: cola/cmds.py:2842 +#: cola/cmds.py:2788 msgid "Tag Created" msgstr "Тег создан" -#: cola/widgets/createtag.py:80 +#: cola/widgets/createtag.py:78 msgid "Tag message..." msgstr "Описание тега..." -#: cola/cmds.py:2802 +#: cola/cmds.py:2748 msgid "Tag-signing was requested but the tag message is empty." msgstr "Требуется подписать тег, но описание тега пустое." -#: cola/widgets/branch.py:179 cola/widgets/branch.py:238 +#: cola/widgets/branch.py:183 cola/widgets/branch.py:248 msgid "Tags" msgstr "" -#: cola/widgets/toolbar.py:180 +#: cola/widgets/action.py:78 cola/widgets/main.py:423 +msgid "Temporarily stash away uncommitted changes using \"git stash\"" +msgstr "" + +#: cola/widgets/toolbar.py:184 msgid "Text Beside Icon" msgstr "" -#: cola/widgets/toolbar.py:179 +#: cola/widgets/toolbar.py:183 msgid "Text Only" msgstr "" -#: cola/widgets/toolbar.py:181 +#: cola/widgets/toolbar.py:185 msgid "Text Under Icon" msgstr "" -#: cola/widgets/prefs.py:169 +#: cola/widgets/prefs.py:272 msgid "Text Width" msgstr "Ширина текста" -#: cola/cmds.py:1116 +#: cola/cmds.py:1117 msgid "The branch will be no longer available." msgstr "" -#: cola/cmds.py:648 +#: cola/cmds.py:650 #, python-format msgid "The branch will be reset using \"git reset --mixed %s\"" msgstr "" -#: cola/cmds.py:699 cola/cmds.py:790 +#: cola/cmds.py:701 cola/cmds.py:792 #, python-format msgid "The branch will be reset using \"git reset --soft %s\"" msgstr "" -#: cola/widgets/commitmsg.py:303 +#: cola/widgets/commitmsg.py:311 msgid "The commit message will be cleared." msgstr "Комментарий к коммиту был очищен." -#: cola/widgets/prefs.py:146 +#: cola/widgets/prefs.py:169 msgid "" "The date-time format used when displaying dates in Git DAG.\n" "This value is passed to git log --date=" msgstr "" -#: cola/widgets/archive.py:208 +#: cola/widgets/archive.py:206 #, python-format msgid "The file \"%s\" exists and will be overwritten." msgstr "Файл \"%s\" существует и будет перезаписан." -#: cola/cmds.py:1086 +#: cola/cmds.py:1087 msgid "The following files will be deleted:" msgstr "Следующие файлы будут удалены:" -#: cola/widgets/status.py:1646 +#: cola/widgets/status.py:1647 msgid "The number of leading paths to strip" msgstr "" -#: cola/cmds.py:716 +#: cola/cmds.py:718 #, python-format msgid "The repository will be reset using \"git reset --hard %s\"" msgstr "" -#: cola/cmds.py:665 +#: cola/cmds.py:667 #, python-format msgid "The repository will be reset using \"git reset --keep %s\"" msgstr "" -#: cola/cmds.py:682 +#: cola/cmds.py:684 #, python-format msgid "The repository will be reset using \"git reset --merge %s\"" msgstr "" -#: cola/cmds.py:2365 +#: cola/cmds.py:2316 msgid "The revision expression cannot be empty." msgstr "Поле версии не может быть пустым." -#: cola/cmds.py:3029 +#: cola/widgets/stash.py:225 +msgid "The stash has not been renamed" +msgstr "" + +#: cola/cmds.py:2975 #, python-format msgid "" "The submodule will be added using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:3074 +#: cola/cmds.py:3020 #, python-format msgid "" "The submodule will be updated using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:736 +#: cola/cmds.py:738 #, python-format msgid "The worktree will be restored using \"git read-tree --reset -u %s\"" msgstr "" -#: cola/widgets/commitmsg.py:304 +#: cola/widgets/commitmsg.py:312 msgid "This cannot be undone. Clear commit message?" msgstr "Это не может быть отменено. Очистить комментарий к коммиту?" -#: cola/cmds.py:778 cola/widgets/commitmsg.py:458 +#: cola/cmds.py:780 cola/widgets/commitmsg.py:466 msgid "" "This commit has already been published.\n" "This operation will rewrite published history.\n" @@ -3647,7 +3773,7 @@ msgstr "" "Данная операция перепишет историю на сервере.\n" "Возможно лучше этого не делать." -#: cola/widgets/diff.py:1158 +#: cola/widgets/diff.py:1232 #, fuzzy msgid "" "This operation drops uncommitted changes.\n" @@ -3656,7 +3782,7 @@ msgstr "" "Эта операция отменит незакомиченные изменения.\n" "Эти изменения нельзя будет восстановить" -#: cola/cmds.py:2307 +#: cola/cmds.py:2258 msgid "" "This operation removes uncommitted edits from selected files.\n" "These changes cannot be recovered." @@ -3664,7 +3790,7 @@ msgstr "" "Эта операция отменит незакомиченные изменения.\n" "Эти изменения нельзя будет восстановить" -#: cola/cmds.py:2285 +#: cola/cmds.py:2236 msgid "" "This operation removes unstaged edits from selected files.\n" "These changes cannot be recovered." @@ -3672,27 +3798,27 @@ msgstr "" "Эта операция отменит незакомиченные изменения.\n" "Эти изменения нельзя будет восстановить" -#: cola/cmds.py:475 +#: cola/cmds.py:476 msgid "" "This operation will replace the selected unmerged files with content from the branch being merged using \"git checkout --theirs\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:513 +#: cola/cmds.py:514 msgid "" "This operation will replace the selected unmerged files with content from your current branch using \"git checkout --ours\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/widgets/main.py:1109 +#: cola/widgets/main.py:1122 msgid "" "This repository has unresolved conflicts after applying a patch.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1102 +#: cola/widgets/main.py:1115 msgid "" "This repository is currently being rebased.\n" "Resolve conflicts, commit changes, and run:\n" @@ -3702,13 +3828,13 @@ msgstr "" "Исправьте конфликты, закоммитьте изменения, и запустите:\n" " Переместить (rebase) > Продолжить" -#: cola/widgets/main.py:1115 +#: cola/widgets/main.py:1128 msgid "" "This repository is in the middle of a cherry-pick.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1121 +#: cola/widgets/main.py:1134 msgid "" "This repository is in the middle of a merge.\n" "Resolve conflicts and commit changes." @@ -3728,15 +3854,15 @@ msgstr "" msgid "To avoid applying removal lines ('-'), change them to context lines (' ')." msgstr "" -#: cola/sequenceeditor.py:342 +#: cola/sequenceeditor.py:338 msgid "Toggle Enabled" msgstr "" -#: cola/widgets/diff.py:776 +#: cola/widgets/diff.py:804 msgid "Toggle image diff" msgstr "" -#: cola/widgets/branch.py:63 +#: cola/widgets/branch.py:65 #, fuzzy msgid "Toggle the branches filter" msgstr "Включить фильтр путей" @@ -3745,51 +3871,51 @@ msgstr "Включить фильтр путей" msgid "Toggle the paths filter" msgstr "Включить фильтр путей" -#: cola/widgets/toolbar.py:317 +#: cola/widgets/toolbar.py:322 msgid "Toolbar Style:" msgstr "" -#: cola/widgets/cfgactions.py:228 cola/widgets/merge.py:47 +#: cola/widgets/cfgactions.py:226 cola/widgets/merge.py:45 msgid "Tracking Branch" msgstr "Ветвь слежения" -#: cola/widgets/createbranch.py:115 +#: cola/widgets/createbranch.py:113 msgid "Tracking branch" msgstr "Отслеживаемая ветвь" -#: cola/widgets/about.py:408 cola/widgets/about.py:434 -#: cola/widgets/about.py:445 +#: cola/widgets/about.py:391 cola/widgets/about.py:417 +#: cola/widgets/about.py:428 msgid "Traditional Chinese (Taiwan) translation" msgstr "" -#: cola/widgets/about.py:439 +#: cola/widgets/about.py:422 msgid "Translation" msgstr "" -#: cola/widgets/about.py:94 +#: cola/widgets/about.py:92 msgid "Translators" msgstr "" -#: cola/widgets/about.py:418 cola/widgets/about.py:423 -#: cola/widgets/about.py:438 +#: cola/widgets/about.py:401 cola/widgets/about.py:406 +#: cola/widgets/about.py:421 msgid "Turkish translation" msgstr "" -#: cola/widgets/clone.py:109 cola/widgets/editremotes.py:451 -#: cola/widgets/submodules.py:117 +#: cola/widgets/clone.py:107 cola/widgets/editremotes.py:449 +#: cola/widgets/submodules.py:116 msgid "URL" msgstr "" -#: cola/widgets/remote.py:463 +#: cola/widgets/remote.py:497 #, python-format msgid "URL: %s" msgstr "" -#: cola/widgets/about.py:415 +#: cola/widgets/about.py:398 msgid "Ukranian translation" msgstr "" -#: cola/cmds.py:2122 +#: cola/cmds.py:2073 msgid "Unable to rebase" msgstr "Не могу переместить (rebase)" @@ -3798,53 +3924,58 @@ msgstr "Не могу переместить (rebase)" msgid "Unable to set URL for \"%(name)s\" to \"%(url)s\"" msgstr "" -#: cola/widgets/diff.py:1327 +#: cola/widgets/diff.py:1401 #, python-format msgid "Unable to write patch to \"%s\". Check permissions?" msgstr "" -#: cola/widgets/main.py:735 +#: cola/widgets/main.py:748 msgid "Undo" msgstr "Отменить" -#: cola/cmds.py:783 cola/cmds.py:788 cola/cmds.py:791 cola/widgets/main.py:208 +#: cola/cmds.py:785 cola/cmds.py:790 cola/cmds.py:793 cola/widgets/main.py:207 msgid "Undo Last Commit" msgstr "" -#: cola/cmds.py:789 +#: cola/cmds.py:791 msgid "Undo last commit?" msgstr "" -#: cola/cmds.py:782 +#: cola/cmds.py:784 msgid "Undo the published commit?" msgstr "" -#: cola/models/browse.py:328 cola/widgets/status.py:157 -#: cola/widgets/status.py:640 +#: cola/models/browse.py:327 cola/widgets/status.py:157 +#: cola/widgets/status.py:641 msgid "Unmerged" msgstr "Не объединено" -#: cola/cmds.py:2855 cola/widgets/action.py:61 cola/widgets/diff.py:985 +#: cola/cmds.py:2801 cola/widgets/action.py:61 cola/widgets/diff.py:1165 +#: cola/widgets/main.py:212 msgid "Unstage" msgstr "Убрать из коммита" -#: cola/widgets/main.py:203 cola/widgets/status.py:790 +#: cola/widgets/main.py:202 cola/widgets/status.py:791 msgid "Unstage All" msgstr "Убрать все из коммита" -#: cola/widgets/diff.py:1061 +#: cola/widgets/diff.py:1017 msgid "Unstage Diff Hunk" msgstr "Убрать эту часть из коммита" -#: cola/widgets/status.py:823 cola/widgets/status.py:858 +#: cola/widgets/status.py:824 cola/widgets/status.py:859 msgid "Unstage Selected" msgstr "Убрать из коммита" -#: cola/widgets/diff.py:1058 +#: cola/widgets/diff.py:1015 msgid "Unstage Selected Lines" msgstr "Убрать из коммита выбранные линии" -#: cola/cmds.py:2867 +#: cola/widgets/action.py:61 +msgid "Unstage changes using \"git reset\"" +msgstr "" + +#: cola/cmds.py:2813 #, python-format msgid "Unstaging: %s" msgstr "Удаление из коммита: %s" @@ -3853,87 +3984,86 @@ msgstr "Удаление из коммита: %s" msgid "Untrack Selected" msgstr "Убрать выбранные файлы из контроля версий" -#: cola/widgets/status.py:159 cola/widgets/status.py:646 +#: cola/widgets/status.py:159 cola/widgets/status.py:647 msgid "Untracked" msgstr "Не добавлены в контроль версий" -#: cola/cmds.py:1141 cola/cmds.py:2923 +#: cola/cmds.py:1142 cola/cmds.py:2869 #, python-format msgid "Untracking: %s" msgstr "Не добавлено в контроль версий: %s" -#: cola/widgets/main.py:374 +#: cola/widgets/main.py:369 msgid "Update All Submodules..." msgstr "" -#: cola/widgets/createbranch.py:121 +#: cola/widgets/createbranch.py:119 msgid "Update Existing Branch:" msgstr "Обновить имеющуюся ветвь:" -#: cola/cmds.py:3075 +#: cola/cmds.py:3021 #, fuzzy msgid "Update Submodule" msgstr "Обновлено" -#: cola/cmds.py:3072 +#: cola/cmds.py:3018 msgid "Update Submodule..." msgstr "" -#: cola/cmds.py:3111 +#: cola/cmds.py:3057 msgid "Update Submodules" msgstr "" -#: cola/cmds.py:3109 +#: cola/cmds.py:3055 msgid "Update all submodules?" msgstr "" -#: cola/cmds.py:2093 +#: cola/cmds.py:2044 msgid "Update stacked branches" msgstr "" -#: cola/cmds.py:2085 cola/cmds.py:2092 +#: cola/cmds.py:2036 cola/cmds.py:2043 msgid "Update stacked branches when rebasing?" msgstr "" -#: cola/cmds.py:3108 +#: cola/cmds.py:3054 msgid "Update submodules..." msgstr "" -#: cola/widgets/status.py:953 +#: cola/widgets/status.py:954 msgid "Update this submodule" msgstr "" -#: cola/cmds.py:3073 +#: cola/cmds.py:3019 msgid "Update this submodule?" msgstr "" -#: cola/widgets/branch.py:421 cola/widgets/createbranch.py:302 -#: cola/widgets/remote.py:135 +#: cola/widgets/branch.py:433 cola/widgets/createbranch.py:300 msgid "Updating" msgstr "Обновление" -#: cola/widgets/prefs.py:350 +#: cola/widgets/prefs.py:370 msgid "Use a block cursor in diff editors" msgstr "" -#: cola/widgets/prefs.py:154 +#: cola/widgets/prefs.py:177 msgid "Use gravatar.com to lookup icons for author emails" msgstr "" -#: cola/widgets/prefs.py:166 +#: cola/widgets/prefs.py:189 msgid "User Name" msgstr "Имя пользователя" -#: cola/widgets/about.py:92 +#: cola/widgets/about.py:90 #, fuzzy msgid "Version" msgstr "Версия" -#: cola/widgets/dag.py:800 cola/widgets/main.py:845 cola/widgets/main.py:966 +#: cola/widgets/dag.py:866 cola/widgets/main.py:858 cola/widgets/main.py:979 msgid "View" msgstr "Вид" -#: cola/widgets/browse.py:137 cola/widgets/status.py:278 +#: cola/widgets/browse.py:137 cola/widgets/status.py:279 msgid "View History..." msgstr "Показать историю..." @@ -3941,39 +4071,39 @@ msgstr "Показать историю..." msgid "View history for selected paths" msgstr "Показать историю для выбранного пути" -#: cola/widgets/merge.py:54 +#: cola/widgets/branch.py:224 cola/widgets/merge.py:52 msgid "Visualize" msgstr "Визуализировать" -#: cola/widgets/main.py:488 +#: cola/widgets/main.py:501 msgid "Visualize All Branches..." msgstr "Отобразить все ветви" -#: cola/widgets/main.py:482 +#: cola/widgets/main.py:495 msgid "Visualize Current Branch..." msgstr "Отобразить текущую ветвь..." -#: cola/widgets/createtag.py:73 +#: cola/widgets/createtag.py:71 msgid "Whether to sign the tag (git tag -s)" msgstr "Подписать тег (git tag -s)" -#: cola/widgets/text.py:399 +#: cola/widgets/text.py:396 msgid "Whole Words" msgstr "" -#: cola/widgets/commitmsg.py:432 +#: cola/widgets/commitmsg.py:440 msgid "Would you like to stage and commit all modified files?" msgstr "Вы хотить добавить к коммиту и закоммитить все измененные файлы?" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "XOR" msgstr "" -#: cola/widgets/standard.py:1064 +#: cola/widgets/standard.py:1182 msgid "Yes" msgstr "" -#: cola/cmds.py:256 +#: cola/cmds.py:255 msgid "" "You are in the middle of a merge.\n" "Cannot amend while merging." @@ -3981,36 +4111,36 @@ msgstr "" "Вы находитесь в процессе слияния (merge).\n" "Нельзя отменить коммит во время слияния." -#: cola/cmds.py:2123 +#: cola/cmds.py:2074 msgid "You cannot rebase with uncommitted changes." msgstr "Вы не можете выполнить перемещение (rebase) с незакомиченными изменениями." -#: cola/widgets/merge.py:227 +#: cola/widgets/merge.py:225 msgid "You must specify a revision to merge." msgstr "Вы должны выбрать версию для слияния (merge)." -#: cola/widgets/merge.py:217 +#: cola/widgets/merge.py:215 msgid "You must specify a revision to view." msgstr "Вы должны выбрать версию для просмотра." -#: cola/widgets/dag.py:710 cola/widgets/dag.py:1588 +#: cola/widgets/dag.py:776 cola/widgets/dag.py:1645 msgid "Zoom In" msgstr "Приблизить" -#: cola/widgets/dag.py:706 cola/widgets/dag.py:1594 +#: cola/widgets/dag.py:772 cola/widgets/dag.py:1651 msgid "Zoom Out" msgstr "Отдалить" -#: cola/widgets/dag.py:524 cola/widgets/dag.py:714 cola/widgets/dag.py:1596 -#: cola/widgets/diff.py:785 +#: cola/widgets/dag.py:590 cola/widgets/dag.py:780 cola/widgets/dag.py:1653 +#: cola/widgets/diff.py:813 msgid "Zoom to Fit" msgstr "Подогнать по размеру" -#: cola/widgets/grep.py:112 +#: cola/widgets/grep.py:110 msgid "command-line arguments" msgstr "фраза для поиска / аргументы командной строки" -#: cola/widgets/main.py:932 cola/widgets/main.py:938 +#: cola/widgets/main.py:945 cola/widgets/main.py:951 msgid "error: unable to execute git" msgstr "" @@ -4019,45 +4149,41 @@ msgstr "" msgid "exit code %s" msgstr "код завершения %s" -#: cola/app.py:301 +#: cola/app.py:304 #, python-format msgid "fatal: \"%s\" is not a directory. Please specify a correct --repo ." msgstr "fatal: \"%s\" не является каталогом. Пожалуйста, укажите корректный --repo ." -#: cola/widgets/main.py:928 +#: cola/widgets/main.py:941 #, python-format msgid "git cola version %s" msgstr "" -#: cola/widgets/startup.py:35 +#: cola/widgets/startup.py:34 msgid "git-cola" msgstr "" -#: cola/difftool.py:63 +#: cola/difftool.py:82 msgid "git-cola diff" msgstr "" -#: cola/widgets/submodules.py:81 +#: cola/widgets/submodules.py:80 msgid "git://git.example.com/repo.git" msgstr "" -#: cola/widgets/grep.py:132 +#: cola/widgets/grep.py:130 msgid "grep result..." msgstr "результаты поиска..." -#: cola/widgets/about.py:486 +#: cola/widgets/about.py:469 msgid "hotkeys.html" msgstr "" -#: cola/widgets/submodules.py:85 +#: cola/widgets/submodules.py:84 msgid "path/to/submodule" msgstr "" -#: cola/cmds.py:2537 -msgid "unknown" -msgstr "неизвестно" - -#: cola/widgets/createtag.py:63 +#: cola/widgets/createtag.py:61 msgid "vX.Y.Z" msgstr "" @@ -4066,14 +4192,18 @@ msgid "x 1" msgstr "" #: cola/hidpi.py:44 -msgid "x 1.5" +msgid "x 1.25" msgstr "" #: cola/hidpi.py:45 +msgid "x 1.5" +msgstr "" + +#: cola/hidpi.py:46 msgid "x 2" msgstr "" -#: cola/widgets/search.py:53 cola/widgets/search.py:58 +#: cola/widgets/search.py:52 cola/widgets/search.py:57 msgid "yyyy-MM-dd" msgstr "" @@ -4126,6 +4256,10 @@ msgstr "" #~ msgid "A branch is required for 'Merged Into'." #~ msgstr "Для опции 'Объединено с' требуется указать ветвь." +#, python-format +#~ msgid "A stash named \"%s\" already exists" +#~ msgstr "Заначка (stash) с именем '%s' уже существует." + #~ msgid "Abort completed. Ready." #~ msgstr "Прервано." @@ -4360,6 +4494,9 @@ msgstr "" #~ msgid "Error: Command Failed" #~ msgstr "Ошибка: не удалось выполнить команду" +#~ msgid "Error: Stash exists" +#~ msgstr "Ошибка: заначка (stash) уже существует" + #~ msgid "Errors: %s" #~ msgstr "Ошибки: %s" @@ -5130,6 +5267,9 @@ msgstr "" #~ msgid "remote prune %s" #~ msgstr "чистка внешнего %s" +#~ msgid "unknown" +#~ msgstr "неизвестно" + #~ msgid "update-ref failed:" #~ msgstr "Программа update-ref завершилась с ошибкой:" diff --git a/cola/i18n/sv.po b/cola/i18n/sv.po index 6f2c8dc4..a9f830b8 100644 --- a/cola/i18n/sv.po +++ b/cola/i18n/sv.po @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cola/widgets/patch.py:86 +#: cola/widgets/diff.py:1680 msgid "" "\n" "

\n" @@ -26,7 +26,7 @@ msgid "" " " msgstr "" -#: cola/widgets/about.py:455 +#: cola/widgets/about.py:438 #, python-format msgid "" "\n" @@ -55,7 +55,7 @@ msgid "" " " msgstr "" -#: cola/widgets/about.py:180 +#: cola/widgets/about.py:182 #, python-format msgid "" "\n" @@ -72,7 +72,7 @@ msgid "" " " msgstr "" -#: cola/widgets/about.py:387 +#: cola/widgets/about.py:370 #, python-format msgid "" "\n" @@ -82,7 +82,7 @@ msgid "" " " msgstr "" -#: cola/widgets/status.py:1310 +#: cola/widgets/status.py:1311 #, python-format msgid "" "\n" @@ -97,7 +97,7 @@ msgid "" " %(ext)s = file extension\n" msgstr "" -#: cola/sequenceeditor.py:700 +#: cola/sequenceeditor.py:695 msgid "" "\n" "Commands\n" @@ -136,7 +136,7 @@ msgid "" "ctrl+d = launch difftool\n" msgstr "" -#: cola/widgets/finder.py:65 +#: cola/widgets/finder.py:64 msgid "" "\n" "Keyboard Shortcuts\n" @@ -152,46 +152,72 @@ msgid "" "and the results.\n" msgstr "" -#: cola/widgets/dag.py:894 +#: cola/widgets/prefs.py:133 +msgid "" +"\n" +"This option determines how the supplied commit message should be\n" +"cleaned up before committing.\n" +"\n" +"The can be strip, whitespace, verbatim, scissors or default.\n" +"\n" +"strip\n" +" Strip leading and trailing empty lines, trailing whitespace,\n" +" commentary and collapse consecutive empty lines.\n" +"\n" +"whitespace\n" +" Same as strip except #commentary is not removed.\n" +"\n" +"verbatim\n" +" Do not change the message at all.\n" +"\n" +"scissors\n" +" Same as whitespace except that everything from (and including) the line\n" +" found below is truncated, if the message is to be edited.\n" +" \"#\" can be customized with core.commentChar.\n" +"\n" +" # ------------------------ >8 ------------------------" +msgstr "" + +#: cola/widgets/dag.py:960 msgid " - DAG" msgstr "" -#: cola/widgets/recent.py:54 +#: cola/widgets/recent.py:52 #, fuzzy msgid " commits ago" msgstr "Incheckningsmeddelande för sammanslagning:" -#: cola/cmds.py:1197 +#: cola/cmds.py:1198 #, python-format msgid "\"%(branch)s\" has been deleted from \"%(remote)s\"." msgstr "" -#: cola/widgets/createbranch.py:316 +#: cola/widgets/createbranch.py:314 #, python-format msgid "\"%(command)s\" returned exit status \"%(status)d\"" msgstr "" -#: cola/interaction.py:39 +#: cola/interaction.py:38 #, python-format msgid "\"%(command)s\" returned exit status %(status)d" msgstr "" -#: cola/guicmds.py:157 +#: cola/guicmds.py:156 #, fuzzy, python-format msgid "\"%s\" already exists" msgstr "Grenen \"%s\" finns redan." -#: cola/widgets/clone.py:206 +#: cola/widgets/clone.py:204 #, python-format msgid "\"%s\" already exists, cola will create a new directory" msgstr "" -#: cola/cmds.py:2349 +#: cola/cmds.py:2300 #, python-format msgid "\"%s\" requires a selected file." msgstr "" -#: cola/cmds.py:2087 +#: cola/cmds.py:2038 msgid "" "\"git rebase --update-refs\" automatically force-updates any\n" "branches that point to commits that are being rebased.\n" @@ -201,7 +227,11 @@ msgid "" "Using this feature is helpful for \"stacked\" branch workflows." msgstr "" -#: cola/sequenceeditor.py:321 +#: cola/models/stash.py:145 +msgid "\"git stash drop\" did not return a ref to rename." +msgstr "" + +#: cola/sequenceeditor.py:318 msgid "#" msgstr "" @@ -210,37 +240,37 @@ msgstr "" msgid "%(project)s: %(branch)s - Browse" msgstr "" -#: cola/widgets/dag.py:887 +#: cola/widgets/dag.py:953 #, python-format msgid "%(project)s: %(ref)s - DAG" msgstr "" -#: cola/models/browse.py:315 +#: cola/models/browse.py:314 #, python-format msgid "%d days ago" msgstr "" -#: cola/models/browse.py:314 +#: cola/models/browse.py:313 #, python-format msgid "%d hours ago" msgstr "" -#: cola/models/browse.py:307 cola/models/browse.py:311 +#: cola/models/browse.py:306 cola/models/browse.py:310 #, python-format msgid "%d minutes ago" msgstr "" -#: cola/cmds.py:376 +#: cola/cmds.py:377 #, python-format msgid "%d patch(es) applied." msgstr "" -#: cola/widgets/createbranch.py:281 +#: cola/widgets/createbranch.py:279 #, python-format msgid "%d skipped" msgstr "" -#: cola/cmds.py:2580 +#: cola/cmds.py:2522 #, python-format msgid "" "%s appears to contain merge conflicts.\n" @@ -249,36 +279,36 @@ msgid "" "Stage it anyways?" msgstr "" -#: cola/widgets/startup.py:263 +#: cola/widgets/startup.py:262 #, python-format msgid "%s could not be opened. Remove from bookmarks?" msgstr "" -#: cola/app.py:498 cola/widgets/bookmarks.py:482 +#: cola/app.py:501 cola/widgets/bookmarks.py:481 #, fuzzy, python-format msgid "%s is not a Git repository." msgstr "Gitarkiv" -#: cola/cmds.py:1015 +#: cola/cmds.py:1016 #, python-format msgid "%s will be removed from your bookmarks." msgstr "" -#: cola/cmds.py:1028 +#: cola/cmds.py:1029 #, python-format msgid "%s will be removed from your recent repositories." msgstr "" -#: cola/cmds.py:1711 +#: cola/cmds.py:1663 #, fuzzy, python-format msgid "%s: No such file or directory." msgstr "ödesdigert: kunde inte ta status på sökvägen %s: Fil eller katalog saknas" -#: cola/widgets/main.py:734 +#: cola/widgets/main.py:747 msgid "&Edit" msgstr "Redigera" -#: cola/widgets/main.py:676 +#: cola/widgets/main.py:689 #, fuzzy msgid "&File" msgstr "&Fil" @@ -287,127 +317,122 @@ msgstr "&Fil" msgid "(Amending)" msgstr "" -#: cola/widgets/compare.py:36 +#: cola/widgets/compare.py:35 msgid "*** Branch Point ***" msgstr "" -#: cola/widgets/compare.py:37 +#: cola/widgets/compare.py:36 msgid "*** Sandbox ***" msgstr "" -#: cola/widgets/diff.py:788 +#: cola/widgets/diff.py:816 msgid "100%" msgstr "" -#: cola/widgets/diff.py:789 +#: cola/widgets/diff.py:817 msgid "200%" msgstr "" -#: cola/widgets/diff.py:786 +#: cola/widgets/diff.py:814 msgid "25%" msgstr "" -#: cola/widgets/diff.py:790 +#: cola/widgets/diff.py:818 msgid "400%" msgstr "" -#: cola/widgets/diff.py:787 +#: cola/widgets/diff.py:815 msgid "50%" msgstr "" -#: cola/widgets/diff.py:791 +#: cola/widgets/diff.py:819 msgid "800%" msgstr "" -#: cola/widgets/finder.py:119 +#: cola/widgets/finder.py:118 msgid " ..." msgstr "" -#: cola/cmds.py:1734 +#: cola/cmds.py:1686 msgid "" "A commit template has not been configured.\n" "Use \"git config\" to define \"commit.template\"\n" "so that it points to a commit template." msgstr "" -#: cola/cmds.py:1784 +#: cola/cmds.py:1735 #, python-format msgid "A hook must be provided at \"%s\"" msgstr "" -#: cola/widgets/stash.py:236 -#, fuzzy, python-format -msgid "A stash named \"%s\" already exists" -msgstr "Filen %s finns redan." - -#: cola/widgets/cfgactions.py:82 cola/widgets/main.py:622 +#: cola/widgets/cfgactions.py:81 cola/widgets/main.py:635 #, fuzzy msgid "Abort" msgstr "Avbryter" -#: cola/widgets/cfgactions.py:149 cola/widgets/cfgactions.py:155 +#: cola/widgets/cfgactions.py:148 cola/widgets/cfgactions.py:154 #, fuzzy msgid "Abort Action" msgstr "Avbryter" -#: cola/cmds.py:132 +#: cola/cmds.py:131 msgid "Abort Applying Patch" msgstr "" -#: cola/cmds.py:126 +#: cola/cmds.py:125 msgid "Abort Applying Patch..." msgstr "" -#: cola/widgets/main.py:245 +#: cola/widgets/main.py:244 msgid "Abort Applying Patches..." msgstr "" -#: cola/cmds.py:162 +#: cola/cmds.py:161 msgid "Abort Cherry-Pick" msgstr "" -#: cola/cmds.py:156 cola/widgets/main.py:334 +#: cola/cmds.py:155 cola/widgets/main.py:329 msgid "Abort Cherry-Pick..." msgstr "" -#: cola/cmds.py:193 +#: cola/cmds.py:192 #, fuzzy msgid "Abort Merge" msgstr "Avbryt sammanslagning..." -#: cola/cmds.py:186 cola/widgets/main.py:368 +#: cola/cmds.py:185 cola/widgets/main.py:363 msgid "Abort Merge..." msgstr "Avbryt sammanslagning..." -#: cola/widgets/cfgactions.py:154 +#: cola/widgets/cfgactions.py:153 msgid "Abort the action?" msgstr "" -#: cola/widgets/main.py:250 +#: cola/widgets/main.py:245 msgid "Abort the current \"git am\" patch session" msgstr "" -#: cola/cmds.py:159 +#: cola/cmds.py:158 msgid "" "Aborting a cherry-pick can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:129 +#: cola/cmds.py:128 msgid "" "Aborting a patch can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:127 +#: cola/cmds.py:126 msgid "Aborting applying the current patch?" msgstr "" -#: cola/cmds.py:157 +#: cola/cmds.py:156 msgid "Aborting the current cherry-pick?" msgstr "" -#: cola/cmds.py:189 +#: cola/cmds.py:188 #, fuzzy msgid "" "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" @@ -419,78 +444,78 @@ msgstr "" "\n" "Gå vidare med att avbryta den aktuella sammanslagningen?" -#: cola/cmds.py:187 +#: cola/cmds.py:186 msgid "Aborting the current merge?" msgstr "" -#: cola/widgets/about.py:91 cola/widgets/main.py:517 +#: cola/widgets/about.py:89 cola/widgets/main.py:530 #, fuzzy msgid "About" msgstr "Om %s" -#: cola/widgets/about.py:67 +#: cola/widgets/about.py:65 msgid "About git-cola" msgstr "" -#: cola/widgets/bookmarks.py:217 cola/widgets/startup.py:340 +#: cola/widgets/bookmarks.py:216 cola/widgets/startup.py:339 msgid "Accept" msgstr "" -#: cola/sequenceeditor.py:159 +#: cola/sequenceeditor.py:157 msgid "" "Accept changes and rebase\n" "Shortcut: Ctrl+Enter" msgstr "" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 #, fuzzy msgid "Action Name" msgstr "Alternativ" -#: cola/sequenceeditor.py:528 cola/widgets/bookmarks.py:321 -#: cola/widgets/branch.py:217 cola/widgets/browse.py:374 -#: cola/widgets/commitmsg.py:99 cola/widgets/dag.py:315 -#: cola/widgets/filelist.py:110 cola/widgets/main.py:95 -#: cola/widgets/main.py:757 cola/widgets/startup.py:436 +#: cola/sequenceeditor.py:524 cola/widgets/bookmarks.py:320 +#: cola/widgets/branch.py:221 cola/widgets/browse.py:375 +#: cola/widgets/commitmsg.py:105 cola/widgets/dag.py:314 +#: cola/widgets/filelist.py:107 cola/widgets/main.py:93 +#: cola/widgets/main.py:770 cola/widgets/startup.py:435 #, fuzzy msgid "Actions" msgstr "Alternativ" -#: cola/widgets/commitmsg.py:101 +#: cola/widgets/commitmsg.py:107 #, fuzzy msgid "Actions..." msgstr "Alternativ..." -#: cola/widgets/bookmarks.py:71 cola/widgets/gitignore.py:64 -#: cola/widgets/patch.py:103 cola/widgets/patch.py:117 -#: cola/widgets/status.py:1381 +#: cola/widgets/bookmarks.py:70 cola/widgets/diff.py:1697 +#: cola/widgets/diff.py:1711 cola/widgets/gitignore.py:63 +#: cola/widgets/status.py:1382 msgid "Add" msgstr "" -#: cola/widgets/bookmarks.py:470 +#: cola/widgets/bookmarks.py:469 #, fuzzy msgid "Add Favorite" msgstr "Fjärr" -#: cola/widgets/editremotes.py:374 +#: cola/widgets/editremotes.py:373 #, fuzzy msgid "Add Remote" msgstr "Fjärr" -#: cola/widgets/toolbar.py:315 +#: cola/widgets/toolbar.py:320 msgid "Add Separator" msgstr "" -#: cola/cmds.py:3030 cola/widgets/submodules.py:42 -#: cola/widgets/submodules.py:111 +#: cola/cmds.py:2976 cola/widgets/submodules.py:41 +#: cola/widgets/submodules.py:110 msgid "Add Submodule" msgstr "" -#: cola/cmds.py:3027 cola/widgets/main.py:381 +#: cola/cmds.py:2973 cola/widgets/main.py:376 msgid "Add Submodule..." msgstr "" -#: cola/widgets/editremotes.py:62 +#: cola/widgets/editremotes.py:61 msgid "" "Add and remove remote repositories using the \n" "Add(+) and Delete(-) buttons on the left-hand side.\n" @@ -499,166 +524,166 @@ msgid "" "and pressing \"enter\", or by double-clicking." msgstr "" -#: cola/widgets/editremotes.py:81 +#: cola/widgets/editremotes.py:80 #, fuzzy msgid "Add new remote git repository" msgstr "Inte ett Gitarkiv: %s" -#: cola/widgets/patch.py:103 +#: cola/widgets/diff.py:1697 msgid "Add patches (+)" msgstr "" -#: cola/widgets/editremotes.py:433 +#: cola/widgets/editremotes.py:431 #, fuzzy msgid "Add remote" msgstr "Fjärr" -#: cola/cmds.py:3028 +#: cola/cmds.py:2974 msgid "Add this submodule?" msgstr "" -#: cola/widgets/gitignore.py:54 +#: cola/widgets/gitignore.py:53 msgid "Add to .gitignore" msgstr "" -#: cola/widgets/status.py:286 +#: cola/widgets/status.py:287 msgid "Add to Git Annex" msgstr "" -#: cola/widgets/status.py:290 +#: cola/widgets/status.py:291 msgid "Add to Git LFS" msgstr "" -#: cola/widgets/gitignore.py:28 +#: cola/widgets/gitignore.py:27 msgid "Add to exclusions" msgstr "" -#: cola/widgets/gitignore.py:55 +#: cola/widgets/gitignore.py:54 msgid "Add to local .git/info/exclude" msgstr "" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 #, fuzzy msgid "Additions" msgstr "Alternativ" -#: cola/widgets/archive.py:134 +#: cola/widgets/archive.py:132 msgid "Advanced" msgstr "" -#: cola/widgets/main.py:522 +#: cola/widgets/main.py:535 msgid "Against Commit... (Diff Mode)" msgstr "" -#: cola/models/browse.py:33 +#: cola/models/browse.py:32 msgid "Age" msgstr "" -#: cola/widgets/prefs.py:403 +#: cola/widgets/prefs.py:441 #, fuzzy msgid "All Repositories" msgstr "Globalt (alla arkiv)" -#: cola/cmds.py:3110 +#: cola/cmds.py:3056 #, python-format msgid "" "All submodules will be updated using\n" "\"%s\"" msgstr "" -#: cola/widgets/remote.py:195 +#: cola/widgets/remote.py:199 msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care" msgstr "" -#: cola/widgets/merge.py:61 +#: cola/widgets/merge.py:59 msgid "Always create a merge commit when enabled, even when the merge is a fast-forward update" msgstr "" -#: cola/cmds.py:221 +#: cola/cmds.py:220 msgid "Amend" msgstr "" -#: cola/widgets/commitmsg.py:463 +#: cola/widgets/commitmsg.py:471 #, fuzzy msgid "Amend Commit" msgstr "Lägg till föregående incheckning" -#: cola/widgets/commitmsg.py:110 cola/widgets/main.py:194 +#: cola/widgets/commitmsg.py:116 cola/widgets/main.py:193 msgid "Amend Last Commit" msgstr "Lägg till föregående incheckning" -#: cola/widgets/commitmsg.py:462 +#: cola/widgets/commitmsg.py:470 msgid "Amend the published commit?" msgstr "" -#: cola/widgets/main.py:1157 +#: cola/widgets/main.py:1170 msgid "Amending" msgstr "" -#: cola/widgets/cfgactions.py:151 +#: cola/widgets/cfgactions.py:150 msgid "" "An action is still running.\n" "Terminating it could result in data loss." msgstr "" -#: cola/cmds.py:2804 +#: cola/cmds.py:2750 msgid "" "An unsigned, lightweight tag will be created instead.\n" "Create an unsigned tag?" msgstr "" -#: cola/widgets/prefs.py:406 +#: cola/widgets/prefs.py:444 msgid "Appearance" msgstr "" -#: cola/widgets/diff.py:1230 +#: cola/widgets/diff.py:1304 msgid "Append Patch" msgstr "" -#: cola/widgets/diff.py:1299 +#: cola/widgets/diff.py:1373 msgid "Append Patch..." msgstr "" -#: cola/widgets/patch.py:112 cola/widgets/stash.py:48 cola/widgets/stash.py:107 -#: cola/widgets/toolbar.py:323 +#: cola/widgets/diff.py:1706 cola/widgets/stash.py:50 cola/widgets/stash.py:110 +#: cola/widgets/toolbar.py:328 #, fuzzy msgid "Apply" msgstr "Äpple" -#: cola/widgets/patch.py:75 +#: cola/widgets/diff.py:1669 msgid "Apply Patches" msgstr "" -#: cola/widgets/main.py:239 +#: cola/widgets/main.py:238 msgid "Apply Patches..." msgstr "" -#: cola/widgets/stash.py:64 +#: cola/widgets/stash.py:66 msgid "Apply and drop the selected stash (git stash pop)" msgstr "" -#: cola/widgets/stash.py:48 +#: cola/widgets/stash.py:50 msgid "Apply the selected stash" msgstr "" -#: cola/widgets/main.py:1167 +#: cola/widgets/main.py:1180 msgid "Applying Patch" msgstr "" -#: cola/widgets/cfgactions.py:207 +#: cola/widgets/cfgactions.py:205 msgid "Arguments" msgstr "" -#: cola/qtutils.py:850 +#: cola/qtutils.py:887 msgid "Attach" msgstr "" -#: cola/models/browse.py:33 cola/models/browse.py:72 cola/widgets/dag.py:506 +#: cola/models/browse.py:32 cola/models/browse.py:71 cola/widgets/dag.py:572 #, fuzzy msgid "Author" msgstr "Författare:" -#: cola/widgets/about.py:93 +#: cola/widgets/about.py:91 #, fuzzy msgid "Authors" msgstr "Författare:" @@ -667,729 +692,745 @@ msgstr "Författare:" msgid "Auto" msgstr "" -#: cola/widgets/commitmsg.py:137 cola/widgets/prefs.py:259 +#: cola/widgets/commitmsg.py:143 cola/widgets/prefs.py:280 msgid "Auto-Wrap Lines" msgstr "" -#: cola/widgets/prefs.py:184 +#: cola/widgets/prefs.py:206 msgid "Autocomplete Paths" msgstr "" -#: cola/widgets/prefs.py:176 +#: cola/widgets/prefs.py:198 msgid "Automatically Load Commit Message Template" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Basic Regexp" msgstr "" -#: cola/widgets/prefs.py:255 +#: cola/widgets/prefs.py:276 #, fuzzy msgid "Blame Viewer" msgstr "Filvisare" -#: cola/widgets/browse.py:205 +#: cola/widgets/browse.py:206 #, fuzzy msgid "Blame selected paths" msgstr "Byt namn på gren" -#: cola/cmds.py:545 cola/widgets/status.py:282 +#: cola/cmds.py:546 cola/widgets/status.py:283 #, fuzzy msgid "Blame..." msgstr "Byt namn..." -#: cola/widgets/prefs.py:347 +#: cola/widgets/prefs.py:367 msgid "Bold on dark headers instead of italic" msgstr "" -#: cola/widgets/main.py:806 cola/widgets/submodules.py:119 +#: cola/widgets/main.py:819 cola/widgets/submodules.py:118 msgid "Branch" msgstr "Gren" -#: cola/widgets/remote.py:600 +#: cola/widgets/remote.py:635 #, python-format msgid "" "Branch \"%(branch)s\" does not exist in \"%(remote)s\".\n" "A new remote branch will be published." msgstr "" -#: cola/widgets/createbranch.py:258 +#: cola/widgets/createbranch.py:256 #, fuzzy, python-format msgid "Branch \"%s\" already exists." msgstr "Grenen \"%s\" finns redan." -#: cola/widgets/compare.py:44 +#: cola/widgets/compare.py:43 msgid "Branch Diff Viewer" msgstr "" -#: cola/widgets/createbranch.py:259 cola/widgets/createbranch.py:271 +#: cola/widgets/createbranch.py:257 cola/widgets/createbranch.py:269 #, fuzzy msgid "Branch Exists" msgstr "Grenar" -#: cola/widgets/createbranch.py:98 +#: cola/widgets/createbranch.py:96 msgid "Branch Name" msgstr "Namn på gren" -#: cola/widgets/submodules.py:89 +#: cola/widgets/submodules.py:88 msgid "Branch name" msgstr "" -#: cola/widgets/browse.py:89 cola/widgets/main.py:1097 +#: cola/widgets/browse.py:89 cola/widgets/main.py:1110 #, fuzzy, python-format msgid "Branch: %s" msgstr "Gren:" -#: cola/widgets/branch.py:85 cola/widgets/main.py:131 +#: cola/widgets/branch.py:87 cola/widgets/main.py:129 #, fuzzy msgid "Branches" msgstr "Gren" -#: cola/widgets/main.py:538 +#: cola/widgets/main.py:551 #, fuzzy msgid "Branches..." msgstr "Grenar" -#: cola/widgets/about.py:414 cola/widgets/about.py:417 -#: cola/widgets/about.py:437 +#: cola/widgets/about.py:397 cola/widgets/about.py:400 +#: cola/widgets/about.py:420 msgid "Brazilian translation" msgstr "" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 #, fuzzy msgid "Browse" msgstr "Bläddra" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 #, fuzzy msgid "Browse Commits..." msgstr "Bläddra" -#: cola/widgets/main.py:499 +#: cola/widgets/main.py:512 #, fuzzy msgid "Browse Current Branch..." msgstr "Bläddra i grenens filer" -#: cola/widgets/main.py:505 +#: cola/widgets/main.py:518 #, fuzzy msgid "Browse Other Branch..." msgstr "Bläddra filer på gren..." -#: cola/widgets/editremotes.py:437 cola/widgets/search.py:46 -#: cola/widgets/startup.py:65 cola/widgets/startup.py:285 +#: cola/widgets/editremotes.py:435 cola/widgets/search.py:45 +#: cola/widgets/startup.py:64 cola/widgets/startup.py:284 #, fuzzy msgid "Browse..." msgstr "Bläddra" -#: cola/widgets/main.py:89 +#: cola/widgets/main.py:87 #, fuzzy msgid "Browser" msgstr "Bläddra" -#: cola/widgets/browse.py:589 +#: cola/widgets/browse.py:590 #, fuzzy, python-format msgid "Browsing %s" msgstr "Lägger till %s" -#: cola/widgets/commitmsg.py:118 +#: cola/widgets/commitmsg.py:124 msgid "Bypass Commit Hooks" msgstr "" -#: cola/sequenceeditor.py:175 cola/widgets/standard.py:991 +#: cola/sequenceeditor.py:173 cola/widgets/standard.py:1058 msgid "Cancel" msgstr "Avbryt" -#: cola/sequenceeditor.py:176 +#: cola/sequenceeditor.py:174 msgid "" "Cancel rebase\n" "Shortcut: Ctrl+Q" msgstr "" -#: cola/cmds.py:254 +#: cola/cmds.py:253 #, fuzzy msgid "Cannot Amend" msgstr "Kan inte skriva ikon:" -#: cola/cmds.py:560 +#: cola/cmds.py:561 #, python-format msgid "Cannot exec \"%s\": please configure a blame viewer" msgstr "" -#: cola/cmds.py:3146 +#: cola/cmds.py:3092 #, python-format msgid "Cannot exec \"%s\": please configure a history browser" msgstr "" -#: cola/cmds.py:1583 +#: cola/cmds.py:1571 #, python-format msgid "Cannot exec \"%s\": please configure your editor" msgstr "" -#: cola/models/browse.py:336 +#: cola/models/browse.py:335 msgid "Changed Upstream" msgstr "" -#: cola/widgets/prefs.py:186 +#: cola/widgets/prefs.py:208 msgid "Check Published Commits when Amending" msgstr "" -#: cola/widgets/commitmsg.py:130 +#: cola/widgets/commitmsg.py:136 msgid "Check Spelling" msgstr "" -#: cola/widgets/prefs.py:265 +#: cola/widgets/prefs.py:286 msgid "Check spelling" msgstr "" -#: cola/widgets/prefs.py:163 +#: cola/widgets/prefs.py:186 msgid "Check whether a commit has been published when amending" msgstr "" -#: cola/guicmds.py:62 cola/widgets/branch.py:222 +#: cola/guicmds.py:61 cola/widgets/branch.py:233 msgid "Checkout" msgstr "Checka ut" -#: cola/widgets/createbranch.py:130 +#: cola/widgets/createbranch.py:128 msgid "Checkout After Creation" msgstr "Checka ut när skapad" -#: cola/guicmds.py:62 cola/widgets/dag.py:410 +#: cola/guicmds.py:61 cola/widgets/dag.py:409 msgid "Checkout Branch" msgstr "Checka ut gren" -#: cola/widgets/dag.py:414 +#: cola/widgets/dag.py:413 #, fuzzy msgid "Checkout Detached HEAD" msgstr "Checka ut gren" -#: cola/cmds.py:480 cola/cmds.py:518 +#: cola/cmds.py:481 cola/cmds.py:519 msgid "Checkout Files" msgstr "" -#: cola/widgets/branch.py:226 +#: cola/widgets/branch.py:237 #, fuzzy msgid "Checkout as new branch" msgstr "Checka ut gren" -#: cola/cmds.py:507 +#: cola/cmds.py:508 msgid "Checkout files from our branch (HEAD)" msgstr "" -#: cola/cmds.py:511 +#: cola/cmds.py:512 msgid "Checkout files from our branch?" msgstr "" -#: cola/cmds.py:469 +#: cola/cmds.py:470 msgid "Checkout files from their branch (MERGE_HEAD)" msgstr "" -#: cola/cmds.py:473 +#: cola/cmds.py:474 msgid "Checkout files from their branch?" msgstr "" -#: cola/widgets/main.py:576 +#: cola/widgets/main.py:589 msgid "Checkout..." msgstr "Checka ut..." -#: cola/widgets/dag.py:387 cola/widgets/search.py:79 +#: cola/widgets/dag.py:386 cola/widgets/search.py:78 msgid "Cherry Pick" msgstr "" -#: cola/guicmds.py:73 +#: cola/guicmds.py:72 #, fuzzy msgid "Cherry-Pick Commit" msgstr "Kopiera incheckning" -#: cola/widgets/main.py:328 +#: cola/widgets/main.py:323 #, fuzzy msgid "Cherry-Pick..." msgstr "Checka ut..." -#: cola/cmds.py:584 +#: cola/cmds.py:585 msgid "Cherry-pick failed" msgstr "" -#: cola/widgets/main.py:1161 +#: cola/widgets/main.py:1174 msgid "Cherry-picking" msgstr "" -#: cola/widgets/diff.py:1247 +#: cola/widgets/diff.py:1321 msgid "Choose Patch..." msgstr "" -#: cola/widgets/search.py:319 +#: cola/widgets/search.py:318 #, fuzzy msgid "Choose Paths" msgstr "Välj %s" -#: cola/widgets/grep.py:116 +#: cola/widgets/grep.py:114 msgid "Choose the \"git grep\" regular expression mode" msgstr "" -#: cola/widgets/bookmarks.py:229 cola/widgets/startup.py:352 +#: cola/widgets/bookmarks.py:228 cola/widgets/startup.py:351 #, fuzzy msgid "Clear Default Repository" msgstr "Skapa nytt arkiv" -#: cola/widgets/commitmsg.py:305 +#: cola/widgets/commitmsg.py:313 #, fuzzy msgid "Clear commit message" msgstr "Incheckningsmeddelande för sammanslagning:" -#: cola/widgets/commitmsg.py:302 +#: cola/widgets/commitmsg.py:310 #, fuzzy msgid "Clear commit message?" msgstr "Incheckningsmeddelande för sammanslagning:" -#: cola/widgets/commitmsg.py:62 +#: cola/widgets/commitmsg.py:63 #, fuzzy msgid "Clear..." msgstr "Klona..." -#: cola/widgets/clone.py:126 +#: cola/widgets/clone.py:124 msgid "Clone" msgstr "Klona" -#: cola/widgets/clone.py:62 cola/widgets/clone.py:104 +#: cola/widgets/clone.py:61 cola/widgets/clone.py:102 #, fuzzy msgid "Clone Repository" msgstr "Klona befintligt arkiv" -#: cola/widgets/main.py:465 cola/widgets/startup.py:58 +#: cola/widgets/main.py:478 cola/widgets/startup.py:57 msgid "Clone..." msgstr "Klona..." -#: cola/widgets/clone.py:62 +#: cola/widgets/clone.py:61 #, fuzzy, python-format msgid "Cloning repository at %s" msgstr "Klona befintligt arkiv" -#: cola/qtutils.py:757 cola/qtutils.py:807 cola/widgets/about.py:508 -#: cola/widgets/remote.py:328 cola/widgets/text.py:1094 +#: cola/qtutils.py:788 cola/qtutils.py:838 cola/widgets/about.py:491 +#: cola/widgets/remote.py:362 cola/widgets/text.py:1090 msgid "Close" msgstr "Stäng" -#: cola/widgets/text.py:402 +#: cola/widgets/remote.py:222 +msgid "Close dialog when completed" +msgstr "" + +#: cola/widgets/remote.py:221 +msgid "Close on completion" +msgstr "" + +#: cola/widgets/text.py:399 msgid "Close the find bar" msgstr "" -#: cola/qtutils.py:623 +#: cola/qtutils.py:651 #, fuzzy msgid "Close..." msgstr "Klona..." -#: cola/widgets/recent.py:71 +#: cola/widgets/recent.py:69 #, fuzzy msgid "Collapse all" msgstr "Stäng" -#: cola/sequenceeditor.py:323 +#: cola/sequenceeditor.py:320 #, fuzzy msgid "Command" msgstr "Incheckning:" -#: cola/widgets/main.py:163 cola/widgets/merge.py:74 +#: cola/widgets/main.py:161 cola/widgets/merge.py:72 #, fuzzy msgid "Commit" msgstr "Incheckning:" -#: cola/cmds.py:837 +#: cola/widgets/prefs.py:192 +msgid "Commit Message Cleanup" +msgstr "" + +#: cola/widgets/commitmsg.py:495 #, fuzzy msgid "Commit failed" msgstr "Incheckningen misslyckades." -#: cola/widgets/commitmsg.py:61 +#: cola/widgets/commitmsg.py:62 #, fuzzy msgid "Commit staged changes" msgstr "Checkar in ändringar..." -#: cola/widgets/commitmsg.py:93 +#: cola/widgets/commitmsg.py:94 msgid "" "Commit staged changes\n" "Shortcut: Ctrl+Enter" msgstr "" -#: cola/widgets/commitmsg.py:564 +#: cola/widgets/commitmsg.py:590 #, fuzzy msgid "Commit summary" msgstr "Incheckningsmeddelande:" -#: cola/widgets/main.py:259 +#: cola/widgets/main.py:253 msgid "Commit the current state and continue applying patches" msgstr "" -#: cola/widgets/merge.py:70 +#: cola/widgets/merge.py:68 msgid "Commit the merge if there are no conflicts. Uncheck to leave the merge uncommitted" msgstr "" -#: cola/widgets/commitmsg.py:58 cola/widgets/commitmsg.py:95 -#: cola/widgets/main.py:778 cola/widgets/main.py:779 +#: cola/widgets/commitmsg.py:59 cola/widgets/commitmsg.py:96 +#: cola/widgets/main.py:791 cola/widgets/main.py:792 msgid "Commit@@verb" msgstr "Checka in" -#: cola/difftool.py:78 cola/widgets/compare.py:70 +#: cola/widgets/dag.py:487 +msgid "Commits authored by me" +msgstr "" + +#: cola/difftool.py:97 cola/widgets/compare.py:69 msgid "Compare" msgstr "" -#: cola/difftool.py:83 +#: cola/difftool.py:102 msgid "Compare All" msgstr "" -#: cola/widgets/toolbar.py:269 cola/widgets/toolbar.py:306 +#: cola/widgets/toolbar.py:274 cola/widgets/toolbar.py:311 msgid "Configure Toolbar" msgstr "" -#: cola/widgets/remote.py:214 +#: cola/widgets/remote.py:218 msgid "Configure the remote branch as the the new upstream" msgstr "" -#: cola/widgets/main.py:170 +#: cola/widgets/main.py:168 #, fuzzy msgid "Console" msgstr "Stäng" -#: cola/interaction.py:111 cola/widgets/main.py:610 +#: cola/interaction.py:109 cola/widgets/main.py:623 msgid "Continue" msgstr "Forstätt" -#: cola/widgets/main.py:255 +#: cola/widgets/main.py:252 msgid "Continue Applying Patches" msgstr "" -#: cola/widgets/bookmarks.py:248 cola/widgets/main.py:742 -#: cola/widgets/startup.py:371 +#: cola/widgets/bookmarks.py:247 cola/widgets/main.py:755 +#: cola/widgets/startup.py:370 msgid "Copy" msgstr "Kopiera" -#: cola/widgets/status.py:268 +#: cola/widgets/status.py:269 msgid "Copy Basename to Clipboard" msgstr "" -#: cola/widgets/diff.py:208 +#: cola/widgets/diff.py:209 msgid "Copy Diff" msgstr "" -#: cola/widgets/status.py:745 +#: cola/widgets/status.py:746 msgid "Copy Leading Path to Clipboard" msgstr "" -#: cola/widgets/status.py:251 +#: cola/widgets/status.py:252 msgid "Copy Path to Clipboard" msgstr "" -#: cola/widgets/status.py:259 +#: cola/widgets/status.py:260 msgid "Copy Relative Path to Clipboard" msgstr "" -#: cola/sequenceeditor.py:334 cola/widgets/dag.py:474 +#: cola/sequenceeditor.py:330 cola/widgets/dag.py:473 #, fuzzy msgid "Copy SHA-1" msgstr "Kopiera alla" -#: cola/widgets/status.py:737 +#: cola/widgets/status.py:738 #, fuzzy msgid "Copy..." msgstr "Kopiera" -#: cola/app.py:490 +#: cola/app.py:493 #, python-format msgid "Could not open %s." msgstr "" -#: cola/widgets/clone.py:191 cola/widgets/clone.py:193 +#: cola/widgets/clone.py:189 cola/widgets/clone.py:191 #, python-format msgid "Could not parse Git URL: \"%s\"" msgstr "" -#: cola/app.py:500 +#: cola/app.py:503 msgid "Create" msgstr "" -#: cola/widgets/createbranch.py:86 cola/widgets/createbranch.py:135 -#: cola/widgets/createbranch.py:301 cola/widgets/dag.py:369 +#: cola/widgets/createbranch.py:84 cola/widgets/createbranch.py:133 +#: cola/widgets/createbranch.py:299 cola/widgets/dag.py:368 msgid "Create Branch" msgstr "Skapa gren" -#: cola/widgets/dag.py:373 +#: cola/widgets/dag.py:372 #, fuzzy msgid "Create Patch" msgstr "Skapa gren" -#: cola/widgets/remote.py:606 +#: cola/widgets/remote.py:641 #, fuzzy msgid "Create Remote Branch" msgstr "Ta bort fjärrgren" -#: cola/widgets/commitmsg.py:124 cola/widgets/merge.py:78 +#: cola/widgets/commitmsg.py:130 cola/widgets/merge.py:76 #, fuzzy msgid "Create Signed Commit" msgstr "Skapade incheckningen %s: %s" -#: cola/widgets/createtag.py:55 cola/widgets/createtag.py:91 -#: cola/widgets/dag.py:377 +#: cola/widgets/createtag.py:53 cola/widgets/createtag.py:89 +#: cola/widgets/dag.py:376 #, fuzzy msgid "Create Tag" msgstr "Skapa" -#: cola/widgets/main.py:544 +#: cola/widgets/main.py:557 #, fuzzy msgid "Create Tag..." msgstr "Skapa..." -#: cola/cmds.py:2807 +#: cola/cmds.py:2753 msgid "Create Unsigned Tag" msgstr "" -#: cola/widgets/remote.py:188 +#: cola/widgets/remote.py:192 msgid "Create a merge commit even when the merge resolves as a fast-forward" msgstr "" -#: cola/widgets/remote.py:605 +#: cola/widgets/remote.py:640 #, fuzzy msgid "Create a new remote branch?" msgstr "Skapa ny gren" -#: cola/app.py:499 +#: cola/app.py:502 msgid "Create a new repository at that location?" msgstr "" -#: cola/widgets/submodules.py:100 +#: cola/widgets/submodules.py:99 msgid "Create a shallow clone with history truncated to the specified number of revisions. 0 performs a full clone." msgstr "" -#: cola/widgets/main.py:551 +#: cola/widgets/main.py:564 msgid "Create..." msgstr "Skapa..." -#: cola/cmds.py:2843 +#: cola/cmds.py:2789 #, python-format msgid "Created a new tag named \"%s\"" msgstr "" -#: cola/widgets/prefs.py:266 +#: cola/widgets/prefs.py:287 msgid "Ctrl+MouseWheel to Zoom" msgstr "" -#: cola/widgets/prefs.py:404 +#: cola/widgets/prefs.py:442 #, fuzzy msgid "Current Repository" msgstr "Skapa nytt arkiv" -#: cola/widgets/status.py:1371 +#: cola/widgets/status.py:1372 msgid "Custom Copy Actions" msgstr "" -#: cola/widgets/status.py:273 +#: cola/widgets/status.py:274 #, fuzzy msgid "Customize..." msgstr "Klona..." -#: cola/widgets/main.py:740 +#: cola/widgets/main.py:753 msgid "Cut" msgstr "Klipp ut" -#: cola/widgets/about.py:411 cola/widgets/about.py:442 +#: cola/widgets/about.py:394 cola/widgets/about.py:425 msgid "Czech translation" msgstr "" -#: cola/widgets/main.py:592 +#: cola/widgets/main.py:605 msgid "DAG..." msgstr "" -#: cola/icons.py:55 +#: cola/icons.py:54 msgid "Dark Theme" msgstr "" -#: cola/widgets/dag.py:506 +#: cola/widgets/dag.py:572 msgid "Date, Time" msgstr "" -#: cola/icons.py:54 cola/themes.py:637 +#: cola/icons.py:53 cola/themes.py:643 #, fuzzy msgid "Default" msgstr "Återställ standardvärden" -#: cola/widgets/prefs.py:126 +#: cola/widgets/prefs.py:124 msgid "" "Default directory when exporting patches.\n" "Relative paths are relative to the current repository.\n" "Absolute path are used as-is." msgstr "" -#: cola/cmds.py:925 cola/guicmds.py:26 cola/guicmds.py:35 -#: cola/widgets/bookmarks.py:75 cola/widgets/bookmarks.py:251 -#: cola/widgets/main.py:746 cola/widgets/startup.py:373 +#: cola/cmds.py:923 cola/guicmds.py:25 cola/guicmds.py:34 +#: cola/widgets/bookmarks.py:74 cola/widgets/bookmarks.py:250 +#: cola/widgets/main.py:759 cola/widgets/startup.py:372 msgid "Delete" msgstr "Ta bort" -#: cola/cmds.py:1088 +#: cola/cmds.py:1089 #, python-format msgid "Delete %d file(s)?" msgstr "" -#: cola/cmds.py:1016 +#: cola/cmds.py:1017 #, fuzzy msgid "Delete Bookmark" msgstr "Ta bort gren" -#: cola/cmds.py:1014 +#: cola/cmds.py:1015 #, fuzzy msgid "Delete Bookmark?" msgstr "Ta bort gren" -#: cola/cmds.py:1114 cola/cmds.py:1117 cola/guicmds.py:26 -#: cola/widgets/branch.py:268 +#: cola/cmds.py:1115 cola/cmds.py:1118 cola/guicmds.py:25 +#: cola/widgets/branch.py:277 msgid "Delete Branch" msgstr "Ta bort gren" -#: cola/cmds.py:1089 +#: cola/cmds.py:1090 #, fuzzy msgid "Delete Files" msgstr "Ta bort" -#: cola/widgets/status.py:311 +#: cola/widgets/status.py:312 #, fuzzy msgid "Delete Files..." msgstr "Ta bort..." -#: cola/cmds.py:1085 +#: cola/cmds.py:1086 #, fuzzy msgid "Delete Files?" msgstr "Ta bort" -#: cola/cmds.py:922 +#: cola/cmds.py:920 #, fuzzy msgid "Delete Remote" msgstr "Ta bort fjärrgren" -#: cola/guicmds.py:35 cola/widgets/branch.py:270 +#: cola/guicmds.py:34 cola/widgets/branch.py:279 #, fuzzy msgid "Delete Remote Branch" msgstr "Ta bort fjärrgren" -#: cola/widgets/main.py:564 +#: cola/widgets/main.py:577 #, fuzzy msgid "Delete Remote Branch..." msgstr "Ta bort fjärrgren" -#: cola/widgets/toolbar.py:271 +#: cola/widgets/toolbar.py:276 #, fuzzy msgid "Delete Toolbar" msgstr "Ta bort gren" -#: cola/cmds.py:1115 +#: cola/cmds.py:1116 #, python-format msgid "Delete branch \"%s\"?" msgstr "" -#: cola/widgets/editremotes.py:88 +#: cola/widgets/editremotes.py:87 #, fuzzy msgid "Delete remote" msgstr "Ta bort fjärrgren" -#: cola/cmds.py:924 +#: cola/cmds.py:922 #, fuzzy, python-format msgid "Delete remote \"%s\"" msgstr "Ta bort fjärrgren" -#: cola/cmds.py:923 +#: cola/cmds.py:921 #, fuzzy msgid "Delete remote?" msgstr "Ta bort fjärrgren" -#: cola/widgets/main.py:558 +#: cola/widgets/main.py:571 msgid "Delete..." msgstr "Ta bort..." -#: cola/cmds.py:1067 +#: cola/cmds.py:1068 #, python-format msgid "Deleting \"%s\" failed" msgstr "" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 #, fuzzy msgid "Deletions" msgstr "Ta bort" -#: cola/widgets/submodules.py:120 +#: cola/widgets/submodules.py:119 msgid "Depth" msgstr "" -#: cola/qtutils.py:811 cola/qtutils.py:852 +#: cola/qtutils.py:842 cola/qtutils.py:889 #, fuzzy msgid "Detach" msgstr "Ta bort gren" -#: cola/widgets/prefs.py:181 +#: cola/widgets/prefs.py:203 msgid "Detect Conflict Markers" msgstr "" -#: cola/widgets/prefs.py:151 +#: cola/widgets/prefs.py:174 msgid "Detect conflict markers in unmerged files" msgstr "" -#: cola/widgets/about.py:271 cola/widgets/about.py:274 -#: cola/widgets/about.py:277 cola/widgets/about.py:278 -#: cola/widgets/about.py:279 cola/widgets/about.py:280 -#: cola/widgets/about.py:281 cola/widgets/about.py:282 -#: cola/widgets/about.py:283 cola/widgets/about.py:284 -#: cola/widgets/about.py:285 cola/widgets/about.py:286 -#: cola/widgets/about.py:287 cola/widgets/about.py:288 -#: cola/widgets/about.py:289 cola/widgets/about.py:290 -#: cola/widgets/about.py:291 cola/widgets/about.py:292 -#: cola/widgets/about.py:293 cola/widgets/about.py:294 -#: cola/widgets/about.py:295 cola/widgets/about.py:296 -#: cola/widgets/about.py:297 cola/widgets/about.py:298 -#: cola/widgets/about.py:299 cola/widgets/about.py:300 -#: cola/widgets/about.py:301 cola/widgets/about.py:302 -#: cola/widgets/about.py:303 cola/widgets/about.py:304 -#: cola/widgets/about.py:305 cola/widgets/about.py:306 -#: cola/widgets/about.py:307 cola/widgets/about.py:308 -#: cola/widgets/about.py:309 cola/widgets/about.py:310 -#: cola/widgets/about.py:311 cola/widgets/about.py:312 -#: cola/widgets/about.py:313 cola/widgets/about.py:314 -#: cola/widgets/about.py:315 cola/widgets/about.py:316 -#: cola/widgets/about.py:317 cola/widgets/about.py:318 -#: cola/widgets/about.py:319 cola/widgets/about.py:320 -#: cola/widgets/about.py:321 cola/widgets/about.py:322 -#: cola/widgets/about.py:323 cola/widgets/about.py:324 -#: cola/widgets/about.py:325 cola/widgets/about.py:326 -#: cola/widgets/about.py:327 cola/widgets/about.py:328 -#: cola/widgets/about.py:329 cola/widgets/about.py:330 -#: cola/widgets/about.py:331 cola/widgets/about.py:332 -#: cola/widgets/about.py:333 cola/widgets/about.py:334 -#: cola/widgets/about.py:335 cola/widgets/about.py:336 -#: cola/widgets/about.py:337 cola/widgets/about.py:338 -#: cola/widgets/about.py:339 cola/widgets/about.py:340 -#: cola/widgets/about.py:341 cola/widgets/about.py:342 -#: cola/widgets/about.py:343 cola/widgets/about.py:344 -#: cola/widgets/about.py:345 cola/widgets/about.py:346 -#: cola/widgets/about.py:347 cola/widgets/about.py:348 -#: cola/widgets/about.py:349 cola/widgets/about.py:350 -#: cola/widgets/about.py:351 cola/widgets/about.py:352 -#: cola/widgets/about.py:353 cola/widgets/about.py:354 -#: cola/widgets/about.py:355 cola/widgets/about.py:356 -#: cola/widgets/about.py:357 cola/widgets/about.py:358 -#: cola/widgets/about.py:359 cola/widgets/about.py:360 -#: cola/widgets/about.py:361 cola/widgets/about.py:362 -#: cola/widgets/about.py:363 cola/widgets/about.py:364 -#: cola/widgets/about.py:365 cola/widgets/about.py:366 -#: cola/widgets/about.py:367 cola/widgets/about.py:368 -#: cola/widgets/about.py:369 cola/widgets/about.py:370 -#: cola/widgets/about.py:371 cola/widgets/about.py:372 -#: cola/widgets/about.py:373 cola/widgets/about.py:374 -#: cola/widgets/about.py:375 cola/widgets/about.py:376 -#: cola/widgets/about.py:377 cola/widgets/about.py:378 -#: cola/widgets/about.py:379 cola/widgets/about.py:380 +#: cola/widgets/about.py:254 cola/widgets/about.py:257 +#: cola/widgets/about.py:260 cola/widgets/about.py:261 +#: cola/widgets/about.py:262 cola/widgets/about.py:263 +#: cola/widgets/about.py:264 cola/widgets/about.py:265 +#: cola/widgets/about.py:266 cola/widgets/about.py:267 +#: cola/widgets/about.py:268 cola/widgets/about.py:269 +#: cola/widgets/about.py:270 cola/widgets/about.py:271 +#: cola/widgets/about.py:272 cola/widgets/about.py:273 +#: cola/widgets/about.py:274 cola/widgets/about.py:275 +#: cola/widgets/about.py:276 cola/widgets/about.py:277 +#: cola/widgets/about.py:278 cola/widgets/about.py:279 +#: cola/widgets/about.py:280 cola/widgets/about.py:281 +#: cola/widgets/about.py:282 cola/widgets/about.py:283 +#: cola/widgets/about.py:284 cola/widgets/about.py:285 +#: cola/widgets/about.py:286 cola/widgets/about.py:287 +#: cola/widgets/about.py:288 cola/widgets/about.py:289 +#: cola/widgets/about.py:290 cola/widgets/about.py:291 +#: cola/widgets/about.py:292 cola/widgets/about.py:293 +#: cola/widgets/about.py:294 cola/widgets/about.py:295 +#: cola/widgets/about.py:296 cola/widgets/about.py:297 +#: cola/widgets/about.py:298 cola/widgets/about.py:299 +#: cola/widgets/about.py:300 cola/widgets/about.py:301 +#: cola/widgets/about.py:302 cola/widgets/about.py:303 +#: cola/widgets/about.py:304 cola/widgets/about.py:305 +#: cola/widgets/about.py:306 cola/widgets/about.py:307 +#: cola/widgets/about.py:308 cola/widgets/about.py:309 +#: cola/widgets/about.py:310 cola/widgets/about.py:311 +#: cola/widgets/about.py:312 cola/widgets/about.py:313 +#: cola/widgets/about.py:314 cola/widgets/about.py:315 +#: cola/widgets/about.py:316 cola/widgets/about.py:317 +#: cola/widgets/about.py:318 cola/widgets/about.py:319 +#: cola/widgets/about.py:320 cola/widgets/about.py:321 +#: cola/widgets/about.py:322 cola/widgets/about.py:323 +#: cola/widgets/about.py:324 cola/widgets/about.py:325 +#: cola/widgets/about.py:326 cola/widgets/about.py:327 +#: cola/widgets/about.py:328 cola/widgets/about.py:329 +#: cola/widgets/about.py:330 cola/widgets/about.py:331 +#: cola/widgets/about.py:332 cola/widgets/about.py:333 +#: cola/widgets/about.py:334 cola/widgets/about.py:335 +#: cola/widgets/about.py:336 cola/widgets/about.py:337 +#: cola/widgets/about.py:338 cola/widgets/about.py:339 +#: cola/widgets/about.py:340 cola/widgets/about.py:341 +#: cola/widgets/about.py:342 cola/widgets/about.py:343 +#: cola/widgets/about.py:344 cola/widgets/about.py:345 +#: cola/widgets/about.py:346 cola/widgets/about.py:347 +#: cola/widgets/about.py:348 cola/widgets/about.py:349 +#: cola/widgets/about.py:350 cola/widgets/about.py:351 +#: cola/widgets/about.py:352 cola/widgets/about.py:353 +#: cola/widgets/about.py:354 cola/widgets/about.py:355 +#: cola/widgets/about.py:356 cola/widgets/about.py:357 +#: cola/widgets/about.py:358 cola/widgets/about.py:359 +#: cola/widgets/about.py:360 cola/widgets/about.py:361 +#: cola/widgets/about.py:362 cola/widgets/about.py:363 msgid "Developer" msgstr "" -#: cola/guicmds.py:185 cola/widgets/dag.py:764 cola/widgets/diff.py:781 -#: cola/widgets/main.py:177 cola/widgets/main.py:797 +#: cola/guicmds.py:184 cola/widgets/dag.py:830 cola/widgets/diff.py:809 +#: cola/widgets/main.py:175 cola/widgets/main.py:810 msgid "Diff" msgstr "" -#: cola/guicmds.py:185 +#: cola/guicmds.py:184 msgid "Diff Against Commit" msgstr "" @@ -1397,37 +1438,37 @@ msgstr "" msgid "Diff Against Predecessor..." msgstr "" -#: cola/widgets/main.py:1159 +#: cola/widgets/main.py:1172 msgid "Diff Mode" msgstr "" -#: cola/widgets/diff.py:772 cola/widgets/diff.py:796 +#: cola/widgets/diff.py:800 cola/widgets/diff.py:824 #, fuzzy msgid "Diff Options" msgstr "Alternativ" -#: cola/widgets/prefs.py:256 +#: cola/widgets/prefs.py:277 msgid "Diff Tool" msgstr "" -#: cola/widgets/dag.py:364 +#: cola/widgets/dag.py:363 msgid "Diff selected -> this" msgstr "" -#: cola/widgets/dag.py:358 +#: cola/widgets/dag.py:357 msgid "Diff this -> selected" msgstr "" -#: cola/widgets/main.py:218 +#: cola/widgets/main.py:217 msgid "Diffstat" msgstr "" -#: cola/cmds.py:3262 +#: cola/difftool.py:324 #, fuzzy msgid "Difftool" msgstr "Alternativ" -#: cola/widgets/clone.py:207 +#: cola/widgets/clone.py:205 #, fuzzy msgid "Directory Exists" msgstr "Katalog:" @@ -1436,88 +1477,92 @@ msgstr "Katalog:" msgid "Disable" msgstr "" -#: cola/widgets/prefs.py:180 +#: cola/widgets/prefs.py:202 msgid "Display Untracked Files" msgstr "" -#: cola/cmds.py:2094 +#: cola/widgets/remote.py:176 +msgid "Display remote messages in a separate dialog" +msgstr "" + +#: cola/cmds.py:2045 msgid "Do not update stacked branches" msgstr "" -#: cola/widgets/main.py:471 +#: cola/widgets/main.py:484 #, fuzzy msgid "Documentation" msgstr "Webbdokumentation" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop" msgstr "" -#: cola/widgets/stash.py:258 +#: cola/widgets/stash.py:276 msgid "Drop Stash" msgstr "" -#: cola/widgets/stash.py:255 +#: cola/widgets/stash.py:273 msgid "Drop Stash?" msgstr "" -#: cola/widgets/stash.py:257 +#: cola/widgets/stash.py:275 #, python-format msgid "Drop the \"%s\" stash?" msgstr "" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop the selected stash" msgstr "" -#: cola/qtutils.py:764 cola/sequenceeditor.py:357 cola/widgets/grep.py:102 +#: cola/qtutils.py:795 cola/sequenceeditor.py:353 cola/widgets/grep.py:100 #, fuzzy msgid "Edit" msgstr "Redigera" -#: cola/widgets/diff.py:1019 +#: cola/widgets/diff.py:1058 msgid "Edit Diff Hunk to Revert..." msgstr "" -#: cola/widgets/diff.py:1017 +#: cola/widgets/diff.py:1056 msgid "Edit Diff Hunk to Stage..." msgstr "" -#: cola/widgets/diff.py:1062 +#: cola/widgets/diff.py:1124 msgid "Edit Diff Hunk to Unstage..." msgstr "" -#: cola/cmds.py:2166 +#: cola/cmds.py:2117 #, fuzzy msgid "Edit Rebase" msgstr "Återställ" -#: cola/widgets/editremotes.py:36 +#: cola/widgets/editremotes.py:35 #, fuzzy msgid "Edit Remotes" msgstr "Fjärr" -#: cola/widgets/main.py:298 +#: cola/widgets/main.py:293 msgid "Edit Remotes..." msgstr "" -#: cola/widgets/diff.py:1014 +#: cola/widgets/diff.py:1053 msgid "Edit Selected Lines to Revert..." msgstr "" -#: cola/widgets/diff.py:1012 +#: cola/widgets/diff.py:1051 msgid "Edit Selected Lines to Stage..." msgstr "" -#: cola/widgets/diff.py:1059 +#: cola/widgets/diff.py:1122 msgid "Edit Selected Lines to Unstage..." msgstr "" -#: cola/widgets/editremotes.py:44 +#: cola/widgets/editremotes.py:43 msgid "Edit remotes by selecting them from the list" msgstr "" -#: cola/widgets/browse.py:197 cola/widgets/common.py:39 +#: cola/widgets/browse.py:198 cola/widgets/common.py:38 msgid "Edit selected paths" msgstr "" @@ -1533,12 +1578,12 @@ msgstr "" msgid "Edit the following patch, which will then be applied to the worktree to revert the changes:" msgstr "" -#: cola/widgets/main.py:604 +#: cola/widgets/main.py:617 #, fuzzy msgid "Edit..." msgstr "Redigera" -#: cola/widgets/prefs.py:253 +#: cola/widgets/prefs.py:274 #, fuzzy msgid "Editor" msgstr "Redigera" @@ -1548,165 +1593,170 @@ msgstr "Redigera" msgid "Editor returned %s exit code. Not applying patch." msgstr "" -#: cola/widgets/prefs.py:167 +#: cola/widgets/prefs.py:190 msgid "Email Address" msgstr "E-postadress" -#: cola/widgets/about.py:258 cola/widgets/about.py:401 +#: cola/widgets/about.py:241 cola/widgets/about.py:384 msgid "Email contributor" msgstr "" -#: cola/widgets/prefs.py:182 +#: cola/widgets/prefs.py:204 msgid "Enable Gravatar Icons" msgstr "" -#: cola/widgets/prefs.py:160 +#: cola/widgets/prefs.py:183 msgid "Enable path autocompletion in tools" msgstr "" -#: cola/widgets/diff.py:768 +#: cola/widgets/diff.py:796 msgid "Enable word wrapping" msgstr "" -#: cola/sequenceeditor.py:322 +#: cola/sequenceeditor.py:319 msgid "Enabled" msgstr "" -#: cola/guicmds.py:333 cola/widgets/branch.py:445 +#: cola/guicmds.py:332 cola/widgets/branch.py:478 #, fuzzy msgid "Enter New Branch Name" msgstr "Namn på gren" -#: cola/guicmds.py:147 +#: cola/guicmds.py:146 msgid "Enter a name for the new bare repo" msgstr "" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Enter a name for the stash" msgstr "" -#: cola/cmds.py:146 cola/cmds.py:176 cola/cmds.py:207 cola/cmds.py:283 -#: cola/cmds.py:292 cola/cmds.py:307 cola/cmds.py:317 cola/cmds.py:460 -#: cola/cmds.py:496 cola/cmds.py:534 cola/cmds.py:633 cola/cmds.py:751 -#: cola/cmds.py:1067 cola/cmds.py:1164 cola/cmds.py:2005 cola/cmds.py:2394 -#: cola/cmds.py:2637 cola/cmds.py:2643 cola/cmds.py:2651 cola/cmds.py:2872 -#: cola/cmds.py:2890 cola/cmds.py:3180 cola/gitcmds.py:984 cola/guicmds.py:157 -#: cola/models/stash.py:70 cola/models/stash.py:87 cola/models/stash.py:108 -#: cola/widgets/bookmarks.py:482 cola/widgets/branch.py:777 +#: cola/widgets/stash.py:216 +msgid "Enter a new name for the stash" +msgstr "" + +#: cola/cmds.py:145 cola/cmds.py:175 cola/cmds.py:206 cola/cmds.py:284 +#: cola/cmds.py:293 cola/cmds.py:308 cola/cmds.py:318 cola/cmds.py:461 +#: cola/cmds.py:497 cola/cmds.py:535 cola/cmds.py:635 cola/cmds.py:753 +#: cola/cmds.py:1068 cola/cmds.py:1165 cola/cmds.py:1956 cola/cmds.py:2345 +#: cola/cmds.py:2579 cola/cmds.py:2585 cola/cmds.py:2593 cola/cmds.py:2818 +#: cola/cmds.py:2836 cola/cmds.py:3125 cola/gitcmds.py:994 cola/guicmds.py:156 +#: cola/models/stash.py:70 cola/models/stash.py:90 cola/models/stash.py:112 +#: cola/models/stash.py:138 cola/widgets/bookmarks.py:481 +#: cola/widgets/branch.py:829 #, fuzzy msgid "Error" msgstr "fel" -#: cola/widgets/clone.py:191 +#: cola/widgets/clone.py:189 #, fuzzy msgid "Error Cloning" msgstr "Fel vid läsning av fil:" -#: cola/widgets/createbranch.py:314 +#: cola/widgets/createbranch.py:312 #, fuzzy msgid "Error Creating Branch" msgstr "Skapa gren" -#: cola/app.py:502 cola/guicmds.py:101 +#: cola/app.py:505 cola/guicmds.py:100 #, fuzzy msgid "Error Creating Repository" msgstr "Skapa nytt arkiv" -#: cola/cmds.py:1202 +#: cola/cmds.py:1206 #, fuzzy msgid "Error Deleting Remote Branch" msgstr "Skapa gren" -#: cola/cmds.py:1585 +#: cola/cmds.py:1573 #, fuzzy msgid "Error Editing File" msgstr "Fel vid inläsning av differens:" -#: cola/cmds.py:559 +#: cola/cmds.py:560 #, fuzzy msgid "Error Launching Blame Viewer" msgstr "Filbläddrare" -#: cola/cmds.py:3145 +#: cola/cmds.py:3091 #, fuzzy msgid "Error Launching History Browser" msgstr "Filbläddrare" -#: cola/app.py:489 +#: cola/app.py:492 msgid "Error Opening Repository" msgstr "" -#: cola/widgets/browse.py:566 +#: cola/models/stash.py:144 +msgid "Error Renaming Stash" +msgstr "" + +#: cola/widgets/browse.py:567 msgid "Error Saving File" msgstr "" -#: cola/cmds.py:914 +#: cola/cmds.py:912 #, python-format msgid "Error creating remote \"%s\"" msgstr "" -#: cola/models/stash.py:197 +#: cola/models/stash.py:233 #, fuzzy msgid "Error creating stash" msgstr "Skapa gren" -#: cola/cmds.py:1126 +#: cola/cmds.py:1127 #, python-format msgid "Error deleting branch \"%s\"" msgstr "" -#: cola/cmds.py:932 +#: cola/cmds.py:930 #, python-format msgid "Error deleting remote \"%s\"" msgstr "" -#: cola/cmds.py:956 +#: cola/cmds.py:955 #, python-format msgid "Error renaming \"%(name)s\" to \"%(new_name)s\"" msgstr "" -#: cola/cmds.py:1771 +#: cola/cmds.py:1722 #, fuzzy msgid "Error running prepare-commitmsg hook" msgstr "Anropar krok före incheckning..." -#: cola/cmds.py:3043 cola/cmds.py:3089 +#: cola/cmds.py:2989 cola/cmds.py:3035 #, fuzzy, python-format msgid "Error updating submodule %s" msgstr "Fel vid inläsning av differens:" -#: cola/cmds.py:3125 +#: cola/cmds.py:3071 #, fuzzy msgid "Error updating submodules" msgstr "Fel vid inläsning av differens:" -#: cola/widgets/diff.py:1326 +#: cola/widgets/diff.py:1400 msgid "Error writing patch" msgstr "" -#: cola/cmds.py:1710 +#: cola/cmds.py:1662 msgid "Error: Cannot find commit template" msgstr "" -#: cola/widgets/stash.py:235 -msgid "Error: Stash exists" -msgstr "" - -#: cola/cmds.py:1732 +#: cola/cmds.py:1684 msgid "Error: Unconfigured commit template" msgstr "" -#: cola/widgets/clone.py:53 +#: cola/widgets/clone.py:52 #, python-format msgid "Error: could not clone \"%s\"" msgstr "" -#: cola/cmds.py:2835 +#: cola/cmds.py:2781 #, python-format msgid "Error: could not create tag \"%s\"" msgstr "" -#: cola/widgets/branch.py:421 +#: cola/widgets/branch.py:433 #, fuzzy, python-format msgid "Executing action %s" msgstr "Återställer ordlistan till %s." @@ -1715,427 +1765,439 @@ msgstr "Återställer ordlistan till %s." msgid "Exit \"Diff\" mode" msgstr "" -#: cola/widgets/action.py:67 +#: cola/widgets/action.py:81 msgid "Exit Diff" msgstr "" -#: cola/widgets/main.py:528 +#: cola/widgets/main.py:541 msgid "Exit Diff Mode" msgstr "" -#: cola/widgets/action.py:68 +#: cola/widgets/action.py:81 msgid "Exit Diff mode" msgstr "" -#: cola/widgets/recent.py:67 +#: cola/widgets/recent.py:65 msgid "Expand all" msgstr "" -#: cola/widgets/diff.py:1223 +#: cola/widgets/diff.py:1297 msgid "Export Patch" msgstr "" -#: cola/guicmds.py:168 cola/widgets/search.py:75 +#: cola/guicmds.py:167 cola/widgets/search.py:74 msgid "Export Patches" msgstr "" -#: cola/widgets/main.py:273 +#: cola/widgets/main.py:268 msgid "Export Patches..." msgstr "" -#: cola/widgets/main.py:533 +#: cola/widgets/main.py:546 #, fuzzy msgid "Expression..." msgstr "Alternativ..." -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Extended Regexp" msgstr "" -#: cola/widgets/commitmsg.py:612 +#: cola/widgets/commitmsg.py:638 msgid "Extended description..." msgstr "" -#: cola/cmds.py:387 +#: cola/cmds.py:388 msgid "Failed to commit and continue applying patches" msgstr "" -#: cola/cmds.py:403 +#: cola/cmds.py:404 msgid "Failed to continue applying patches after skipping the current patch" msgstr "" -#: cola/widgets/createbranch.py:124 +#: cola/widgets/createbranch.py:122 msgid "Fast Forward Only" msgstr "Endast snabbspolning" -#: cola/widgets/remote.py:177 +#: cola/widgets/remote.py:181 #, fuzzy msgid "Fast-forward only" msgstr "Endast snabbspolning" -#: cola/widgets/bookmarks.py:91 +#: cola/widgets/bookmarks.py:90 #, fuzzy msgid "Favorite repositories" msgstr "Senaste arkiven" -#: cola/widgets/main.py:111 +#: cola/widgets/main.py:109 msgid "Favorites" msgstr "" -#: cola/widgets/remote.py:673 +#: cola/widgets/remote.py:735 #, fuzzy msgid "Fetch" msgstr "Återställ..." -#: cola/widgets/createbranch.py:127 +#: cola/widgets/createbranch.py:125 msgid "Fetch Tracking Branch" msgstr "Hämta spårande gren" -#: cola/widgets/action.py:63 cola/widgets/main.py:387 +#: cola/widgets/action.py:67 cola/widgets/main.py:384 +msgid "Fetch from one or more remotes using \"git fetch\"" +msgstr "" + +#: cola/widgets/action.py:65 cola/widgets/main.py:383 #, fuzzy msgid "Fetch..." msgstr "Återställ..." -#: cola/widgets/main.py:588 +#: cola/widgets/main.py:601 #, fuzzy msgid "File Browser..." msgstr "Bläddra" -#: cola/widgets/compare.py:75 +#: cola/widgets/compare.py:74 #, fuzzy msgid "File Differences" msgstr "Inställningar" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 msgid "File Saved" msgstr "" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 #, python-format msgid "File saved to \"%s\"" msgstr "" -#: cola/fsmonitor.py:517 +#: cola/fsmonitor.py:528 msgid "File system change monitoring: disabled because \"cola.inotify\" is false.\n" msgstr "" -#: cola/fsmonitor.py:534 +#: cola/fsmonitor.py:545 msgid "File system change monitoring: disabled because libc does not support the inotify system calls.\n" msgstr "" -#: cola/fsmonitor.py:528 +#: cola/fsmonitor.py:539 msgid "File system change monitoring: disabled because pywin32 is not installed.\n" msgstr "" -#: cola/fsmonitor.py:181 +#: cola/fsmonitor.py:184 msgid "" "File system change monitoring: disabled because the limit on the total number of inotify watches was reached. You may be able to increase the limit on the number of watches by running:\n" "\n" " echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n" msgstr "" -#: cola/fsmonitor.py:142 +#: cola/fsmonitor.py:145 #, fuzzy msgid "File system change monitoring: enabled.\n" msgstr "Lita på filändringstidsstämplar\n" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 #, fuzzy msgid "Filename" msgstr "Byt namn" -#: cola/widgets/dag.py:755 +#: cola/widgets/dag.py:821 #, fuzzy msgid "Files" msgstr "Fil:" -#: cola/widgets/branch.py:785 +#: cola/widgets/branch.py:837 #, fuzzy msgid "Filter branches..." msgstr "Återställ..." -#: cola/widgets/status.py:1333 +#: cola/widgets/status.py:1334 #, fuzzy msgid "Filter paths..." msgstr "Återställ..." -#: cola/widgets/finder.py:113 cola/widgets/main.py:312 +#: cola/widgets/finder.py:112 cola/widgets/main.py:307 #, fuzzy msgid "Find Files" msgstr "Fil:" -#: cola/widgets/text.py:388 +#: cola/widgets/text.py:385 msgid "Find in diff" msgstr "" -#: cola/widgets/text.py:425 +#: cola/widgets/text.py:422 msgid "Find next item" msgstr "" -#: cola/widgets/text.py:431 +#: cola/widgets/text.py:428 msgid "Find previous item" msgstr "" -#: cola/widgets/text.py:395 +#: cola/widgets/text.py:392 msgid "Find the next occurrence of the phrase" msgstr "" -#: cola/widgets/text.py:391 +#: cola/widgets/text.py:388 msgid "Find the previous occurrence of the phrase" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Fixed String" msgstr "" -#: cola/widgets/prefs.py:251 +#: cola/widgets/prefs.py:270 msgid "Fixed-Width Font" msgstr "" -#: cola/sequenceeditor.py:362 +#: cola/sequenceeditor.py:358 msgid "Fixup" msgstr "" -#: cola/widgets/commitmsg.py:148 +#: cola/widgets/commitmsg.py:154 #, fuzzy msgid "Fixup Previous Commit" msgstr "Incheckningsmeddelande för sammanslagning:" -#: cola/themes.py:672 +#: cola/themes.py:684 msgid "Flat dark blue" msgstr "" -#: cola/themes.py:693 +#: cola/themes.py:705 msgid "Flat dark green" msgstr "" -#: cola/themes.py:686 +#: cola/themes.py:698 msgid "Flat dark grey" msgstr "" -#: cola/themes.py:679 +#: cola/themes.py:691 msgid "Flat dark red" msgstr "" -#: cola/themes.py:644 +#: cola/themes.py:656 msgid "Flat light blue" msgstr "" -#: cola/themes.py:665 +#: cola/themes.py:677 msgid "Flat light green" msgstr "" -#: cola/themes.py:658 +#: cola/themes.py:670 msgid "Flat light grey" msgstr "" -#: cola/themes.py:651 +#: cola/themes.py:663 msgid "Flat light red" msgstr "" -#: cola/widgets/startup.py:73 +#: cola/widgets/startup.py:72 msgid "Folder" msgstr "" -#: cola/widgets/toolbar.py:177 +#: cola/widgets/toolbar.py:181 msgid "Follow System Style" msgstr "" -#: cola/widgets/prefs.py:252 +#: cola/widgets/prefs.py:271 msgid "Font Size" msgstr "Storlek" -#: cola/widgets/remote.py:193 +#: cola/widgets/remote.py:197 msgid "Force" msgstr "" -#: cola/widgets/remote.py:617 +#: cola/widgets/remote.py:652 msgid "Force Fetch" msgstr "" -#: cola/widgets/remote.py:614 +#: cola/widgets/remote.py:649 msgid "Force Fetch?" msgstr "" -#: cola/widgets/remote.py:625 +#: cola/widgets/remote.py:660 msgid "Force Push" msgstr "" -#: cola/widgets/remote.py:619 +#: cola/widgets/remote.py:654 msgid "Force Push?" msgstr "" -#: cola/widgets/remote.py:616 +#: cola/widgets/remote.py:651 #, fuzzy, python-format msgid "Force fetching from %s?" msgstr "Hämtar %s från %s" -#: cola/widgets/remote.py:624 +#: cola/widgets/remote.py:659 #, python-format msgid "Force push to %s?" msgstr "" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Format String" msgstr "" -#: cola/widgets/about.py:430 cola/widgets/about.py:431 +#: cola/widgets/about.py:413 cola/widgets/about.py:414 msgid "French translation" msgstr "" -#: cola/widgets/merge.py:80 +#: cola/widgets/merge.py:78 msgid "GPG-sign the merge commit" msgstr "" -#: cola/widgets/prefs.py:344 +#: cola/widgets/prefs.py:364 msgid "GUI theme" msgstr "" -#: cola/widgets/editremotes.py:318 +#: cola/widgets/editremotes.py:317 #, fuzzy, python-format msgid "Gathering info for \"%s\"..." msgstr "Läser differens för %s..." -#: cola/widgets/about.py:420 cola/widgets/about.py:428 -#: cola/widgets/about.py:429 +#: cola/widgets/about.py:403 cola/widgets/about.py:411 +#: cola/widgets/about.py:412 msgid "German translation" msgstr "" -#: cola/widgets/main.py:511 +#: cola/widgets/main.py:524 #, fuzzy msgid "Get Commit Message Template" msgstr "Textbredd för incheckningsmeddelande" -#: cola/widgets/dag.py:520 +#: cola/widgets/dag.py:586 msgid "Go Down" msgstr "" -#: cola/widgets/dag.py:516 +#: cola/widgets/dag.py:582 msgid "Go Up" msgstr "" -#: cola/widgets/dag.py:467 cola/widgets/filelist.py:42 +#: cola/widgets/dag.py:466 cola/widgets/filelist.py:39 msgid "Grab File..." msgstr "" -#: cola/widgets/dag.py:782 +#: cola/widgets/dag.py:848 msgid "Graph" msgstr "" -#: cola/widgets/main.py:358 +#: cola/widgets/main.py:353 msgid "Grep" msgstr "" -#: cola/widgets/remote.py:662 +#: cola/widgets/remote.py:707 msgid "Have you rebased/pulled lately?" msgstr "" -#: cola/sequenceeditor.py:110 cola/sequenceeditor.py:171 -#: cola/widgets/finder.py:138 cola/widgets/main.py:854 +#: cola/sequenceeditor.py:108 cola/sequenceeditor.py:169 +#: cola/widgets/finder.py:137 cola/widgets/main.py:867 msgid "Help" msgstr "Hjälp" -#: cola/widgets/status.py:1322 +#: cola/widgets/status.py:1323 msgid "Help - Custom Copy Actions" msgstr "" -#: cola/widgets/finder.py:79 +#: cola/widgets/finder.py:78 msgid "Help - Find Files" msgstr "" -#: cola/sequenceeditor.py:737 +#: cola/sequenceeditor.py:732 msgid "Help - git-cola-sequence-editor" msgstr "" -#: cola/widgets/prefs.py:346 +#: cola/widgets/prefs.py:366 msgid "High DPI" msgstr "" -#: cola/gitcmds.py:876 +#: cola/gitcmds.py:886 msgid "Hint: The \"Actions > Abort Cherry-Pick\" menu action can be used to cancel the current cherry-pick." msgstr "" -#: cola/widgets/prefs.py:254 +#: cola/widgets/prefs.py:275 #, fuzzy msgid "History Browser" msgstr "Filbläddrare" -#: cola/widgets/about.py:427 cola/widgets/about.py:441 +#: cola/widgets/about.py:410 cola/widgets/about.py:424 msgid "Hungarian translation" msgstr "" -#: cola/widgets/toolbar.py:178 +#: cola/widgets/toolbar.py:182 msgid "Icon Only" msgstr "" -#: cola/widgets/prefs.py:345 +#: cola/widgets/prefs.py:365 msgid "Icon theme" msgstr "" -#: cola/widgets/diff.py:758 +#: cola/widgets/diff.py:787 msgid "Ignore all whitespace" msgstr "" -#: cola/widgets/diff.py:755 +#: cola/widgets/diff.py:785 msgid "Ignore changes in amount of whitespace" msgstr "" -#: cola/widgets/diff.py:751 +#: cola/widgets/diff.py:782 msgid "Ignore changes in whitespace at EOL" msgstr "" -#: cola/widgets/gitignore.py:46 +#: cola/widgets/gitignore.py:45 msgid "Ignore custom pattern" msgstr "" -#: cola/widgets/gitignore.py:44 +#: cola/widgets/gitignore.py:43 msgid "Ignore exact filename" msgstr "" -#: cola/widgets/gitignore.py:32 +#: cola/widgets/gitignore.py:31 msgid "Ignore filename or pattern" msgstr "" -#: cola/widgets/status.py:933 +#: cola/widgets/dag.py:498 +msgid "Ignore merge commits" +msgstr "" + +#: cola/widgets/status.py:934 msgid "Ignore..." msgstr "" -#: cola/widgets/remote.py:203 +#: cola/widgets/remote.py:207 #, fuzzy msgid "Include tags " msgstr "Ta med taggar" -#: cola/widgets/prefs.py:349 +#: cola/widgets/prefs.py:369 msgid "Indent Status paths" msgstr "" -#: cola/widgets/about.py:419 cola/widgets/about.py:426 +#: cola/widgets/about.py:402 cola/widgets/about.py:409 msgid "Indonesian translation" msgstr "" -#: cola/widgets/main.py:643 +#: cola/widgets/main.py:656 #, fuzzy msgid "Initialize Git Annex" msgstr "Initierar..." -#: cola/widgets/main.py:647 +#: cola/widgets/main.py:660 #, fuzzy msgid "Initialize Git LFS" msgstr "Initierar..." -#: cola/widgets/clone.py:116 +#: cola/widgets/clone.py:114 msgid "Inititalize submodules" msgstr "" -#: cola/widgets/prefs.py:260 +#: cola/widgets/prefs.py:281 msgid "Insert spaces instead of tabs" msgstr "" -#: cola/cmds.py:2130 +#: cola/widgets/action.py:73 cola/widgets/main.py:402 +msgid "Integrate changes using \"git pull\"" +msgstr "" + +#: cola/cmds.py:2081 msgid "Interactive Rebase" msgstr "" -#: cola/cmds.py:2364 +#: cola/cmds.py:2315 #, fuzzy msgid "Invalid Revision" msgstr "Ogiltig revision: %s" @@ -2144,47 +2206,47 @@ msgstr "Ogiltig revision: %s" msgid "It is not necessary to update the hunk header lines as they will be regenerated automatically." msgstr "" -#: cola/widgets/about.py:421 cola/widgets/about.py:424 +#: cola/widgets/about.py:404 cola/widgets/about.py:407 msgid "Japanese translation" msgstr "" -#: cola/widgets/prefs.py:262 +#: cola/widgets/prefs.py:283 msgid "Keep *.orig Merge Backups" msgstr "" -#: cola/widgets/stash.py:71 +#: cola/widgets/stash.py:73 msgid "Keep Index" msgstr "" -#: cola/widgets/main.py:477 +#: cola/widgets/main.py:490 msgid "Keyboard Shortcuts" msgstr "" -#: cola/cmds.py:1608 cola/sequenceeditor.py:165 cola/sequenceeditor.py:338 -#: cola/widgets/dag.py:395 cola/widgets/filelist.py:34 +#: cola/difftool.py:27 cola/sequenceeditor.py:163 cola/sequenceeditor.py:334 +#: cola/widgets/dag.py:394 cola/widgets/filelist.py:31 msgid "Launch Diff Tool" msgstr "" -#: cola/widgets/dag.py:402 +#: cola/widgets/dag.py:401 msgid "Launch Directory Diff Tool" msgstr "" -#: cola/cmds.py:1541 cola/cmds.py:1679 cola/widgets/filelist.py:38 +#: cola/cmds.py:1529 cola/cmds.py:1631 cola/widgets/filelist.py:35 msgid "Launch Editor" msgstr "" -#: cola/cmds.py:1644 +#: cola/cmds.py:1596 msgid "Launch Terminal" msgstr "" -#: cola/sequenceeditor.py:166 +#: cola/sequenceeditor.py:164 msgid "" "Launch external diff tool\n" "Shortcut: Ctrl+D" msgstr "" -#: cola/widgets/diff.py:1005 cola/widgets/diff.py:1051 -#: cola/widgets/status.py:852 cola/widgets/status.py:948 +#: cola/widgets/diff.py:1044 cola/widgets/diff.py:1106 +#: cola/widgets/status.py:853 cola/widgets/status.py:949 msgid "Launch git-cola" msgstr "" @@ -2196,7 +2258,7 @@ msgstr "" msgid "Launch git-difftool on the current path" msgstr "" -#: cola/icons.py:56 +#: cola/icons.py:55 msgid "Light Theme" msgstr "" @@ -2205,187 +2267,203 @@ msgstr "" msgid "Lines starting with '%s' will be ignored." msgstr "" -#: cola/widgets/startup.py:74 +#: cola/widgets/startup.py:73 msgid "List" msgstr "" -#: cola/guicmds.py:267 +#: cola/guicmds.py:266 #, fuzzy msgid "Load Commit Message" msgstr "Incheckningsmeddelande:" -#: cola/widgets/main.py:339 +#: cola/widgets/main.py:334 #, fuzzy msgid "Load Commit Message..." msgstr "Incheckningsmeddelande:" -#: cola/widgets/commitmsg.py:144 +#: cola/widgets/commitmsg.py:150 #, fuzzy msgid "Load Previous Commit Message" msgstr "Incheckningsmeddelande för sammanslagning:" -#: cola/widgets/diff.py:264 +#: cola/widgets/diff.py:265 #, fuzzy msgid "Loading..." msgstr "Läser %s..." -#: cola/widgets/branch.py:169 cola/widgets/branch.py:240 -#: cola/widgets/branch.py:281 cola/widgets/compare.py:38 -#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/branch.py:173 cola/widgets/branch.py:250 +#: cola/widgets/branch.py:290 cola/widgets/compare.py:37 +#: cola/widgets/compare.py:52 cola/widgets/compare.py:57 msgid "Local" msgstr "" -#: cola/widgets/cfgactions.py:227 cola/widgets/merge.py:46 -#: cola/widgets/remote.py:138 +#: cola/widgets/cfgactions.py:225 cola/widgets/merge.py:44 +#: cola/widgets/remote.py:136 msgid "Local Branch" msgstr "Lokal gren" -#: cola/widgets/createbranch.py:114 +#: cola/widgets/createbranch.py:112 #, fuzzy msgid "Local branch" msgstr "Lokal gren" -#: cola/widgets/dag.py:788 cola/widgets/main.py:651 +#: cola/widgets/dag.py:854 cola/widgets/main.py:664 msgid "Lock Layout" msgstr "" -#: cola/widgets/dag.py:750 +#: cola/widgets/dag.py:816 msgid "Log" msgstr "" -#: cola/widgets/prefs.py:170 +#: cola/widgets/prefs.py:191 msgid "Log Date Format" msgstr "" -#: cola/widgets/about.py:268 +#: cola/themes.py:769 +msgid "MacOS Aqua dark" +msgstr "" + +#: cola/themes.py:765 +msgid "MacOS Aqua light" +msgstr "" + +#: cola/themes.py:781 +msgid "MacOS Vibrant dark" +msgstr "" + +#: cola/themes.py:775 +msgid "MacOS Vibrant light" +msgstr "" + +#: cola/widgets/about.py:251 msgid "Maintainer (since 2007) and developer" msgstr "" -#: cola/widgets/text.py:398 +#: cola/widgets/text.py:395 msgid "Match Case" msgstr "" -#: cola/widgets/merge.py:88 +#: cola/widgets/merge.py:86 msgid "Merge" msgstr "Slå ihop" -#: cola/widgets/merge.py:162 +#: cola/widgets/merge.py:160 #, python-format msgid "Merge \"%(revision)s\" into \"%(branch)s\"" msgstr "" -#: cola/widgets/prefs.py:257 +#: cola/widgets/prefs.py:278 #, fuzzy msgid "Merge Tool" msgstr "Slå ihop" -#: cola/widgets/prefs.py:171 +#: cola/widgets/prefs.py:193 msgid "Merge Verbosity" msgstr "Pratsamhet för sammanslagningar" -#: cola/cmds.py:1829 +#: cola/cmds.py:1780 msgid "Merge failed. Conflict resolution is required." msgstr "Sammanslagningen misslyckades. Du måste lösa konflikterna." -#: cola/widgets/merge.py:167 +#: cola/widgets/merge.py:165 #, fuzzy, python-format msgid "Merge into \"%s\"" msgstr "Slå ihop i %s" -#: cola/widgets/branch.py:231 +#: cola/widgets/branch.py:242 #, fuzzy msgid "Merge into current branch" msgstr "Bläddra i grenens filer" -#: cola/widgets/main.py:363 +#: cola/widgets/main.py:358 #, fuzzy msgid "Merge..." msgstr "Slå ihop" -#: cola/widgets/main.py:1163 +#: cola/widgets/main.py:1176 #, fuzzy msgid "Merging" msgstr "Slå ihop" -#: cola/models/browse.py:33 cola/widgets/createtag.py:78 +#: cola/models/browse.py:32 cola/widgets/createtag.py:76 #, fuzzy msgid "Message" msgstr "Slå ihop" -#: cola/widgets/commitmsg.py:417 +#: cola/widgets/commitmsg.py:425 #, fuzzy msgid "Missing Commit Message" msgstr "Incheckningsmeddelande för sammanslagning:" -#: cola/widgets/createbranch.py:252 +#: cola/widgets/createbranch.py:250 #, fuzzy msgid "Missing Data" msgstr "Saknade" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 #, fuzzy msgid "Missing Name" msgstr "Saknade" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 #, fuzzy msgid "Missing Revision" msgstr "Inledande revision" -#: cola/cmds.py:2801 +#: cola/cmds.py:2747 #, fuzzy msgid "Missing Tag Message" msgstr "Revisioner att slå ihop" -#: cola/models/browse.py:332 cola/widgets/status.py:158 -#: cola/widgets/status.py:631 +#: cola/models/browse.py:331 cola/widgets/status.py:158 +#: cola/widgets/status.py:632 #, fuzzy msgid "Modified" msgstr "Oförändrade" -#: cola/widgets/commitmsg.py:506 +#: cola/widgets/commitmsg.py:532 #, fuzzy msgid "More..." msgstr "Klona..." -#: cola/widgets/standard.py:243 cola/widgets/status.py:233 +#: cola/widgets/standard.py:242 cola/widgets/status.py:234 msgid "Move Down" msgstr "" -#: cola/widgets/standard.py:235 cola/widgets/status.py:225 +#: cola/widgets/standard.py:234 cola/widgets/status.py:226 msgid "Move Up" msgstr "" -#: cola/widgets/status.py:300 +#: cola/widgets/status.py:301 msgid "Move files to trash" msgstr "" -#: cola/models/browse.py:33 cola/widgets/bookmarks.py:467 -#: cola/widgets/createtag.py:61 cola/widgets/editremotes.py:450 -#: cola/widgets/status.py:1452 cola/widgets/toolbar.py:312 +#: cola/models/browse.py:32 cola/widgets/bookmarks.py:466 +#: cola/widgets/createtag.py:59 cola/widgets/editremotes.py:448 +#: cola/widgets/status.py:1453 cola/widgets/toolbar.py:317 #, fuzzy msgid "Name" msgstr "Namn:" -#: cola/widgets/editremotes.py:434 +#: cola/widgets/editremotes.py:432 msgid "Name for the new remote" msgstr "" -#: cola/guicmds.py:148 cola/widgets/main.py:285 +#: cola/guicmds.py:147 cola/widgets/main.py:280 #, fuzzy msgid "New Bare Repository..." msgstr "Gitarkiv" -#: cola/guicmds.py:87 cola/widgets/main.py:280 +#: cola/guicmds.py:86 cola/widgets/main.py:275 #, fuzzy msgid "New Repository..." msgstr "Gitarkiv" -#: cola/widgets/main.py:983 +#: cola/widgets/main.py:996 msgid "New Toolbar" msgstr "" -#: cola/widgets/startup.py:53 +#: cola/widgets/startup.py:52 msgid "New..." msgstr "Nytt..." @@ -2394,16 +2472,20 @@ msgstr "Nytt..." msgid "Next File" msgstr "Markera alla" -#: cola/widgets/createbranch.py:123 cola/widgets/standard.py:1065 +#: cola/widgets/createbranch.py:121 cola/widgets/standard.py:1183 msgid "No" msgstr "Nej" -#: cola/widgets/merge.py:217 cola/widgets/merge.py:227 +#: cola/widgets/merge.py:215 cola/widgets/merge.py:225 #, fuzzy msgid "No Revision Specified" msgstr "Ingen revision vald." -#: cola/widgets/commitmsg.py:427 +#: cola/widgets/stash.py:225 +msgid "No change made" +msgstr "" + +#: cola/widgets/commitmsg.py:435 #, fuzzy msgid "" "No changes to commit.\n" @@ -2414,35 +2496,35 @@ msgstr "" "\n" "Du måste köa åtminstone en fil innan du kan checka in." -#: cola/widgets/selectcommits.py:118 +#: cola/widgets/selectcommits.py:117 msgid "No commits exist in this branch." msgstr "" -#: cola/widgets/merge.py:65 +#: cola/widgets/merge.py:63 #, fuzzy msgid "No fast forward" msgstr "Endast snabbspolning" -#: cola/widgets/remote.py:186 +#: cola/widgets/remote.py:190 #, fuzzy msgid "No fast-forward" msgstr "Endast snabbspolning" -#: cola/widgets/remote.py:577 +#: cola/widgets/remote.py:612 msgid "No repository selected." msgstr "Inget arkiv markerat." -#: cola/widgets/remote.py:615 +#: cola/widgets/remote.py:650 msgid "Non-fast-forward fetch overwrites local history!" msgstr "" -#: cola/widgets/remote.py:621 +#: cola/widgets/remote.py:656 msgid "" "Non-fast-forward push overwrites published history!\n" "(Did you pull first?)" msgstr "" -#: cola/widgets/commitmsg.py:444 +#: cola/widgets/commitmsg.py:452 #, fuzzy msgid "Nothing to commit" msgstr "Inga ändringar att checka in." @@ -2452,149 +2534,153 @@ msgstr "Inga ändringar att checka in." msgid "Nothing to do" msgstr "Ingenting att klona från %s." -#: cola/widgets/prefs.py:172 +#: cola/widgets/prefs.py:194 msgid "Number of Diff Context Lines" msgstr "Antal rader sammanhang i differenser" -#: cola/widgets/bookmarks.py:79 cola/widgets/bookmarks.py:213 -#: cola/widgets/startup.py:336 +#: cola/widgets/bookmarks.py:78 cola/widgets/bookmarks.py:212 +#: cola/widgets/startup.py:335 msgid "Open" msgstr "Öppna" -#: cola/widgets/text.py:230 +#: cola/widgets/text.py:228 #, python-format msgid "Open \"%s\"" msgstr "" -#: cola/cmds.py:1857 +#: cola/cmds.py:1808 msgid "Open Directory" msgstr "" -#: cola/guicmds.py:205 cola/guicmds.py:214 cola/widgets/editremotes.py:473 -#: cola/widgets/startup.py:55 cola/widgets/startup.py:215 +#: cola/guicmds.py:204 cola/guicmds.py:213 cola/widgets/editremotes.py:471 +#: cola/widgets/startup.py:54 cola/widgets/startup.py:214 #, fuzzy msgid "Open Git Repository" msgstr "Öppna befintligt arkiv" -#: cola/widgets/submodules.py:49 +#: cola/widgets/submodules.py:48 #, fuzzy msgid "Open Parent" msgstr "Öppna tidigare arkiv:" -#: cola/cmds.py:1877 +#: cola/cmds.py:1828 #, fuzzy msgid "Open Parent Directory" msgstr "Öppna tidigare arkiv:" -#: cola/widgets/main.py:679 +#: cola/widgets/main.py:692 #, fuzzy msgid "Open Recent" msgstr "Öppna tidigare arkiv:" -#: cola/cmds.py:1840 +#: cola/cmds.py:1791 msgid "Open Using Default Application" msgstr "" -#: cola/cmds.py:1890 +#: cola/cmds.py:1841 msgid "Open Worktree" msgstr "" -#: cola/widgets/bookmarks.py:221 cola/widgets/startup.py:344 +#: cola/widgets/bookmarks.py:220 cola/widgets/startup.py:343 msgid "Open in New Window" msgstr "" -#: cola/widgets/main.py:408 +#: cola/widgets/main.py:415 #, fuzzy msgid "Open in New Window..." msgstr "Öppna befintligt arkiv" -#: cola/widgets/main.py:402 +#: cola/widgets/main.py:409 msgid "Open..." msgstr "Öppna..." -#: cola/widgets/branch.py:345 +#: cola/widgets/branch.py:354 #, fuzzy msgid "Other branches" msgstr "Återställ..." -#: cola/widgets/archive.py:210 +#: cola/widgets/archive.py:208 msgid "Overwrite" msgstr "" -#: cola/widgets/archive.py:209 +#: cola/widgets/archive.py:207 #, python-format msgid "Overwrite \"%s\"?" msgstr "" -#: cola/widgets/archive.py:207 +#: cola/widgets/archive.py:205 msgid "Overwrite File?" msgstr "" -#: cola/widgets/grep.py:144 +#: cola/widgets/grep.py:142 msgid "" "Parse arguments using a shell.\n" "Queries with spaces will require \"double quotes\"." msgstr "" -#: cola/models/browse.py:330 +#: cola/models/browse.py:329 msgid "Partially Staged" msgstr "" -#: cola/widgets/main.py:744 +#: cola/widgets/main.py:757 msgid "Paste" msgstr "Klistra in" -#: cola/cmds.py:363 +#: cola/cmds.py:364 msgid "Patch failed to apply" msgstr "" -#: cola/cmds.py:375 +#: cola/cmds.py:376 msgid "Patch(es) Applied" msgstr "" -#: cola/widgets/diff.py:1219 cola/widgets/main.py:695 +#: cola/widgets/diff.py:1293 cola/widgets/main.py:708 msgid "Patches" msgstr "" -#: cola/widgets/prefs.py:173 +#: cola/widgets/prefs.py:195 msgid "Patches Directory" msgstr "" -#: cola/widgets/bookmarks.py:468 cola/widgets/submodules.py:118 +#: cola/widgets/bookmarks.py:467 cola/widgets/submodules.py:117 msgid "Path" msgstr "" -#: cola/widgets/clone.py:112 +#: cola/widgets/clone.py:110 msgid "Path or URL to clone (Env. $VARS okay)" msgstr "" -#: cola/sequenceeditor.py:346 +#: cola/sequenceeditor.py:342 msgid "Pick" msgstr "" -#: cola/widgets/diff.py:781 +#: cola/widgets/dag.py:490 +msgid "Pickaxe search for changes containing text" +msgstr "" + +#: cola/widgets/diff.py:809 msgid "Pixel XOR" msgstr "" -#: cola/widgets/createbranch.py:253 +#: cola/widgets/createbranch.py:251 msgid "Please provide both a branch name and revision expression." msgstr "" -#: cola/cmds.py:2348 +#: cola/cmds.py:2299 #, fuzzy msgid "Please select a file" msgstr "Välj en gren att spåra." -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Please specify a name for the new tag." msgstr "" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 #, fuzzy msgid "Please specify a revision to tag." msgstr "Välj en gren att byta namn på." -#: cola/widgets/commitmsg.py:410 +#: cola/widgets/commitmsg.py:418 msgid "" "Please supply a commit message.\n" "\n" @@ -2612,32 +2698,32 @@ msgstr "" "- Andra raden: Tom\n" "- Följande rader: Beskriv varför det här är en bra ändring.\n" -#: cola/cmds.py:653 +#: cola/cmds.py:655 msgid "Point the current branch head to a new commit?" msgstr "" -#: cola/widgets/about.py:416 +#: cola/widgets/about.py:399 msgid "Polish translation" msgstr "" -#: cola/widgets/stash.py:63 cola/widgets/stash.py:111 cola/widgets/stash.py:115 +#: cola/widgets/stash.py:65 cola/widgets/stash.py:114 cola/widgets/stash.py:118 msgid "Pop" msgstr "" -#: cola/widgets/main.py:293 cola/widgets/prefs.py:395 +#: cola/widgets/main.py:288 cola/widgets/prefs.py:433 msgid "Preferences" msgstr "Inställningar" -#: cola/widgets/archive.py:129 +#: cola/widgets/archive.py:127 msgid "Prefix" msgstr "" -#: cola/widgets/main.py:345 +#: cola/widgets/main.py:340 #, fuzzy msgid "Prepare Commit Message" msgstr "Incheckningsmeddelande för sammanslagning:" -#: cola/widgets/prefs.py:157 +#: cola/widgets/prefs.py:180 msgid "Prevent \"Stage\" from staging all files when nothing is selected" msgstr "" @@ -2645,239 +2731,251 @@ msgstr "" msgid "Previous File" msgstr "" -#: cola/widgets/remote.py:171 +#: cola/widgets/remote.py:169 msgid "Prompt on creation" msgstr "" -#: cola/widgets/remote.py:172 +#: cola/widgets/remote.py:170 #, fuzzy msgid "Prompt when pushing creates new remote branches" msgstr "Skapa ny gren" -#: cola/widgets/remote.py:208 +#: cola/widgets/remote.py:212 #, fuzzy msgid "Prune " msgstr "Ta bort från" -#: cola/widgets/bookmarks.py:255 cola/widgets/startup.py:376 +#: cola/widgets/bookmarks.py:254 cola/widgets/startup.py:375 msgid "Prune Missing Entries" msgstr "" -#: cola/widgets/branch.py:247 cola/widgets/remote.py:728 +#: cola/widgets/branch.py:256 cola/widgets/remote.py:783 #, fuzzy msgid "Pull" msgstr "Sänd..." -#: cola/widgets/action.py:65 cola/widgets/main.py:397 +#: cola/widgets/action.py:73 cola/widgets/main.py:401 #, fuzzy msgid "Pull..." msgstr "Sänd..." -#: cola/widgets/branch.py:253 cola/widgets/remote.py:593 -#: cola/widgets/remote.py:698 +#: cola/widgets/branch.py:262 cola/widgets/remote.py:628 +#: cola/widgets/remote.py:758 msgid "Push" msgstr "Sänd" -#: cola/widgets/action.py:64 cola/widgets/main.py:392 +#: cola/widgets/action.py:70 cola/widgets/main.py:393 +msgid "Push to one or more remotes using \"git push\"" +msgstr "" + +#: cola/widgets/action.py:70 cola/widgets/main.py:392 msgid "Push..." msgstr "Sänd..." -#: cola/guicmds.py:252 +#: cola/guicmds.py:251 msgid "Quick Open Repository" msgstr "" -#: cola/widgets/main.py:660 +#: cola/widgets/main.py:673 msgid "Quick Open..." msgstr "" -#: cola/widgets/main.py:355 +#: cola/widgets/main.py:350 msgid "Quit" msgstr "Avsluta" -#: cola/cmds.py:2144 cola/cmds.py:2180 cola/cmds.py:2181 cola/cmds.py:2194 -#: cola/cmds.py:2195 cola/sequenceeditor.py:158 cola/sequenceeditor.py:199 -#: cola/widgets/main.py:822 cola/widgets/remote.py:211 +#: cola/cmds.py:2095 cola/cmds.py:2131 cola/cmds.py:2132 cola/cmds.py:2145 +#: cola/cmds.py:2146 cola/sequenceeditor.py:156 cola/sequenceeditor.py:197 +#: cola/widgets/main.py:835 cola/widgets/remote.py:215 #, fuzzy msgid "Rebase" msgstr "Återställ" -#: cola/cmds.py:2143 +#: cola/cmds.py:2094 #, fuzzy, python-format msgid "Rebase onto %s" msgstr "Återställ" -#: cola/cmds.py:2156 +#: cola/cmds.py:2107 #, fuzzy msgid "Rebase stopped" msgstr "Återställ" -#: cola/widgets/remote.py:210 +#: cola/widgets/remote.py:214 msgid "Rebase the current branch instead of merging" msgstr "" -#: cola/widgets/dag.py:419 +#: cola/widgets/dag.py:418 msgid "Rebase to this commit" msgstr "" -#: cola/widgets/main.py:1165 +#: cola/widgets/main.py:1178 #, fuzzy msgid "Rebasing" msgstr "Återställ" -#: cola/widgets/main.py:120 +#: cola/widgets/main.py:118 #, fuzzy msgid "Recent" msgstr "Återställ" -#: cola/widgets/bookmarks.py:93 +#: cola/widgets/bookmarks.py:92 #, fuzzy msgid "Recent repositories" msgstr "Senaste arkiven" -#: cola/widgets/prefs.py:258 +#: cola/widgets/prefs.py:279 #, fuzzy msgid "Recent repository count" msgstr "Senaste arkiven" -#: cola/widgets/recent.py:46 +#: cola/widgets/recent.py:44 msgid "Recently Modified Files" msgstr "" -#: cola/widgets/main.py:320 +#: cola/widgets/main.py:315 #, fuzzy msgid "Recently Modified Files..." msgstr "Söker efter ändrade filer..." -#: cola/widgets/stash.py:256 +#: cola/widgets/stash.py:274 #, fuzzy msgid "Recovering a dropped stash is not possible." msgstr "Det kanske inte är så enkelt att återskapa förlorade incheckningar." -#: cola/widgets/createbranch.py:283 +#: cola/widgets/createbranch.py:281 msgid "Recovering lost commits may not be easy." msgstr "Det kanske inte är så enkelt att återskapa förlorade incheckningar." -#: cola/widgets/main.py:737 +#: cola/widgets/main.py:750 msgid "Redo" msgstr "Gör om" -#: cola/widgets/clone.py:121 +#: cola/widgets/clone.py:119 msgid "Reduce commit history to minimum" msgstr "" -#: cola/widgets/submodules.py:121 +#: cola/widgets/submodules.py:120 msgid "Reference Repository" msgstr "" -#: cola/widgets/submodules.py:105 +#: cola/widgets/submodules.py:104 msgid "Reference URL" msgstr "" -#: cola/widgets/submodules.py:106 +#: cola/widgets/submodules.py:105 msgid "Reference repository to use when cloning (optional)" msgstr "" -#: cola/cmds.py:2222 cola/qtutils.py:770 cola/widgets/action.py:62 -#: cola/widgets/dag.py:792 cola/widgets/editremotes.py:85 -#: cola/widgets/grep.py:105 cola/widgets/recent.py:116 -#: cola/widgets/submodules.py:45 +#: cola/cmds.py:2173 cola/qtutils.py:801 cola/widgets/action.py:63 +#: cola/widgets/dag.py:858 cola/widgets/editremotes.py:84 +#: cola/widgets/grep.py:103 cola/widgets/recent.py:114 +#: cola/widgets/submodules.py:44 msgid "Refresh" msgstr "Uppdatera" -#: cola/widgets/remote.py:179 +#: cola/widgets/remote.py:183 msgid "Refuse to merge unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward" msgstr "" -#: cola/widgets/branch.py:173 cola/widgets/branch.py:225 -#: cola/widgets/branch.py:269 cola/widgets/branch.py:470 -#: cola/widgets/compare.py:54 cola/widgets/compare.py:59 -#: cola/widgets/remote.py:147 +#: cola/widgets/branch.py:177 cola/widgets/branch.py:236 +#: cola/widgets/branch.py:278 cola/widgets/branch.py:513 +#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/remote.py:145 msgid "Remote" msgstr "Fjärr" -#: cola/widgets/remote.py:162 +#: cola/widgets/remote.py:160 #, fuzzy msgid "Remote Branch" msgstr "Byt namn på gren" -#: cola/cmds.py:1196 +#: cola/cmds.py:1197 #, fuzzy msgid "Remote Branch Deleted" msgstr "Byt namn på gren" -#: cola/widgets/editremotes.py:49 +#: cola/widgets/log.py:99 +msgid "Remote Messages" +msgstr "" + +#: cola/widgets/editremotes.py:48 msgid "Remote git repositories - double-click to rename" msgstr "" -#: cola/cmds.py:1029 cola/widgets/patch.py:107 cola/widgets/patch.py:122 -#: cola/widgets/startup.py:265 cola/widgets/status.py:1382 +#: cola/cmds.py:1030 cola/widgets/diff.py:1701 cola/widgets/diff.py:1716 +#: cola/widgets/startup.py:264 cola/widgets/status.py:1383 #, fuzzy msgid "Remove" msgstr "Fjärr" -#: cola/cmds.py:1027 +#: cola/cmds.py:1028 #, python-format msgid "Remove %s from the recent list?" msgstr "" -#: cola/widgets/toolbar.py:316 +#: cola/widgets/toolbar.py:321 #, fuzzy msgid "Remove Element" msgstr "Fjärr" -#: cola/widgets/remote.py:206 +#: cola/widgets/remote.py:210 msgid "Remove remote-tracking branches that no longer exist on the remote" msgstr "" -#: cola/widgets/patch.py:109 +#: cola/widgets/diff.py:1703 #, fuzzy msgid "Remove selected (Delete)" msgstr "Byt namn på gren" -#: cola/widgets/bookmarks.py:258 cola/widgets/startup.py:379 +#: cola/widgets/bookmarks.py:257 cola/widgets/startup.py:378 msgid "Remove stale entries for repositories that no longer exist" msgstr "" -#: cola/guicmds.py:333 cola/widgets/browse.py:159 +#: cola/guicmds.py:332 cola/widgets/browse.py:159 cola/widgets/stash.py:44 msgid "Rename" msgstr "Byt namn" -#: cola/cmds.py:1153 +#: cola/cmds.py:1154 #, fuzzy, python-format msgid "Rename \"%s\"" msgstr "Byt namn" -#: cola/widgets/branch.py:259 +#: cola/widgets/branch.py:268 #, fuzzy msgid "Rename Branch" msgstr "Byt namn på gren" -#: cola/widgets/main.py:570 +#: cola/widgets/main.py:583 #, fuzzy msgid "Rename Branch..." msgstr "Byt namn på gren" -#: cola/guicmds.py:330 +#: cola/guicmds.py:329 #, fuzzy msgid "Rename Existing Branch" msgstr "Uppdatera befintlig gren:" -#: cola/cmds.py:944 +#: cola/cmds.py:942 #, fuzzy msgid "Rename Remote" msgstr "Fjärr" -#: cola/widgets/bookmarks.py:233 cola/widgets/startup.py:356 +#: cola/widgets/bookmarks.py:232 cola/widgets/startup.py:355 #, fuzzy msgid "Rename Repository" msgstr "Klona befintligt arkiv" -#: cola/widgets/branch.py:445 +#: cola/widgets/stash.py:218 +msgid "Rename Stash" +msgstr "" + +#: cola/widgets/branch.py:478 #, fuzzy msgid "Rename branch" msgstr "Byt namn på gren" -#: cola/cmds.py:945 +#: cola/cmds.py:943 #, python-format msgid "Rename remote \"%(current)s\" to \"%(new)s\"?" msgstr "" @@ -2887,188 +2985,192 @@ msgstr "" msgid "Rename selected paths" msgstr "Byt namn på gren" -#: cola/app.py:497 cola/widgets/startup.py:262 +#: cola/widgets/stash.py:45 +msgid "Rename the selected stash" +msgstr "" + +#: cola/app.py:500 cola/widgets/startup.py:261 msgid "Repository Not Found" msgstr "" -#: cola/widgets/browse.py:87 cola/widgets/main.py:1095 +#: cola/widgets/browse.py:87 cola/widgets/main.py:1108 #, fuzzy, python-format msgid "Repository: %s" msgstr "Arkiv:" -#: cola/guicmds.py:351 cola/widgets/createbranch.py:125 cola/widgets/dag.py:331 -#: cola/widgets/editremotes.py:58 cola/widgets/main.py:832 +#: cola/guicmds.py:350 cola/widgets/createbranch.py:123 cola/widgets/dag.py:330 +#: cola/widgets/editremotes.py:57 cola/widgets/main.py:845 msgid "Reset" msgstr "Återställ" -#: cola/widgets/createbranch.py:286 +#: cola/widgets/createbranch.py:284 #, python-format msgid "Reset \"%(branch)s\" to \"%(revision)s\"?" msgstr "" -#: cola/guicmds.py:359 +#: cola/guicmds.py:358 msgid "Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/cmds.py:655 cola/cmds.py:706 cola/guicmds.py:342 -#: cola/widgets/createbranch.py:295 +#: cola/cmds.py:657 cola/cmds.py:708 cola/guicmds.py:341 +#: cola/widgets/createbranch.py:293 #, fuzzy msgid "Reset Branch" msgstr "Ta bort gren" -#: cola/cmds.py:703 cola/guicmds.py:341 cola/widgets/dag.py:425 -#: cola/widgets/main.py:419 +#: cola/cmds.py:705 cola/guicmds.py:340 cola/widgets/dag.py:424 +#: cola/widgets/main.py:431 msgid "Reset Branch (Soft)" msgstr "" -#: cola/cmds.py:652 cola/guicmds.py:350 cola/widgets/dag.py:431 -#: cola/widgets/main.py:426 +#: cola/cmds.py:654 cola/guicmds.py:349 cola/widgets/dag.py:430 +#: cola/widgets/main.py:439 msgid "Reset Branch and Stage (Mixed)" msgstr "" -#: cola/widgets/createbranch.py:292 +#: cola/widgets/createbranch.py:290 #, fuzzy msgid "Reset Branch?" msgstr "Ta bort gren" -#: cola/widgets/main.py:655 +#: cola/widgets/main.py:668 msgid "Reset Layout" msgstr "" -#: cola/cmds.py:687 +#: cola/cmds.py:689 msgid "Reset Worktree and Reset All?" msgstr "" -#: cola/cmds.py:672 cola/cmds.py:689 cola/cmds.py:723 cola/guicmds.py:360 -#: cola/guicmds.py:373 cola/guicmds.py:382 +#: cola/cmds.py:674 cola/cmds.py:691 cola/cmds.py:725 cola/guicmds.py:359 +#: cola/guicmds.py:372 cola/guicmds.py:381 msgid "Reset and Restore" msgstr "" -#: cola/cmds.py:704 +#: cola/cmds.py:706 msgid "Reset branch?" msgstr "" -#: cola/widgets/createbranch.py:266 +#: cola/widgets/createbranch.py:264 #, fuzzy, python-format msgid "Resetting \"%(branch)s\" to \"%(revision)s\" will lose commits." msgstr "Om du återställer \"%s\" till \"%s\" går följande incheckningar förlorade:" -#: cola/widgets/prefs.py:264 +#: cola/widgets/prefs.py:285 msgid "Resize File Browser columns" msgstr "" -#: cola/widgets/prefs.py:374 +#: cola/widgets/prefs.py:412 msgid "Restart the application after changing appearance settings." msgstr "" -#: cola/cmds.py:757 cola/cmds.py:760 cola/guicmds.py:390 cola/guicmds.py:391 -#: cola/widgets/dag.py:461 cola/widgets/main.py:457 +#: cola/cmds.py:759 cola/cmds.py:762 cola/guicmds.py:389 cola/guicmds.py:390 +#: cola/widgets/dag.py:460 cola/widgets/main.py:471 msgid "Restore Worktree" msgstr "" -#: cola/cmds.py:720 cola/guicmds.py:381 cola/widgets/dag.py:454 -#: cola/widgets/main.py:450 +#: cola/cmds.py:722 cola/guicmds.py:380 cola/widgets/dag.py:453 +#: cola/widgets/main.py:463 msgid "Restore Worktree and Reset All (Hard)" msgstr "" -#: cola/cmds.py:669 cola/widgets/main.py:434 +#: cola/cmds.py:671 cola/widgets/main.py:447 msgid "Restore Worktree and Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/widgets/dag.py:438 +#: cola/widgets/dag.py:437 msgid "Restore Worktree and Reset All (Keep Unstaged Edits)" msgstr "" -#: cola/cmds.py:686 cola/guicmds.py:372 cola/widgets/dag.py:446 -#: cola/widgets/main.py:442 +#: cola/cmds.py:688 cola/guicmds.py:371 cola/widgets/dag.py:445 +#: cola/widgets/main.py:455 msgid "Restore Worktree and Reset All (Merge)" msgstr "" -#: cola/cmds.py:721 +#: cola/cmds.py:723 msgid "Restore Worktree and Reset All?" msgstr "" -#: cola/cmds.py:758 +#: cola/cmds.py:760 #, python-format msgid "Restore Worktree to %s?" msgstr "" -#: cola/cmds.py:670 +#: cola/cmds.py:672 msgid "Restore worktree, reset, and preserve unstaged edits?" msgstr "" -#: cola/widgets/dag.py:390 +#: cola/widgets/dag.py:389 msgid "Revert" msgstr "" -#: cola/widgets/diff.py:1153 +#: cola/widgets/diff.py:1227 msgid "Revert Diff Hunk" msgstr "" -#: cola/widgets/diff.py:1018 +#: cola/widgets/diff.py:1057 msgid "Revert Diff Hunk..." msgstr "" -#: cola/widgets/diff.py:1152 +#: cola/widgets/diff.py:1226 msgid "Revert Diff Hunk?" msgstr "" -#: cola/widgets/diff.py:1150 +#: cola/widgets/diff.py:1224 msgid "Revert Selected Lines" msgstr "" -#: cola/widgets/diff.py:1013 +#: cola/widgets/diff.py:1052 msgid "Revert Selected Lines..." msgstr "" -#: cola/widgets/diff.py:1149 +#: cola/widgets/diff.py:1223 #, fuzzy msgid "Revert Selected Lines?" msgstr "Återställ ändringarna i filen %s?" -#: cola/cmds.py:2311 +#: cola/cmds.py:2262 #, fuzzy msgid "Revert Uncommitted Changes" msgstr "Återställ ändringar" -#: cola/cmds.py:2305 +#: cola/cmds.py:2256 #, fuzzy msgid "Revert Uncommitted Changes?" msgstr "Återställ ändringar" -#: cola/cmds.py:2298 +#: cola/cmds.py:2249 #, fuzzy msgid "Revert Uncommitted Edits..." msgstr "Återställ ändringar" -#: cola/cmds.py:2289 +#: cola/cmds.py:2240 #, fuzzy msgid "Revert Unstaged Changes" msgstr "Oköade ändringar" -#: cola/cmds.py:2283 +#: cola/cmds.py:2234 #, fuzzy msgid "Revert Unstaged Changes?" msgstr "Oköade ändringar" -#: cola/cmds.py:2275 +#: cola/cmds.py:2226 msgid "Revert Unstaged Edits..." msgstr "" -#: cola/cmds.py:598 +#: cola/cmds.py:599 msgid "Revert failed" msgstr "" -#: cola/cmds.py:2310 cola/widgets/diff.py:1161 +#: cola/cmds.py:2261 cola/widgets/diff.py:1235 msgid "Revert the uncommitted changes?" msgstr "" -#: cola/cmds.py:2288 +#: cola/cmds.py:2239 #, fuzzy msgid "Revert the unstaged changes?" msgstr "Oköade ändringar" -#: cola/widgets/browse.py:189 +#: cola/widgets/browse.py:190 #, fuzzy msgid "Revert uncommitted changes to selected paths" msgstr "Återställ ändringarna i filen %s?" @@ -3078,467 +3180,482 @@ msgstr "Återställ ändringarna i filen %s?" msgid "Revert unstaged changes to selected paths" msgstr "Återställ ändringarna i filen %s?" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Review" msgstr "" -#: cola/widgets/main.py:583 +#: cola/widgets/main.py:596 #, fuzzy msgid "Review..." msgstr "Återställ..." -#: cola/widgets/cfgactions.py:233 cola/widgets/createtag.py:84 +#: cola/widgets/cfgactions.py:231 cola/widgets/createtag.py:82 msgid "Revision" msgstr "Revision" -#: cola/widgets/selectcommits.py:62 +#: cola/widgets/selectcommits.py:61 msgid "Revision Expression:" msgstr "Revisionsuttryck:" -#: cola/widgets/merge.py:39 cola/widgets/merge.py:42 +#: cola/widgets/merge.py:37 cola/widgets/merge.py:40 msgid "Revision to Merge" msgstr "Revisioner att slå ihop" -#: cola/sequenceeditor.py:351 +#: cola/sequenceeditor.py:347 msgid "Reword" msgstr "" -#: cola/cmds.py:776 cola/widgets/commitmsg.py:456 +#: cola/cmds.py:778 cola/widgets/commitmsg.py:464 msgid "Rewrite Published Commit?" msgstr "" -#: cola/widgets/log.py:31 +#: cola/widgets/log.py:31 cola/widgets/log.py:133 msgid "Right-click links to open:" msgstr "" -#: cola/interaction.py:127 cola/widgets/cfgactions.py:245 +#: cola/interaction.py:125 cola/widgets/cfgactions.py:243 msgid "Run" msgstr "" -#: cola/cmds.py:2341 +#: cola/cmds.py:2292 #, python-format msgid "Run \"%s\"?" msgstr "" -#: cola/interaction.py:124 +#: cola/interaction.py:122 #, python-format msgid "Run %s?" msgstr "" -#: cola/interaction.py:125 +#: cola/interaction.py:123 #, python-format msgid "Run the \"%s\" command?" msgstr "" -#: cola/cmds.py:2380 +#: cola/cmds.py:2331 #, python-format msgid "Running command: %s" msgstr "" -#: cola/widgets/about.py:422 +#: cola/widgets/about.py:405 msgid "Russian translation" msgstr "" -#: cola/sequenceeditor.py:324 +#: cola/sequenceeditor.py:321 #, fuzzy msgid "SHA-1" msgstr "Kopiera alla" -#: cola/widgets/prefs.py:183 +#: cola/widgets/prefs.py:205 msgid "Safe Mode" msgstr "" -#: cola/cmds.py:2167 cola/widgets/archive.py:126 cola/widgets/browse.py:609 -#: cola/widgets/editremotes.py:54 cola/widgets/stash.py:52 -#: cola/widgets/status.py:1388 +#: cola/cmds.py:2118 cola/widgets/archive.py:124 cola/widgets/browse.py:610 +#: cola/widgets/editremotes.py:53 cola/widgets/stash.py:54 +#: cola/widgets/status.py:1389 msgid "Save" msgstr "Spara" -#: cola/widgets/archive.py:113 +#: cola/widgets/archive.py:111 msgid "Save Archive" msgstr "" -#: cola/widgets/dag.py:382 cola/widgets/main.py:351 +#: cola/widgets/dag.py:381 cola/widgets/main.py:346 msgid "Save As Tarball/Zip..." msgstr "" -#: cola/widgets/prefs.py:263 +#: cola/widgets/prefs.py:284 msgid "Save GUI Settings" msgstr "" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Save Stash" msgstr "" -#: cola/widgets/stash.py:53 +#: cola/widgets/stash.py:55 msgid "Save modified state to new stash" msgstr "" -#: cola/widgets/browse.py:570 +#: cola/widgets/browse.py:571 #, python-format msgid "Saved \"%(filename)s\" from \"%(ref)s\" to \"%(destination)s\"" msgstr "" -#: cola/widgets/bookmarks.py:83 cola/widgets/grep.py:98 -#: cola/widgets/search.py:42 cola/widgets/search.py:62 +#: cola/widgets/bookmarks.py:82 cola/widgets/grep.py:96 +#: cola/widgets/search.py:41 cola/widgets/search.py:61 msgid "Search" msgstr "" -#: cola/widgets/search.py:226 +#: cola/widgets/search.py:225 msgid "Search Authors" msgstr "" -#: cola/widgets/search.py:224 +#: cola/widgets/search.py:223 #, fuzzy msgid "Search Commit Messages" msgstr "Incheckningsmeddelande för sammanslagning:" -#: cola/widgets/search.py:227 +#: cola/widgets/search.py:226 #, fuzzy msgid "Search Committers" msgstr "Incheckare:" -#: cola/widgets/search.py:228 +#: cola/widgets/search.py:227 msgid "Search Date Range" msgstr "" -#: cola/widgets/search.py:225 +#: cola/widgets/search.py:224 msgid "Search Diffs" msgstr "" -#: cola/widgets/search.py:222 +#: cola/widgets/search.py:221 #, fuzzy msgid "Search by Expression" msgstr "Revisionsuttryck:" -#: cola/widgets/search.py:223 +#: cola/widgets/search.py:222 msgid "Search by Path" msgstr "" -#: cola/widgets/grep.py:124 +#: cola/widgets/dag.py:494 +msgid "Search commit messages" +msgstr "" + +#: cola/widgets/grep.py:122 msgid "Search for a fixed string" msgstr "" -#: cola/widgets/diff.py:519 cola/widgets/diff.py:1514 +#: cola/widgets/diff.py:526 cola/widgets/diff.py:1576 msgid "Search in Diff" msgstr "" -#: cola/guicmds.py:253 cola/widgets/bookmarks.py:62 +#: cola/guicmds.py:252 cola/widgets/bookmarks.py:61 msgid "Search repositories by name..." msgstr "" -#: cola/widgets/grep.py:122 +#: cola/widgets/grep.py:120 msgid "Search using a POSIX basic regular expression" msgstr "" -#: cola/widgets/grep.py:123 +#: cola/widgets/grep.py:121 msgid "Search using a POSIX extended regular expression" msgstr "" -#: cola/widgets/main.py:493 +#: cola/widgets/main.py:506 #, fuzzy msgid "Search..." msgstr "Startar..." -#: cola/widgets/selectcommits.py:67 +#: cola/widgets/selectcommits.py:66 msgid "Search:" msgstr "" -#: cola/guicmds.py:330 cola/widgets/selectcommits.py:74 +#: cola/guicmds.py:329 cola/widgets/selectcommits.py:73 msgid "Select" msgstr "Välj" -#: cola/widgets/main.py:750 +#: cola/widgets/main.py:763 msgid "Select All" msgstr "Markera alla" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 #, fuzzy msgid "Select Branch to Review" msgstr "Ta bort gren" -#: cola/widgets/dag.py:1610 +#: cola/widgets/dag.py:1667 #, fuzzy msgid "Select Child" msgstr "Markera alla" -#: cola/widgets/commitmsg.py:512 +#: cola/widgets/commitmsg.py:538 #, fuzzy msgid "Select Commit" msgstr "Incheckningsmeddelande för sammanslagning:" -#: cola/guicmds.py:137 +#: cola/guicmds.py:136 #, fuzzy msgid "Select Directory..." msgstr "Gitarkiv" -#: cola/cmds.py:2129 +#: cola/cmds.py:2080 #, fuzzy msgid "Select New Upstream" msgstr "Välj" -#: cola/widgets/dag.py:1614 +#: cola/widgets/dag.py:1671 msgid "Select Newest Child" msgstr "" -#: cola/widgets/dag.py:1604 +#: cola/widgets/dag.py:1661 msgid "Select Oldest Parent" msgstr "" -#: cola/widgets/dag.py:1599 +#: cola/widgets/dag.py:1656 #, fuzzy msgid "Select Parent" msgstr "Välj" -#: cola/widgets/browse.py:525 +#: cola/widgets/browse.py:526 msgid "Select Previous Version" msgstr "" -#: cola/widgets/clone.py:197 +#: cola/widgets/clone.py:195 msgid "Select a parent directory for the new clone" msgstr "" -#: cola/widgets/standard.py:756 cola/widgets/standard.py:779 +#: cola/widgets/standard.py:826 cola/widgets/standard.py:848 msgid "Select directory" msgstr "" -#: cola/widgets/selectcommits.py:162 +#: cola/widgets/selectcommits.py:161 #, fuzzy msgid "Select output dir" msgstr "Incheckningsmeddelande för sammanslagning:" -#: cola/widgets/selectcommits.py:183 +#: cola/widgets/selectcommits.py:182 #, fuzzy msgid "Select output directory" msgstr "Gitarkiv" -#: cola/widgets/patch.py:175 +#: cola/widgets/diff.py:1769 #, fuzzy msgid "Select patch file(s)..." msgstr "Ta bort..." -#: cola/widgets/editremotes.py:437 +#: cola/widgets/editremotes.py:435 #, fuzzy msgid "Select repository" msgstr "Gitarkiv" -#: cola/widgets/bookmarks.py:225 cola/widgets/startup.py:348 +#: cola/widgets/bookmarks.py:224 cola/widgets/startup.py:347 #, fuzzy msgid "Set Default Repository" msgstr "Gitarkiv" -#: cola/widgets/branch.py:282 +#: cola/widgets/branch.py:291 #, fuzzy msgid "Set Upstream Branch" msgstr "Välj" -#: cola/widgets/branch.py:72 +#: cola/widgets/branch.py:74 msgid "" "Set the sort order for branches and tags.\n" "Toggle between date-based and version-name-based sorting." msgstr "" -#: cola/widgets/remote.py:213 +#: cola/widgets/remote.py:217 #, fuzzy msgid "Set upstream" msgstr "Välj" -#: cola/widgets/prefs.py:405 +#: cola/widgets/prefs.py:443 #, fuzzy msgid "Settings" msgstr "Startar..." -#: cola/widgets/grep.py:142 +#: cola/widgets/grep.py:140 msgid "Shell arguments" msgstr "" -#: cola/sequenceeditor.py:375 +#: cola/sequenceeditor.py:371 msgid "Shift Down" msgstr "" -#: cola/sequenceeditor.py:379 +#: cola/sequenceeditor.py:375 msgid "Shift Up" msgstr "" -#: cola/widgets/about.py:499 +#: cola/widgets/about.py:482 msgid "Shortcuts" msgstr "" -#: cola/widgets/prefs.py:179 +#: cola/widgets/prefs.py:201 msgid "Show Diffstat After Merge" msgstr "Visa diffstatistik efter sammanslagning" -#: cola/widgets/prefs.py:178 +#: cola/widgets/prefs.py:200 msgid "Show Full Paths in the Window Title" msgstr "" -#: cola/sequenceeditor.py:106 cola/widgets/finder.py:187 -#: cola/widgets/status.py:1384 +#: cola/sequenceeditor.py:104 cola/widgets/finder.py:186 +#: cola/widgets/status.py:1385 #, fuzzy msgid "Show Help" msgstr "Hjälp" -#: cola/widgets/filelist.py:30 +#: cola/widgets/filelist.py:27 msgid "Show History" msgstr "" -#: cola/widgets/prefs.py:348 +#: cola/widgets/prefs.py:368 msgid "Show file counts in Status titles" msgstr "" -#: cola/sequenceeditor.py:171 cola/widgets/finder.py:138 +#: cola/widgets/diff.py:794 +msgid "Show filenames" +msgstr "" + +#: cola/sequenceeditor.py:169 cola/widgets/finder.py:137 msgid "" "Show help\n" "Shortcut: ?" msgstr "" -#: cola/widgets/diff.py:765 +#: cola/widgets/diff.py:792 msgid "Show line numbers" msgstr "" -#: cola/widgets/diff.py:761 +#: cola/widgets/remote.py:175 +msgid "Show remote messages" +msgstr "" + +#: cola/widgets/diff.py:789 msgid "Show whole surrounding functions of changes" msgstr "" -#: cola/widgets/recent.py:58 +#: cola/widgets/recent.py:56 #, fuzzy msgid "Showing changes since" msgstr "Sänder ändringar till %s" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "Side by side" msgstr "" -#: cola/cmds.py:2512 +#: cola/cmds.py:2463 msgid "Sign Off" msgstr "Skriv under" -#: cola/widgets/createtag.py:71 +#: cola/widgets/createtag.py:69 #, fuzzy msgid "Sign Tag" msgstr "Skriv under" -#: cola/widgets/commitmsg.py:55 +#: cola/widgets/commitmsg.py:56 #, fuzzy msgid "Sign off on this commit" msgstr "Köade för incheckning" -#: cola/widgets/about.py:412 cola/widgets/about.py:425 +#: cola/widgets/about.py:395 cola/widgets/about.py:408 msgid "Simplified Chinese translation" msgstr "" -#: cola/cmds.py:2587 +#: cola/cmds.py:2529 msgid "Skip" msgstr "" -#: cola/widgets/main.py:264 cola/widgets/main.py:617 +#: cola/widgets/main.py:260 cola/widgets/main.py:630 #, fuzzy msgid "Skip Current Patch" msgstr "Skapa gren" -#: cola/widgets/main.py:267 +#: cola/widgets/main.py:261 msgid "Skip applying the current patch and continue applying patches" msgstr "" -#: cola/widgets/prefs.py:261 +#: cola/widgets/prefs.py:282 msgid "Sort bookmarks alphabetically" msgstr "" -#: cola/widgets/about.py:413 cola/widgets/about.py:436 -#: cola/widgets/about.py:440 +#: cola/widgets/about.py:396 cola/widgets/about.py:419 +#: cola/widgets/about.py:423 msgid "Spanish translation" msgstr "" -#: cola/widgets/createtag.py:88 +#: cola/widgets/createtag.py:86 msgid "Specifies the SHA-1 to tag" msgstr "" -#: cola/widgets/createtag.py:81 +#: cola/widgets/createtag.py:79 msgid "Specifies the tag message" msgstr "" -#: cola/widgets/createtag.py:65 +#: cola/widgets/createtag.py:63 msgid "Specifies the tag name" msgstr "" -#: cola/widgets/spellcheck.py:46 +#: cola/widgets/spellcheck.py:45 #, fuzzy msgid "Spelling Suggestions" msgstr "Inga förslag" -#: cola/sequenceeditor.py:369 cola/widgets/merge.py:58 +#: cola/sequenceeditor.py:365 cola/widgets/merge.py:56 #, fuzzy msgid "Squash" msgstr "Sänd" -#: cola/widgets/merge.py:57 +#: cola/widgets/merge.py:55 msgid "Squash the merged commits into a single commit" msgstr "" -#: cola/cmds.py:2598 cola/widgets/action.py:60 cola/widgets/diff.py:982 +#: cola/cmds.py:2540 cola/widgets/action.py:58 cola/widgets/diff.py:1168 #, fuzzy msgid "Stage" msgstr "Spara" -#: cola/cmds.py:2753 +#: cola/cmds.py:2699 #, fuzzy msgid "Stage / Unstage" msgstr "Köa ändrade" -#: cola/cmds.py:2735 +#: cola/cmds.py:2681 msgid "Stage / Unstage All" msgstr "" -#: cola/widgets/diff.py:1016 -#, fuzzy +#: cola/widgets/diff.py:1055 msgid "Stage Diff Hunk" msgstr "" -#: cola/cmds.py:2691 +#: cola/cmds.py:2633 msgid "Stage Modified" msgstr "Köa ändrade" -#: cola/cmds.py:2724 +#: cola/cmds.py:2670 msgid "Stage Modified and Untracked" msgstr "" -#: cola/widgets/status.py:872 cola/widgets/status.py:894 -#: cola/widgets/status.py:962 +#: cola/widgets/status.py:873 cola/widgets/status.py:895 +#: cola/widgets/status.py:963 #, fuzzy msgid "Stage Selected" msgstr "Välj" -#: cola/widgets/diff.py:1011 +#: cola/widgets/diff.py:1050 #, fuzzy msgid "Stage Selected Lines" msgstr "Oköade ändringar" -#: cola/cmds.py:2702 +#: cola/cmds.py:2644 #, fuzzy msgid "Stage Unmerged" msgstr "Köa ändrade unmerged" -#: cola/cmds.py:2713 +#: cola/cmds.py:2655 #, fuzzy msgid "Stage Untracked" msgstr "Köa ändrade untracked" -#: cola/widgets/commitmsg.py:438 +#: cola/widgets/commitmsg.py:446 #, fuzzy msgid "Stage and Commit" msgstr "Köa för incheckning" -#: cola/widgets/commitmsg.py:435 +#: cola/widgets/commitmsg.py:443 #, fuzzy msgid "Stage and commit?" msgstr "Köade för incheckning" -#: cola/cmds.py:2586 +#: cola/widgets/action.py:58 +msgid "Stage changes using \"git add\"" +msgstr "" + +#: cola/cmds.py:2528 #, fuzzy msgid "Stage conflicts" msgstr "Köade för incheckning" -#: cola/cmds.py:2577 +#: cola/cmds.py:2519 #, fuzzy msgid "Stage conflicts?" msgstr "Köade för incheckning" @@ -3548,50 +3665,50 @@ msgstr "Köade för incheckning" msgid "Stage/unstage selected paths for commit" msgstr "Köade för incheckning" -#: cola/models/browse.py:334 cola/widgets/status.py:156 -#: cola/widgets/status.py:620 +#: cola/models/browse.py:333 cola/widgets/status.py:156 +#: cola/widgets/status.py:621 #, fuzzy msgid "Staged" msgstr "Köa ändrade" -#: cola/cmds.py:2605 +#: cola/cmds.py:2547 #, fuzzy, python-format msgid "Staging: %s" msgstr "Söker %s..." -#: cola/widgets/main.py:597 +#: cola/widgets/main.py:610 msgid "Start Interactive Rebase..." msgstr "" -#: cola/widgets/createbranch.py:107 +#: cola/widgets/createbranch.py:105 msgid "Starting Revision" msgstr "Inledande revision" -#: cola/widgets/stash.py:40 +#: cola/widgets/stash.py:36 msgid "Stash" msgstr "" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 #, fuzzy msgid "Stash Index" msgstr "Indexfel" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 #, fuzzy msgid "Stash staged changes only" msgstr "Checkar in ändringar..." -#: cola/widgets/stash.py:73 +#: cola/widgets/stash.py:75 #, fuzzy msgid "Stash unstaged changes only, keeping staged changes" msgstr "Återställ ändringarna i filen %s?" -#: cola/widgets/action.py:66 cola/widgets/main.py:414 +#: cola/widgets/action.py:76 cola/widgets/main.py:422 #, fuzzy msgid "Stash..." msgstr "Sänd..." -#: cola/models/browse.py:33 cola/widgets/main.py:102 +#: cola/models/browse.py:32 cola/widgets/main.py:100 msgid "Status" msgstr "" @@ -3599,212 +3716,220 @@ msgstr "" msgid "Stop tracking paths" msgstr "" -#: cola/widgets/submodules.py:82 +#: cola/widgets/submodules.py:81 msgid "Submodule URL (can be relative, ex: ../repo.git)" msgstr "" -#: cola/widgets/submodules.py:90 +#: cola/widgets/submodules.py:89 msgid "Submodule branch to track (optional)" msgstr "" -#: cola/widgets/submodules.py:86 +#: cola/widgets/submodules.py:85 msgid "Submodule path within the current repository (optional)" msgstr "" -#: cola/widgets/main.py:143 cola/widgets/submodules.py:32 +#: cola/widgets/main.py:141 cola/widgets/submodules.py:31 msgid "Submodules" msgstr "" -#: cola/widgets/prefs.py:174 +#: cola/widgets/prefs.py:196 msgid "Summarize Merge Commits" msgstr "Summera sammanslagningsincheckningar" -#: cola/sequenceeditor.py:325 cola/widgets/dag.py:506 +#: cola/sequenceeditor.py:322 cola/widgets/dag.py:572 msgid "Summary" msgstr "" -#: cola/widgets/prefs.py:168 +#: cola/widgets/prefs.py:273 msgid "Tab Width" msgstr "" -#: cola/widgets/cfgactions.py:229 cola/widgets/createbranch.py:116 -#: cola/widgets/merge.py:48 +#: cola/widgets/cfgactions.py:227 cola/widgets/createbranch.py:114 +#: cola/widgets/merge.py:46 msgid "Tag" msgstr "Tagg" -#: cola/cmds.py:2842 +#: cola/cmds.py:2788 #, fuzzy msgid "Tag Created" msgstr "Skapa" -#: cola/widgets/createtag.py:80 +#: cola/widgets/createtag.py:78 msgid "Tag message..." msgstr "" -#: cola/cmds.py:2802 +#: cola/cmds.py:2748 msgid "Tag-signing was requested but the tag message is empty." msgstr "" -#: cola/widgets/branch.py:179 cola/widgets/branch.py:238 +#: cola/widgets/branch.py:183 cola/widgets/branch.py:248 msgid "Tags" msgstr "" -#: cola/widgets/toolbar.py:180 +#: cola/widgets/action.py:78 cola/widgets/main.py:423 +msgid "Temporarily stash away uncommitted changes using \"git stash\"" +msgstr "" + +#: cola/widgets/toolbar.py:184 msgid "Text Beside Icon" msgstr "" -#: cola/widgets/toolbar.py:179 +#: cola/widgets/toolbar.py:183 msgid "Text Only" msgstr "" -#: cola/widgets/toolbar.py:181 +#: cola/widgets/toolbar.py:185 msgid "Text Under Icon" msgstr "" -#: cola/widgets/prefs.py:169 +#: cola/widgets/prefs.py:272 msgid "Text Width" msgstr "" -#: cola/cmds.py:1116 +#: cola/cmds.py:1117 msgid "The branch will be no longer available." msgstr "" -#: cola/cmds.py:648 +#: cola/cmds.py:650 #, python-format msgid "The branch will be reset using \"git reset --mixed %s\"" msgstr "" -#: cola/cmds.py:699 cola/cmds.py:790 +#: cola/cmds.py:701 cola/cmds.py:792 #, python-format msgid "The branch will be reset using \"git reset --soft %s\"" msgstr "" -#: cola/widgets/commitmsg.py:303 +#: cola/widgets/commitmsg.py:311 #, fuzzy msgid "The commit message will be cleared." msgstr "Textbredd för incheckningsmeddelande" -#: cola/widgets/prefs.py:146 +#: cola/widgets/prefs.py:169 msgid "" "The date-time format used when displaying dates in Git DAG.\n" "This value is passed to git log --date=" msgstr "" -#: cola/widgets/archive.py:208 +#: cola/widgets/archive.py:206 #, python-format msgid "The file \"%s\" exists and will be overwritten." msgstr "" -#: cola/cmds.py:1086 +#: cola/cmds.py:1087 msgid "The following files will be deleted:" msgstr "" -#: cola/widgets/status.py:1646 +#: cola/widgets/status.py:1647 msgid "The number of leading paths to strip" msgstr "" -#: cola/cmds.py:716 +#: cola/cmds.py:718 #, python-format msgid "The repository will be reset using \"git reset --hard %s\"" msgstr "" -#: cola/cmds.py:665 +#: cola/cmds.py:667 #, python-format msgid "The repository will be reset using \"git reset --keep %s\"" msgstr "" -#: cola/cmds.py:682 +#: cola/cmds.py:684 #, python-format msgid "The repository will be reset using \"git reset --merge %s\"" msgstr "" -#: cola/cmds.py:2365 +#: cola/cmds.py:2316 #, fuzzy msgid "The revision expression cannot be empty." msgstr "Revisionsuttrycket är tomt." -#: cola/cmds.py:3029 +#: cola/widgets/stash.py:225 +msgid "The stash has not been renamed" +msgstr "" + +#: cola/cmds.py:2975 #, python-format msgid "" "The submodule will be added using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:3074 +#: cola/cmds.py:3020 #, python-format msgid "" "The submodule will be updated using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:736 +#: cola/cmds.py:738 #, python-format msgid "The worktree will be restored using \"git read-tree --reset -u %s\"" msgstr "" -#: cola/widgets/commitmsg.py:304 +#: cola/widgets/commitmsg.py:312 msgid "This cannot be undone. Clear commit message?" msgstr "" -#: cola/cmds.py:778 cola/widgets/commitmsg.py:458 +#: cola/cmds.py:780 cola/widgets/commitmsg.py:466 msgid "" "This commit has already been published.\n" "This operation will rewrite published history.\n" "You probably don't want to do this." msgstr "" -#: cola/widgets/diff.py:1158 +#: cola/widgets/diff.py:1232 msgid "" "This operation drops uncommitted changes.\n" "These changes cannot be recovered." msgstr "" -#: cola/cmds.py:2307 +#: cola/cmds.py:2258 msgid "" "This operation removes uncommitted edits from selected files.\n" "These changes cannot be recovered." msgstr "" -#: cola/cmds.py:2285 +#: cola/cmds.py:2236 msgid "" "This operation removes unstaged edits from selected files.\n" "These changes cannot be recovered." msgstr "" -#: cola/cmds.py:475 +#: cola/cmds.py:476 msgid "" "This operation will replace the selected unmerged files with content from the branch being merged using \"git checkout --theirs\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:513 +#: cola/cmds.py:514 msgid "" "This operation will replace the selected unmerged files with content from your current branch using \"git checkout --ours\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/widgets/main.py:1109 +#: cola/widgets/main.py:1122 msgid "" "This repository has unresolved conflicts after applying a patch.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1102 +#: cola/widgets/main.py:1115 msgid "" "This repository is currently being rebased.\n" "Resolve conflicts, commit changes, and run:\n" " Rebase > Continue" msgstr "" -#: cola/widgets/main.py:1115 +#: cola/widgets/main.py:1128 msgid "" "This repository is in the middle of a cherry-pick.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1121 +#: cola/widgets/main.py:1134 msgid "" "This repository is in the middle of a merge.\n" "Resolve conflicts and commit changes." @@ -3822,15 +3947,15 @@ msgstr "" msgid "To avoid applying removal lines ('-'), change them to context lines (' ')." msgstr "" -#: cola/sequenceeditor.py:342 +#: cola/sequenceeditor.py:338 msgid "Toggle Enabled" msgstr "" -#: cola/widgets/diff.py:776 +#: cola/widgets/diff.py:804 msgid "Toggle image diff" msgstr "" -#: cola/widgets/branch.py:63 +#: cola/widgets/branch.py:65 msgid "Toggle the branches filter" msgstr "" @@ -3838,52 +3963,52 @@ msgstr "" msgid "Toggle the paths filter" msgstr "" -#: cola/widgets/toolbar.py:317 +#: cola/widgets/toolbar.py:322 msgid "Toolbar Style:" msgstr "" -#: cola/widgets/cfgactions.py:228 cola/widgets/merge.py:47 +#: cola/widgets/cfgactions.py:226 cola/widgets/merge.py:45 msgid "Tracking Branch" msgstr "Spårande gren" -#: cola/widgets/createbranch.py:115 +#: cola/widgets/createbranch.py:113 #, fuzzy msgid "Tracking branch" msgstr "Spårande gren" -#: cola/widgets/about.py:408 cola/widgets/about.py:434 -#: cola/widgets/about.py:445 +#: cola/widgets/about.py:391 cola/widgets/about.py:417 +#: cola/widgets/about.py:428 msgid "Traditional Chinese (Taiwan) translation" msgstr "" -#: cola/widgets/about.py:439 +#: cola/widgets/about.py:422 msgid "Translation" msgstr "" -#: cola/widgets/about.py:94 +#: cola/widgets/about.py:92 msgid "Translators" msgstr "" -#: cola/widgets/about.py:418 cola/widgets/about.py:423 -#: cola/widgets/about.py:438 +#: cola/widgets/about.py:401 cola/widgets/about.py:406 +#: cola/widgets/about.py:421 msgid "Turkish translation" msgstr "" -#: cola/widgets/clone.py:109 cola/widgets/editremotes.py:451 -#: cola/widgets/submodules.py:117 +#: cola/widgets/clone.py:107 cola/widgets/editremotes.py:449 +#: cola/widgets/submodules.py:116 msgid "URL" msgstr "Webbadress" -#: cola/widgets/remote.py:463 +#: cola/widgets/remote.py:497 #, fuzzy, python-format msgid "URL: %s" msgstr "Webbadress:" -#: cola/widgets/about.py:415 +#: cola/widgets/about.py:398 msgid "Ukranian translation" msgstr "" -#: cola/cmds.py:2122 +#: cola/cmds.py:2073 #, fuzzy msgid "Unable to rebase" msgstr "Kunde inte städa upp %s" @@ -3893,56 +4018,61 @@ msgstr "Kunde inte städa upp %s" msgid "Unable to set URL for \"%(name)s\" to \"%(url)s\"" msgstr "" -#: cola/widgets/diff.py:1327 +#: cola/widgets/diff.py:1401 #, python-format msgid "Unable to write patch to \"%s\". Check permissions?" msgstr "" -#: cola/widgets/main.py:735 +#: cola/widgets/main.py:748 msgid "Undo" msgstr "Ångra" -#: cola/cmds.py:783 cola/cmds.py:788 cola/cmds.py:791 cola/widgets/main.py:208 +#: cola/cmds.py:785 cola/cmds.py:790 cola/cmds.py:793 cola/widgets/main.py:207 msgid "Undo Last Commit" msgstr "" -#: cola/cmds.py:789 +#: cola/cmds.py:791 msgid "Undo last commit?" msgstr "" -#: cola/cmds.py:782 +#: cola/cmds.py:784 msgid "Undo the published commit?" msgstr "" -#: cola/models/browse.py:328 cola/widgets/status.py:157 -#: cola/widgets/status.py:640 +#: cola/models/browse.py:327 cola/widgets/status.py:157 +#: cola/widgets/status.py:641 #, fuzzy msgid "Unmerged" msgstr "Slå ihop" -#: cola/cmds.py:2855 cola/widgets/action.py:61 cola/widgets/diff.py:985 +#: cola/cmds.py:2801 cola/widgets/action.py:61 cola/widgets/diff.py:1165 +#: cola/widgets/main.py:212 #, fuzzy msgid "Unstage" msgstr "Oköade ändringar" -#: cola/widgets/main.py:203 cola/widgets/status.py:790 +#: cola/widgets/main.py:202 cola/widgets/status.py:791 msgid "Unstage All" msgstr "" -#: cola/widgets/diff.py:1061 +#: cola/widgets/diff.py:1017 msgid "Unstage Diff Hunk" msgstr "" -#: cola/widgets/status.py:823 cola/widgets/status.py:858 +#: cola/widgets/status.py:824 cola/widgets/status.py:859 msgid "Unstage Selected" msgstr "" -#: cola/widgets/diff.py:1058 +#: cola/widgets/diff.py:1015 #, fuzzy msgid "Unstage Selected Lines" msgstr "Oköade ändringar" -#: cola/cmds.py:2867 +#: cola/widgets/action.py:61 +msgid "Unstage changes using \"git reset\"" +msgstr "" + +#: cola/cmds.py:2813 #, fuzzy, python-format msgid "Unstaging: %s" msgstr "Tar bort %s för incheckningskön" @@ -3951,89 +4081,88 @@ msgstr "Tar bort %s för incheckningskön" msgid "Untrack Selected" msgstr "" -#: cola/widgets/status.py:159 cola/widgets/status.py:646 +#: cola/widgets/status.py:159 cola/widgets/status.py:647 #, fuzzy msgid "Untracked" msgstr "Ej spårade, ej köade" -#: cola/cmds.py:1141 cola/cmds.py:2923 +#: cola/cmds.py:1142 cola/cmds.py:2869 #, python-format msgid "Untracking: %s" msgstr "" -#: cola/widgets/main.py:374 +#: cola/widgets/main.py:369 msgid "Update All Submodules..." msgstr "" -#: cola/widgets/createbranch.py:121 +#: cola/widgets/createbranch.py:119 msgid "Update Existing Branch:" msgstr "Uppdatera befintlig gren:" -#: cola/cmds.py:3075 +#: cola/cmds.py:3021 #, fuzzy msgid "Update Submodule" msgstr "Uppdaterad" -#: cola/cmds.py:3072 +#: cola/cmds.py:3018 msgid "Update Submodule..." msgstr "" -#: cola/cmds.py:3111 +#: cola/cmds.py:3057 msgid "Update Submodules" msgstr "" -#: cola/cmds.py:3109 +#: cola/cmds.py:3055 msgid "Update all submodules?" msgstr "" -#: cola/cmds.py:2093 +#: cola/cmds.py:2044 msgid "Update stacked branches" msgstr "" -#: cola/cmds.py:2085 cola/cmds.py:2092 +#: cola/cmds.py:2036 cola/cmds.py:2043 msgid "Update stacked branches when rebasing?" msgstr "" -#: cola/cmds.py:3108 +#: cola/cmds.py:3054 msgid "Update submodules..." msgstr "" -#: cola/widgets/status.py:953 +#: cola/widgets/status.py:954 msgid "Update this submodule" msgstr "" -#: cola/cmds.py:3073 +#: cola/cmds.py:3019 msgid "Update this submodule?" msgstr "" -#: cola/widgets/branch.py:421 cola/widgets/createbranch.py:302 -#: cola/widgets/remote.py:135 +#: cola/widgets/branch.py:433 cola/widgets/createbranch.py:300 #, fuzzy msgid "Updating" msgstr "Startar..." -#: cola/widgets/prefs.py:350 +#: cola/widgets/prefs.py:370 msgid "Use a block cursor in diff editors" msgstr "" -#: cola/widgets/prefs.py:154 +#: cola/widgets/prefs.py:177 msgid "Use gravatar.com to lookup icons for author emails" msgstr "" -#: cola/widgets/prefs.py:166 +#: cola/widgets/prefs.py:189 msgid "User Name" msgstr "Användarnamn" -#: cola/widgets/about.py:92 +#: cola/widgets/about.py:90 #, fuzzy msgid "Version" msgstr "Revision" -#: cola/widgets/dag.py:800 cola/widgets/main.py:845 cola/widgets/main.py:966 +#: cola/widgets/dag.py:866 cola/widgets/main.py:858 cola/widgets/main.py:979 msgid "View" msgstr "" -#: cola/widgets/browse.py:137 cola/widgets/status.py:278 +#: cola/widgets/browse.py:137 cola/widgets/status.py:279 msgid "View History..." msgstr "" @@ -4042,77 +4171,77 @@ msgstr "" msgid "View history for selected paths" msgstr "Återställ ändringarna i filen %s?" -#: cola/widgets/merge.py:54 +#: cola/widgets/branch.py:224 cola/widgets/merge.py:52 msgid "Visualize" msgstr "Visualisera" -#: cola/widgets/main.py:488 +#: cola/widgets/main.py:501 #, fuzzy msgid "Visualize All Branches..." msgstr "Visualisera alla grenars historik" -#: cola/widgets/main.py:482 +#: cola/widgets/main.py:495 #, fuzzy msgid "Visualize Current Branch..." msgstr "Visualisera grenens historik" -#: cola/widgets/createtag.py:73 +#: cola/widgets/createtag.py:71 msgid "Whether to sign the tag (git tag -s)" msgstr "" -#: cola/widgets/text.py:399 +#: cola/widgets/text.py:396 msgid "Whole Words" msgstr "" -#: cola/widgets/commitmsg.py:432 +#: cola/widgets/commitmsg.py:440 msgid "Would you like to stage and commit all modified files?" msgstr "" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "XOR" msgstr "" -#: cola/widgets/standard.py:1064 +#: cola/widgets/standard.py:1182 msgid "Yes" msgstr "" -#: cola/cmds.py:256 +#: cola/cmds.py:255 msgid "" "You are in the middle of a merge.\n" "Cannot amend while merging." msgstr "" -#: cola/cmds.py:2123 +#: cola/cmds.py:2074 #, fuzzy msgid "You cannot rebase with uncommitted changes." msgstr "Återställ ändringar" -#: cola/widgets/merge.py:227 +#: cola/widgets/merge.py:225 msgid "You must specify a revision to merge." msgstr "" -#: cola/widgets/merge.py:217 +#: cola/widgets/merge.py:215 msgid "You must specify a revision to view." msgstr "" -#: cola/widgets/dag.py:710 cola/widgets/dag.py:1588 +#: cola/widgets/dag.py:776 cola/widgets/dag.py:1645 msgid "Zoom In" msgstr "" -#: cola/widgets/dag.py:706 cola/widgets/dag.py:1594 +#: cola/widgets/dag.py:772 cola/widgets/dag.py:1651 msgid "Zoom Out" msgstr "" -#: cola/widgets/dag.py:524 cola/widgets/dag.py:714 cola/widgets/dag.py:1596 -#: cola/widgets/diff.py:785 +#: cola/widgets/dag.py:590 cola/widgets/dag.py:780 cola/widgets/dag.py:1653 +#: cola/widgets/diff.py:813 msgid "Zoom to Fit" msgstr "" -#: cola/widgets/grep.py:112 +#: cola/widgets/grep.py:110 msgid "command-line arguments" msgstr "" -#: cola/widgets/main.py:932 cola/widgets/main.py:938 +#: cola/widgets/main.py:945 cola/widgets/main.py:951 msgid "error: unable to execute git" msgstr "" @@ -4121,45 +4250,41 @@ msgstr "" msgid "exit code %s" msgstr "hämta %s" -#: cola/app.py:301 +#: cola/app.py:304 #, python-format msgid "fatal: \"%s\" is not a directory. Please specify a correct --repo ." msgstr "" -#: cola/widgets/main.py:928 +#: cola/widgets/main.py:941 #, python-format msgid "git cola version %s" msgstr "" -#: cola/widgets/startup.py:35 +#: cola/widgets/startup.py:34 msgid "git-cola" msgstr "" -#: cola/difftool.py:63 +#: cola/difftool.py:82 msgid "git-cola diff" msgstr "" -#: cola/widgets/submodules.py:81 +#: cola/widgets/submodules.py:80 msgid "git://git.example.com/repo.git" msgstr "" -#: cola/widgets/grep.py:132 +#: cola/widgets/grep.py:130 msgid "grep result..." msgstr "" -#: cola/widgets/about.py:486 +#: cola/widgets/about.py:469 msgid "hotkeys.html" msgstr "" -#: cola/widgets/submodules.py:85 +#: cola/widgets/submodules.py:84 msgid "path/to/submodule" msgstr "" -#: cola/cmds.py:2537 -msgid "unknown" -msgstr "" - -#: cola/widgets/createtag.py:63 +#: cola/widgets/createtag.py:61 msgid "vX.Y.Z" msgstr "" @@ -4168,14 +4293,18 @@ msgid "x 1" msgstr "" #: cola/hidpi.py:44 -msgid "x 1.5" +msgid "x 1.25" msgstr "" #: cola/hidpi.py:45 +msgid "x 1.5" +msgstr "" + +#: cola/hidpi.py:46 msgid "x 2" msgstr "" -#: cola/widgets/search.py:53 cola/widgets/search.py:58 +#: cola/widgets/search.py:52 cola/widgets/search.py:57 msgid "yyyy-MM-dd" msgstr "" @@ -4221,6 +4350,10 @@ msgstr "" #~ msgid "A branch is required for 'Merged Into'." #~ msgstr "En gren krävs för \"Sammanslagen i\"." +#, fuzzy, python-format +#~ msgid "A stash named \"%s\" already exists" +#~ msgstr "Filen %s finns redan." + #~ msgid "Abort completed. Ready." #~ msgstr "Avbrytning fullbordad. Redo." diff --git a/cola/i18n/tr_TR.po b/cola/i18n/tr_TR.po index 70f853c2..884e9bfc 100644 --- a/cola/i18n/tr_TR.po +++ b/cola/i18n/tr_TR.po @@ -21,7 +21,7 @@ msgstr "" "X-Generator: Poedit 2.1.7\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cola/widgets/patch.py:86 +#: cola/widgets/diff.py:1680 msgid "" "\n" "

\n" @@ -31,7 +31,7 @@ msgid "" " " msgstr "" -#: cola/widgets/about.py:455 +#: cola/widgets/about.py:438 #, python-format msgid "" "\n" @@ -60,7 +60,7 @@ msgid "" " " msgstr "" -#: cola/widgets/about.py:180 +#: cola/widgets/about.py:182 #, python-format msgid "" "\n" @@ -77,7 +77,7 @@ msgid "" " " msgstr "" -#: cola/widgets/about.py:387 +#: cola/widgets/about.py:370 #, python-format msgid "" "\n" @@ -87,7 +87,7 @@ msgid "" " " msgstr "" -#: cola/widgets/status.py:1310 +#: cola/widgets/status.py:1311 #, python-format msgid "" "\n" @@ -102,7 +102,7 @@ msgid "" " %(ext)s = file extension\n" msgstr "" -#: cola/sequenceeditor.py:700 +#: cola/sequenceeditor.py:695 msgid "" "\n" "Commands\n" @@ -141,7 +141,7 @@ msgid "" "ctrl+d = launch difftool\n" msgstr "" -#: cola/widgets/finder.py:65 +#: cola/widgets/finder.py:64 msgid "" "\n" "Keyboard Shortcuts\n" @@ -157,45 +157,71 @@ msgid "" "and the results.\n" msgstr "" -#: cola/widgets/dag.py:894 +#: cola/widgets/prefs.py:133 +msgid "" +"\n" +"This option determines how the supplied commit message should be\n" +"cleaned up before committing.\n" +"\n" +"The can be strip, whitespace, verbatim, scissors or default.\n" +"\n" +"strip\n" +" Strip leading and trailing empty lines, trailing whitespace,\n" +" commentary and collapse consecutive empty lines.\n" +"\n" +"whitespace\n" +" Same as strip except #commentary is not removed.\n" +"\n" +"verbatim\n" +" Do not change the message at all.\n" +"\n" +"scissors\n" +" Same as whitespace except that everything from (and including) the line\n" +" found below is truncated, if the message is to be edited.\n" +" \"#\" can be customized with core.commentChar.\n" +"\n" +" # ------------------------ >8 ------------------------" +msgstr "" + +#: cola/widgets/dag.py:960 msgid " - DAG" msgstr "" -#: cola/widgets/recent.py:54 +#: cola/widgets/recent.py:52 msgid " commits ago" msgstr "" -#: cola/cmds.py:1197 +#: cola/cmds.py:1198 #, python-format msgid "\"%(branch)s\" has been deleted from \"%(remote)s\"." msgstr "\"%(branch)s\" öğesi \"%(remote)s\" uzak kaynağından silindi." -#: cola/widgets/createbranch.py:316 +#: cola/widgets/createbranch.py:314 #, python-format msgid "\"%(command)s\" returned exit status \"%(status)d\"" msgstr "" -#: cola/interaction.py:39 +#: cola/interaction.py:38 #, python-format msgid "\"%(command)s\" returned exit status %(status)d" msgstr "\"%(command)s\" çıkış durumu döndürdü %(status)d" -#: cola/guicmds.py:157 +#: cola/guicmds.py:156 #, python-format msgid "\"%s\" already exists" msgstr "" -#: cola/widgets/clone.py:206 +#: cola/widgets/clone.py:204 #, python-format msgid "\"%s\" already exists, cola will create a new directory" msgstr "" -#: cola/cmds.py:2349 +#: cola/cmds.py:2300 #, python-format msgid "\"%s\" requires a selected file." msgstr "" -#: cola/cmds.py:2087 +#: cola/cmds.py:2038 msgid "" "\"git rebase --update-refs\" automatically force-updates any\n" "branches that point to commits that are being rebased.\n" @@ -205,7 +231,11 @@ msgid "" "Using this feature is helpful for \"stacked\" branch workflows." msgstr "" -#: cola/sequenceeditor.py:321 +#: cola/models/stash.py:145 +msgid "\"git stash drop\" did not return a ref to rename." +msgstr "" + +#: cola/sequenceeditor.py:318 msgid "#" msgstr "" @@ -214,37 +244,37 @@ msgstr "" msgid "%(project)s: %(branch)s - Browse" msgstr "" -#: cola/widgets/dag.py:887 +#: cola/widgets/dag.py:953 #, python-format msgid "%(project)s: %(ref)s - DAG" msgstr "" -#: cola/models/browse.py:315 +#: cola/models/browse.py:314 #, python-format msgid "%d days ago" msgstr "%d gün önce" -#: cola/models/browse.py:314 +#: cola/models/browse.py:313 #, python-format msgid "%d hours ago" msgstr "%d saat önce" -#: cola/models/browse.py:307 cola/models/browse.py:311 +#: cola/models/browse.py:306 cola/models/browse.py:310 #, python-format msgid "%d minutes ago" msgstr "%d dakika önce" -#: cola/cmds.py:376 +#: cola/cmds.py:377 #, python-format msgid "%d patch(es) applied." msgstr "%d düzeltme uygulandı." -#: cola/widgets/createbranch.py:281 +#: cola/widgets/createbranch.py:279 #, python-format msgid "%d skipped" msgstr "%d geçildi" -#: cola/cmds.py:2580 +#: cola/cmds.py:2522 #, python-format msgid "" "%s appears to contain merge conflicts.\n" @@ -253,36 +283,36 @@ msgid "" "Stage it anyways?" msgstr "" -#: cola/widgets/startup.py:263 +#: cola/widgets/startup.py:262 #, python-format msgid "%s could not be opened. Remove from bookmarks?" msgstr "" -#: cola/app.py:498 cola/widgets/bookmarks.py:482 +#: cola/app.py:501 cola/widgets/bookmarks.py:481 #, python-format msgid "%s is not a Git repository." msgstr "" -#: cola/cmds.py:1015 +#: cola/cmds.py:1016 #, python-format msgid "%s will be removed from your bookmarks." msgstr "%s işaretlerinizden kaldırılacak." -#: cola/cmds.py:1028 +#: cola/cmds.py:1029 #, python-format msgid "%s will be removed from your recent repositories." msgstr "%s son kullanılan repolardan silinecek." -#: cola/cmds.py:1711 +#: cola/cmds.py:1663 #, python-format msgid "%s: No such file or directory." msgstr "%s: Böyle bir dosya ya da dizin yok." -#: cola/widgets/main.py:734 +#: cola/widgets/main.py:747 msgid "&Edit" msgstr "" -#: cola/widgets/main.py:676 +#: cola/widgets/main.py:689 msgid "&File" msgstr "Dosya" @@ -290,43 +320,43 @@ msgstr "Dosya" msgid "(Amending)" msgstr "" -#: cola/widgets/compare.py:36 +#: cola/widgets/compare.py:35 msgid "*** Branch Point ***" msgstr "" -#: cola/widgets/compare.py:37 +#: cola/widgets/compare.py:36 msgid "*** Sandbox ***" msgstr "" -#: cola/widgets/diff.py:788 +#: cola/widgets/diff.py:816 msgid "100%" msgstr "" -#: cola/widgets/diff.py:789 +#: cola/widgets/diff.py:817 msgid "200%" msgstr "" -#: cola/widgets/diff.py:786 +#: cola/widgets/diff.py:814 msgid "25%" msgstr "" -#: cola/widgets/diff.py:790 +#: cola/widgets/diff.py:818 msgid "400%" msgstr "" -#: cola/widgets/diff.py:787 +#: cola/widgets/diff.py:815 msgid "50%" msgstr "" -#: cola/widgets/diff.py:791 +#: cola/widgets/diff.py:819 msgid "800%" msgstr "" -#: cola/widgets/finder.py:119 +#: cola/widgets/finder.py:118 msgid " ..." msgstr "" -#: cola/cmds.py:1734 +#: cola/cmds.py:1686 msgid "" "A commit template has not been configured.\n" "Use \"git config\" to define \"commit.template\"\n" @@ -336,152 +366,147 @@ msgstr "" "\"commit.template\" tanımlamak için \"git config\" komutunu kullanın\n" "yaptığınız ayarla doğru yeri işaret edin." -#: cola/cmds.py:1784 +#: cola/cmds.py:1735 #, python-format msgid "A hook must be provided at \"%s\"" msgstr "" -#: cola/widgets/stash.py:236 -#, python-format -msgid "A stash named \"%s\" already exists" -msgstr "" - -#: cola/widgets/cfgactions.py:82 cola/widgets/main.py:622 +#: cola/widgets/cfgactions.py:81 cola/widgets/main.py:635 msgid "Abort" msgstr "" -#: cola/widgets/cfgactions.py:149 cola/widgets/cfgactions.py:155 +#: cola/widgets/cfgactions.py:148 cola/widgets/cfgactions.py:154 msgid "Abort Action" msgstr "" -#: cola/cmds.py:132 +#: cola/cmds.py:131 msgid "Abort Applying Patch" msgstr "" -#: cola/cmds.py:126 +#: cola/cmds.py:125 msgid "Abort Applying Patch..." msgstr "" -#: cola/widgets/main.py:245 +#: cola/widgets/main.py:244 msgid "Abort Applying Patches..." msgstr "" -#: cola/cmds.py:162 +#: cola/cmds.py:161 msgid "Abort Cherry-Pick" msgstr "" -#: cola/cmds.py:156 cola/widgets/main.py:334 +#: cola/cmds.py:155 cola/widgets/main.py:329 msgid "Abort Cherry-Pick..." msgstr "" -#: cola/cmds.py:193 +#: cola/cmds.py:192 msgid "Abort Merge" msgstr "" -#: cola/cmds.py:186 cola/widgets/main.py:368 +#: cola/cmds.py:185 cola/widgets/main.py:363 msgid "Abort Merge..." msgstr "" -#: cola/widgets/cfgactions.py:154 +#: cola/widgets/cfgactions.py:153 msgid "Abort the action?" msgstr "" -#: cola/widgets/main.py:250 +#: cola/widgets/main.py:245 msgid "Abort the current \"git am\" patch session" msgstr "" -#: cola/cmds.py:159 +#: cola/cmds.py:158 msgid "" "Aborting a cherry-pick can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:129 +#: cola/cmds.py:128 msgid "" "Aborting a patch can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:127 +#: cola/cmds.py:126 msgid "Aborting applying the current patch?" msgstr "" -#: cola/cmds.py:157 +#: cola/cmds.py:156 msgid "Aborting the current cherry-pick?" msgstr "" -#: cola/cmds.py:189 +#: cola/cmds.py:188 msgid "" "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:187 +#: cola/cmds.py:186 msgid "Aborting the current merge?" msgstr "" -#: cola/widgets/about.py:91 cola/widgets/main.py:517 +#: cola/widgets/about.py:89 cola/widgets/main.py:530 msgid "About" msgstr "Hakkında" -#: cola/widgets/about.py:67 +#: cola/widgets/about.py:65 msgid "About git-cola" msgstr "" -#: cola/widgets/bookmarks.py:217 cola/widgets/startup.py:340 +#: cola/widgets/bookmarks.py:216 cola/widgets/startup.py:339 msgid "Accept" msgstr "" -#: cola/sequenceeditor.py:159 +#: cola/sequenceeditor.py:157 msgid "" "Accept changes and rebase\n" "Shortcut: Ctrl+Enter" msgstr "" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Action Name" msgstr "Aksiyon Adı" -#: cola/sequenceeditor.py:528 cola/widgets/bookmarks.py:321 -#: cola/widgets/branch.py:217 cola/widgets/browse.py:374 -#: cola/widgets/commitmsg.py:99 cola/widgets/dag.py:315 -#: cola/widgets/filelist.py:110 cola/widgets/main.py:95 -#: cola/widgets/main.py:757 cola/widgets/startup.py:436 +#: cola/sequenceeditor.py:524 cola/widgets/bookmarks.py:320 +#: cola/widgets/branch.py:221 cola/widgets/browse.py:375 +#: cola/widgets/commitmsg.py:105 cola/widgets/dag.py:314 +#: cola/widgets/filelist.py:107 cola/widgets/main.py:93 +#: cola/widgets/main.py:770 cola/widgets/startup.py:435 msgid "Actions" msgstr "İşlemler" -#: cola/widgets/commitmsg.py:101 +#: cola/widgets/commitmsg.py:107 msgid "Actions..." msgstr "İşlemler..." -#: cola/widgets/bookmarks.py:71 cola/widgets/gitignore.py:64 -#: cola/widgets/patch.py:103 cola/widgets/patch.py:117 -#: cola/widgets/status.py:1381 +#: cola/widgets/bookmarks.py:70 cola/widgets/diff.py:1697 +#: cola/widgets/diff.py:1711 cola/widgets/gitignore.py:63 +#: cola/widgets/status.py:1382 msgid "Add" msgstr "Ekle" -#: cola/widgets/bookmarks.py:470 +#: cola/widgets/bookmarks.py:469 msgid "Add Favorite" msgstr "" -#: cola/widgets/editremotes.py:374 +#: cola/widgets/editremotes.py:373 msgid "Add Remote" msgstr "" -#: cola/widgets/toolbar.py:315 +#: cola/widgets/toolbar.py:320 msgid "Add Separator" msgstr "Ayraç Ekle" -#: cola/cmds.py:3030 cola/widgets/submodules.py:42 -#: cola/widgets/submodules.py:111 +#: cola/cmds.py:2976 cola/widgets/submodules.py:41 +#: cola/widgets/submodules.py:110 msgid "Add Submodule" msgstr "" -#: cola/cmds.py:3027 cola/widgets/main.py:381 +#: cola/cmds.py:2973 cola/widgets/main.py:376 msgid "Add Submodule..." msgstr "" -#: cola/widgets/editremotes.py:62 +#: cola/widgets/editremotes.py:61 msgid "" "Add and remove remote repositories using the \n" "Add(+) and Delete(-) buttons on the left-hand side.\n" @@ -490,159 +515,159 @@ msgid "" "and pressing \"enter\", or by double-clicking." msgstr "" -#: cola/widgets/editremotes.py:81 +#: cola/widgets/editremotes.py:80 msgid "Add new remote git repository" msgstr "Yeni uzak git deposu ekle" -#: cola/widgets/patch.py:103 +#: cola/widgets/diff.py:1697 msgid "Add patches (+)" msgstr "" -#: cola/widgets/editremotes.py:433 +#: cola/widgets/editremotes.py:431 msgid "Add remote" msgstr "" -#: cola/cmds.py:3028 +#: cola/cmds.py:2974 msgid "Add this submodule?" msgstr "" -#: cola/widgets/gitignore.py:54 +#: cola/widgets/gitignore.py:53 msgid "Add to .gitignore" msgstr "" -#: cola/widgets/status.py:286 +#: cola/widgets/status.py:287 msgid "Add to Git Annex" msgstr "" -#: cola/widgets/status.py:290 +#: cola/widgets/status.py:291 msgid "Add to Git LFS" msgstr "" -#: cola/widgets/gitignore.py:28 +#: cola/widgets/gitignore.py:27 msgid "Add to exclusions" msgstr "" -#: cola/widgets/gitignore.py:55 +#: cola/widgets/gitignore.py:54 msgid "Add to local .git/info/exclude" msgstr "" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Additions" msgstr "" -#: cola/widgets/archive.py:134 +#: cola/widgets/archive.py:132 msgid "Advanced" msgstr "" -#: cola/widgets/main.py:522 +#: cola/widgets/main.py:535 msgid "Against Commit... (Diff Mode)" msgstr "" -#: cola/models/browse.py:33 +#: cola/models/browse.py:32 msgid "Age" msgstr "Yaş" -#: cola/widgets/prefs.py:403 +#: cola/widgets/prefs.py:441 msgid "All Repositories" msgstr "Tüm Depolar" -#: cola/cmds.py:3110 +#: cola/cmds.py:3056 #, python-format msgid "" "All submodules will be updated using\n" "\"%s\"" msgstr "" -#: cola/widgets/remote.py:195 +#: cola/widgets/remote.py:199 msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care" msgstr "" -#: cola/widgets/merge.py:61 +#: cola/widgets/merge.py:59 msgid "Always create a merge commit when enabled, even when the merge is a fast-forward update" msgstr "" -#: cola/cmds.py:221 +#: cola/cmds.py:220 msgid "Amend" msgstr "" -#: cola/widgets/commitmsg.py:463 +#: cola/widgets/commitmsg.py:471 msgid "Amend Commit" msgstr "" -#: cola/widgets/commitmsg.py:110 cola/widgets/main.py:194 +#: cola/widgets/commitmsg.py:116 cola/widgets/main.py:193 msgid "Amend Last Commit" msgstr "" -#: cola/widgets/commitmsg.py:462 +#: cola/widgets/commitmsg.py:470 msgid "Amend the published commit?" msgstr "" -#: cola/widgets/main.py:1157 +#: cola/widgets/main.py:1170 msgid "Amending" msgstr "" -#: cola/widgets/cfgactions.py:151 +#: cola/widgets/cfgactions.py:150 msgid "" "An action is still running.\n" "Terminating it could result in data loss." msgstr "" -#: cola/cmds.py:2804 +#: cola/cmds.py:2750 msgid "" "An unsigned, lightweight tag will be created instead.\n" "Create an unsigned tag?" msgstr "" -#: cola/widgets/prefs.py:406 +#: cola/widgets/prefs.py:444 msgid "Appearance" msgstr "" -#: cola/widgets/diff.py:1230 +#: cola/widgets/diff.py:1304 msgid "Append Patch" msgstr "" -#: cola/widgets/diff.py:1299 +#: cola/widgets/diff.py:1373 msgid "Append Patch..." msgstr "" -#: cola/widgets/patch.py:112 cola/widgets/stash.py:48 cola/widgets/stash.py:107 -#: cola/widgets/toolbar.py:323 +#: cola/widgets/diff.py:1706 cola/widgets/stash.py:50 cola/widgets/stash.py:110 +#: cola/widgets/toolbar.py:328 msgid "Apply" msgstr "Uygula" -#: cola/widgets/patch.py:75 +#: cola/widgets/diff.py:1669 msgid "Apply Patches" msgstr "" -#: cola/widgets/main.py:239 +#: cola/widgets/main.py:238 msgid "Apply Patches..." msgstr "Düzeltmeleri Uygula..." -#: cola/widgets/stash.py:64 +#: cola/widgets/stash.py:66 msgid "Apply and drop the selected stash (git stash pop)" msgstr "" -#: cola/widgets/stash.py:48 +#: cola/widgets/stash.py:50 msgid "Apply the selected stash" msgstr "" -#: cola/widgets/main.py:1167 +#: cola/widgets/main.py:1180 msgid "Applying Patch" msgstr "" -#: cola/widgets/cfgactions.py:207 +#: cola/widgets/cfgactions.py:205 msgid "Arguments" msgstr "Argümanlar" -#: cola/qtutils.py:850 +#: cola/qtutils.py:887 msgid "Attach" msgstr "" -#: cola/models/browse.py:33 cola/models/browse.py:72 cola/widgets/dag.py:506 +#: cola/models/browse.py:32 cola/models/browse.py:71 cola/widgets/dag.py:572 msgid "Author" msgstr "Yazar" -#: cola/widgets/about.py:93 +#: cola/widgets/about.py:91 msgid "Authors" msgstr "Yazarlar" @@ -650,674 +675,690 @@ msgstr "Yazarlar" msgid "Auto" msgstr "Otamatik" -#: cola/widgets/commitmsg.py:137 cola/widgets/prefs.py:259 +#: cola/widgets/commitmsg.py:143 cola/widgets/prefs.py:280 msgid "Auto-Wrap Lines" msgstr "" -#: cola/widgets/prefs.py:184 +#: cola/widgets/prefs.py:206 msgid "Autocomplete Paths" msgstr "" -#: cola/widgets/prefs.py:176 +#: cola/widgets/prefs.py:198 msgid "Automatically Load Commit Message Template" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Basic Regexp" msgstr "" -#: cola/widgets/prefs.py:255 +#: cola/widgets/prefs.py:276 msgid "Blame Viewer" msgstr "" -#: cola/widgets/browse.py:205 +#: cola/widgets/browse.py:206 msgid "Blame selected paths" msgstr "" -#: cola/cmds.py:545 cola/widgets/status.py:282 +#: cola/cmds.py:546 cola/widgets/status.py:283 msgid "Blame..." msgstr "" -#: cola/widgets/prefs.py:347 +#: cola/widgets/prefs.py:367 msgid "Bold on dark headers instead of italic" msgstr "" -#: cola/widgets/main.py:806 cola/widgets/submodules.py:119 +#: cola/widgets/main.py:819 cola/widgets/submodules.py:118 msgid "Branch" msgstr "Dal" -#: cola/widgets/remote.py:600 +#: cola/widgets/remote.py:635 #, python-format msgid "" "Branch \"%(branch)s\" does not exist in \"%(remote)s\".\n" "A new remote branch will be published." msgstr "" -#: cola/widgets/createbranch.py:258 +#: cola/widgets/createbranch.py:256 #, python-format msgid "Branch \"%s\" already exists." msgstr "" -#: cola/widgets/compare.py:44 +#: cola/widgets/compare.py:43 msgid "Branch Diff Viewer" msgstr "" -#: cola/widgets/createbranch.py:259 cola/widgets/createbranch.py:271 +#: cola/widgets/createbranch.py:257 cola/widgets/createbranch.py:269 msgid "Branch Exists" msgstr "" -#: cola/widgets/createbranch.py:98 +#: cola/widgets/createbranch.py:96 msgid "Branch Name" msgstr "Dal Adı" -#: cola/widgets/submodules.py:89 +#: cola/widgets/submodules.py:88 msgid "Branch name" msgstr "" -#: cola/widgets/browse.py:89 cola/widgets/main.py:1097 +#: cola/widgets/browse.py:89 cola/widgets/main.py:1110 #, python-format msgid "Branch: %s" msgstr "Dal: %s" -#: cola/widgets/branch.py:85 cola/widgets/main.py:131 +#: cola/widgets/branch.py:87 cola/widgets/main.py:129 msgid "Branches" msgstr "Dallar" -#: cola/widgets/main.py:538 +#: cola/widgets/main.py:551 msgid "Branches..." msgstr "Dallar..." -#: cola/widgets/about.py:414 cola/widgets/about.py:417 -#: cola/widgets/about.py:437 +#: cola/widgets/about.py:397 cola/widgets/about.py:400 +#: cola/widgets/about.py:420 msgid "Brazilian translation" msgstr "" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse" msgstr "Gözat" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse Commits..." msgstr "İşlemelere Gözat..." -#: cola/widgets/main.py:499 +#: cola/widgets/main.py:512 msgid "Browse Current Branch..." msgstr "Geçerli Dala Gözat..." -#: cola/widgets/main.py:505 +#: cola/widgets/main.py:518 msgid "Browse Other Branch..." msgstr "Diğer Dala Gözat..." -#: cola/widgets/editremotes.py:437 cola/widgets/search.py:46 -#: cola/widgets/startup.py:65 cola/widgets/startup.py:285 +#: cola/widgets/editremotes.py:435 cola/widgets/search.py:45 +#: cola/widgets/startup.py:64 cola/widgets/startup.py:284 msgid "Browse..." msgstr "Gözat..." -#: cola/widgets/main.py:89 +#: cola/widgets/main.py:87 msgid "Browser" msgstr "Görüntüleyici" -#: cola/widgets/browse.py:589 +#: cola/widgets/browse.py:590 #, python-format msgid "Browsing %s" msgstr "" -#: cola/widgets/commitmsg.py:118 +#: cola/widgets/commitmsg.py:124 msgid "Bypass Commit Hooks" msgstr "" -#: cola/sequenceeditor.py:175 cola/widgets/standard.py:991 +#: cola/sequenceeditor.py:173 cola/widgets/standard.py:1058 msgid "Cancel" msgstr "İptal" -#: cola/sequenceeditor.py:176 +#: cola/sequenceeditor.py:174 msgid "" "Cancel rebase\n" "Shortcut: Ctrl+Q" msgstr "" -#: cola/cmds.py:254 +#: cola/cmds.py:253 msgid "Cannot Amend" msgstr "" -#: cola/cmds.py:560 +#: cola/cmds.py:561 #, python-format msgid "Cannot exec \"%s\": please configure a blame viewer" msgstr "" -#: cola/cmds.py:3146 +#: cola/cmds.py:3092 #, python-format msgid "Cannot exec \"%s\": please configure a history browser" msgstr "" -#: cola/cmds.py:1583 +#: cola/cmds.py:1571 #, python-format msgid "Cannot exec \"%s\": please configure your editor" msgstr "Çalıştırılamayan sorgu \"%s\": lütfen editörü ayarlayın" -#: cola/models/browse.py:336 +#: cola/models/browse.py:335 msgid "Changed Upstream" msgstr "" -#: cola/widgets/prefs.py:186 +#: cola/widgets/prefs.py:208 msgid "Check Published Commits when Amending" msgstr "" -#: cola/widgets/commitmsg.py:130 +#: cola/widgets/commitmsg.py:136 msgid "Check Spelling" msgstr "" -#: cola/widgets/prefs.py:265 +#: cola/widgets/prefs.py:286 msgid "Check spelling" msgstr "" -#: cola/widgets/prefs.py:163 +#: cola/widgets/prefs.py:186 msgid "Check whether a commit has been published when amending" msgstr "" -#: cola/guicmds.py:62 cola/widgets/branch.py:222 +#: cola/guicmds.py:61 cola/widgets/branch.py:233 msgid "Checkout" msgstr "" -#: cola/widgets/createbranch.py:130 +#: cola/widgets/createbranch.py:128 msgid "Checkout After Creation" msgstr "" -#: cola/guicmds.py:62 cola/widgets/dag.py:410 +#: cola/guicmds.py:61 cola/widgets/dag.py:409 msgid "Checkout Branch" msgstr "" -#: cola/widgets/dag.py:414 +#: cola/widgets/dag.py:413 msgid "Checkout Detached HEAD" msgstr "" -#: cola/cmds.py:480 cola/cmds.py:518 +#: cola/cmds.py:481 cola/cmds.py:519 msgid "Checkout Files" msgstr "" -#: cola/widgets/branch.py:226 +#: cola/widgets/branch.py:237 msgid "Checkout as new branch" msgstr "" -#: cola/cmds.py:507 +#: cola/cmds.py:508 msgid "Checkout files from our branch (HEAD)" msgstr "" -#: cola/cmds.py:511 +#: cola/cmds.py:512 msgid "Checkout files from our branch?" msgstr "" -#: cola/cmds.py:469 +#: cola/cmds.py:470 msgid "Checkout files from their branch (MERGE_HEAD)" msgstr "" -#: cola/cmds.py:473 +#: cola/cmds.py:474 msgid "Checkout files from their branch?" msgstr "" -#: cola/widgets/main.py:576 +#: cola/widgets/main.py:589 msgid "Checkout..." msgstr "" -#: cola/widgets/dag.py:387 cola/widgets/search.py:79 +#: cola/widgets/dag.py:386 cola/widgets/search.py:78 msgid "Cherry Pick" msgstr "" -#: cola/guicmds.py:73 +#: cola/guicmds.py:72 msgid "Cherry-Pick Commit" msgstr "" -#: cola/widgets/main.py:328 +#: cola/widgets/main.py:323 msgid "Cherry-Pick..." msgstr "" -#: cola/cmds.py:584 +#: cola/cmds.py:585 msgid "Cherry-pick failed" msgstr "" -#: cola/widgets/main.py:1161 +#: cola/widgets/main.py:1174 msgid "Cherry-picking" msgstr "" -#: cola/widgets/diff.py:1247 +#: cola/widgets/diff.py:1321 msgid "Choose Patch..." msgstr "" -#: cola/widgets/search.py:319 +#: cola/widgets/search.py:318 msgid "Choose Paths" msgstr "" -#: cola/widgets/grep.py:116 +#: cola/widgets/grep.py:114 msgid "Choose the \"git grep\" regular expression mode" msgstr "" -#: cola/widgets/bookmarks.py:229 cola/widgets/startup.py:352 +#: cola/widgets/bookmarks.py:228 cola/widgets/startup.py:351 msgid "Clear Default Repository" msgstr "Varsayılan Depoyu Temizle" -#: cola/widgets/commitmsg.py:305 +#: cola/widgets/commitmsg.py:313 msgid "Clear commit message" msgstr "" -#: cola/widgets/commitmsg.py:302 +#: cola/widgets/commitmsg.py:310 msgid "Clear commit message?" msgstr "" -#: cola/widgets/commitmsg.py:62 +#: cola/widgets/commitmsg.py:63 msgid "Clear..." msgstr "Temizle..." -#: cola/widgets/clone.py:126 +#: cola/widgets/clone.py:124 msgid "Clone" msgstr "" -#: cola/widgets/clone.py:62 cola/widgets/clone.py:104 +#: cola/widgets/clone.py:61 cola/widgets/clone.py:102 msgid "Clone Repository" msgstr "" -#: cola/widgets/main.py:465 cola/widgets/startup.py:58 +#: cola/widgets/main.py:478 cola/widgets/startup.py:57 msgid "Clone..." msgstr "" -#: cola/widgets/clone.py:62 +#: cola/widgets/clone.py:61 #, python-format msgid "Cloning repository at %s" msgstr "" -#: cola/qtutils.py:757 cola/qtutils.py:807 cola/widgets/about.py:508 -#: cola/widgets/remote.py:328 cola/widgets/text.py:1094 +#: cola/qtutils.py:788 cola/qtutils.py:838 cola/widgets/about.py:491 +#: cola/widgets/remote.py:362 cola/widgets/text.py:1090 msgid "Close" msgstr "Kapat" -#: cola/widgets/text.py:402 +#: cola/widgets/remote.py:222 +msgid "Close dialog when completed" +msgstr "" + +#: cola/widgets/remote.py:221 +msgid "Close on completion" +msgstr "" + +#: cola/widgets/text.py:399 msgid "Close the find bar" msgstr "" -#: cola/qtutils.py:623 +#: cola/qtutils.py:651 msgid "Close..." msgstr "Kapat..." -#: cola/widgets/recent.py:71 +#: cola/widgets/recent.py:69 msgid "Collapse all" msgstr "" -#: cola/sequenceeditor.py:323 +#: cola/sequenceeditor.py:320 msgid "Command" msgstr "Komut" -#: cola/widgets/main.py:163 cola/widgets/merge.py:74 +#: cola/widgets/main.py:161 cola/widgets/merge.py:72 msgid "Commit" msgstr "" -#: cola/cmds.py:837 +#: cola/widgets/prefs.py:192 +msgid "Commit Message Cleanup" +msgstr "" + +#: cola/widgets/commitmsg.py:495 msgid "Commit failed" msgstr "" -#: cola/widgets/commitmsg.py:61 +#: cola/widgets/commitmsg.py:62 msgid "Commit staged changes" msgstr "" -#: cola/widgets/commitmsg.py:93 +#: cola/widgets/commitmsg.py:94 msgid "" "Commit staged changes\n" "Shortcut: Ctrl+Enter" msgstr "" -#: cola/widgets/commitmsg.py:564 +#: cola/widgets/commitmsg.py:590 msgid "Commit summary" msgstr "" -#: cola/widgets/main.py:259 +#: cola/widgets/main.py:253 msgid "Commit the current state and continue applying patches" msgstr "" -#: cola/widgets/merge.py:70 +#: cola/widgets/merge.py:68 msgid "Commit the merge if there are no conflicts. Uncheck to leave the merge uncommitted" msgstr "" -#: cola/widgets/commitmsg.py:58 cola/widgets/commitmsg.py:95 -#: cola/widgets/main.py:778 cola/widgets/main.py:779 +#: cola/widgets/commitmsg.py:59 cola/widgets/commitmsg.py:96 +#: cola/widgets/main.py:791 cola/widgets/main.py:792 msgid "Commit@@verb" msgstr "" -#: cola/difftool.py:78 cola/widgets/compare.py:70 +#: cola/widgets/dag.py:487 +msgid "Commits authored by me" +msgstr "" + +#: cola/difftool.py:97 cola/widgets/compare.py:69 msgid "Compare" msgstr "" -#: cola/difftool.py:83 +#: cola/difftool.py:102 msgid "Compare All" msgstr "" -#: cola/widgets/toolbar.py:269 cola/widgets/toolbar.py:306 +#: cola/widgets/toolbar.py:274 cola/widgets/toolbar.py:311 msgid "Configure Toolbar" msgstr "" -#: cola/widgets/remote.py:214 +#: cola/widgets/remote.py:218 msgid "Configure the remote branch as the the new upstream" msgstr "" -#: cola/widgets/main.py:170 +#: cola/widgets/main.py:168 msgid "Console" msgstr "Uçbirim" -#: cola/interaction.py:111 cola/widgets/main.py:610 +#: cola/interaction.py:109 cola/widgets/main.py:623 msgid "Continue" msgstr "Devam et" -#: cola/widgets/main.py:255 +#: cola/widgets/main.py:252 msgid "Continue Applying Patches" msgstr "" -#: cola/widgets/bookmarks.py:248 cola/widgets/main.py:742 -#: cola/widgets/startup.py:371 +#: cola/widgets/bookmarks.py:247 cola/widgets/main.py:755 +#: cola/widgets/startup.py:370 msgid "Copy" msgstr "Kopyala" -#: cola/widgets/status.py:268 +#: cola/widgets/status.py:269 msgid "Copy Basename to Clipboard" msgstr "Ana Adı Panoya Kopyala" -#: cola/widgets/diff.py:208 +#: cola/widgets/diff.py:209 msgid "Copy Diff" msgstr "" -#: cola/widgets/status.py:745 +#: cola/widgets/status.py:746 msgid "Copy Leading Path to Clipboard" msgstr "" -#: cola/widgets/status.py:251 +#: cola/widgets/status.py:252 msgid "Copy Path to Clipboard" msgstr "Yolu Panoya Kopyala" -#: cola/widgets/status.py:259 +#: cola/widgets/status.py:260 msgid "Copy Relative Path to Clipboard" msgstr "Sabit Yolu Panoya Kopyala" -#: cola/sequenceeditor.py:334 cola/widgets/dag.py:474 +#: cola/sequenceeditor.py:330 cola/widgets/dag.py:473 msgid "Copy SHA-1" msgstr "Copy SHA-1" -#: cola/widgets/status.py:737 +#: cola/widgets/status.py:738 msgid "Copy..." msgstr "Kopyala..." -#: cola/app.py:490 +#: cola/app.py:493 #, python-format msgid "Could not open %s." msgstr "" -#: cola/widgets/clone.py:191 cola/widgets/clone.py:193 +#: cola/widgets/clone.py:189 cola/widgets/clone.py:191 #, python-format msgid "Could not parse Git URL: \"%s\"" msgstr "" -#: cola/app.py:500 +#: cola/app.py:503 msgid "Create" msgstr "" -#: cola/widgets/createbranch.py:86 cola/widgets/createbranch.py:135 -#: cola/widgets/createbranch.py:301 cola/widgets/dag.py:369 +#: cola/widgets/createbranch.py:84 cola/widgets/createbranch.py:133 +#: cola/widgets/createbranch.py:299 cola/widgets/dag.py:368 msgid "Create Branch" msgstr "Dal Oluştur" -#: cola/widgets/dag.py:373 +#: cola/widgets/dag.py:372 msgid "Create Patch" msgstr "Yol Oluştur" -#: cola/widgets/remote.py:606 +#: cola/widgets/remote.py:641 msgid "Create Remote Branch" msgstr "Uzak Dal Oluştur" -#: cola/widgets/commitmsg.py:124 cola/widgets/merge.py:78 +#: cola/widgets/commitmsg.py:130 cola/widgets/merge.py:76 msgid "Create Signed Commit" msgstr "" -#: cola/widgets/createtag.py:55 cola/widgets/createtag.py:91 -#: cola/widgets/dag.py:377 +#: cola/widgets/createtag.py:53 cola/widgets/createtag.py:89 +#: cola/widgets/dag.py:376 msgid "Create Tag" msgstr "Etiket Oluştur" -#: cola/widgets/main.py:544 +#: cola/widgets/main.py:557 msgid "Create Tag..." msgstr "Etiket Oluştur..." -#: cola/cmds.py:2807 +#: cola/cmds.py:2753 msgid "Create Unsigned Tag" msgstr "" -#: cola/widgets/remote.py:188 +#: cola/widgets/remote.py:192 msgid "Create a merge commit even when the merge resolves as a fast-forward" msgstr "" -#: cola/widgets/remote.py:605 +#: cola/widgets/remote.py:640 msgid "Create a new remote branch?" msgstr "" -#: cola/app.py:499 +#: cola/app.py:502 msgid "Create a new repository at that location?" msgstr "" -#: cola/widgets/submodules.py:100 +#: cola/widgets/submodules.py:99 msgid "Create a shallow clone with history truncated to the specified number of revisions. 0 performs a full clone." msgstr "" -#: cola/widgets/main.py:551 +#: cola/widgets/main.py:564 msgid "Create..." msgstr "Oluştur..." -#: cola/cmds.py:2843 +#: cola/cmds.py:2789 #, python-format msgid "Created a new tag named \"%s\"" msgstr "" -#: cola/widgets/prefs.py:266 +#: cola/widgets/prefs.py:287 msgid "Ctrl+MouseWheel to Zoom" msgstr "" -#: cola/widgets/prefs.py:404 +#: cola/widgets/prefs.py:442 msgid "Current Repository" msgstr "Güncel Depo" -#: cola/widgets/status.py:1371 +#: cola/widgets/status.py:1372 msgid "Custom Copy Actions" msgstr "" -#: cola/widgets/status.py:273 +#: cola/widgets/status.py:274 msgid "Customize..." msgstr "" -#: cola/widgets/main.py:740 +#: cola/widgets/main.py:753 msgid "Cut" msgstr "Kes" -#: cola/widgets/about.py:411 cola/widgets/about.py:442 +#: cola/widgets/about.py:394 cola/widgets/about.py:425 msgid "Czech translation" msgstr "" -#: cola/widgets/main.py:592 +#: cola/widgets/main.py:605 msgid "DAG..." msgstr "" -#: cola/icons.py:55 +#: cola/icons.py:54 msgid "Dark Theme" msgstr "Koyu Tema" -#: cola/widgets/dag.py:506 +#: cola/widgets/dag.py:572 msgid "Date, Time" msgstr "Tarih, Saat" -#: cola/icons.py:54 cola/themes.py:637 +#: cola/icons.py:53 cola/themes.py:643 msgid "Default" msgstr "Varsayılan" -#: cola/widgets/prefs.py:126 +#: cola/widgets/prefs.py:124 msgid "" "Default directory when exporting patches.\n" "Relative paths are relative to the current repository.\n" "Absolute path are used as-is." msgstr "" -#: cola/cmds.py:925 cola/guicmds.py:26 cola/guicmds.py:35 -#: cola/widgets/bookmarks.py:75 cola/widgets/bookmarks.py:251 -#: cola/widgets/main.py:746 cola/widgets/startup.py:373 +#: cola/cmds.py:923 cola/guicmds.py:25 cola/guicmds.py:34 +#: cola/widgets/bookmarks.py:74 cola/widgets/bookmarks.py:250 +#: cola/widgets/main.py:759 cola/widgets/startup.py:372 msgid "Delete" msgstr "Sil" -#: cola/cmds.py:1088 +#: cola/cmds.py:1089 #, python-format msgid "Delete %d file(s)?" msgstr "%d dosyayı sil?" -#: cola/cmds.py:1016 +#: cola/cmds.py:1017 msgid "Delete Bookmark" msgstr "İşareti Sil" -#: cola/cmds.py:1014 +#: cola/cmds.py:1015 msgid "Delete Bookmark?" msgstr "İşareti Sil?" -#: cola/cmds.py:1114 cola/cmds.py:1117 cola/guicmds.py:26 -#: cola/widgets/branch.py:268 +#: cola/cmds.py:1115 cola/cmds.py:1118 cola/guicmds.py:25 +#: cola/widgets/branch.py:277 msgid "Delete Branch" msgstr "Dalı Sil" -#: cola/cmds.py:1089 +#: cola/cmds.py:1090 msgid "Delete Files" msgstr "Dosyaları Sil" -#: cola/widgets/status.py:311 +#: cola/widgets/status.py:312 msgid "Delete Files..." msgstr "Dosyaları Sil..." -#: cola/cmds.py:1085 +#: cola/cmds.py:1086 msgid "Delete Files?" msgstr "Dosyaları Sil?" -#: cola/cmds.py:922 +#: cola/cmds.py:920 msgid "Delete Remote" msgstr "Uzaktakini Sil" -#: cola/guicmds.py:35 cola/widgets/branch.py:270 +#: cola/guicmds.py:34 cola/widgets/branch.py:279 msgid "Delete Remote Branch" msgstr "" -#: cola/widgets/main.py:564 +#: cola/widgets/main.py:577 msgid "Delete Remote Branch..." msgstr "Uzaktaki Dalı Sil..." -#: cola/widgets/toolbar.py:271 +#: cola/widgets/toolbar.py:276 msgid "Delete Toolbar" msgstr "Araç çubuğunu sil" -#: cola/cmds.py:1115 +#: cola/cmds.py:1116 #, python-format msgid "Delete branch \"%s\"?" msgstr "" -#: cola/widgets/editremotes.py:88 +#: cola/widgets/editremotes.py:87 msgid "Delete remote" msgstr "" -#: cola/cmds.py:924 +#: cola/cmds.py:922 #, python-format msgid "Delete remote \"%s\"" msgstr "Uzaktakini sil \"%s\"" -#: cola/cmds.py:923 +#: cola/cmds.py:921 msgid "Delete remote?" msgstr "Uzaktakini sil?" -#: cola/widgets/main.py:558 +#: cola/widgets/main.py:571 msgid "Delete..." msgstr "Sil..." -#: cola/cmds.py:1067 +#: cola/cmds.py:1068 #, python-format msgid "Deleting \"%s\" failed" msgstr "\"%s\" silme işlemi başarısız" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Deletions" msgstr "" -#: cola/widgets/submodules.py:120 +#: cola/widgets/submodules.py:119 msgid "Depth" msgstr "" -#: cola/qtutils.py:811 cola/qtutils.py:852 +#: cola/qtutils.py:842 cola/qtutils.py:889 msgid "Detach" msgstr "" -#: cola/widgets/prefs.py:181 +#: cola/widgets/prefs.py:203 msgid "Detect Conflict Markers" msgstr "" -#: cola/widgets/prefs.py:151 +#: cola/widgets/prefs.py:174 msgid "Detect conflict markers in unmerged files" msgstr "" -#: cola/widgets/about.py:271 cola/widgets/about.py:274 -#: cola/widgets/about.py:277 cola/widgets/about.py:278 -#: cola/widgets/about.py:279 cola/widgets/about.py:280 -#: cola/widgets/about.py:281 cola/widgets/about.py:282 -#: cola/widgets/about.py:283 cola/widgets/about.py:284 -#: cola/widgets/about.py:285 cola/widgets/about.py:286 -#: cola/widgets/about.py:287 cola/widgets/about.py:288 -#: cola/widgets/about.py:289 cola/widgets/about.py:290 -#: cola/widgets/about.py:291 cola/widgets/about.py:292 -#: cola/widgets/about.py:293 cola/widgets/about.py:294 -#: cola/widgets/about.py:295 cola/widgets/about.py:296 -#: cola/widgets/about.py:297 cola/widgets/about.py:298 -#: cola/widgets/about.py:299 cola/widgets/about.py:300 -#: cola/widgets/about.py:301 cola/widgets/about.py:302 -#: cola/widgets/about.py:303 cola/widgets/about.py:304 -#: cola/widgets/about.py:305 cola/widgets/about.py:306 -#: cola/widgets/about.py:307 cola/widgets/about.py:308 -#: cola/widgets/about.py:309 cola/widgets/about.py:310 -#: cola/widgets/about.py:311 cola/widgets/about.py:312 -#: cola/widgets/about.py:313 cola/widgets/about.py:314 -#: cola/widgets/about.py:315 cola/widgets/about.py:316 -#: cola/widgets/about.py:317 cola/widgets/about.py:318 -#: cola/widgets/about.py:319 cola/widgets/about.py:320 -#: cola/widgets/about.py:321 cola/widgets/about.py:322 -#: cola/widgets/about.py:323 cola/widgets/about.py:324 -#: cola/widgets/about.py:325 cola/widgets/about.py:326 -#: cola/widgets/about.py:327 cola/widgets/about.py:328 -#: cola/widgets/about.py:329 cola/widgets/about.py:330 -#: cola/widgets/about.py:331 cola/widgets/about.py:332 -#: cola/widgets/about.py:333 cola/widgets/about.py:334 -#: cola/widgets/about.py:335 cola/widgets/about.py:336 -#: cola/widgets/about.py:337 cola/widgets/about.py:338 -#: cola/widgets/about.py:339 cola/widgets/about.py:340 -#: cola/widgets/about.py:341 cola/widgets/about.py:342 -#: cola/widgets/about.py:343 cola/widgets/about.py:344 -#: cola/widgets/about.py:345 cola/widgets/about.py:346 -#: cola/widgets/about.py:347 cola/widgets/about.py:348 -#: cola/widgets/about.py:349 cola/widgets/about.py:350 -#: cola/widgets/about.py:351 cola/widgets/about.py:352 -#: cola/widgets/about.py:353 cola/widgets/about.py:354 -#: cola/widgets/about.py:355 cola/widgets/about.py:356 -#: cola/widgets/about.py:357 cola/widgets/about.py:358 -#: cola/widgets/about.py:359 cola/widgets/about.py:360 -#: cola/widgets/about.py:361 cola/widgets/about.py:362 -#: cola/widgets/about.py:363 cola/widgets/about.py:364 -#: cola/widgets/about.py:365 cola/widgets/about.py:366 -#: cola/widgets/about.py:367 cola/widgets/about.py:368 -#: cola/widgets/about.py:369 cola/widgets/about.py:370 -#: cola/widgets/about.py:371 cola/widgets/about.py:372 -#: cola/widgets/about.py:373 cola/widgets/about.py:374 -#: cola/widgets/about.py:375 cola/widgets/about.py:376 -#: cola/widgets/about.py:377 cola/widgets/about.py:378 -#: cola/widgets/about.py:379 cola/widgets/about.py:380 +#: cola/widgets/about.py:254 cola/widgets/about.py:257 +#: cola/widgets/about.py:260 cola/widgets/about.py:261 +#: cola/widgets/about.py:262 cola/widgets/about.py:263 +#: cola/widgets/about.py:264 cola/widgets/about.py:265 +#: cola/widgets/about.py:266 cola/widgets/about.py:267 +#: cola/widgets/about.py:268 cola/widgets/about.py:269 +#: cola/widgets/about.py:270 cola/widgets/about.py:271 +#: cola/widgets/about.py:272 cola/widgets/about.py:273 +#: cola/widgets/about.py:274 cola/widgets/about.py:275 +#: cola/widgets/about.py:276 cola/widgets/about.py:277 +#: cola/widgets/about.py:278 cola/widgets/about.py:279 +#: cola/widgets/about.py:280 cola/widgets/about.py:281 +#: cola/widgets/about.py:282 cola/widgets/about.py:283 +#: cola/widgets/about.py:284 cola/widgets/about.py:285 +#: cola/widgets/about.py:286 cola/widgets/about.py:287 +#: cola/widgets/about.py:288 cola/widgets/about.py:289 +#: cola/widgets/about.py:290 cola/widgets/about.py:291 +#: cola/widgets/about.py:292 cola/widgets/about.py:293 +#: cola/widgets/about.py:294 cola/widgets/about.py:295 +#: cola/widgets/about.py:296 cola/widgets/about.py:297 +#: cola/widgets/about.py:298 cola/widgets/about.py:299 +#: cola/widgets/about.py:300 cola/widgets/about.py:301 +#: cola/widgets/about.py:302 cola/widgets/about.py:303 +#: cola/widgets/about.py:304 cola/widgets/about.py:305 +#: cola/widgets/about.py:306 cola/widgets/about.py:307 +#: cola/widgets/about.py:308 cola/widgets/about.py:309 +#: cola/widgets/about.py:310 cola/widgets/about.py:311 +#: cola/widgets/about.py:312 cola/widgets/about.py:313 +#: cola/widgets/about.py:314 cola/widgets/about.py:315 +#: cola/widgets/about.py:316 cola/widgets/about.py:317 +#: cola/widgets/about.py:318 cola/widgets/about.py:319 +#: cola/widgets/about.py:320 cola/widgets/about.py:321 +#: cola/widgets/about.py:322 cola/widgets/about.py:323 +#: cola/widgets/about.py:324 cola/widgets/about.py:325 +#: cola/widgets/about.py:326 cola/widgets/about.py:327 +#: cola/widgets/about.py:328 cola/widgets/about.py:329 +#: cola/widgets/about.py:330 cola/widgets/about.py:331 +#: cola/widgets/about.py:332 cola/widgets/about.py:333 +#: cola/widgets/about.py:334 cola/widgets/about.py:335 +#: cola/widgets/about.py:336 cola/widgets/about.py:337 +#: cola/widgets/about.py:338 cola/widgets/about.py:339 +#: cola/widgets/about.py:340 cola/widgets/about.py:341 +#: cola/widgets/about.py:342 cola/widgets/about.py:343 +#: cola/widgets/about.py:344 cola/widgets/about.py:345 +#: cola/widgets/about.py:346 cola/widgets/about.py:347 +#: cola/widgets/about.py:348 cola/widgets/about.py:349 +#: cola/widgets/about.py:350 cola/widgets/about.py:351 +#: cola/widgets/about.py:352 cola/widgets/about.py:353 +#: cola/widgets/about.py:354 cola/widgets/about.py:355 +#: cola/widgets/about.py:356 cola/widgets/about.py:357 +#: cola/widgets/about.py:358 cola/widgets/about.py:359 +#: cola/widgets/about.py:360 cola/widgets/about.py:361 +#: cola/widgets/about.py:362 cola/widgets/about.py:363 msgid "Developer" msgstr "Geliştirici" -#: cola/guicmds.py:185 cola/widgets/dag.py:764 cola/widgets/diff.py:781 -#: cola/widgets/main.py:177 cola/widgets/main.py:797 +#: cola/guicmds.py:184 cola/widgets/dag.py:830 cola/widgets/diff.py:809 +#: cola/widgets/main.py:175 cola/widgets/main.py:810 msgid "Diff" msgstr "" -#: cola/guicmds.py:185 +#: cola/guicmds.py:184 msgid "Diff Against Commit" msgstr "" @@ -1325,35 +1366,35 @@ msgstr "" msgid "Diff Against Predecessor..." msgstr "" -#: cola/widgets/main.py:1159 +#: cola/widgets/main.py:1172 msgid "Diff Mode" msgstr "" -#: cola/widgets/diff.py:772 cola/widgets/diff.py:796 +#: cola/widgets/diff.py:800 cola/widgets/diff.py:824 msgid "Diff Options" msgstr "" -#: cola/widgets/prefs.py:256 +#: cola/widgets/prefs.py:277 msgid "Diff Tool" msgstr "Karşılaştırma Aracı" -#: cola/widgets/dag.py:364 +#: cola/widgets/dag.py:363 msgid "Diff selected -> this" msgstr "" -#: cola/widgets/dag.py:358 +#: cola/widgets/dag.py:357 msgid "Diff this -> selected" msgstr "" -#: cola/widgets/main.py:218 +#: cola/widgets/main.py:217 msgid "Diffstat" msgstr "" -#: cola/cmds.py:3262 +#: cola/difftool.py:324 msgid "Difftool" msgstr "Karşılaştırma Aracı" -#: cola/widgets/clone.py:207 +#: cola/widgets/clone.py:205 msgid "Directory Exists" msgstr "" @@ -1361,84 +1402,88 @@ msgstr "" msgid "Disable" msgstr "" -#: cola/widgets/prefs.py:180 +#: cola/widgets/prefs.py:202 msgid "Display Untracked Files" msgstr "" -#: cola/cmds.py:2094 +#: cola/widgets/remote.py:176 +msgid "Display remote messages in a separate dialog" +msgstr "" + +#: cola/cmds.py:2045 msgid "Do not update stacked branches" msgstr "" -#: cola/widgets/main.py:471 +#: cola/widgets/main.py:484 msgid "Documentation" msgstr "Belgelendirme" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop" msgstr "" -#: cola/widgets/stash.py:258 +#: cola/widgets/stash.py:276 msgid "Drop Stash" msgstr "" -#: cola/widgets/stash.py:255 +#: cola/widgets/stash.py:273 msgid "Drop Stash?" msgstr "" -#: cola/widgets/stash.py:257 +#: cola/widgets/stash.py:275 #, python-format msgid "Drop the \"%s\" stash?" msgstr "" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop the selected stash" msgstr "" -#: cola/qtutils.py:764 cola/sequenceeditor.py:357 cola/widgets/grep.py:102 +#: cola/qtutils.py:795 cola/sequenceeditor.py:353 cola/widgets/grep.py:100 msgid "Edit" msgstr "Düzenle" -#: cola/widgets/diff.py:1019 +#: cola/widgets/diff.py:1058 msgid "Edit Diff Hunk to Revert..." msgstr "" -#: cola/widgets/diff.py:1017 +#: cola/widgets/diff.py:1056 msgid "Edit Diff Hunk to Stage..." msgstr "" -#: cola/widgets/diff.py:1062 +#: cola/widgets/diff.py:1124 msgid "Edit Diff Hunk to Unstage..." msgstr "" -#: cola/cmds.py:2166 +#: cola/cmds.py:2117 msgid "Edit Rebase" msgstr "Konumlandırmayı Düzenle" -#: cola/widgets/editremotes.py:36 +#: cola/widgets/editremotes.py:35 msgid "Edit Remotes" msgstr "Uzaktakini Düzenle" -#: cola/widgets/main.py:298 +#: cola/widgets/main.py:293 msgid "Edit Remotes..." msgstr "Uzaktakini Düzenle..." -#: cola/widgets/diff.py:1014 +#: cola/widgets/diff.py:1053 msgid "Edit Selected Lines to Revert..." msgstr "" -#: cola/widgets/diff.py:1012 +#: cola/widgets/diff.py:1051 msgid "Edit Selected Lines to Stage..." msgstr "" -#: cola/widgets/diff.py:1059 +#: cola/widgets/diff.py:1122 msgid "Edit Selected Lines to Unstage..." msgstr "" -#: cola/widgets/editremotes.py:44 +#: cola/widgets/editremotes.py:43 msgid "Edit remotes by selecting them from the list" msgstr "" -#: cola/widgets/browse.py:197 cola/widgets/common.py:39 +#: cola/widgets/browse.py:198 cola/widgets/common.py:38 msgid "Edit selected paths" msgstr "" @@ -1454,11 +1499,11 @@ msgstr "" msgid "Edit the following patch, which will then be applied to the worktree to revert the changes:" msgstr "" -#: cola/widgets/main.py:604 +#: cola/widgets/main.py:617 msgid "Edit..." msgstr "Düzenle..." -#: cola/widgets/prefs.py:253 +#: cola/widgets/prefs.py:274 msgid "Editor" msgstr "Düzenleyici" @@ -1467,153 +1512,158 @@ msgstr "Düzenleyici" msgid "Editor returned %s exit code. Not applying patch." msgstr "" -#: cola/widgets/prefs.py:167 +#: cola/widgets/prefs.py:190 msgid "Email Address" msgstr "E-Posta Adresi" -#: cola/widgets/about.py:258 cola/widgets/about.py:401 +#: cola/widgets/about.py:241 cola/widgets/about.py:384 msgid "Email contributor" msgstr "" -#: cola/widgets/prefs.py:182 +#: cola/widgets/prefs.py:204 msgid "Enable Gravatar Icons" msgstr "" -#: cola/widgets/prefs.py:160 +#: cola/widgets/prefs.py:183 msgid "Enable path autocompletion in tools" msgstr "" -#: cola/widgets/diff.py:768 +#: cola/widgets/diff.py:796 msgid "Enable word wrapping" msgstr "" -#: cola/sequenceeditor.py:322 +#: cola/sequenceeditor.py:319 msgid "Enabled" msgstr "" -#: cola/guicmds.py:333 cola/widgets/branch.py:445 +#: cola/guicmds.py:332 cola/widgets/branch.py:478 msgid "Enter New Branch Name" msgstr "Yeni Dal Adı Gir" -#: cola/guicmds.py:147 +#: cola/guicmds.py:146 msgid "Enter a name for the new bare repo" msgstr "" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Enter a name for the stash" msgstr "" -#: cola/cmds.py:146 cola/cmds.py:176 cola/cmds.py:207 cola/cmds.py:283 -#: cola/cmds.py:292 cola/cmds.py:307 cola/cmds.py:317 cola/cmds.py:460 -#: cola/cmds.py:496 cola/cmds.py:534 cola/cmds.py:633 cola/cmds.py:751 -#: cola/cmds.py:1067 cola/cmds.py:1164 cola/cmds.py:2005 cola/cmds.py:2394 -#: cola/cmds.py:2637 cola/cmds.py:2643 cola/cmds.py:2651 cola/cmds.py:2872 -#: cola/cmds.py:2890 cola/cmds.py:3180 cola/gitcmds.py:984 cola/guicmds.py:157 -#: cola/models/stash.py:70 cola/models/stash.py:87 cola/models/stash.py:108 -#: cola/widgets/bookmarks.py:482 cola/widgets/branch.py:777 +#: cola/widgets/stash.py:216 +msgid "Enter a new name for the stash" +msgstr "" + +#: cola/cmds.py:145 cola/cmds.py:175 cola/cmds.py:206 cola/cmds.py:284 +#: cola/cmds.py:293 cola/cmds.py:308 cola/cmds.py:318 cola/cmds.py:461 +#: cola/cmds.py:497 cola/cmds.py:535 cola/cmds.py:635 cola/cmds.py:753 +#: cola/cmds.py:1068 cola/cmds.py:1165 cola/cmds.py:1956 cola/cmds.py:2345 +#: cola/cmds.py:2579 cola/cmds.py:2585 cola/cmds.py:2593 cola/cmds.py:2818 +#: cola/cmds.py:2836 cola/cmds.py:3125 cola/gitcmds.py:994 cola/guicmds.py:156 +#: cola/models/stash.py:70 cola/models/stash.py:90 cola/models/stash.py:112 +#: cola/models/stash.py:138 cola/widgets/bookmarks.py:481 +#: cola/widgets/branch.py:829 msgid "Error" msgstr "Hata" -#: cola/widgets/clone.py:191 +#: cola/widgets/clone.py:189 msgid "Error Cloning" msgstr "" -#: cola/widgets/createbranch.py:314 +#: cola/widgets/createbranch.py:312 msgid "Error Creating Branch" msgstr "Hata Dalı Oluştur" -#: cola/app.py:502 cola/guicmds.py:101 +#: cola/app.py:505 cola/guicmds.py:100 msgid "Error Creating Repository" msgstr "Hata Deposu Oluştur" -#: cola/cmds.py:1202 +#: cola/cmds.py:1206 msgid "Error Deleting Remote Branch" msgstr "Uzak Dal Silinirken Hata" -#: cola/cmds.py:1585 +#: cola/cmds.py:1573 msgid "Error Editing File" msgstr "Dosyayı Düzenlemede Hata" -#: cola/cmds.py:559 +#: cola/cmds.py:560 msgid "Error Launching Blame Viewer" msgstr "" -#: cola/cmds.py:3145 +#: cola/cmds.py:3091 msgid "Error Launching History Browser" msgstr "" -#: cola/app.py:489 +#: cola/app.py:492 msgid "Error Opening Repository" msgstr "" -#: cola/widgets/browse.py:566 +#: cola/models/stash.py:144 +msgid "Error Renaming Stash" +msgstr "" + +#: cola/widgets/browse.py:567 msgid "Error Saving File" msgstr "" -#: cola/cmds.py:914 +#: cola/cmds.py:912 #, python-format msgid "Error creating remote \"%s\"" msgstr "Uzak \"%s\" oluşturulurken hata" -#: cola/models/stash.py:197 +#: cola/models/stash.py:233 msgid "Error creating stash" msgstr "" -#: cola/cmds.py:1126 +#: cola/cmds.py:1127 #, python-format msgid "Error deleting branch \"%s\"" msgstr "" -#: cola/cmds.py:932 +#: cola/cmds.py:930 #, python-format msgid "Error deleting remote \"%s\"" msgstr "Uzaktaki silinirken hata \"%s\"" -#: cola/cmds.py:956 +#: cola/cmds.py:955 #, python-format msgid "Error renaming \"%(name)s\" to \"%(new_name)s\"" msgstr "" -#: cola/cmds.py:1771 +#: cola/cmds.py:1722 msgid "Error running prepare-commitmsg hook" msgstr "" -#: cola/cmds.py:3043 cola/cmds.py:3089 +#: cola/cmds.py:2989 cola/cmds.py:3035 #, python-format msgid "Error updating submodule %s" msgstr "" -#: cola/cmds.py:3125 +#: cola/cmds.py:3071 msgid "Error updating submodules" msgstr "" -#: cola/widgets/diff.py:1326 +#: cola/widgets/diff.py:1400 msgid "Error writing patch" msgstr "" -#: cola/cmds.py:1710 +#: cola/cmds.py:1662 msgid "Error: Cannot find commit template" msgstr "Hata: İşleme şablonu bulunamadı" -#: cola/widgets/stash.py:235 -msgid "Error: Stash exists" -msgstr "" - -#: cola/cmds.py:1732 +#: cola/cmds.py:1684 msgid "Error: Unconfigured commit template" msgstr "Hata: Ayarlanmamış işleme şablonu" -#: cola/widgets/clone.py:53 +#: cola/widgets/clone.py:52 #, python-format msgid "Error: could not clone \"%s\"" msgstr "Hata: \"%s\" klonlanamadı" -#: cola/cmds.py:2835 +#: cola/cmds.py:2781 #, python-format msgid "Error: could not create tag \"%s\"" msgstr "" -#: cola/widgets/branch.py:421 +#: cola/widgets/branch.py:433 #, python-format msgid "Executing action %s" msgstr "" @@ -1622,408 +1672,420 @@ msgstr "" msgid "Exit \"Diff\" mode" msgstr "" -#: cola/widgets/action.py:67 +#: cola/widgets/action.py:81 msgid "Exit Diff" msgstr "" -#: cola/widgets/main.py:528 +#: cola/widgets/main.py:541 msgid "Exit Diff Mode" msgstr "" -#: cola/widgets/action.py:68 +#: cola/widgets/action.py:81 msgid "Exit Diff mode" msgstr "" -#: cola/widgets/recent.py:67 +#: cola/widgets/recent.py:65 msgid "Expand all" msgstr "" -#: cola/widgets/diff.py:1223 +#: cola/widgets/diff.py:1297 msgid "Export Patch" msgstr "" -#: cola/guicmds.py:168 cola/widgets/search.py:75 +#: cola/guicmds.py:167 cola/widgets/search.py:74 msgid "Export Patches" msgstr "Düzeltmeleri Dışa Aktar" -#: cola/widgets/main.py:273 +#: cola/widgets/main.py:268 msgid "Export Patches..." msgstr "Düzeltmeleri Dışa Aktar..." -#: cola/widgets/main.py:533 +#: cola/widgets/main.py:546 msgid "Expression..." msgstr "İfade..." -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Extended Regexp" msgstr "" -#: cola/widgets/commitmsg.py:612 +#: cola/widgets/commitmsg.py:638 msgid "Extended description..." msgstr "" -#: cola/cmds.py:387 +#: cola/cmds.py:388 msgid "Failed to commit and continue applying patches" msgstr "" -#: cola/cmds.py:403 +#: cola/cmds.py:404 msgid "Failed to continue applying patches after skipping the current patch" msgstr "" -#: cola/widgets/createbranch.py:124 +#: cola/widgets/createbranch.py:122 msgid "Fast Forward Only" msgstr "" -#: cola/widgets/remote.py:177 +#: cola/widgets/remote.py:181 msgid "Fast-forward only" msgstr "" -#: cola/widgets/bookmarks.py:91 +#: cola/widgets/bookmarks.py:90 msgid "Favorite repositories" msgstr "Favori depolar" -#: cola/widgets/main.py:111 +#: cola/widgets/main.py:109 msgid "Favorites" msgstr "Favoriler" -#: cola/widgets/remote.py:673 +#: cola/widgets/remote.py:735 msgid "Fetch" msgstr "" -#: cola/widgets/createbranch.py:127 +#: cola/widgets/createbranch.py:125 msgid "Fetch Tracking Branch" msgstr "" -#: cola/widgets/action.py:63 cola/widgets/main.py:387 +#: cola/widgets/action.py:67 cola/widgets/main.py:384 +msgid "Fetch from one or more remotes using \"git fetch\"" +msgstr "" + +#: cola/widgets/action.py:65 cola/widgets/main.py:383 msgid "Fetch..." msgstr "" -#: cola/widgets/main.py:588 +#: cola/widgets/main.py:601 msgid "File Browser..." msgstr "" -#: cola/widgets/compare.py:75 +#: cola/widgets/compare.py:74 msgid "File Differences" msgstr "" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 msgid "File Saved" msgstr "Dosya Kaydedildi" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 #, python-format msgid "File saved to \"%s\"" msgstr "\"%s\" dosyası kaydedildi" -#: cola/fsmonitor.py:517 +#: cola/fsmonitor.py:528 msgid "File system change monitoring: disabled because \"cola.inotify\" is false.\n" msgstr "" -#: cola/fsmonitor.py:534 +#: cola/fsmonitor.py:545 msgid "File system change monitoring: disabled because libc does not support the inotify system calls.\n" msgstr "" -#: cola/fsmonitor.py:528 +#: cola/fsmonitor.py:539 msgid "File system change monitoring: disabled because pywin32 is not installed.\n" msgstr "" -#: cola/fsmonitor.py:181 +#: cola/fsmonitor.py:184 msgid "" "File system change monitoring: disabled because the limit on the total number of inotify watches was reached. You may be able to increase the limit on the number of watches by running:\n" "\n" " echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n" msgstr "" -#: cola/fsmonitor.py:142 +#: cola/fsmonitor.py:145 msgid "File system change monitoring: enabled.\n" msgstr "" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Filename" msgstr "Dosya adı" -#: cola/widgets/dag.py:755 +#: cola/widgets/dag.py:821 msgid "Files" msgstr "Dosyalar" -#: cola/widgets/branch.py:785 +#: cola/widgets/branch.py:837 msgid "Filter branches..." msgstr "" -#: cola/widgets/status.py:1333 +#: cola/widgets/status.py:1334 msgid "Filter paths..." msgstr "" -#: cola/widgets/finder.py:113 cola/widgets/main.py:312 +#: cola/widgets/finder.py:112 cola/widgets/main.py:307 msgid "Find Files" msgstr "Dosyaları Bul" -#: cola/widgets/text.py:388 +#: cola/widgets/text.py:385 msgid "Find in diff" msgstr "" -#: cola/widgets/text.py:425 +#: cola/widgets/text.py:422 msgid "Find next item" msgstr "" -#: cola/widgets/text.py:431 +#: cola/widgets/text.py:428 msgid "Find previous item" msgstr "" -#: cola/widgets/text.py:395 +#: cola/widgets/text.py:392 msgid "Find the next occurrence of the phrase" msgstr "" -#: cola/widgets/text.py:391 +#: cola/widgets/text.py:388 msgid "Find the previous occurrence of the phrase" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Fixed String" msgstr "" -#: cola/widgets/prefs.py:251 +#: cola/widgets/prefs.py:270 msgid "Fixed-Width Font" msgstr "" -#: cola/sequenceeditor.py:362 +#: cola/sequenceeditor.py:358 msgid "Fixup" msgstr "" -#: cola/widgets/commitmsg.py:148 +#: cola/widgets/commitmsg.py:154 msgid "Fixup Previous Commit" msgstr "" -#: cola/themes.py:672 +#: cola/themes.py:684 msgid "Flat dark blue" msgstr "Düz koyu mavi" -#: cola/themes.py:693 +#: cola/themes.py:705 msgid "Flat dark green" msgstr "Düz koyu yeşil" -#: cola/themes.py:686 +#: cola/themes.py:698 msgid "Flat dark grey" msgstr "Düz koyu gri" -#: cola/themes.py:679 +#: cola/themes.py:691 msgid "Flat dark red" msgstr "Düz koyu kırmızı" -#: cola/themes.py:644 +#: cola/themes.py:656 msgid "Flat light blue" msgstr "Düz açık mavi" -#: cola/themes.py:665 +#: cola/themes.py:677 msgid "Flat light green" msgstr "Düz açık yeşil" -#: cola/themes.py:658 +#: cola/themes.py:670 msgid "Flat light grey" msgstr "Düz açık gri" -#: cola/themes.py:651 +#: cola/themes.py:663 msgid "Flat light red" msgstr "Düz açık kırmızı" -#: cola/widgets/startup.py:73 +#: cola/widgets/startup.py:72 msgid "Folder" msgstr "" -#: cola/widgets/toolbar.py:177 +#: cola/widgets/toolbar.py:181 msgid "Follow System Style" msgstr "" -#: cola/widgets/prefs.py:252 +#: cola/widgets/prefs.py:271 msgid "Font Size" msgstr "Yazı Tipi Boyutu" -#: cola/widgets/remote.py:193 +#: cola/widgets/remote.py:197 msgid "Force" msgstr "" -#: cola/widgets/remote.py:617 +#: cola/widgets/remote.py:652 msgid "Force Fetch" msgstr "" -#: cola/widgets/remote.py:614 +#: cola/widgets/remote.py:649 msgid "Force Fetch?" msgstr "" -#: cola/widgets/remote.py:625 +#: cola/widgets/remote.py:660 msgid "Force Push" msgstr "" -#: cola/widgets/remote.py:619 +#: cola/widgets/remote.py:654 msgid "Force Push?" msgstr "" -#: cola/widgets/remote.py:616 +#: cola/widgets/remote.py:651 #, python-format msgid "Force fetching from %s?" msgstr "" -#: cola/widgets/remote.py:624 +#: cola/widgets/remote.py:659 #, python-format msgid "Force push to %s?" msgstr "" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Format String" msgstr "" -#: cola/widgets/about.py:430 cola/widgets/about.py:431 +#: cola/widgets/about.py:413 cola/widgets/about.py:414 msgid "French translation" msgstr "" -#: cola/widgets/merge.py:80 +#: cola/widgets/merge.py:78 msgid "GPG-sign the merge commit" msgstr "" -#: cola/widgets/prefs.py:344 +#: cola/widgets/prefs.py:364 msgid "GUI theme" msgstr "Arayüz teması" -#: cola/widgets/editremotes.py:318 +#: cola/widgets/editremotes.py:317 #, python-format msgid "Gathering info for \"%s\"..." msgstr "" -#: cola/widgets/about.py:420 cola/widgets/about.py:428 -#: cola/widgets/about.py:429 +#: cola/widgets/about.py:403 cola/widgets/about.py:411 +#: cola/widgets/about.py:412 msgid "German translation" msgstr "" -#: cola/widgets/main.py:511 +#: cola/widgets/main.py:524 msgid "Get Commit Message Template" msgstr "" -#: cola/widgets/dag.py:520 +#: cola/widgets/dag.py:586 msgid "Go Down" msgstr "" -#: cola/widgets/dag.py:516 +#: cola/widgets/dag.py:582 msgid "Go Up" msgstr "Yukarı Git" -#: cola/widgets/dag.py:467 cola/widgets/filelist.py:42 +#: cola/widgets/dag.py:466 cola/widgets/filelist.py:39 msgid "Grab File..." msgstr "" -#: cola/widgets/dag.py:782 +#: cola/widgets/dag.py:848 msgid "Graph" msgstr "" -#: cola/widgets/main.py:358 +#: cola/widgets/main.py:353 msgid "Grep" msgstr "" -#: cola/widgets/remote.py:662 +#: cola/widgets/remote.py:707 msgid "Have you rebased/pulled lately?" msgstr "" -#: cola/sequenceeditor.py:110 cola/sequenceeditor.py:171 -#: cola/widgets/finder.py:138 cola/widgets/main.py:854 +#: cola/sequenceeditor.py:108 cola/sequenceeditor.py:169 +#: cola/widgets/finder.py:137 cola/widgets/main.py:867 msgid "Help" msgstr "Yardım" -#: cola/widgets/status.py:1322 +#: cola/widgets/status.py:1323 msgid "Help - Custom Copy Actions" msgstr "" -#: cola/widgets/finder.py:79 +#: cola/widgets/finder.py:78 msgid "Help - Find Files" msgstr "Yardım - Dosyaları Ara" -#: cola/sequenceeditor.py:737 +#: cola/sequenceeditor.py:732 msgid "Help - git-cola-sequence-editor" msgstr "" -#: cola/widgets/prefs.py:346 +#: cola/widgets/prefs.py:366 msgid "High DPI" msgstr "" -#: cola/gitcmds.py:876 +#: cola/gitcmds.py:886 msgid "Hint: The \"Actions > Abort Cherry-Pick\" menu action can be used to cancel the current cherry-pick." msgstr "" -#: cola/widgets/prefs.py:254 +#: cola/widgets/prefs.py:275 msgid "History Browser" msgstr "Geçmiş Görüntüleyici" -#: cola/widgets/about.py:427 cola/widgets/about.py:441 +#: cola/widgets/about.py:410 cola/widgets/about.py:424 msgid "Hungarian translation" msgstr "" -#: cola/widgets/toolbar.py:178 +#: cola/widgets/toolbar.py:182 msgid "Icon Only" msgstr "" -#: cola/widgets/prefs.py:345 +#: cola/widgets/prefs.py:365 msgid "Icon theme" msgstr "Simge Teması" -#: cola/widgets/diff.py:758 +#: cola/widgets/diff.py:787 msgid "Ignore all whitespace" msgstr "" -#: cola/widgets/diff.py:755 +#: cola/widgets/diff.py:785 msgid "Ignore changes in amount of whitespace" msgstr "" -#: cola/widgets/diff.py:751 +#: cola/widgets/diff.py:782 msgid "Ignore changes in whitespace at EOL" msgstr "" -#: cola/widgets/gitignore.py:46 +#: cola/widgets/gitignore.py:45 msgid "Ignore custom pattern" msgstr "" -#: cola/widgets/gitignore.py:44 +#: cola/widgets/gitignore.py:43 msgid "Ignore exact filename" msgstr "" -#: cola/widgets/gitignore.py:32 +#: cola/widgets/gitignore.py:31 msgid "Ignore filename or pattern" msgstr "" -#: cola/widgets/status.py:933 +#: cola/widgets/dag.py:498 +msgid "Ignore merge commits" +msgstr "" + +#: cola/widgets/status.py:934 msgid "Ignore..." msgstr "" -#: cola/widgets/remote.py:203 +#: cola/widgets/remote.py:207 msgid "Include tags " msgstr "" -#: cola/widgets/prefs.py:349 +#: cola/widgets/prefs.py:369 msgid "Indent Status paths" msgstr "" -#: cola/widgets/about.py:419 cola/widgets/about.py:426 +#: cola/widgets/about.py:402 cola/widgets/about.py:409 msgid "Indonesian translation" msgstr "" -#: cola/widgets/main.py:643 +#: cola/widgets/main.py:656 msgid "Initialize Git Annex" msgstr "" -#: cola/widgets/main.py:647 +#: cola/widgets/main.py:660 msgid "Initialize Git LFS" msgstr "" -#: cola/widgets/clone.py:116 +#: cola/widgets/clone.py:114 msgid "Inititalize submodules" msgstr "" -#: cola/widgets/prefs.py:260 +#: cola/widgets/prefs.py:281 msgid "Insert spaces instead of tabs" msgstr "" -#: cola/cmds.py:2130 +#: cola/widgets/action.py:73 cola/widgets/main.py:402 +msgid "Integrate changes using \"git pull\"" +msgstr "" + +#: cola/cmds.py:2081 msgid "Interactive Rebase" msgstr "" -#: cola/cmds.py:2364 +#: cola/cmds.py:2315 msgid "Invalid Revision" msgstr "" @@ -2031,47 +2093,47 @@ msgstr "" msgid "It is not necessary to update the hunk header lines as they will be regenerated automatically." msgstr "" -#: cola/widgets/about.py:421 cola/widgets/about.py:424 +#: cola/widgets/about.py:404 cola/widgets/about.py:407 msgid "Japanese translation" msgstr "" -#: cola/widgets/prefs.py:262 +#: cola/widgets/prefs.py:283 msgid "Keep *.orig Merge Backups" msgstr "" -#: cola/widgets/stash.py:71 +#: cola/widgets/stash.py:73 msgid "Keep Index" msgstr "" -#: cola/widgets/main.py:477 +#: cola/widgets/main.py:490 msgid "Keyboard Shortcuts" msgstr "Klavye Kısayolları" -#: cola/cmds.py:1608 cola/sequenceeditor.py:165 cola/sequenceeditor.py:338 -#: cola/widgets/dag.py:395 cola/widgets/filelist.py:34 +#: cola/difftool.py:27 cola/sequenceeditor.py:163 cola/sequenceeditor.py:334 +#: cola/widgets/dag.py:394 cola/widgets/filelist.py:31 msgid "Launch Diff Tool" msgstr "Karşılaştırma Aracını Çalıştır" -#: cola/widgets/dag.py:402 +#: cola/widgets/dag.py:401 msgid "Launch Directory Diff Tool" msgstr "" -#: cola/cmds.py:1541 cola/cmds.py:1679 cola/widgets/filelist.py:38 +#: cola/cmds.py:1529 cola/cmds.py:1631 cola/widgets/filelist.py:35 msgid "Launch Editor" msgstr "Editörü Çalıştır" -#: cola/cmds.py:1644 +#: cola/cmds.py:1596 msgid "Launch Terminal" msgstr "Terminali Çalıştır" -#: cola/sequenceeditor.py:166 +#: cola/sequenceeditor.py:164 msgid "" "Launch external diff tool\n" "Shortcut: Ctrl+D" msgstr "" -#: cola/widgets/diff.py:1005 cola/widgets/diff.py:1051 -#: cola/widgets/status.py:852 cola/widgets/status.py:948 +#: cola/widgets/diff.py:1044 cola/widgets/diff.py:1106 +#: cola/widgets/status.py:853 cola/widgets/status.py:949 msgid "Launch git-cola" msgstr "" @@ -2083,7 +2145,7 @@ msgstr "" msgid "Launch git-difftool on the current path" msgstr "" -#: cola/icons.py:56 +#: cola/icons.py:55 msgid "Light Theme" msgstr "Açık Tema" @@ -2092,167 +2154,183 @@ msgstr "Açık Tema" msgid "Lines starting with '%s' will be ignored." msgstr "" -#: cola/widgets/startup.py:74 +#: cola/widgets/startup.py:73 msgid "List" msgstr "" -#: cola/guicmds.py:267 +#: cola/guicmds.py:266 msgid "Load Commit Message" msgstr "İşleme Mesajını Yükle" -#: cola/widgets/main.py:339 +#: cola/widgets/main.py:334 msgid "Load Commit Message..." msgstr "İşleme Mesajını Yükle..." -#: cola/widgets/commitmsg.py:144 +#: cola/widgets/commitmsg.py:150 msgid "Load Previous Commit Message" msgstr "" -#: cola/widgets/diff.py:264 +#: cola/widgets/diff.py:265 msgid "Loading..." msgstr "Yükleniyor..." -#: cola/widgets/branch.py:169 cola/widgets/branch.py:240 -#: cola/widgets/branch.py:281 cola/widgets/compare.py:38 -#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/branch.py:173 cola/widgets/branch.py:250 +#: cola/widgets/branch.py:290 cola/widgets/compare.py:37 +#: cola/widgets/compare.py:52 cola/widgets/compare.py:57 msgid "Local" msgstr "Yerel" -#: cola/widgets/cfgactions.py:227 cola/widgets/merge.py:46 -#: cola/widgets/remote.py:138 +#: cola/widgets/cfgactions.py:225 cola/widgets/merge.py:44 +#: cola/widgets/remote.py:136 msgid "Local Branch" msgstr "Yerel Dal" -#: cola/widgets/createbranch.py:114 +#: cola/widgets/createbranch.py:112 msgid "Local branch" msgstr "Yerel dal" -#: cola/widgets/dag.py:788 cola/widgets/main.py:651 +#: cola/widgets/dag.py:854 cola/widgets/main.py:664 msgid "Lock Layout" msgstr "" -#: cola/widgets/dag.py:750 +#: cola/widgets/dag.py:816 msgid "Log" msgstr "Kayıt" -#: cola/widgets/prefs.py:170 +#: cola/widgets/prefs.py:191 msgid "Log Date Format" msgstr "" -#: cola/widgets/about.py:268 +#: cola/themes.py:769 +msgid "MacOS Aqua dark" +msgstr "" + +#: cola/themes.py:765 +msgid "MacOS Aqua light" +msgstr "" + +#: cola/themes.py:781 +msgid "MacOS Vibrant dark" +msgstr "" + +#: cola/themes.py:775 +msgid "MacOS Vibrant light" +msgstr "" + +#: cola/widgets/about.py:251 msgid "Maintainer (since 2007) and developer" msgstr "" -#: cola/widgets/text.py:398 +#: cola/widgets/text.py:395 msgid "Match Case" msgstr "" -#: cola/widgets/merge.py:88 +#: cola/widgets/merge.py:86 msgid "Merge" msgstr "" -#: cola/widgets/merge.py:162 +#: cola/widgets/merge.py:160 #, python-format msgid "Merge \"%(revision)s\" into \"%(branch)s\"" msgstr "" -#: cola/widgets/prefs.py:257 +#: cola/widgets/prefs.py:278 msgid "Merge Tool" msgstr "Birleştirme Aracı" -#: cola/widgets/prefs.py:171 +#: cola/widgets/prefs.py:193 msgid "Merge Verbosity" msgstr "" -#: cola/cmds.py:1829 +#: cola/cmds.py:1780 msgid "Merge failed. Conflict resolution is required." msgstr "" -#: cola/widgets/merge.py:167 +#: cola/widgets/merge.py:165 #, python-format msgid "Merge into \"%s\"" msgstr "" -#: cola/widgets/branch.py:231 +#: cola/widgets/branch.py:242 msgid "Merge into current branch" msgstr "" -#: cola/widgets/main.py:363 +#: cola/widgets/main.py:358 msgid "Merge..." msgstr "" -#: cola/widgets/main.py:1163 +#: cola/widgets/main.py:1176 msgid "Merging" msgstr "Birleştiriliyor" -#: cola/models/browse.py:33 cola/widgets/createtag.py:78 +#: cola/models/browse.py:32 cola/widgets/createtag.py:76 msgid "Message" msgstr "Mesaj" -#: cola/widgets/commitmsg.py:417 +#: cola/widgets/commitmsg.py:425 msgid "Missing Commit Message" msgstr "" -#: cola/widgets/createbranch.py:252 +#: cola/widgets/createbranch.py:250 msgid "Missing Data" msgstr "Kayıp Veri" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Missing Name" msgstr "Kayıp Ad" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Missing Revision" msgstr "" -#: cola/cmds.py:2801 +#: cola/cmds.py:2747 msgid "Missing Tag Message" msgstr "" -#: cola/models/browse.py:332 cola/widgets/status.py:158 -#: cola/widgets/status.py:631 +#: cola/models/browse.py:331 cola/widgets/status.py:158 +#: cola/widgets/status.py:632 msgid "Modified" msgstr "Düzenlenmiş" -#: cola/widgets/commitmsg.py:506 +#: cola/widgets/commitmsg.py:532 msgid "More..." msgstr "" -#: cola/widgets/standard.py:243 cola/widgets/status.py:233 +#: cola/widgets/standard.py:242 cola/widgets/status.py:234 msgid "Move Down" msgstr "" -#: cola/widgets/standard.py:235 cola/widgets/status.py:225 +#: cola/widgets/standard.py:234 cola/widgets/status.py:226 msgid "Move Up" msgstr "Yukarı Kaydır" -#: cola/widgets/status.py:300 +#: cola/widgets/status.py:301 msgid "Move files to trash" msgstr "" -#: cola/models/browse.py:33 cola/widgets/bookmarks.py:467 -#: cola/widgets/createtag.py:61 cola/widgets/editremotes.py:450 -#: cola/widgets/status.py:1452 cola/widgets/toolbar.py:312 +#: cola/models/browse.py:32 cola/widgets/bookmarks.py:466 +#: cola/widgets/createtag.py:59 cola/widgets/editremotes.py:448 +#: cola/widgets/status.py:1453 cola/widgets/toolbar.py:317 msgid "Name" msgstr "Ad" -#: cola/widgets/editremotes.py:434 +#: cola/widgets/editremotes.py:432 msgid "Name for the new remote" msgstr "" -#: cola/guicmds.py:148 cola/widgets/main.py:285 +#: cola/guicmds.py:147 cola/widgets/main.py:280 msgid "New Bare Repository..." msgstr "" -#: cola/guicmds.py:87 cola/widgets/main.py:280 +#: cola/guicmds.py:86 cola/widgets/main.py:275 msgid "New Repository..." msgstr "Yeni Depo..." -#: cola/widgets/main.py:983 +#: cola/widgets/main.py:996 msgid "New Toolbar" msgstr "Araç Çubuğu Ekle" -#: cola/widgets/startup.py:53 +#: cola/widgets/startup.py:52 msgid "New..." msgstr "Yeni..." @@ -2260,48 +2338,52 @@ msgstr "Yeni..." msgid "Next File" msgstr "Sonraki Dosya" -#: cola/widgets/createbranch.py:123 cola/widgets/standard.py:1065 +#: cola/widgets/createbranch.py:121 cola/widgets/standard.py:1183 msgid "No" msgstr "Hayır" -#: cola/widgets/merge.py:217 cola/widgets/merge.py:227 +#: cola/widgets/merge.py:215 cola/widgets/merge.py:225 msgid "No Revision Specified" msgstr "" -#: cola/widgets/commitmsg.py:427 +#: cola/widgets/stash.py:225 +msgid "No change made" +msgstr "" + +#: cola/widgets/commitmsg.py:435 msgid "" "No changes to commit.\n" "\n" "You must stage at least 1 file before you can commit." msgstr "" -#: cola/widgets/selectcommits.py:118 +#: cola/widgets/selectcommits.py:117 msgid "No commits exist in this branch." msgstr "" -#: cola/widgets/merge.py:65 +#: cola/widgets/merge.py:63 msgid "No fast forward" msgstr "" -#: cola/widgets/remote.py:186 +#: cola/widgets/remote.py:190 msgid "No fast-forward" msgstr "" -#: cola/widgets/remote.py:577 +#: cola/widgets/remote.py:612 msgid "No repository selected." msgstr "" -#: cola/widgets/remote.py:615 +#: cola/widgets/remote.py:650 msgid "Non-fast-forward fetch overwrites local history!" msgstr "" -#: cola/widgets/remote.py:621 +#: cola/widgets/remote.py:656 msgid "" "Non-fast-forward push overwrites published history!\n" "(Did you pull first?)" msgstr "" -#: cola/widgets/commitmsg.py:444 +#: cola/widgets/commitmsg.py:452 msgid "Nothing to commit" msgstr "" @@ -2309,141 +2391,145 @@ msgstr "" msgid "Nothing to do" msgstr "" -#: cola/widgets/prefs.py:172 +#: cola/widgets/prefs.py:194 msgid "Number of Diff Context Lines" msgstr "" -#: cola/widgets/bookmarks.py:79 cola/widgets/bookmarks.py:213 -#: cola/widgets/startup.py:336 +#: cola/widgets/bookmarks.py:78 cola/widgets/bookmarks.py:212 +#: cola/widgets/startup.py:335 msgid "Open" msgstr "Aç" -#: cola/widgets/text.py:230 +#: cola/widgets/text.py:228 #, python-format msgid "Open \"%s\"" msgstr "" -#: cola/cmds.py:1857 +#: cola/cmds.py:1808 msgid "Open Directory" msgstr "" -#: cola/guicmds.py:205 cola/guicmds.py:214 cola/widgets/editremotes.py:473 -#: cola/widgets/startup.py:55 cola/widgets/startup.py:215 +#: cola/guicmds.py:204 cola/guicmds.py:213 cola/widgets/editremotes.py:471 +#: cola/widgets/startup.py:54 cola/widgets/startup.py:214 msgid "Open Git Repository" msgstr "Git Deposunu Aç" -#: cola/widgets/submodules.py:49 +#: cola/widgets/submodules.py:48 msgid "Open Parent" msgstr "" -#: cola/cmds.py:1877 +#: cola/cmds.py:1828 msgid "Open Parent Directory" msgstr "Üst Klasörü Aç" -#: cola/widgets/main.py:679 +#: cola/widgets/main.py:692 msgid "Open Recent" msgstr "" -#: cola/cmds.py:1840 +#: cola/cmds.py:1791 msgid "Open Using Default Application" msgstr "Varsayılan Uygulamayla Aç" -#: cola/cmds.py:1890 +#: cola/cmds.py:1841 msgid "Open Worktree" msgstr "" -#: cola/widgets/bookmarks.py:221 cola/widgets/startup.py:344 +#: cola/widgets/bookmarks.py:220 cola/widgets/startup.py:343 msgid "Open in New Window" msgstr "Yeni Pencere Aç" -#: cola/widgets/main.py:408 +#: cola/widgets/main.py:415 msgid "Open in New Window..." msgstr "Yeni Pencere Aç..." -#: cola/widgets/main.py:402 +#: cola/widgets/main.py:409 msgid "Open..." msgstr "Aç..." -#: cola/widgets/branch.py:345 +#: cola/widgets/branch.py:354 msgid "Other branches" msgstr "Diğer dallar" -#: cola/widgets/archive.py:210 +#: cola/widgets/archive.py:208 msgid "Overwrite" msgstr "" -#: cola/widgets/archive.py:209 +#: cola/widgets/archive.py:207 #, python-format msgid "Overwrite \"%s\"?" msgstr "" -#: cola/widgets/archive.py:207 +#: cola/widgets/archive.py:205 msgid "Overwrite File?" msgstr "" -#: cola/widgets/grep.py:144 +#: cola/widgets/grep.py:142 msgid "" "Parse arguments using a shell.\n" "Queries with spaces will require \"double quotes\"." msgstr "" -#: cola/models/browse.py:330 +#: cola/models/browse.py:329 msgid "Partially Staged" msgstr "" -#: cola/widgets/main.py:744 +#: cola/widgets/main.py:757 msgid "Paste" msgstr "Yapıştır" -#: cola/cmds.py:363 +#: cola/cmds.py:364 msgid "Patch failed to apply" msgstr "" -#: cola/cmds.py:375 +#: cola/cmds.py:376 msgid "Patch(es) Applied" msgstr "Uygulanan Düzeltmeler" -#: cola/widgets/diff.py:1219 cola/widgets/main.py:695 +#: cola/widgets/diff.py:1293 cola/widgets/main.py:708 msgid "Patches" msgstr "" -#: cola/widgets/prefs.py:173 +#: cola/widgets/prefs.py:195 msgid "Patches Directory" msgstr "" -#: cola/widgets/bookmarks.py:468 cola/widgets/submodules.py:118 +#: cola/widgets/bookmarks.py:467 cola/widgets/submodules.py:117 msgid "Path" msgstr "Yol" -#: cola/widgets/clone.py:112 +#: cola/widgets/clone.py:110 msgid "Path or URL to clone (Env. $VARS okay)" msgstr "" -#: cola/sequenceeditor.py:346 +#: cola/sequenceeditor.py:342 msgid "Pick" msgstr "" -#: cola/widgets/diff.py:781 +#: cola/widgets/dag.py:490 +msgid "Pickaxe search for changes containing text" +msgstr "" + +#: cola/widgets/diff.py:809 msgid "Pixel XOR" msgstr "" -#: cola/widgets/createbranch.py:253 +#: cola/widgets/createbranch.py:251 msgid "Please provide both a branch name and revision expression." msgstr "" -#: cola/cmds.py:2348 +#: cola/cmds.py:2299 msgid "Please select a file" msgstr "Lütfen bir dosya seçin" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Please specify a name for the new tag." msgstr "" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Please specify a revision to tag." msgstr "" -#: cola/widgets/commitmsg.py:410 +#: cola/widgets/commitmsg.py:418 msgid "" "Please supply a commit message.\n" "\n" @@ -2454,31 +2540,31 @@ msgid "" "- Remaining lines: Describe why this change is good.\n" msgstr "" -#: cola/cmds.py:653 +#: cola/cmds.py:655 msgid "Point the current branch head to a new commit?" msgstr "" -#: cola/widgets/about.py:416 +#: cola/widgets/about.py:399 msgid "Polish translation" msgstr "" -#: cola/widgets/stash.py:63 cola/widgets/stash.py:111 cola/widgets/stash.py:115 +#: cola/widgets/stash.py:65 cola/widgets/stash.py:114 cola/widgets/stash.py:118 msgid "Pop" msgstr "" -#: cola/widgets/main.py:293 cola/widgets/prefs.py:395 +#: cola/widgets/main.py:288 cola/widgets/prefs.py:433 msgid "Preferences" msgstr "Seçenekler" -#: cola/widgets/archive.py:129 +#: cola/widgets/archive.py:127 msgid "Prefix" msgstr "Ön Ek" -#: cola/widgets/main.py:345 +#: cola/widgets/main.py:340 msgid "Prepare Commit Message" msgstr "" -#: cola/widgets/prefs.py:157 +#: cola/widgets/prefs.py:180 msgid "Prevent \"Stage\" from staging all files when nothing is selected" msgstr "" @@ -2486,216 +2572,228 @@ msgstr "" msgid "Previous File" msgstr "Önceki Dosya" -#: cola/widgets/remote.py:171 +#: cola/widgets/remote.py:169 msgid "Prompt on creation" msgstr "" -#: cola/widgets/remote.py:172 +#: cola/widgets/remote.py:170 msgid "Prompt when pushing creates new remote branches" msgstr "" -#: cola/widgets/remote.py:208 +#: cola/widgets/remote.py:212 msgid "Prune " msgstr "" -#: cola/widgets/bookmarks.py:255 cola/widgets/startup.py:376 +#: cola/widgets/bookmarks.py:254 cola/widgets/startup.py:375 msgid "Prune Missing Entries" msgstr "" -#: cola/widgets/branch.py:247 cola/widgets/remote.py:728 +#: cola/widgets/branch.py:256 cola/widgets/remote.py:783 msgid "Pull" msgstr "" -#: cola/widgets/action.py:65 cola/widgets/main.py:397 +#: cola/widgets/action.py:73 cola/widgets/main.py:401 msgid "Pull..." msgstr "" -#: cola/widgets/branch.py:253 cola/widgets/remote.py:593 -#: cola/widgets/remote.py:698 +#: cola/widgets/branch.py:262 cola/widgets/remote.py:628 +#: cola/widgets/remote.py:758 msgid "Push" msgstr "" -#: cola/widgets/action.py:64 cola/widgets/main.py:392 +#: cola/widgets/action.py:70 cola/widgets/main.py:393 +msgid "Push to one or more remotes using \"git push\"" +msgstr "" + +#: cola/widgets/action.py:70 cola/widgets/main.py:392 msgid "Push..." msgstr "" -#: cola/guicmds.py:252 +#: cola/guicmds.py:251 msgid "Quick Open Repository" msgstr "" -#: cola/widgets/main.py:660 +#: cola/widgets/main.py:673 msgid "Quick Open..." msgstr "" -#: cola/widgets/main.py:355 +#: cola/widgets/main.py:350 msgid "Quit" msgstr "Çık" -#: cola/cmds.py:2144 cola/cmds.py:2180 cola/cmds.py:2181 cola/cmds.py:2194 -#: cola/cmds.py:2195 cola/sequenceeditor.py:158 cola/sequenceeditor.py:199 -#: cola/widgets/main.py:822 cola/widgets/remote.py:211 +#: cola/cmds.py:2095 cola/cmds.py:2131 cola/cmds.py:2132 cola/cmds.py:2145 +#: cola/cmds.py:2146 cola/sequenceeditor.py:156 cola/sequenceeditor.py:197 +#: cola/widgets/main.py:835 cola/widgets/remote.py:215 msgid "Rebase" msgstr "Konumlandır" -#: cola/cmds.py:2143 +#: cola/cmds.py:2094 #, python-format msgid "Rebase onto %s" msgstr "%s öğesine konumlandır" -#: cola/cmds.py:2156 +#: cola/cmds.py:2107 msgid "Rebase stopped" msgstr "" -#: cola/widgets/remote.py:210 +#: cola/widgets/remote.py:214 msgid "Rebase the current branch instead of merging" msgstr "" -#: cola/widgets/dag.py:419 +#: cola/widgets/dag.py:418 msgid "Rebase to this commit" msgstr "" -#: cola/widgets/main.py:1165 +#: cola/widgets/main.py:1178 msgid "Rebasing" msgstr "" -#: cola/widgets/main.py:120 +#: cola/widgets/main.py:118 msgid "Recent" msgstr "Son" -#: cola/widgets/bookmarks.py:93 +#: cola/widgets/bookmarks.py:92 msgid "Recent repositories" msgstr "" -#: cola/widgets/prefs.py:258 +#: cola/widgets/prefs.py:279 msgid "Recent repository count" msgstr "" -#: cola/widgets/recent.py:46 +#: cola/widgets/recent.py:44 msgid "Recently Modified Files" msgstr "" -#: cola/widgets/main.py:320 +#: cola/widgets/main.py:315 msgid "Recently Modified Files..." msgstr "En Son Düzenlenen Dosyalar..." -#: cola/widgets/stash.py:256 +#: cola/widgets/stash.py:274 msgid "Recovering a dropped stash is not possible." msgstr "" -#: cola/widgets/createbranch.py:283 +#: cola/widgets/createbranch.py:281 msgid "Recovering lost commits may not be easy." msgstr "" -#: cola/widgets/main.py:737 +#: cola/widgets/main.py:750 msgid "Redo" msgstr "" -#: cola/widgets/clone.py:121 +#: cola/widgets/clone.py:119 msgid "Reduce commit history to minimum" msgstr "" -#: cola/widgets/submodules.py:121 +#: cola/widgets/submodules.py:120 msgid "Reference Repository" msgstr "" -#: cola/widgets/submodules.py:105 +#: cola/widgets/submodules.py:104 msgid "Reference URL" msgstr "" -#: cola/widgets/submodules.py:106 +#: cola/widgets/submodules.py:105 msgid "Reference repository to use when cloning (optional)" msgstr "" -#: cola/cmds.py:2222 cola/qtutils.py:770 cola/widgets/action.py:62 -#: cola/widgets/dag.py:792 cola/widgets/editremotes.py:85 -#: cola/widgets/grep.py:105 cola/widgets/recent.py:116 -#: cola/widgets/submodules.py:45 +#: cola/cmds.py:2173 cola/qtutils.py:801 cola/widgets/action.py:63 +#: cola/widgets/dag.py:858 cola/widgets/editremotes.py:84 +#: cola/widgets/grep.py:103 cola/widgets/recent.py:114 +#: cola/widgets/submodules.py:44 msgid "Refresh" msgstr "Yenile" -#: cola/widgets/remote.py:179 +#: cola/widgets/remote.py:183 msgid "Refuse to merge unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward" msgstr "" -#: cola/widgets/branch.py:173 cola/widgets/branch.py:225 -#: cola/widgets/branch.py:269 cola/widgets/branch.py:470 -#: cola/widgets/compare.py:54 cola/widgets/compare.py:59 -#: cola/widgets/remote.py:147 +#: cola/widgets/branch.py:177 cola/widgets/branch.py:236 +#: cola/widgets/branch.py:278 cola/widgets/branch.py:513 +#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/remote.py:145 msgid "Remote" msgstr "" -#: cola/widgets/remote.py:162 +#: cola/widgets/remote.py:160 msgid "Remote Branch" msgstr "" -#: cola/cmds.py:1196 +#: cola/cmds.py:1197 msgid "Remote Branch Deleted" msgstr "Uzaktaki Dal Silindi" -#: cola/widgets/editremotes.py:49 +#: cola/widgets/log.py:99 +msgid "Remote Messages" +msgstr "" + +#: cola/widgets/editremotes.py:48 msgid "Remote git repositories - double-click to rename" msgstr "" -#: cola/cmds.py:1029 cola/widgets/patch.py:107 cola/widgets/patch.py:122 -#: cola/widgets/startup.py:265 cola/widgets/status.py:1382 +#: cola/cmds.py:1030 cola/widgets/diff.py:1701 cola/widgets/diff.py:1716 +#: cola/widgets/startup.py:264 cola/widgets/status.py:1383 msgid "Remove" msgstr "Kaldır" -#: cola/cmds.py:1027 +#: cola/cmds.py:1028 #, python-format msgid "Remove %s from the recent list?" msgstr "%s öğesini son kullanılanlardan sil?" -#: cola/widgets/toolbar.py:316 +#: cola/widgets/toolbar.py:321 msgid "Remove Element" msgstr "" -#: cola/widgets/remote.py:206 +#: cola/widgets/remote.py:210 msgid "Remove remote-tracking branches that no longer exist on the remote" msgstr "" -#: cola/widgets/patch.py:109 +#: cola/widgets/diff.py:1703 msgid "Remove selected (Delete)" msgstr "" -#: cola/widgets/bookmarks.py:258 cola/widgets/startup.py:379 +#: cola/widgets/bookmarks.py:257 cola/widgets/startup.py:378 msgid "Remove stale entries for repositories that no longer exist" msgstr "" -#: cola/guicmds.py:333 cola/widgets/browse.py:159 +#: cola/guicmds.py:332 cola/widgets/browse.py:159 cola/widgets/stash.py:44 msgid "Rename" msgstr "Yeniden Adlandır" -#: cola/cmds.py:1153 +#: cola/cmds.py:1154 #, python-format msgid "Rename \"%s\"" msgstr "" -#: cola/widgets/branch.py:259 +#: cola/widgets/branch.py:268 msgid "Rename Branch" msgstr "Dalı Yeniden Adlandır" -#: cola/widgets/main.py:570 +#: cola/widgets/main.py:583 msgid "Rename Branch..." msgstr "Dalı Yeniden Adlandır..." -#: cola/guicmds.py:330 +#: cola/guicmds.py:329 msgid "Rename Existing Branch" msgstr "" -#: cola/cmds.py:944 +#: cola/cmds.py:942 msgid "Rename Remote" msgstr "Uzaktakini Yeniden Adlandır" -#: cola/widgets/bookmarks.py:233 cola/widgets/startup.py:356 +#: cola/widgets/bookmarks.py:232 cola/widgets/startup.py:355 msgid "Rename Repository" msgstr "Depoyu Yeniden Adlandır" -#: cola/widgets/branch.py:445 +#: cola/widgets/stash.py:218 +msgid "Rename Stash" +msgstr "" + +#: cola/widgets/branch.py:478 msgid "Rename branch" msgstr "Dalı yeniden adlandır" -#: cola/cmds.py:945 +#: cola/cmds.py:943 #, python-format msgid "Rename remote \"%(current)s\" to \"%(new)s\"?" msgstr "" @@ -2704,179 +2802,183 @@ msgstr "" msgid "Rename selected paths" msgstr "" -#: cola/app.py:497 cola/widgets/startup.py:262 +#: cola/widgets/stash.py:45 +msgid "Rename the selected stash" +msgstr "" + +#: cola/app.py:500 cola/widgets/startup.py:261 msgid "Repository Not Found" msgstr "" -#: cola/widgets/browse.py:87 cola/widgets/main.py:1095 +#: cola/widgets/browse.py:87 cola/widgets/main.py:1108 #, python-format msgid "Repository: %s" msgstr "Depo: %s" -#: cola/guicmds.py:351 cola/widgets/createbranch.py:125 cola/widgets/dag.py:331 -#: cola/widgets/editremotes.py:58 cola/widgets/main.py:832 +#: cola/guicmds.py:350 cola/widgets/createbranch.py:123 cola/widgets/dag.py:330 +#: cola/widgets/editremotes.py:57 cola/widgets/main.py:845 msgid "Reset" msgstr "Sıfırla" -#: cola/widgets/createbranch.py:286 +#: cola/widgets/createbranch.py:284 #, python-format msgid "Reset \"%(branch)s\" to \"%(revision)s\"?" msgstr "" -#: cola/guicmds.py:359 +#: cola/guicmds.py:358 msgid "Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/cmds.py:655 cola/cmds.py:706 cola/guicmds.py:342 -#: cola/widgets/createbranch.py:295 +#: cola/cmds.py:657 cola/cmds.py:708 cola/guicmds.py:341 +#: cola/widgets/createbranch.py:293 msgid "Reset Branch" msgstr "Dalı Sıfırla" -#: cola/cmds.py:703 cola/guicmds.py:341 cola/widgets/dag.py:425 -#: cola/widgets/main.py:419 +#: cola/cmds.py:705 cola/guicmds.py:340 cola/widgets/dag.py:424 +#: cola/widgets/main.py:431 msgid "Reset Branch (Soft)" msgstr "" -#: cola/cmds.py:652 cola/guicmds.py:350 cola/widgets/dag.py:431 -#: cola/widgets/main.py:426 +#: cola/cmds.py:654 cola/guicmds.py:349 cola/widgets/dag.py:430 +#: cola/widgets/main.py:439 msgid "Reset Branch and Stage (Mixed)" msgstr "" -#: cola/widgets/createbranch.py:292 +#: cola/widgets/createbranch.py:290 msgid "Reset Branch?" msgstr "Dalı Sıfırla?" -#: cola/widgets/main.py:655 +#: cola/widgets/main.py:668 msgid "Reset Layout" msgstr "" -#: cola/cmds.py:687 +#: cola/cmds.py:689 msgid "Reset Worktree and Reset All?" msgstr "" -#: cola/cmds.py:672 cola/cmds.py:689 cola/cmds.py:723 cola/guicmds.py:360 -#: cola/guicmds.py:373 cola/guicmds.py:382 +#: cola/cmds.py:674 cola/cmds.py:691 cola/cmds.py:725 cola/guicmds.py:359 +#: cola/guicmds.py:372 cola/guicmds.py:381 msgid "Reset and Restore" msgstr "" -#: cola/cmds.py:704 +#: cola/cmds.py:706 msgid "Reset branch?" msgstr "" -#: cola/widgets/createbranch.py:266 +#: cola/widgets/createbranch.py:264 #, python-format msgid "Resetting \"%(branch)s\" to \"%(revision)s\" will lose commits." msgstr "" -#: cola/widgets/prefs.py:264 +#: cola/widgets/prefs.py:285 msgid "Resize File Browser columns" msgstr "" -#: cola/widgets/prefs.py:374 +#: cola/widgets/prefs.py:412 msgid "Restart the application after changing appearance settings." msgstr "" -#: cola/cmds.py:757 cola/cmds.py:760 cola/guicmds.py:390 cola/guicmds.py:391 -#: cola/widgets/dag.py:461 cola/widgets/main.py:457 +#: cola/cmds.py:759 cola/cmds.py:762 cola/guicmds.py:389 cola/guicmds.py:390 +#: cola/widgets/dag.py:460 cola/widgets/main.py:471 msgid "Restore Worktree" msgstr "" -#: cola/cmds.py:720 cola/guicmds.py:381 cola/widgets/dag.py:454 -#: cola/widgets/main.py:450 +#: cola/cmds.py:722 cola/guicmds.py:380 cola/widgets/dag.py:453 +#: cola/widgets/main.py:463 msgid "Restore Worktree and Reset All (Hard)" msgstr "" -#: cola/cmds.py:669 cola/widgets/main.py:434 +#: cola/cmds.py:671 cola/widgets/main.py:447 msgid "Restore Worktree and Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/widgets/dag.py:438 +#: cola/widgets/dag.py:437 msgid "Restore Worktree and Reset All (Keep Unstaged Edits)" msgstr "" -#: cola/cmds.py:686 cola/guicmds.py:372 cola/widgets/dag.py:446 -#: cola/widgets/main.py:442 +#: cola/cmds.py:688 cola/guicmds.py:371 cola/widgets/dag.py:445 +#: cola/widgets/main.py:455 msgid "Restore Worktree and Reset All (Merge)" msgstr "" -#: cola/cmds.py:721 +#: cola/cmds.py:723 msgid "Restore Worktree and Reset All?" msgstr "" -#: cola/cmds.py:758 +#: cola/cmds.py:760 #, python-format msgid "Restore Worktree to %s?" msgstr "" -#: cola/cmds.py:670 +#: cola/cmds.py:672 msgid "Restore worktree, reset, and preserve unstaged edits?" msgstr "" -#: cola/widgets/dag.py:390 +#: cola/widgets/dag.py:389 msgid "Revert" msgstr "" -#: cola/widgets/diff.py:1153 +#: cola/widgets/diff.py:1227 msgid "Revert Diff Hunk" msgstr "" -#: cola/widgets/diff.py:1018 +#: cola/widgets/diff.py:1057 msgid "Revert Diff Hunk..." msgstr "" -#: cola/widgets/diff.py:1152 +#: cola/widgets/diff.py:1226 msgid "Revert Diff Hunk?" msgstr "" -#: cola/widgets/diff.py:1150 +#: cola/widgets/diff.py:1224 msgid "Revert Selected Lines" msgstr "" -#: cola/widgets/diff.py:1013 +#: cola/widgets/diff.py:1052 msgid "Revert Selected Lines..." msgstr "" -#: cola/widgets/diff.py:1149 +#: cola/widgets/diff.py:1223 msgid "Revert Selected Lines?" msgstr "" -#: cola/cmds.py:2311 +#: cola/cmds.py:2262 msgid "Revert Uncommitted Changes" msgstr "" -#: cola/cmds.py:2305 +#: cola/cmds.py:2256 msgid "Revert Uncommitted Changes?" msgstr "" -#: cola/cmds.py:2298 +#: cola/cmds.py:2249 msgid "Revert Uncommitted Edits..." msgstr "" -#: cola/cmds.py:2289 +#: cola/cmds.py:2240 msgid "Revert Unstaged Changes" msgstr "" -#: cola/cmds.py:2283 +#: cola/cmds.py:2234 msgid "Revert Unstaged Changes?" msgstr "" -#: cola/cmds.py:2275 +#: cola/cmds.py:2226 msgid "Revert Unstaged Edits..." msgstr "" -#: cola/cmds.py:598 +#: cola/cmds.py:599 msgid "Revert failed" msgstr "" -#: cola/cmds.py:2310 cola/widgets/diff.py:1161 +#: cola/cmds.py:2261 cola/widgets/diff.py:1235 msgid "Revert the uncommitted changes?" msgstr "" -#: cola/cmds.py:2288 +#: cola/cmds.py:2239 msgid "Revert the unstaged changes?" msgstr "" -#: cola/widgets/browse.py:189 +#: cola/widgets/browse.py:190 msgid "Revert uncommitted changes to selected paths" msgstr "" @@ -2884,294 +2986,302 @@ msgstr "" msgid "Revert unstaged changes to selected paths" msgstr "" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Review" msgstr "Önizle" -#: cola/widgets/main.py:583 +#: cola/widgets/main.py:596 msgid "Review..." msgstr "Önizle..." -#: cola/widgets/cfgactions.py:233 cola/widgets/createtag.py:84 +#: cola/widgets/cfgactions.py:231 cola/widgets/createtag.py:82 msgid "Revision" msgstr "" -#: cola/widgets/selectcommits.py:62 +#: cola/widgets/selectcommits.py:61 msgid "Revision Expression:" msgstr "" -#: cola/widgets/merge.py:39 cola/widgets/merge.py:42 +#: cola/widgets/merge.py:37 cola/widgets/merge.py:40 msgid "Revision to Merge" msgstr "" -#: cola/sequenceeditor.py:351 +#: cola/sequenceeditor.py:347 msgid "Reword" msgstr "" -#: cola/cmds.py:776 cola/widgets/commitmsg.py:456 +#: cola/cmds.py:778 cola/widgets/commitmsg.py:464 msgid "Rewrite Published Commit?" msgstr "" -#: cola/widgets/log.py:31 +#: cola/widgets/log.py:31 cola/widgets/log.py:133 msgid "Right-click links to open:" msgstr "" -#: cola/interaction.py:127 cola/widgets/cfgactions.py:245 +#: cola/interaction.py:125 cola/widgets/cfgactions.py:243 msgid "Run" msgstr "Çalıştır" -#: cola/cmds.py:2341 +#: cola/cmds.py:2292 #, python-format msgid "Run \"%s\"?" msgstr "\"%s\" çalıştırılsın mı?" -#: cola/interaction.py:124 +#: cola/interaction.py:122 #, python-format msgid "Run %s?" msgstr "%s çalıştırılsın mı?" -#: cola/interaction.py:125 +#: cola/interaction.py:123 #, python-format msgid "Run the \"%s\" command?" msgstr "" -#: cola/cmds.py:2380 +#: cola/cmds.py:2331 #, python-format msgid "Running command: %s" msgstr "Komut çalıştırılıyor: %s" -#: cola/widgets/about.py:422 +#: cola/widgets/about.py:405 msgid "Russian translation" msgstr "" -#: cola/sequenceeditor.py:324 +#: cola/sequenceeditor.py:321 msgid "SHA-1" msgstr "" -#: cola/widgets/prefs.py:183 +#: cola/widgets/prefs.py:205 msgid "Safe Mode" msgstr "" -#: cola/cmds.py:2167 cola/widgets/archive.py:126 cola/widgets/browse.py:609 -#: cola/widgets/editremotes.py:54 cola/widgets/stash.py:52 -#: cola/widgets/status.py:1388 +#: cola/cmds.py:2118 cola/widgets/archive.py:124 cola/widgets/browse.py:610 +#: cola/widgets/editremotes.py:53 cola/widgets/stash.py:54 +#: cola/widgets/status.py:1389 msgid "Save" msgstr "Kaydet" -#: cola/widgets/archive.py:113 +#: cola/widgets/archive.py:111 msgid "Save Archive" msgstr "Arşivi Kaydet" -#: cola/widgets/dag.py:382 cola/widgets/main.py:351 +#: cola/widgets/dag.py:381 cola/widgets/main.py:346 msgid "Save As Tarball/Zip..." msgstr "" -#: cola/widgets/prefs.py:263 +#: cola/widgets/prefs.py:284 msgid "Save GUI Settings" msgstr "Arayüz Ayarlarını Kaydet" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Save Stash" msgstr "" -#: cola/widgets/stash.py:53 +#: cola/widgets/stash.py:55 msgid "Save modified state to new stash" msgstr "" -#: cola/widgets/browse.py:570 +#: cola/widgets/browse.py:571 #, python-format msgid "Saved \"%(filename)s\" from \"%(ref)s\" to \"%(destination)s\"" msgstr "" -#: cola/widgets/bookmarks.py:83 cola/widgets/grep.py:98 -#: cola/widgets/search.py:42 cola/widgets/search.py:62 +#: cola/widgets/bookmarks.py:82 cola/widgets/grep.py:96 +#: cola/widgets/search.py:41 cola/widgets/search.py:61 msgid "Search" msgstr "Ara" -#: cola/widgets/search.py:226 +#: cola/widgets/search.py:225 msgid "Search Authors" msgstr "Yazarları Ara" -#: cola/widgets/search.py:224 +#: cola/widgets/search.py:223 msgid "Search Commit Messages" msgstr "" -#: cola/widgets/search.py:227 +#: cola/widgets/search.py:226 msgid "Search Committers" msgstr "" -#: cola/widgets/search.py:228 +#: cola/widgets/search.py:227 msgid "Search Date Range" msgstr "" -#: cola/widgets/search.py:225 +#: cola/widgets/search.py:224 msgid "Search Diffs" msgstr "" -#: cola/widgets/search.py:222 +#: cola/widgets/search.py:221 msgid "Search by Expression" msgstr "" -#: cola/widgets/search.py:223 +#: cola/widgets/search.py:222 msgid "Search by Path" msgstr "" -#: cola/widgets/grep.py:124 +#: cola/widgets/dag.py:494 +msgid "Search commit messages" +msgstr "" + +#: cola/widgets/grep.py:122 msgid "Search for a fixed string" msgstr "" -#: cola/widgets/diff.py:519 cola/widgets/diff.py:1514 +#: cola/widgets/diff.py:526 cola/widgets/diff.py:1576 msgid "Search in Diff" msgstr "" -#: cola/guicmds.py:253 cola/widgets/bookmarks.py:62 +#: cola/guicmds.py:252 cola/widgets/bookmarks.py:61 msgid "Search repositories by name..." msgstr "" -#: cola/widgets/grep.py:122 +#: cola/widgets/grep.py:120 msgid "Search using a POSIX basic regular expression" msgstr "" -#: cola/widgets/grep.py:123 +#: cola/widgets/grep.py:121 msgid "Search using a POSIX extended regular expression" msgstr "" -#: cola/widgets/main.py:493 +#: cola/widgets/main.py:506 msgid "Search..." msgstr "Arama..." -#: cola/widgets/selectcommits.py:67 +#: cola/widgets/selectcommits.py:66 msgid "Search:" msgstr "" -#: cola/guicmds.py:330 cola/widgets/selectcommits.py:74 +#: cola/guicmds.py:329 cola/widgets/selectcommits.py:73 msgid "Select" msgstr "Seç" -#: cola/widgets/main.py:750 +#: cola/widgets/main.py:763 msgid "Select All" msgstr "" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Select Branch to Review" msgstr "" -#: cola/widgets/dag.py:1610 +#: cola/widgets/dag.py:1667 msgid "Select Child" msgstr "" -#: cola/widgets/commitmsg.py:512 +#: cola/widgets/commitmsg.py:538 msgid "Select Commit" msgstr "" -#: cola/guicmds.py:137 +#: cola/guicmds.py:136 msgid "Select Directory..." msgstr "Dosyayı Seç..." -#: cola/cmds.py:2129 +#: cola/cmds.py:2080 msgid "Select New Upstream" msgstr "" -#: cola/widgets/dag.py:1614 +#: cola/widgets/dag.py:1671 msgid "Select Newest Child" msgstr "" -#: cola/widgets/dag.py:1604 +#: cola/widgets/dag.py:1661 msgid "Select Oldest Parent" msgstr "" -#: cola/widgets/dag.py:1599 +#: cola/widgets/dag.py:1656 msgid "Select Parent" msgstr "" -#: cola/widgets/browse.py:525 +#: cola/widgets/browse.py:526 msgid "Select Previous Version" msgstr "" -#: cola/widgets/clone.py:197 +#: cola/widgets/clone.py:195 msgid "Select a parent directory for the new clone" msgstr "" -#: cola/widgets/standard.py:756 cola/widgets/standard.py:779 +#: cola/widgets/standard.py:826 cola/widgets/standard.py:848 msgid "Select directory" msgstr "" -#: cola/widgets/selectcommits.py:162 +#: cola/widgets/selectcommits.py:161 msgid "Select output dir" msgstr "" -#: cola/widgets/selectcommits.py:183 +#: cola/widgets/selectcommits.py:182 msgid "Select output directory" msgstr "" -#: cola/widgets/patch.py:175 +#: cola/widgets/diff.py:1769 msgid "Select patch file(s)..." msgstr "" -#: cola/widgets/editremotes.py:437 +#: cola/widgets/editremotes.py:435 msgid "Select repository" msgstr "Depoyu seç" -#: cola/widgets/bookmarks.py:225 cola/widgets/startup.py:348 +#: cola/widgets/bookmarks.py:224 cola/widgets/startup.py:347 msgid "Set Default Repository" msgstr "Varsayılan Depoyu Seç" -#: cola/widgets/branch.py:282 +#: cola/widgets/branch.py:291 msgid "Set Upstream Branch" msgstr "" -#: cola/widgets/branch.py:72 +#: cola/widgets/branch.py:74 msgid "" "Set the sort order for branches and tags.\n" "Toggle between date-based and version-name-based sorting." msgstr "" -#: cola/widgets/remote.py:213 +#: cola/widgets/remote.py:217 msgid "Set upstream" msgstr "" -#: cola/widgets/prefs.py:405 +#: cola/widgets/prefs.py:443 msgid "Settings" msgstr "Ayarlar" -#: cola/widgets/grep.py:142 +#: cola/widgets/grep.py:140 msgid "Shell arguments" msgstr "" -#: cola/sequenceeditor.py:375 +#: cola/sequenceeditor.py:371 msgid "Shift Down" msgstr "" -#: cola/sequenceeditor.py:379 +#: cola/sequenceeditor.py:375 msgid "Shift Up" msgstr "" -#: cola/widgets/about.py:499 +#: cola/widgets/about.py:482 msgid "Shortcuts" msgstr "Kısayollar" -#: cola/widgets/prefs.py:179 +#: cola/widgets/prefs.py:201 msgid "Show Diffstat After Merge" msgstr "" -#: cola/widgets/prefs.py:178 +#: cola/widgets/prefs.py:200 msgid "Show Full Paths in the Window Title" msgstr "" -#: cola/sequenceeditor.py:106 cola/widgets/finder.py:187 -#: cola/widgets/status.py:1384 +#: cola/sequenceeditor.py:104 cola/widgets/finder.py:186 +#: cola/widgets/status.py:1385 msgid "Show Help" msgstr "Yardımı Göster" -#: cola/widgets/filelist.py:30 +#: cola/widgets/filelist.py:27 msgid "Show History" msgstr "Geçmişi Göster" -#: cola/widgets/prefs.py:348 +#: cola/widgets/prefs.py:368 msgid "Show file counts in Status titles" msgstr "" -#: cola/sequenceeditor.py:171 cola/widgets/finder.py:138 +#: cola/widgets/diff.py:794 +msgid "Show filenames" +msgstr "" + +#: cola/sequenceeditor.py:169 cola/widgets/finder.py:137 msgid "" "Show help\n" "Shortcut: ?" @@ -3179,137 +3289,145 @@ msgstr "" "Yardımı göster\n" "Kısayol: ?" -#: cola/widgets/diff.py:765 +#: cola/widgets/diff.py:792 msgid "Show line numbers" msgstr "" -#: cola/widgets/diff.py:761 +#: cola/widgets/remote.py:175 +msgid "Show remote messages" +msgstr "" + +#: cola/widgets/diff.py:789 msgid "Show whole surrounding functions of changes" msgstr "" -#: cola/widgets/recent.py:58 +#: cola/widgets/recent.py:56 msgid "Showing changes since" msgstr "" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "Side by side" msgstr "" -#: cola/cmds.py:2512 +#: cola/cmds.py:2463 msgid "Sign Off" msgstr "" -#: cola/widgets/createtag.py:71 +#: cola/widgets/createtag.py:69 msgid "Sign Tag" msgstr "" -#: cola/widgets/commitmsg.py:55 +#: cola/widgets/commitmsg.py:56 msgid "Sign off on this commit" msgstr "" -#: cola/widgets/about.py:412 cola/widgets/about.py:425 +#: cola/widgets/about.py:395 cola/widgets/about.py:408 msgid "Simplified Chinese translation" msgstr "" -#: cola/cmds.py:2587 +#: cola/cmds.py:2529 msgid "Skip" msgstr "Atla" -#: cola/widgets/main.py:264 cola/widgets/main.py:617 +#: cola/widgets/main.py:260 cola/widgets/main.py:630 msgid "Skip Current Patch" msgstr "" -#: cola/widgets/main.py:267 +#: cola/widgets/main.py:261 msgid "Skip applying the current patch and continue applying patches" msgstr "" -#: cola/widgets/prefs.py:261 +#: cola/widgets/prefs.py:282 msgid "Sort bookmarks alphabetically" msgstr "" -#: cola/widgets/about.py:413 cola/widgets/about.py:436 -#: cola/widgets/about.py:440 +#: cola/widgets/about.py:396 cola/widgets/about.py:419 +#: cola/widgets/about.py:423 msgid "Spanish translation" msgstr "" -#: cola/widgets/createtag.py:88 +#: cola/widgets/createtag.py:86 msgid "Specifies the SHA-1 to tag" msgstr "" -#: cola/widgets/createtag.py:81 +#: cola/widgets/createtag.py:79 msgid "Specifies the tag message" msgstr "" -#: cola/widgets/createtag.py:65 +#: cola/widgets/createtag.py:63 msgid "Specifies the tag name" msgstr "" -#: cola/widgets/spellcheck.py:46 +#: cola/widgets/spellcheck.py:45 msgid "Spelling Suggestions" msgstr "" -#: cola/sequenceeditor.py:369 cola/widgets/merge.py:58 +#: cola/sequenceeditor.py:365 cola/widgets/merge.py:56 msgid "Squash" msgstr "" -#: cola/widgets/merge.py:57 +#: cola/widgets/merge.py:55 msgid "Squash the merged commits into a single commit" msgstr "" -#: cola/cmds.py:2598 cola/widgets/action.py:60 cola/widgets/diff.py:982 +#: cola/cmds.py:2540 cola/widgets/action.py:58 cola/widgets/diff.py:1168 msgid "Stage" msgstr "" -#: cola/cmds.py:2753 +#: cola/cmds.py:2699 msgid "Stage / Unstage" msgstr "" -#: cola/cmds.py:2735 +#: cola/cmds.py:2681 msgid "Stage / Unstage All" msgstr "" -#: cola/widgets/diff.py:1016 +#: cola/widgets/diff.py:1055 msgid "Stage Diff Hunk" msgstr "" -#: cola/cmds.py:2691 +#: cola/cmds.py:2633 msgid "Stage Modified" msgstr "" -#: cola/cmds.py:2724 +#: cola/cmds.py:2670 msgid "Stage Modified and Untracked" msgstr "" -#: cola/widgets/status.py:872 cola/widgets/status.py:894 -#: cola/widgets/status.py:962 +#: cola/widgets/status.py:873 cola/widgets/status.py:895 +#: cola/widgets/status.py:963 msgid "Stage Selected" msgstr "" -#: cola/widgets/diff.py:1011 +#: cola/widgets/diff.py:1050 msgid "Stage Selected Lines" msgstr "" -#: cola/cmds.py:2702 +#: cola/cmds.py:2644 msgid "Stage Unmerged" msgstr "" -#: cola/cmds.py:2713 +#: cola/cmds.py:2655 msgid "Stage Untracked" msgstr "" -#: cola/widgets/commitmsg.py:438 +#: cola/widgets/commitmsg.py:446 msgid "Stage and Commit" msgstr "" -#: cola/widgets/commitmsg.py:435 +#: cola/widgets/commitmsg.py:443 msgid "Stage and commit?" msgstr "" -#: cola/cmds.py:2586 +#: cola/widgets/action.py:58 +msgid "Stage changes using \"git add\"" +msgstr "" + +#: cola/cmds.py:2528 msgid "Stage conflicts" msgstr "" -#: cola/cmds.py:2577 +#: cola/cmds.py:2519 msgid "Stage conflicts?" msgstr "" @@ -3317,45 +3435,45 @@ msgstr "" msgid "Stage/unstage selected paths for commit" msgstr "" -#: cola/models/browse.py:334 cola/widgets/status.py:156 -#: cola/widgets/status.py:620 +#: cola/models/browse.py:333 cola/widgets/status.py:156 +#: cola/widgets/status.py:621 msgid "Staged" msgstr "" -#: cola/cmds.py:2605 +#: cola/cmds.py:2547 #, python-format msgid "Staging: %s" msgstr "" -#: cola/widgets/main.py:597 +#: cola/widgets/main.py:610 msgid "Start Interactive Rebase..." msgstr "" -#: cola/widgets/createbranch.py:107 +#: cola/widgets/createbranch.py:105 msgid "Starting Revision" msgstr "" -#: cola/widgets/stash.py:40 +#: cola/widgets/stash.py:36 msgid "Stash" msgstr "" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash Index" msgstr "" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash staged changes only" msgstr "" -#: cola/widgets/stash.py:73 +#: cola/widgets/stash.py:75 msgid "Stash unstaged changes only, keeping staged changes" msgstr "" -#: cola/widgets/action.py:66 cola/widgets/main.py:414 +#: cola/widgets/action.py:76 cola/widgets/main.py:422 msgid "Stash..." msgstr "" -#: cola/models/browse.py:33 cola/widgets/main.py:102 +#: cola/models/browse.py:32 cola/widgets/main.py:100 msgid "Status" msgstr "Durum" @@ -3363,209 +3481,217 @@ msgstr "Durum" msgid "Stop tracking paths" msgstr "" -#: cola/widgets/submodules.py:82 +#: cola/widgets/submodules.py:81 msgid "Submodule URL (can be relative, ex: ../repo.git)" msgstr "" -#: cola/widgets/submodules.py:90 +#: cola/widgets/submodules.py:89 msgid "Submodule branch to track (optional)" msgstr "" -#: cola/widgets/submodules.py:86 +#: cola/widgets/submodules.py:85 msgid "Submodule path within the current repository (optional)" msgstr "" -#: cola/widgets/main.py:143 cola/widgets/submodules.py:32 +#: cola/widgets/main.py:141 cola/widgets/submodules.py:31 msgid "Submodules" msgstr "" -#: cola/widgets/prefs.py:174 +#: cola/widgets/prefs.py:196 msgid "Summarize Merge Commits" msgstr "" -#: cola/sequenceeditor.py:325 cola/widgets/dag.py:506 +#: cola/sequenceeditor.py:322 cola/widgets/dag.py:572 msgid "Summary" msgstr "" -#: cola/widgets/prefs.py:168 +#: cola/widgets/prefs.py:273 msgid "Tab Width" msgstr "Tab Genişliği" -#: cola/widgets/cfgactions.py:229 cola/widgets/createbranch.py:116 -#: cola/widgets/merge.py:48 +#: cola/widgets/cfgactions.py:227 cola/widgets/createbranch.py:114 +#: cola/widgets/merge.py:46 msgid "Tag" msgstr "Etiket" -#: cola/cmds.py:2842 +#: cola/cmds.py:2788 msgid "Tag Created" msgstr "" -#: cola/widgets/createtag.py:80 +#: cola/widgets/createtag.py:78 msgid "Tag message..." msgstr "Etiket mesajı..." -#: cola/cmds.py:2802 +#: cola/cmds.py:2748 msgid "Tag-signing was requested but the tag message is empty." msgstr "" -#: cola/widgets/branch.py:179 cola/widgets/branch.py:238 +#: cola/widgets/branch.py:183 cola/widgets/branch.py:248 msgid "Tags" msgstr "Etiketler" -#: cola/widgets/toolbar.py:180 +#: cola/widgets/action.py:78 cola/widgets/main.py:423 +msgid "Temporarily stash away uncommitted changes using \"git stash\"" +msgstr "" + +#: cola/widgets/toolbar.py:184 msgid "Text Beside Icon" msgstr "" -#: cola/widgets/toolbar.py:179 +#: cola/widgets/toolbar.py:183 msgid "Text Only" msgstr "" -#: cola/widgets/toolbar.py:181 +#: cola/widgets/toolbar.py:185 msgid "Text Under Icon" msgstr "" -#: cola/widgets/prefs.py:169 +#: cola/widgets/prefs.py:272 msgid "Text Width" msgstr "Yazı Genişliği" -#: cola/cmds.py:1116 +#: cola/cmds.py:1117 msgid "The branch will be no longer available." msgstr "" -#: cola/cmds.py:648 +#: cola/cmds.py:650 #, python-format msgid "The branch will be reset using \"git reset --mixed %s\"" msgstr "" -#: cola/cmds.py:699 cola/cmds.py:790 +#: cola/cmds.py:701 cola/cmds.py:792 #, python-format msgid "The branch will be reset using \"git reset --soft %s\"" msgstr "" -#: cola/widgets/commitmsg.py:303 +#: cola/widgets/commitmsg.py:311 msgid "The commit message will be cleared." msgstr "" -#: cola/widgets/prefs.py:146 +#: cola/widgets/prefs.py:169 msgid "" "The date-time format used when displaying dates in Git DAG.\n" "This value is passed to git log --date=" msgstr "" -#: cola/widgets/archive.py:208 +#: cola/widgets/archive.py:206 #, python-format msgid "The file \"%s\" exists and will be overwritten." msgstr "" -#: cola/cmds.py:1086 +#: cola/cmds.py:1087 msgid "The following files will be deleted:" msgstr "Aşağıdaki satırlar silinecek:" -#: cola/widgets/status.py:1646 +#: cola/widgets/status.py:1647 msgid "The number of leading paths to strip" msgstr "" -#: cola/cmds.py:716 +#: cola/cmds.py:718 #, python-format msgid "The repository will be reset using \"git reset --hard %s\"" msgstr "" -#: cola/cmds.py:665 +#: cola/cmds.py:667 #, python-format msgid "The repository will be reset using \"git reset --keep %s\"" msgstr "" -#: cola/cmds.py:682 +#: cola/cmds.py:684 #, python-format msgid "The repository will be reset using \"git reset --merge %s\"" msgstr "" -#: cola/cmds.py:2365 +#: cola/cmds.py:2316 msgid "The revision expression cannot be empty." msgstr "" -#: cola/cmds.py:3029 +#: cola/widgets/stash.py:225 +msgid "The stash has not been renamed" +msgstr "" + +#: cola/cmds.py:2975 #, python-format msgid "" "The submodule will be added using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:3074 +#: cola/cmds.py:3020 #, python-format msgid "" "The submodule will be updated using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:736 +#: cola/cmds.py:738 #, python-format msgid "The worktree will be restored using \"git read-tree --reset -u %s\"" msgstr "" -#: cola/widgets/commitmsg.py:304 +#: cola/widgets/commitmsg.py:312 msgid "This cannot be undone. Clear commit message?" msgstr "" -#: cola/cmds.py:778 cola/widgets/commitmsg.py:458 +#: cola/cmds.py:780 cola/widgets/commitmsg.py:466 msgid "" "This commit has already been published.\n" "This operation will rewrite published history.\n" "You probably don't want to do this." msgstr "" -#: cola/widgets/diff.py:1158 +#: cola/widgets/diff.py:1232 msgid "" "This operation drops uncommitted changes.\n" "These changes cannot be recovered." msgstr "" -#: cola/cmds.py:2307 +#: cola/cmds.py:2258 msgid "" "This operation removes uncommitted edits from selected files.\n" "These changes cannot be recovered." msgstr "" -#: cola/cmds.py:2285 +#: cola/cmds.py:2236 msgid "" "This operation removes unstaged edits from selected files.\n" "These changes cannot be recovered." msgstr "" -#: cola/cmds.py:475 +#: cola/cmds.py:476 msgid "" "This operation will replace the selected unmerged files with content from the branch being merged using \"git checkout --theirs\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:513 +#: cola/cmds.py:514 msgid "" "This operation will replace the selected unmerged files with content from your current branch using \"git checkout --ours\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/widgets/main.py:1109 +#: cola/widgets/main.py:1122 msgid "" "This repository has unresolved conflicts after applying a patch.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1102 +#: cola/widgets/main.py:1115 msgid "" "This repository is currently being rebased.\n" "Resolve conflicts, commit changes, and run:\n" " Rebase > Continue" msgstr "" -#: cola/widgets/main.py:1115 +#: cola/widgets/main.py:1128 msgid "" "This repository is in the middle of a cherry-pick.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1121 +#: cola/widgets/main.py:1134 msgid "" "This repository is in the middle of a merge.\n" "Resolve conflicts and commit changes." @@ -3583,15 +3709,15 @@ msgstr "" msgid "To avoid applying removal lines ('-'), change them to context lines (' ')." msgstr "" -#: cola/sequenceeditor.py:342 +#: cola/sequenceeditor.py:338 msgid "Toggle Enabled" msgstr "" -#: cola/widgets/diff.py:776 +#: cola/widgets/diff.py:804 msgid "Toggle image diff" msgstr "" -#: cola/widgets/branch.py:63 +#: cola/widgets/branch.py:65 msgid "Toggle the branches filter" msgstr "" @@ -3599,51 +3725,51 @@ msgstr "" msgid "Toggle the paths filter" msgstr "" -#: cola/widgets/toolbar.py:317 +#: cola/widgets/toolbar.py:322 msgid "Toolbar Style:" msgstr "" -#: cola/widgets/cfgactions.py:228 cola/widgets/merge.py:47 +#: cola/widgets/cfgactions.py:226 cola/widgets/merge.py:45 msgid "Tracking Branch" msgstr "" -#: cola/widgets/createbranch.py:115 +#: cola/widgets/createbranch.py:113 msgid "Tracking branch" msgstr "" -#: cola/widgets/about.py:408 cola/widgets/about.py:434 -#: cola/widgets/about.py:445 +#: cola/widgets/about.py:391 cola/widgets/about.py:417 +#: cola/widgets/about.py:428 msgid "Traditional Chinese (Taiwan) translation" msgstr "" -#: cola/widgets/about.py:439 +#: cola/widgets/about.py:422 msgid "Translation" msgstr "" -#: cola/widgets/about.py:94 +#: cola/widgets/about.py:92 msgid "Translators" msgstr "" -#: cola/widgets/about.py:418 cola/widgets/about.py:423 -#: cola/widgets/about.py:438 +#: cola/widgets/about.py:401 cola/widgets/about.py:406 +#: cola/widgets/about.py:421 msgid "Turkish translation" msgstr "Türkçe çeviri" -#: cola/widgets/clone.py:109 cola/widgets/editremotes.py:451 -#: cola/widgets/submodules.py:117 +#: cola/widgets/clone.py:107 cola/widgets/editremotes.py:449 +#: cola/widgets/submodules.py:116 msgid "URL" msgstr "URL" -#: cola/widgets/remote.py:463 +#: cola/widgets/remote.py:497 #, python-format msgid "URL: %s" msgstr "URL: %s" -#: cola/widgets/about.py:415 +#: cola/widgets/about.py:398 msgid "Ukranian translation" msgstr "" -#: cola/cmds.py:2122 +#: cola/cmds.py:2073 msgid "Unable to rebase" msgstr "" @@ -3652,53 +3778,58 @@ msgstr "" msgid "Unable to set URL for \"%(name)s\" to \"%(url)s\"" msgstr "" -#: cola/widgets/diff.py:1327 +#: cola/widgets/diff.py:1401 #, python-format msgid "Unable to write patch to \"%s\". Check permissions?" msgstr "" -#: cola/widgets/main.py:735 +#: cola/widgets/main.py:748 msgid "Undo" msgstr "" -#: cola/cmds.py:783 cola/cmds.py:788 cola/cmds.py:791 cola/widgets/main.py:208 +#: cola/cmds.py:785 cola/cmds.py:790 cola/cmds.py:793 cola/widgets/main.py:207 msgid "Undo Last Commit" msgstr "" -#: cola/cmds.py:789 +#: cola/cmds.py:791 msgid "Undo last commit?" msgstr "" -#: cola/cmds.py:782 +#: cola/cmds.py:784 msgid "Undo the published commit?" msgstr "" -#: cola/models/browse.py:328 cola/widgets/status.py:157 -#: cola/widgets/status.py:640 +#: cola/models/browse.py:327 cola/widgets/status.py:157 +#: cola/widgets/status.py:641 msgid "Unmerged" msgstr "Birleştirilmemiş" -#: cola/cmds.py:2855 cola/widgets/action.py:61 cola/widgets/diff.py:985 +#: cola/cmds.py:2801 cola/widgets/action.py:61 cola/widgets/diff.py:1165 +#: cola/widgets/main.py:212 msgid "Unstage" msgstr "" -#: cola/widgets/main.py:203 cola/widgets/status.py:790 +#: cola/widgets/main.py:202 cola/widgets/status.py:791 msgid "Unstage All" msgstr "" -#: cola/widgets/diff.py:1061 +#: cola/widgets/diff.py:1017 msgid "Unstage Diff Hunk" msgstr "" -#: cola/widgets/status.py:823 cola/widgets/status.py:858 +#: cola/widgets/status.py:824 cola/widgets/status.py:859 msgid "Unstage Selected" msgstr "" -#: cola/widgets/diff.py:1058 +#: cola/widgets/diff.py:1015 msgid "Unstage Selected Lines" msgstr "" -#: cola/cmds.py:2867 +#: cola/widgets/action.py:61 +msgid "Unstage changes using \"git reset\"" +msgstr "" + +#: cola/cmds.py:2813 #, python-format msgid "Unstaging: %s" msgstr "" @@ -3707,85 +3838,84 @@ msgstr "" msgid "Untrack Selected" msgstr "" -#: cola/widgets/status.py:159 cola/widgets/status.py:646 +#: cola/widgets/status.py:159 cola/widgets/status.py:647 msgid "Untracked" msgstr "Takip Edilmemiş" -#: cola/cmds.py:1141 cola/cmds.py:2923 +#: cola/cmds.py:1142 cola/cmds.py:2869 #, python-format msgid "Untracking: %s" msgstr "" -#: cola/widgets/main.py:374 +#: cola/widgets/main.py:369 msgid "Update All Submodules..." msgstr "" -#: cola/widgets/createbranch.py:121 +#: cola/widgets/createbranch.py:119 msgid "Update Existing Branch:" msgstr "" -#: cola/cmds.py:3075 +#: cola/cmds.py:3021 msgid "Update Submodule" msgstr "" -#: cola/cmds.py:3072 +#: cola/cmds.py:3018 msgid "Update Submodule..." msgstr "" -#: cola/cmds.py:3111 +#: cola/cmds.py:3057 msgid "Update Submodules" msgstr "" -#: cola/cmds.py:3109 +#: cola/cmds.py:3055 msgid "Update all submodules?" msgstr "" -#: cola/cmds.py:2093 +#: cola/cmds.py:2044 msgid "Update stacked branches" msgstr "" -#: cola/cmds.py:2085 cola/cmds.py:2092 +#: cola/cmds.py:2036 cola/cmds.py:2043 msgid "Update stacked branches when rebasing?" msgstr "" -#: cola/cmds.py:3108 +#: cola/cmds.py:3054 msgid "Update submodules..." msgstr "" -#: cola/widgets/status.py:953 +#: cola/widgets/status.py:954 msgid "Update this submodule" msgstr "" -#: cola/cmds.py:3073 +#: cola/cmds.py:3019 msgid "Update this submodule?" msgstr "" -#: cola/widgets/branch.py:421 cola/widgets/createbranch.py:302 -#: cola/widgets/remote.py:135 +#: cola/widgets/branch.py:433 cola/widgets/createbranch.py:300 msgid "Updating" msgstr "" -#: cola/widgets/prefs.py:350 +#: cola/widgets/prefs.py:370 msgid "Use a block cursor in diff editors" msgstr "" -#: cola/widgets/prefs.py:154 +#: cola/widgets/prefs.py:177 msgid "Use gravatar.com to lookup icons for author emails" msgstr "" -#: cola/widgets/prefs.py:166 +#: cola/widgets/prefs.py:189 msgid "User Name" msgstr "Kullanıcı Adı" -#: cola/widgets/about.py:92 +#: cola/widgets/about.py:90 msgid "Version" msgstr "Versiyon" -#: cola/widgets/dag.py:800 cola/widgets/main.py:845 cola/widgets/main.py:966 +#: cola/widgets/dag.py:866 cola/widgets/main.py:858 cola/widgets/main.py:979 msgid "View" msgstr "Göster" -#: cola/widgets/browse.py:137 cola/widgets/status.py:278 +#: cola/widgets/browse.py:137 cola/widgets/status.py:279 msgid "View History..." msgstr "Geçmişi Göster..." @@ -3793,39 +3923,39 @@ msgstr "Geçmişi Göster..." msgid "View history for selected paths" msgstr "" -#: cola/widgets/merge.py:54 +#: cola/widgets/branch.py:224 cola/widgets/merge.py:52 msgid "Visualize" msgstr "" -#: cola/widgets/main.py:488 +#: cola/widgets/main.py:501 msgid "Visualize All Branches..." msgstr "" -#: cola/widgets/main.py:482 +#: cola/widgets/main.py:495 msgid "Visualize Current Branch..." msgstr "" -#: cola/widgets/createtag.py:73 +#: cola/widgets/createtag.py:71 msgid "Whether to sign the tag (git tag -s)" msgstr "" -#: cola/widgets/text.py:399 +#: cola/widgets/text.py:396 msgid "Whole Words" msgstr "" -#: cola/widgets/commitmsg.py:432 +#: cola/widgets/commitmsg.py:440 msgid "Would you like to stage and commit all modified files?" msgstr "" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "XOR" msgstr "" -#: cola/widgets/standard.py:1064 +#: cola/widgets/standard.py:1182 msgid "Yes" msgstr "Evet" -#: cola/cmds.py:256 +#: cola/cmds.py:255 msgid "" "You are in the middle of a merge.\n" "Cannot amend while merging." @@ -3833,36 +3963,36 @@ msgstr "" "Bir birleştirme işleminin ortasındasınız.\n" "Birleştirme yapılırken değişiklik yapamazsınız." -#: cola/cmds.py:2123 +#: cola/cmds.py:2074 msgid "You cannot rebase with uncommitted changes." msgstr "" -#: cola/widgets/merge.py:227 +#: cola/widgets/merge.py:225 msgid "You must specify a revision to merge." msgstr "" -#: cola/widgets/merge.py:217 +#: cola/widgets/merge.py:215 msgid "You must specify a revision to view." msgstr "" -#: cola/widgets/dag.py:710 cola/widgets/dag.py:1588 +#: cola/widgets/dag.py:776 cola/widgets/dag.py:1645 msgid "Zoom In" msgstr "Yakınlaş" -#: cola/widgets/dag.py:706 cola/widgets/dag.py:1594 +#: cola/widgets/dag.py:772 cola/widgets/dag.py:1651 msgid "Zoom Out" msgstr "Uzaklaş" -#: cola/widgets/dag.py:524 cola/widgets/dag.py:714 cola/widgets/dag.py:1596 -#: cola/widgets/diff.py:785 +#: cola/widgets/dag.py:590 cola/widgets/dag.py:780 cola/widgets/dag.py:1653 +#: cola/widgets/diff.py:813 msgid "Zoom to Fit" msgstr "" -#: cola/widgets/grep.py:112 +#: cola/widgets/grep.py:110 msgid "command-line arguments" msgstr "" -#: cola/widgets/main.py:932 cola/widgets/main.py:938 +#: cola/widgets/main.py:945 cola/widgets/main.py:951 msgid "error: unable to execute git" msgstr "" @@ -3871,45 +4001,41 @@ msgstr "" msgid "exit code %s" msgstr "" -#: cola/app.py:301 +#: cola/app.py:304 #, python-format msgid "fatal: \"%s\" is not a directory. Please specify a correct --repo ." msgstr "" -#: cola/widgets/main.py:928 +#: cola/widgets/main.py:941 #, python-format msgid "git cola version %s" msgstr "git cola sürümü %s" -#: cola/widgets/startup.py:35 +#: cola/widgets/startup.py:34 msgid "git-cola" msgstr "git-cola" -#: cola/difftool.py:63 +#: cola/difftool.py:82 msgid "git-cola diff" msgstr "git-cola diff" -#: cola/widgets/submodules.py:81 +#: cola/widgets/submodules.py:80 msgid "git://git.example.com/repo.git" msgstr "" -#: cola/widgets/grep.py:132 +#: cola/widgets/grep.py:130 msgid "grep result..." msgstr "grep sonucu..." -#: cola/widgets/about.py:486 +#: cola/widgets/about.py:469 msgid "hotkeys.html" msgstr "hotkeys.html" -#: cola/widgets/submodules.py:85 +#: cola/widgets/submodules.py:84 msgid "path/to/submodule" msgstr "" -#: cola/cmds.py:2537 -msgid "unknown" -msgstr "bilinmeyen" - -#: cola/widgets/createtag.py:63 +#: cola/widgets/createtag.py:61 msgid "vX.Y.Z" msgstr "vX.Y.Z" @@ -3918,14 +4044,18 @@ msgid "x 1" msgstr "x 1" #: cola/hidpi.py:44 +msgid "x 1.25" +msgstr "" + +#: cola/hidpi.py:45 msgid "x 1.5" msgstr "x 1.5" -#: cola/hidpi.py:45 +#: cola/hidpi.py:46 msgid "x 2" msgstr "x 2" -#: cola/widgets/search.py:53 cola/widgets/search.py:58 +#: cola/widgets/search.py:52 cola/widgets/search.py:57 msgid "yyyy-MM-dd" msgstr "yyyy-AA-gg" @@ -4044,3 +4174,6 @@ msgstr "yyyy-AA-gg" #~ msgstr "" #~ "inotify: disabled\n" #~ "Note: install python-pyinotify to enable inotify.\n" + +#~ msgid "unknown" +#~ msgstr "bilinmeyen" diff --git a/cola/i18n/uk.po b/cola/i18n/uk.po index 752834c2..b6c49896 100644 --- a/cola/i18n/uk.po +++ b/cola/i18n/uk.po @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cola/widgets/patch.py:86 +#: cola/widgets/diff.py:1680 msgid "" "\n" "

\n" @@ -32,7 +32,7 @@ msgstr "" "

\n" " " -#: cola/widgets/about.py:455 +#: cola/widgets/about.py:438 #, python-format msgid "" "\n" @@ -85,7 +85,7 @@ msgstr "" "\n" " " -#: cola/widgets/about.py:180 +#: cola/widgets/about.py:182 #, fuzzy, python-format msgid "" "\n" @@ -114,7 +114,7 @@ msgstr "" " \n" " " -#: cola/widgets/about.py:387 +#: cola/widgets/about.py:370 #, python-format msgid "" "\n" @@ -129,7 +129,7 @@ msgstr "" "
\n" " " -#: cola/widgets/status.py:1310 +#: cola/widgets/status.py:1311 #, python-format msgid "" "\n" @@ -144,7 +144,7 @@ msgid "" " %(ext)s = file extension\n" msgstr "" -#: cola/sequenceeditor.py:700 +#: cola/sequenceeditor.py:695 msgid "" "\n" "Commands\n" @@ -183,7 +183,7 @@ msgid "" "ctrl+d = launch difftool\n" msgstr "" -#: cola/widgets/finder.py:65 +#: cola/widgets/finder.py:64 msgid "" "\n" "Keyboard Shortcuts\n" @@ -211,45 +211,71 @@ msgstr "" "Стрілки вготу та вниз змінюють фокус поміж полем для введення тексту\n" "та результатами.\n" -#: cola/widgets/dag.py:894 +#: cola/widgets/prefs.py:133 +msgid "" +"\n" +"This option determines how the supplied commit message should be\n" +"cleaned up before committing.\n" +"\n" +"The can be strip, whitespace, verbatim, scissors or default.\n" +"\n" +"strip\n" +" Strip leading and trailing empty lines, trailing whitespace,\n" +" commentary and collapse consecutive empty lines.\n" +"\n" +"whitespace\n" +" Same as strip except #commentary is not removed.\n" +"\n" +"verbatim\n" +" Do not change the message at all.\n" +"\n" +"scissors\n" +" Same as whitespace except that everything from (and including) the line\n" +" found below is truncated, if the message is to be edited.\n" +" \"#\" can be customized with core.commentChar.\n" +"\n" +" # ------------------------ >8 ------------------------" +msgstr "" + +#: cola/widgets/dag.py:960 msgid " - DAG" msgstr " - Граф (DAG)" -#: cola/widgets/recent.py:54 +#: cola/widgets/recent.py:52 msgid " commits ago" msgstr " комітів тому" -#: cola/cmds.py:1197 +#: cola/cmds.py:1198 #, python-format msgid "\"%(branch)s\" has been deleted from \"%(remote)s\"." msgstr "\"%(branch)s\" було видалено з \"%(remote)s\"." -#: cola/widgets/createbranch.py:316 +#: cola/widgets/createbranch.py:314 #, python-format msgid "\"%(command)s\" returned exit status \"%(status)d\"" msgstr "\"%(command)s\" завершилась з кодом \"%(status)d\"" -#: cola/interaction.py:39 +#: cola/interaction.py:38 #, python-format msgid "\"%(command)s\" returned exit status %(status)d" msgstr "\"%(command)s\" завершилась з кодом %(status)d" -#: cola/guicmds.py:157 +#: cola/guicmds.py:156 #, fuzzy, python-format msgid "\"%s\" already exists" msgstr "Гілка \"%s\" вже існує." -#: cola/widgets/clone.py:206 +#: cola/widgets/clone.py:204 #, python-format msgid "\"%s\" already exists, cola will create a new directory" msgstr "\"%s\" вже існує, cola створить новий каталог" -#: cola/cmds.py:2349 +#: cola/cmds.py:2300 #, python-format msgid "\"%s\" requires a selected file." msgstr "\"%s\" потребує вибраного файла." -#: cola/cmds.py:2087 +#: cola/cmds.py:2038 msgid "" "\"git rebase --update-refs\" automatically force-updates any\n" "branches that point to commits that are being rebased.\n" @@ -259,7 +285,11 @@ msgid "" "Using this feature is helpful for \"stacked\" branch workflows." msgstr "" -#: cola/sequenceeditor.py:321 +#: cola/models/stash.py:145 +msgid "\"git stash drop\" did not return a ref to rename." +msgstr "" + +#: cola/sequenceeditor.py:318 msgid "#" msgstr "" @@ -268,37 +298,37 @@ msgstr "" msgid "%(project)s: %(branch)s - Browse" msgstr "%(project)s: %(branch)s - Переглянути" -#: cola/widgets/dag.py:887 +#: cola/widgets/dag.py:953 #, python-format msgid "%(project)s: %(ref)s - DAG" msgstr "%(project)s: %(ref)s - Граф (DAG)" -#: cola/models/browse.py:315 +#: cola/models/browse.py:314 #, python-format msgid "%d days ago" msgstr "%d днів тому" -#: cola/models/browse.py:314 +#: cola/models/browse.py:313 #, python-format msgid "%d hours ago" msgstr "%d годин тому" -#: cola/models/browse.py:307 cola/models/browse.py:311 +#: cola/models/browse.py:306 cola/models/browse.py:310 #, python-format msgid "%d minutes ago" msgstr "%d хвилин тому" -#: cola/cmds.py:376 +#: cola/cmds.py:377 #, python-format msgid "%d patch(es) applied." msgstr "%d латку(ок) застосовано." -#: cola/widgets/createbranch.py:281 +#: cola/widgets/createbranch.py:279 #, python-format msgid "%d skipped" msgstr "%d пропущено" -#: cola/cmds.py:2580 +#: cola/cmds.py:2522 #, python-format msgid "" "%s appears to contain merge conflicts.\n" @@ -311,36 +341,36 @@ msgstr "" "Скоріш за все, ви маєте пропустити цей файл.\n" "Проіндексувати в будь-якому випадку?" -#: cola/widgets/startup.py:263 +#: cola/widgets/startup.py:262 #, python-format msgid "%s could not be opened. Remove from bookmarks?" msgstr "" -#: cola/app.py:498 cola/widgets/bookmarks.py:482 +#: cola/app.py:501 cola/widgets/bookmarks.py:481 #, python-format msgid "%s is not a Git repository." msgstr "%s не є репозиторієм Git." -#: cola/cmds.py:1015 +#: cola/cmds.py:1016 #, python-format msgid "%s will be removed from your bookmarks." msgstr "%s буде видалено з ваших закладок." -#: cola/cmds.py:1028 +#: cola/cmds.py:1029 #, python-format msgid "%s will be removed from your recent repositories." msgstr "%s буде видалено зі списку останніх репозиторіїв." -#: cola/cmds.py:1711 +#: cola/cmds.py:1663 #, python-format msgid "%s: No such file or directory." msgstr "%s: Немає такого файла або каталогу." -#: cola/widgets/main.py:734 +#: cola/widgets/main.py:747 msgid "&Edit" msgstr "Редагувати" -#: cola/widgets/main.py:676 +#: cola/widgets/main.py:689 msgid "&File" msgstr "Файл" @@ -348,43 +378,43 @@ msgstr "Файл" msgid "(Amending)" msgstr "(Зміна коміту)" -#: cola/widgets/compare.py:36 +#: cola/widgets/compare.py:35 msgid "*** Branch Point ***" msgstr "*** Вказівка на гілку ***" -#: cola/widgets/compare.py:37 +#: cola/widgets/compare.py:36 msgid "*** Sandbox ***" msgstr "*** Пісочниця ***" -#: cola/widgets/diff.py:788 +#: cola/widgets/diff.py:816 msgid "100%" msgstr "" -#: cola/widgets/diff.py:789 +#: cola/widgets/diff.py:817 msgid "200%" msgstr "" -#: cola/widgets/diff.py:786 +#: cola/widgets/diff.py:814 msgid "25%" msgstr "" -#: cola/widgets/diff.py:790 +#: cola/widgets/diff.py:818 msgid "400%" msgstr "" -#: cola/widgets/diff.py:787 +#: cola/widgets/diff.py:815 msgid "50%" msgstr "" -#: cola/widgets/diff.py:791 +#: cola/widgets/diff.py:819 msgid "800%" msgstr "" -#: cola/widgets/finder.py:119 +#: cola/widgets/finder.py:118 msgid " ..." msgstr "<шлях> ..." -#: cola/cmds.py:1734 +#: cola/cmds.py:1686 msgid "" "A commit template has not been configured.\n" "Use \"git config\" to define \"commit.template\"\n" @@ -394,81 +424,76 @@ msgstr "" "Використовуйте \"git config\" щоб задати \"commit.template\"\n" "так, щоб він вказував на шаблон коміту" -#: cola/cmds.py:1784 +#: cola/cmds.py:1735 #, python-format msgid "A hook must be provided at \"%s\"" msgstr "Гак (hook) має бути в \"%s\"" -#: cola/widgets/stash.py:236 -#, python-format -msgid "A stash named \"%s\" already exists" -msgstr "Сховок з назвою \"%s\" вже існує" - -#: cola/widgets/cfgactions.py:82 cola/widgets/main.py:622 +#: cola/widgets/cfgactions.py:81 cola/widgets/main.py:635 msgid "Abort" msgstr "Перервати" -#: cola/widgets/cfgactions.py:149 cola/widgets/cfgactions.py:155 +#: cola/widgets/cfgactions.py:148 cola/widgets/cfgactions.py:154 msgid "Abort Action" msgstr "Перервати дію" -#: cola/cmds.py:132 +#: cola/cmds.py:131 msgid "Abort Applying Patch" msgstr "" -#: cola/cmds.py:126 +#: cola/cmds.py:125 msgid "Abort Applying Patch..." msgstr "" -#: cola/widgets/main.py:245 +#: cola/widgets/main.py:244 msgid "Abort Applying Patches..." msgstr "" -#: cola/cmds.py:162 +#: cola/cmds.py:161 msgid "Abort Cherry-Pick" msgstr "" -#: cola/cmds.py:156 cola/widgets/main.py:334 +#: cola/cmds.py:155 cola/widgets/main.py:329 msgid "Abort Cherry-Pick..." msgstr "" -#: cola/cmds.py:193 +#: cola/cmds.py:192 msgid "Abort Merge" msgstr "Перервати злиття" -#: cola/cmds.py:186 cola/widgets/main.py:368 +#: cola/cmds.py:185 cola/widgets/main.py:363 msgid "Abort Merge..." msgstr "Перервати злиття..." -#: cola/widgets/cfgactions.py:154 +#: cola/widgets/cfgactions.py:153 msgid "Abort the action?" msgstr "Перервати дію?" -#: cola/widgets/main.py:250 +#: cola/widgets/main.py:245 msgid "Abort the current \"git am\" patch session" msgstr "" -#: cola/cmds.py:159 +#: cola/cmds.py:158 msgid "" "Aborting a cherry-pick can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:129 +#: cola/cmds.py:128 msgid "" "Aborting a patch can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:127 +#: cola/cmds.py:126 msgid "Aborting applying the current patch?" msgstr "" -#: cola/cmds.py:157 +#: cola/cmds.py:156 msgid "Aborting the current cherry-pick?" msgstr "" -#: cola/cmds.py:189 +#: cola/cmds.py:188 msgid "" "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." @@ -476,23 +501,23 @@ msgstr "" "Переривання поточного злиття спричинить втрату *ВСІХ* незакомітованих змін.\n" "Відновлення незакомітованих змін неможливе." -#: cola/cmds.py:187 +#: cola/cmds.py:186 msgid "Aborting the current merge?" msgstr "Перервати поточне злиття?" -#: cola/widgets/about.py:91 cola/widgets/main.py:517 +#: cola/widgets/about.py:89 cola/widgets/main.py:530 msgid "About" msgstr "Про програму" -#: cola/widgets/about.py:67 +#: cola/widgets/about.py:65 msgid "About git-cola" msgstr "Про git-cola" -#: cola/widgets/bookmarks.py:217 cola/widgets/startup.py:340 +#: cola/widgets/bookmarks.py:216 cola/widgets/startup.py:339 msgid "Accept" msgstr "Погодитись" -#: cola/sequenceeditor.py:159 +#: cola/sequenceeditor.py:157 #, fuzzy msgid "" "Accept changes and rebase\n" @@ -501,51 +526,51 @@ msgstr "" "Закомітувати проіндексовані зміни\n" "Поєднання клавіш: Ctrl+Enter" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 #, fuzzy msgid "Action Name" msgstr "Дії" -#: cola/sequenceeditor.py:528 cola/widgets/bookmarks.py:321 -#: cola/widgets/branch.py:217 cola/widgets/browse.py:374 -#: cola/widgets/commitmsg.py:99 cola/widgets/dag.py:315 -#: cola/widgets/filelist.py:110 cola/widgets/main.py:95 -#: cola/widgets/main.py:757 cola/widgets/startup.py:436 +#: cola/sequenceeditor.py:524 cola/widgets/bookmarks.py:320 +#: cola/widgets/branch.py:221 cola/widgets/browse.py:375 +#: cola/widgets/commitmsg.py:105 cola/widgets/dag.py:314 +#: cola/widgets/filelist.py:107 cola/widgets/main.py:93 +#: cola/widgets/main.py:770 cola/widgets/startup.py:435 msgid "Actions" msgstr "Дії" -#: cola/widgets/commitmsg.py:101 +#: cola/widgets/commitmsg.py:107 msgid "Actions..." msgstr "Дії..." -#: cola/widgets/bookmarks.py:71 cola/widgets/gitignore.py:64 -#: cola/widgets/patch.py:103 cola/widgets/patch.py:117 -#: cola/widgets/status.py:1381 +#: cola/widgets/bookmarks.py:70 cola/widgets/diff.py:1697 +#: cola/widgets/diff.py:1711 cola/widgets/gitignore.py:63 +#: cola/widgets/status.py:1382 msgid "Add" msgstr "Додати" -#: cola/widgets/bookmarks.py:470 +#: cola/widgets/bookmarks.py:469 msgid "Add Favorite" msgstr "Додати улюбление" -#: cola/widgets/editremotes.py:374 +#: cola/widgets/editremotes.py:373 msgid "Add Remote" msgstr "Додати віддалений репозиторій" -#: cola/widgets/toolbar.py:315 +#: cola/widgets/toolbar.py:320 msgid "Add Separator" msgstr "" -#: cola/cmds.py:3030 cola/widgets/submodules.py:42 -#: cola/widgets/submodules.py:111 +#: cola/cmds.py:2976 cola/widgets/submodules.py:41 +#: cola/widgets/submodules.py:110 msgid "Add Submodule" msgstr "" -#: cola/cmds.py:3027 cola/widgets/main.py:381 +#: cola/cmds.py:2973 cola/widgets/main.py:376 msgid "Add Submodule..." msgstr "" -#: cola/widgets/editremotes.py:62 +#: cola/widgets/editremotes.py:61 msgid "" "Add and remove remote repositories using the \n" "Add(+) and Delete(-) buttons on the left-hand side.\n" @@ -559,99 +584,99 @@ msgstr "" "Віддалені репозиторіїї можна перейменувати, вибрабравши один зі списку\n" "та натиснувши \"enter\", або подвійним кліком мишки." -#: cola/widgets/editremotes.py:81 +#: cola/widgets/editremotes.py:80 msgid "Add new remote git repository" msgstr "Додати новий віддалений репозиторій git" -#: cola/widgets/patch.py:103 +#: cola/widgets/diff.py:1697 msgid "Add patches (+)" msgstr "Додати латки (+)" -#: cola/widgets/editremotes.py:433 +#: cola/widgets/editremotes.py:431 msgid "Add remote" msgstr "Додати віддалений репозиторій" -#: cola/cmds.py:3028 +#: cola/cmds.py:2974 msgid "Add this submodule?" msgstr "" -#: cola/widgets/gitignore.py:54 +#: cola/widgets/gitignore.py:53 msgid "Add to .gitignore" msgstr "Додати до .gitignore" -#: cola/widgets/status.py:286 +#: cola/widgets/status.py:287 #, fuzzy msgid "Add to Git Annex" msgstr "Додати до .gitignore" -#: cola/widgets/status.py:290 +#: cola/widgets/status.py:291 msgid "Add to Git LFS" msgstr "" -#: cola/widgets/gitignore.py:28 +#: cola/widgets/gitignore.py:27 msgid "Add to exclusions" msgstr "" -#: cola/widgets/gitignore.py:55 +#: cola/widgets/gitignore.py:54 msgid "Add to local .git/info/exclude" msgstr "" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Additions" msgstr "Додано" -#: cola/widgets/archive.py:134 +#: cola/widgets/archive.py:132 msgid "Advanced" msgstr "Розширено" -#: cola/widgets/main.py:522 +#: cola/widgets/main.py:535 msgid "Against Commit... (Diff Mode)" msgstr "" -#: cola/models/browse.py:33 +#: cola/models/browse.py:32 msgid "Age" msgstr "Вік" -#: cola/widgets/prefs.py:403 +#: cola/widgets/prefs.py:441 msgid "All Repositories" msgstr "Всі репозиторіїї" -#: cola/cmds.py:3110 +#: cola/cmds.py:3056 #, python-format msgid "" "All submodules will be updated using\n" "\"%s\"" msgstr "" -#: cola/widgets/remote.py:195 +#: cola/widgets/remote.py:199 msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care" msgstr "Дозволити оновлення без перемотки. Використання \"примусу\" може призвести до того, що віддалений репозиторій втратить коміти; використовйте це з обережністю" -#: cola/widgets/merge.py:61 +#: cola/widgets/merge.py:59 msgid "Always create a merge commit when enabled, even when the merge is a fast-forward update" msgstr "Якщо увімкнено, завжди створювати коміт злиття, навіть якщо злиття може бути виконано використовуючи метод перемотки (fast-forward)" -#: cola/cmds.py:221 +#: cola/cmds.py:220 msgid "Amend" msgstr "Змінити" -#: cola/widgets/commitmsg.py:463 +#: cola/widgets/commitmsg.py:471 msgid "Amend Commit" msgstr "Змінити коміт" -#: cola/widgets/commitmsg.py:110 cola/widgets/main.py:194 +#: cola/widgets/commitmsg.py:116 cola/widgets/main.py:193 msgid "Amend Last Commit" msgstr "Змінити останній коміт" -#: cola/widgets/commitmsg.py:462 +#: cola/widgets/commitmsg.py:470 msgid "Amend the published commit?" msgstr "Змінити опублікований коміт?" -#: cola/widgets/main.py:1157 +#: cola/widgets/main.py:1170 msgid "Amending" msgstr "Змінення" -#: cola/widgets/cfgactions.py:151 +#: cola/widgets/cfgactions.py:150 msgid "" "An action is still running.\n" "Terminating it could result in data loss." @@ -659,7 +684,7 @@ msgstr "" "Дія все ще виконується.\n" "Переривання може призвести до втрати даних." -#: cola/cmds.py:2804 +#: cola/cmds.py:2750 msgid "" "An unsigned, lightweight tag will be created instead.\n" "Create an unsigned tag?" @@ -667,57 +692,57 @@ msgstr "" "Замість цього буде створено легкий непідписаний теґ.\n" "Створити непідписаний теґ?" -#: cola/widgets/prefs.py:406 +#: cola/widgets/prefs.py:444 msgid "Appearance" msgstr "" -#: cola/widgets/diff.py:1230 +#: cola/widgets/diff.py:1304 msgid "Append Patch" msgstr "" -#: cola/widgets/diff.py:1299 +#: cola/widgets/diff.py:1373 msgid "Append Patch..." msgstr "" -#: cola/widgets/patch.py:112 cola/widgets/stash.py:48 cola/widgets/stash.py:107 -#: cola/widgets/toolbar.py:323 +#: cola/widgets/diff.py:1706 cola/widgets/stash.py:50 cola/widgets/stash.py:110 +#: cola/widgets/toolbar.py:328 msgid "Apply" msgstr "Застосувати" -#: cola/widgets/patch.py:75 +#: cola/widgets/diff.py:1669 msgid "Apply Patches" msgstr "Застосувати латки" -#: cola/widgets/main.py:239 +#: cola/widgets/main.py:238 msgid "Apply Patches..." msgstr "Примінити латки..." -#: cola/widgets/stash.py:64 +#: cola/widgets/stash.py:66 #, fuzzy msgid "Apply and drop the selected stash (git stash pop)" msgstr "Застосувати виділений сховок" -#: cola/widgets/stash.py:48 +#: cola/widgets/stash.py:50 msgid "Apply the selected stash" msgstr "Застосувати виділений сховок" -#: cola/widgets/main.py:1167 +#: cola/widgets/main.py:1180 msgid "Applying Patch" msgstr "" -#: cola/widgets/cfgactions.py:207 +#: cola/widgets/cfgactions.py:205 msgid "Arguments" msgstr "Аргументи" -#: cola/qtutils.py:850 +#: cola/qtutils.py:887 msgid "Attach" msgstr "Прикріпити" -#: cola/models/browse.py:33 cola/models/browse.py:72 cola/widgets/dag.py:506 +#: cola/models/browse.py:32 cola/models/browse.py:71 cola/widgets/dag.py:572 msgid "Author" msgstr "Автор" -#: cola/widgets/about.py:93 +#: cola/widgets/about.py:91 msgid "Authors" msgstr "Автори" @@ -725,44 +750,44 @@ msgstr "Автори" msgid "Auto" msgstr "" -#: cola/widgets/commitmsg.py:137 cola/widgets/prefs.py:259 +#: cola/widgets/commitmsg.py:143 cola/widgets/prefs.py:280 msgid "Auto-Wrap Lines" msgstr "Авто-перенос рядків" -#: cola/widgets/prefs.py:184 +#: cola/widgets/prefs.py:206 msgid "Autocomplete Paths" msgstr "" -#: cola/widgets/prefs.py:176 +#: cola/widgets/prefs.py:198 msgid "Automatically Load Commit Message Template" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Basic Regexp" msgstr "Базовий регулярний вираз" -#: cola/widgets/prefs.py:255 +#: cola/widgets/prefs.py:276 msgid "Blame Viewer" msgstr "Переглядач анотацій (blame)" -#: cola/widgets/browse.py:205 +#: cola/widgets/browse.py:206 #, fuzzy msgid "Blame selected paths" msgstr "Редагувати вибрані шляхи" -#: cola/cmds.py:545 cola/widgets/status.py:282 +#: cola/cmds.py:546 cola/widgets/status.py:283 msgid "Blame..." msgstr "Анотувати (blame)..." -#: cola/widgets/prefs.py:347 +#: cola/widgets/prefs.py:367 msgid "Bold on dark headers instead of italic" msgstr "Напівжирний з темним фоном шрифт замість заголовків курсивом" -#: cola/widgets/main.py:806 cola/widgets/submodules.py:119 +#: cola/widgets/main.py:819 cola/widgets/submodules.py:118 msgid "Branch" msgstr "Гілка" -#: cola/widgets/remote.py:600 +#: cola/widgets/remote.py:635 #, python-format msgid "" "Branch \"%(branch)s\" does not exist in \"%(remote)s\".\n" @@ -771,84 +796,84 @@ msgstr "" "Гілка \"%(branch)s\" не існує в \"%(remote)s\".\n" "Нова гілка буде опублікована." -#: cola/widgets/createbranch.py:258 +#: cola/widgets/createbranch.py:256 #, python-format msgid "Branch \"%s\" already exists." msgstr "Гілка \"%s\" вже існує." -#: cola/widgets/compare.py:44 +#: cola/widgets/compare.py:43 msgid "Branch Diff Viewer" msgstr "Переглядач різниц на гілкаї" -#: cola/widgets/createbranch.py:259 cola/widgets/createbranch.py:271 +#: cola/widgets/createbranch.py:257 cola/widgets/createbranch.py:269 msgid "Branch Exists" msgstr "Гілка існує" -#: cola/widgets/createbranch.py:98 +#: cola/widgets/createbranch.py:96 msgid "Branch Name" msgstr "Назва гілки" -#: cola/widgets/submodules.py:89 +#: cola/widgets/submodules.py:88 msgid "Branch name" msgstr "" -#: cola/widgets/browse.py:89 cola/widgets/main.py:1097 +#: cola/widgets/browse.py:89 cola/widgets/main.py:1110 #, python-format msgid "Branch: %s" msgstr "Гілка: %s" -#: cola/widgets/branch.py:85 cola/widgets/main.py:131 +#: cola/widgets/branch.py:87 cola/widgets/main.py:129 msgid "Branches" msgstr "Гілки" -#: cola/widgets/main.py:538 +#: cola/widgets/main.py:551 msgid "Branches..." msgstr "Гілки..." -#: cola/widgets/about.py:414 cola/widgets/about.py:417 -#: cola/widgets/about.py:437 +#: cola/widgets/about.py:397 cola/widgets/about.py:400 +#: cola/widgets/about.py:420 msgid "Brazilian translation" msgstr "Бразильський переклад" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse" msgstr "Переглянути" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse Commits..." msgstr "Переглянути коміти..." -#: cola/widgets/main.py:499 +#: cola/widgets/main.py:512 msgid "Browse Current Branch..." msgstr "Переглянути поточну гілку..." -#: cola/widgets/main.py:505 +#: cola/widgets/main.py:518 msgid "Browse Other Branch..." msgstr "Переглянути іншу гілку..." -#: cola/widgets/editremotes.py:437 cola/widgets/search.py:46 -#: cola/widgets/startup.py:65 cola/widgets/startup.py:285 +#: cola/widgets/editremotes.py:435 cola/widgets/search.py:45 +#: cola/widgets/startup.py:64 cola/widgets/startup.py:284 msgid "Browse..." msgstr "Переглянути..." -#: cola/widgets/main.py:89 +#: cola/widgets/main.py:87 msgid "Browser" msgstr "Переглядач" -#: cola/widgets/browse.py:589 +#: cola/widgets/browse.py:590 #, python-format msgid "Browsing %s" msgstr "Перегляд %s" -#: cola/widgets/commitmsg.py:118 +#: cola/widgets/commitmsg.py:124 msgid "Bypass Commit Hooks" msgstr "Оминути гаки (hooks) коміту" -#: cola/sequenceeditor.py:175 cola/widgets/standard.py:991 +#: cola/sequenceeditor.py:173 cola/widgets/standard.py:1058 msgid "Cancel" msgstr "" -#: cola/sequenceeditor.py:176 +#: cola/sequenceeditor.py:174 #, fuzzy msgid "" "Cancel rebase\n" @@ -857,192 +882,204 @@ msgstr "" "Закомітувати проіндексовані зміни\n" "Поєднання клавіш: Ctrl+Enter" -#: cola/cmds.py:254 +#: cola/cmds.py:253 msgid "Cannot Amend" msgstr "Не вдається змінити" -#: cola/cmds.py:560 +#: cola/cmds.py:561 #, python-format msgid "Cannot exec \"%s\": please configure a blame viewer" msgstr "Не вдалось виконати \"%s\": будь ласка налаштуйте переглядач анотацій (blame)" -#: cola/cmds.py:3146 +#: cola/cmds.py:3092 #, python-format msgid "Cannot exec \"%s\": please configure a history browser" msgstr "Не вдалось виконати \"%s\": будь ласка налаштуйте переглядач історії" -#: cola/cmds.py:1583 +#: cola/cmds.py:1571 #, python-format msgid "Cannot exec \"%s\": please configure your editor" msgstr "Не вдалось виконати \"%s\": будь ласка, налаштуйте ваш редактор" -#: cola/models/browse.py:336 +#: cola/models/browse.py:335 msgid "Changed Upstream" msgstr "Змінено в віддаленому джерелі" -#: cola/widgets/prefs.py:186 +#: cola/widgets/prefs.py:208 msgid "Check Published Commits when Amending" msgstr "" -#: cola/widgets/commitmsg.py:130 +#: cola/widgets/commitmsg.py:136 msgid "Check Spelling" msgstr "Перевірити правопис" -#: cola/widgets/prefs.py:265 +#: cola/widgets/prefs.py:286 msgid "Check spelling" msgstr "Перевірити правопис" -#: cola/widgets/prefs.py:163 +#: cola/widgets/prefs.py:186 msgid "Check whether a commit has been published when amending" msgstr "" -#: cola/guicmds.py:62 cola/widgets/branch.py:222 +#: cola/guicmds.py:61 cola/widgets/branch.py:233 msgid "Checkout" msgstr "Переключитись" -#: cola/widgets/createbranch.py:130 +#: cola/widgets/createbranch.py:128 msgid "Checkout After Creation" msgstr "Переключитись після створення" -#: cola/guicmds.py:62 cola/widgets/dag.py:410 +#: cola/guicmds.py:61 cola/widgets/dag.py:409 msgid "Checkout Branch" msgstr "Переключитись на гілку" -#: cola/widgets/dag.py:414 +#: cola/widgets/dag.py:413 #, fuzzy msgid "Checkout Detached HEAD" msgstr "Переключитись на гілку" -#: cola/cmds.py:480 cola/cmds.py:518 +#: cola/cmds.py:481 cola/cmds.py:519 msgid "Checkout Files" msgstr "" -#: cola/widgets/branch.py:226 +#: cola/widgets/branch.py:237 #, fuzzy msgid "Checkout as new branch" msgstr "Переключитись на гілку" -#: cola/cmds.py:507 +#: cola/cmds.py:508 msgid "Checkout files from our branch (HEAD)" msgstr "" -#: cola/cmds.py:511 +#: cola/cmds.py:512 msgid "Checkout files from our branch?" msgstr "" -#: cola/cmds.py:469 +#: cola/cmds.py:470 msgid "Checkout files from their branch (MERGE_HEAD)" msgstr "" -#: cola/cmds.py:473 +#: cola/cmds.py:474 msgid "Checkout files from their branch?" msgstr "" -#: cola/widgets/main.py:576 +#: cola/widgets/main.py:589 msgid "Checkout..." msgstr "Переключитись..." -#: cola/widgets/dag.py:387 cola/widgets/search.py:79 +#: cola/widgets/dag.py:386 cola/widgets/search.py:78 msgid "Cherry Pick" msgstr "Висмикнути коміт (cherry pick)" -#: cola/guicmds.py:73 +#: cola/guicmds.py:72 msgid "Cherry-Pick Commit" msgstr "Висмикнути коміт (cherry pick)" -#: cola/widgets/main.py:328 +#: cola/widgets/main.py:323 msgid "Cherry-Pick..." msgstr "Висмикнути коміт (cherry pick)..." -#: cola/cmds.py:584 +#: cola/cmds.py:585 msgid "Cherry-pick failed" msgstr "" -#: cola/widgets/main.py:1161 +#: cola/widgets/main.py:1174 msgid "Cherry-picking" msgstr "" -#: cola/widgets/diff.py:1247 +#: cola/widgets/diff.py:1321 msgid "Choose Patch..." msgstr "" -#: cola/widgets/search.py:319 +#: cola/widgets/search.py:318 msgid "Choose Paths" msgstr "Вибрати шляхи" -#: cola/widgets/grep.py:116 +#: cola/widgets/grep.py:114 msgid "Choose the \"git grep\" regular expression mode" msgstr "Виберіть режим регулярного виразу \"git grep\"" -#: cola/widgets/bookmarks.py:229 cola/widgets/startup.py:352 +#: cola/widgets/bookmarks.py:228 cola/widgets/startup.py:351 msgid "Clear Default Repository" msgstr "Очистити репозиторій за замовчуванням" -#: cola/widgets/commitmsg.py:305 +#: cola/widgets/commitmsg.py:313 msgid "Clear commit message" msgstr "Очистити повідомлення коміту" -#: cola/widgets/commitmsg.py:302 +#: cola/widgets/commitmsg.py:310 msgid "Clear commit message?" msgstr "Очистити повідомлення коміту?" -#: cola/widgets/commitmsg.py:62 +#: cola/widgets/commitmsg.py:63 msgid "Clear..." msgstr "Очистити..." -#: cola/widgets/clone.py:126 +#: cola/widgets/clone.py:124 #, fuzzy msgid "Clone" msgstr "Клонувати..." -#: cola/widgets/clone.py:62 cola/widgets/clone.py:104 +#: cola/widgets/clone.py:61 cola/widgets/clone.py:102 msgid "Clone Repository" msgstr "Клонувати репозиторій" -#: cola/widgets/main.py:465 cola/widgets/startup.py:58 +#: cola/widgets/main.py:478 cola/widgets/startup.py:57 msgid "Clone..." msgstr "Клонувати..." -#: cola/widgets/clone.py:62 +#: cola/widgets/clone.py:61 #, python-format msgid "Cloning repository at %s" msgstr "Клонувати репозиторій в %s" -#: cola/qtutils.py:757 cola/qtutils.py:807 cola/widgets/about.py:508 -#: cola/widgets/remote.py:328 cola/widgets/text.py:1094 +#: cola/qtutils.py:788 cola/qtutils.py:838 cola/widgets/about.py:491 +#: cola/widgets/remote.py:362 cola/widgets/text.py:1090 msgid "Close" msgstr "Закрити" -#: cola/widgets/text.py:402 +#: cola/widgets/remote.py:222 +msgid "Close dialog when completed" +msgstr "" + +#: cola/widgets/remote.py:221 +msgid "Close on completion" +msgstr "" + +#: cola/widgets/text.py:399 msgid "Close the find bar" msgstr "" -#: cola/qtutils.py:623 +#: cola/qtutils.py:651 msgid "Close..." msgstr "Закрити..." -#: cola/widgets/recent.py:71 +#: cola/widgets/recent.py:69 msgid "Collapse all" msgstr "Згорнути все" -#: cola/sequenceeditor.py:323 +#: cola/sequenceeditor.py:320 #, fuzzy msgid "Command" msgstr "Коміт" -#: cola/widgets/main.py:163 cola/widgets/merge.py:74 +#: cola/widgets/main.py:161 cola/widgets/merge.py:72 msgid "Commit" msgstr "Коміт" -#: cola/cmds.py:837 +#: cola/widgets/prefs.py:192 +msgid "Commit Message Cleanup" +msgstr "" + +#: cola/widgets/commitmsg.py:495 msgid "Commit failed" msgstr "Не вдалось зробити коміт" -#: cola/widgets/commitmsg.py:61 +#: cola/widgets/commitmsg.py:62 msgid "Commit staged changes" msgstr "Закомітувати проіндексовані зміни" -#: cola/widgets/commitmsg.py:93 +#: cola/widgets/commitmsg.py:94 msgid "" "Commit staged changes\n" "Shortcut: Ctrl+Enter" @@ -1050,367 +1087,371 @@ msgstr "" "Закомітувати проіндексовані зміни\n" "Поєднання клавіш: Ctrl+Enter" -#: cola/widgets/commitmsg.py:564 +#: cola/widgets/commitmsg.py:590 msgid "Commit summary" msgstr "Опис коміту" -#: cola/widgets/main.py:259 +#: cola/widgets/main.py:253 msgid "Commit the current state and continue applying patches" msgstr "" -#: cola/widgets/merge.py:70 +#: cola/widgets/merge.py:68 msgid "Commit the merge if there are no conflicts. Uncheck to leave the merge uncommitted" msgstr "Закомітувати злиття, якщо немає конфліктів. Зніміть прапорець щоб залишити злиття незакомітованим" -#: cola/widgets/commitmsg.py:58 cola/widgets/commitmsg.py:95 -#: cola/widgets/main.py:778 cola/widgets/main.py:779 +#: cola/widgets/commitmsg.py:59 cola/widgets/commitmsg.py:96 +#: cola/widgets/main.py:791 cola/widgets/main.py:792 msgid "Commit@@verb" msgstr "Закомітувати" -#: cola/difftool.py:78 cola/widgets/compare.py:70 +#: cola/widgets/dag.py:487 +msgid "Commits authored by me" +msgstr "" + +#: cola/difftool.py:97 cola/widgets/compare.py:69 msgid "Compare" msgstr "Порівняти" -#: cola/difftool.py:83 +#: cola/difftool.py:102 msgid "Compare All" msgstr "Порівняти все" -#: cola/widgets/toolbar.py:269 cola/widgets/toolbar.py:306 +#: cola/widgets/toolbar.py:274 cola/widgets/toolbar.py:311 msgid "Configure Toolbar" msgstr "" -#: cola/widgets/remote.py:214 +#: cola/widgets/remote.py:218 msgid "Configure the remote branch as the the new upstream" msgstr "Налаштувати віддалену гілку як нове віддалене джерело" -#: cola/widgets/main.py:170 +#: cola/widgets/main.py:168 msgid "Console" msgstr "Консоль" -#: cola/interaction.py:111 cola/widgets/main.py:610 +#: cola/interaction.py:109 cola/widgets/main.py:623 msgid "Continue" msgstr "Продовжити" -#: cola/widgets/main.py:255 +#: cola/widgets/main.py:252 msgid "Continue Applying Patches" msgstr "" -#: cola/widgets/bookmarks.py:248 cola/widgets/main.py:742 -#: cola/widgets/startup.py:371 +#: cola/widgets/bookmarks.py:247 cola/widgets/main.py:755 +#: cola/widgets/startup.py:370 msgid "Copy" msgstr "Скопіювати" -#: cola/widgets/status.py:268 +#: cola/widgets/status.py:269 #, fuzzy msgid "Copy Basename to Clipboard" msgstr "Скопіювати шлях в буфер обміну" -#: cola/widgets/diff.py:208 +#: cola/widgets/diff.py:209 msgid "Copy Diff" msgstr "" -#: cola/widgets/status.py:745 +#: cola/widgets/status.py:746 #, fuzzy msgid "Copy Leading Path to Clipboard" msgstr "Скопіювати відносний шлях в буфер обміну" -#: cola/widgets/status.py:251 +#: cola/widgets/status.py:252 msgid "Copy Path to Clipboard" msgstr "Скопіювати шлях в буфер обміну" -#: cola/widgets/status.py:259 +#: cola/widgets/status.py:260 msgid "Copy Relative Path to Clipboard" msgstr "Скопіювати відносний шлях в буфер обміну" -#: cola/sequenceeditor.py:334 cola/widgets/dag.py:474 +#: cola/sequenceeditor.py:330 cola/widgets/dag.py:473 msgid "Copy SHA-1" msgstr "Скопіювати SHA-1" -#: cola/widgets/status.py:737 +#: cola/widgets/status.py:738 #, fuzzy msgid "Copy..." msgstr "Скопіювати" -#: cola/app.py:490 +#: cola/app.py:493 #, python-format msgid "Could not open %s." msgstr "" -#: cola/widgets/clone.py:191 cola/widgets/clone.py:193 +#: cola/widgets/clone.py:189 cola/widgets/clone.py:191 #, python-format msgid "Could not parse Git URL: \"%s\"" msgstr "Не вдалось розпізнати Git URL: \"%s\"" -#: cola/app.py:500 +#: cola/app.py:503 msgid "Create" msgstr "" -#: cola/widgets/createbranch.py:86 cola/widgets/createbranch.py:135 -#: cola/widgets/createbranch.py:301 cola/widgets/dag.py:369 +#: cola/widgets/createbranch.py:84 cola/widgets/createbranch.py:133 +#: cola/widgets/createbranch.py:299 cola/widgets/dag.py:368 msgid "Create Branch" msgstr "Створити гілку" -#: cola/widgets/dag.py:373 +#: cola/widgets/dag.py:372 msgid "Create Patch" msgstr "Створити латку" -#: cola/widgets/remote.py:606 +#: cola/widgets/remote.py:641 msgid "Create Remote Branch" msgstr "Створити віддалену гілку" -#: cola/widgets/commitmsg.py:124 cola/widgets/merge.py:78 +#: cola/widgets/commitmsg.py:130 cola/widgets/merge.py:76 msgid "Create Signed Commit" msgstr "Створити підписаний коміт" -#: cola/widgets/createtag.py:55 cola/widgets/createtag.py:91 -#: cola/widgets/dag.py:377 +#: cola/widgets/createtag.py:53 cola/widgets/createtag.py:89 +#: cola/widgets/dag.py:376 msgid "Create Tag" msgstr "Створити теґ" -#: cola/widgets/main.py:544 +#: cola/widgets/main.py:557 msgid "Create Tag..." msgstr "Створити теґ..." -#: cola/cmds.py:2807 +#: cola/cmds.py:2753 msgid "Create Unsigned Tag" msgstr "Створити непідписаний теґ" -#: cola/widgets/remote.py:188 +#: cola/widgets/remote.py:192 msgid "Create a merge commit even when the merge resolves as a fast-forward" msgstr "Створити коміт злиття навіть якщо злиття може бути вирішено методом перемотки" -#: cola/widgets/remote.py:605 +#: cola/widgets/remote.py:640 msgid "Create a new remote branch?" msgstr "Створити нову віддалену гілку?" -#: cola/app.py:499 +#: cola/app.py:502 msgid "Create a new repository at that location?" msgstr "" -#: cola/widgets/submodules.py:100 +#: cola/widgets/submodules.py:99 msgid "Create a shallow clone with history truncated to the specified number of revisions. 0 performs a full clone." msgstr "" -#: cola/widgets/main.py:551 +#: cola/widgets/main.py:564 msgid "Create..." msgstr "Створити..." -#: cola/cmds.py:2843 +#: cola/cmds.py:2789 #, python-format msgid "Created a new tag named \"%s\"" msgstr "Створено новий теґ з назвою \"%s\"" -#: cola/widgets/prefs.py:266 +#: cola/widgets/prefs.py:287 msgid "Ctrl+MouseWheel to Zoom" msgstr "" -#: cola/widgets/prefs.py:404 +#: cola/widgets/prefs.py:442 msgid "Current Repository" msgstr "Поточний репозиторій" -#: cola/widgets/status.py:1371 +#: cola/widgets/status.py:1372 msgid "Custom Copy Actions" msgstr "" -#: cola/widgets/status.py:273 +#: cola/widgets/status.py:274 #, fuzzy msgid "Customize..." msgstr "Закрити..." -#: cola/widgets/main.py:740 +#: cola/widgets/main.py:753 msgid "Cut" msgstr "" -#: cola/widgets/about.py:411 cola/widgets/about.py:442 +#: cola/widgets/about.py:394 cola/widgets/about.py:425 #, fuzzy msgid "Czech translation" msgstr "Французький переклад" -#: cola/widgets/main.py:592 +#: cola/widgets/main.py:605 msgid "DAG..." msgstr "Граф (DAG)..." -#: cola/icons.py:55 +#: cola/icons.py:54 msgid "Dark Theme" msgstr "" -#: cola/widgets/dag.py:506 +#: cola/widgets/dag.py:572 msgid "Date, Time" msgstr "Дата, час" -#: cola/icons.py:54 cola/themes.py:637 +#: cola/icons.py:53 cola/themes.py:643 msgid "Default" msgstr "" -#: cola/widgets/prefs.py:126 +#: cola/widgets/prefs.py:124 msgid "" "Default directory when exporting patches.\n" "Relative paths are relative to the current repository.\n" "Absolute path are used as-is." msgstr "" -#: cola/cmds.py:925 cola/guicmds.py:26 cola/guicmds.py:35 -#: cola/widgets/bookmarks.py:75 cola/widgets/bookmarks.py:251 -#: cola/widgets/main.py:746 cola/widgets/startup.py:373 +#: cola/cmds.py:923 cola/guicmds.py:25 cola/guicmds.py:34 +#: cola/widgets/bookmarks.py:74 cola/widgets/bookmarks.py:250 +#: cola/widgets/main.py:759 cola/widgets/startup.py:372 msgid "Delete" msgstr "Видалити" -#: cola/cmds.py:1088 +#: cola/cmds.py:1089 #, python-format msgid "Delete %d file(s)?" msgstr "Видалити %d файл(ів)?" -#: cola/cmds.py:1016 +#: cola/cmds.py:1017 msgid "Delete Bookmark" msgstr "Видалити закладку" -#: cola/cmds.py:1014 +#: cola/cmds.py:1015 msgid "Delete Bookmark?" msgstr "Видалити закладку?" -#: cola/cmds.py:1114 cola/cmds.py:1117 cola/guicmds.py:26 -#: cola/widgets/branch.py:268 +#: cola/cmds.py:1115 cola/cmds.py:1118 cola/guicmds.py:25 +#: cola/widgets/branch.py:277 msgid "Delete Branch" msgstr "Видалити гілку" -#: cola/cmds.py:1089 +#: cola/cmds.py:1090 msgid "Delete Files" msgstr "Видалити файли" -#: cola/widgets/status.py:311 +#: cola/widgets/status.py:312 msgid "Delete Files..." msgstr "Видалити файли..." -#: cola/cmds.py:1085 +#: cola/cmds.py:1086 msgid "Delete Files?" msgstr "Видалити файли?" -#: cola/cmds.py:922 +#: cola/cmds.py:920 msgid "Delete Remote" msgstr "Видалити віддалений репозиторій" -#: cola/guicmds.py:35 cola/widgets/branch.py:270 +#: cola/guicmds.py:34 cola/widgets/branch.py:279 msgid "Delete Remote Branch" msgstr "Видалити віддалену гілку" -#: cola/widgets/main.py:564 +#: cola/widgets/main.py:577 msgid "Delete Remote Branch..." msgstr "Видалити віддалену гілку..." -#: cola/widgets/toolbar.py:271 +#: cola/widgets/toolbar.py:276 #, fuzzy msgid "Delete Toolbar" msgstr "Видалити закладку" -#: cola/cmds.py:1115 +#: cola/cmds.py:1116 #, python-format msgid "Delete branch \"%s\"?" msgstr "" -#: cola/widgets/editremotes.py:88 +#: cola/widgets/editremotes.py:87 msgid "Delete remote" msgstr "Видалити віддалений репозиторій" -#: cola/cmds.py:924 +#: cola/cmds.py:922 #, python-format msgid "Delete remote \"%s\"" msgstr "Видалити віддалений репозиторій \"%s\"" -#: cola/cmds.py:923 +#: cola/cmds.py:921 msgid "Delete remote?" msgstr "Видалити віддалений репозиторій?" -#: cola/widgets/main.py:558 +#: cola/widgets/main.py:571 msgid "Delete..." msgstr "Видалити..." -#: cola/cmds.py:1067 +#: cola/cmds.py:1068 #, python-format msgid "Deleting \"%s\" failed" msgstr "Не вдалось видалити \"%s\"" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Deletions" msgstr "Видалено" -#: cola/widgets/submodules.py:120 +#: cola/widgets/submodules.py:119 msgid "Depth" msgstr "" -#: cola/qtutils.py:811 cola/qtutils.py:852 +#: cola/qtutils.py:842 cola/qtutils.py:889 msgid "Detach" msgstr "Відкріпити" -#: cola/widgets/prefs.py:181 +#: cola/widgets/prefs.py:203 msgid "Detect Conflict Markers" msgstr "Виявити мітки конфліктів" -#: cola/widgets/prefs.py:151 +#: cola/widgets/prefs.py:174 msgid "Detect conflict markers in unmerged files" msgstr "Виявити мітки конфліктів в незлитих файлах" -#: cola/widgets/about.py:271 cola/widgets/about.py:274 -#: cola/widgets/about.py:277 cola/widgets/about.py:278 -#: cola/widgets/about.py:279 cola/widgets/about.py:280 -#: cola/widgets/about.py:281 cola/widgets/about.py:282 -#: cola/widgets/about.py:283 cola/widgets/about.py:284 -#: cola/widgets/about.py:285 cola/widgets/about.py:286 -#: cola/widgets/about.py:287 cola/widgets/about.py:288 -#: cola/widgets/about.py:289 cola/widgets/about.py:290 -#: cola/widgets/about.py:291 cola/widgets/about.py:292 -#: cola/widgets/about.py:293 cola/widgets/about.py:294 -#: cola/widgets/about.py:295 cola/widgets/about.py:296 -#: cola/widgets/about.py:297 cola/widgets/about.py:298 -#: cola/widgets/about.py:299 cola/widgets/about.py:300 -#: cola/widgets/about.py:301 cola/widgets/about.py:302 -#: cola/widgets/about.py:303 cola/widgets/about.py:304 -#: cola/widgets/about.py:305 cola/widgets/about.py:306 -#: cola/widgets/about.py:307 cola/widgets/about.py:308 -#: cola/widgets/about.py:309 cola/widgets/about.py:310 -#: cola/widgets/about.py:311 cola/widgets/about.py:312 -#: cola/widgets/about.py:313 cola/widgets/about.py:314 -#: cola/widgets/about.py:315 cola/widgets/about.py:316 -#: cola/widgets/about.py:317 cola/widgets/about.py:318 -#: cola/widgets/about.py:319 cola/widgets/about.py:320 -#: cola/widgets/about.py:321 cola/widgets/about.py:322 -#: cola/widgets/about.py:323 cola/widgets/about.py:324 -#: cola/widgets/about.py:325 cola/widgets/about.py:326 -#: cola/widgets/about.py:327 cola/widgets/about.py:328 -#: cola/widgets/about.py:329 cola/widgets/about.py:330 -#: cola/widgets/about.py:331 cola/widgets/about.py:332 -#: cola/widgets/about.py:333 cola/widgets/about.py:334 -#: cola/widgets/about.py:335 cola/widgets/about.py:336 -#: cola/widgets/about.py:337 cola/widgets/about.py:338 -#: cola/widgets/about.py:339 cola/widgets/about.py:340 -#: cola/widgets/about.py:341 cola/widgets/about.py:342 -#: cola/widgets/about.py:343 cola/widgets/about.py:344 -#: cola/widgets/about.py:345 cola/widgets/about.py:346 -#: cola/widgets/about.py:347 cola/widgets/about.py:348 -#: cola/widgets/about.py:349 cola/widgets/about.py:350 -#: cola/widgets/about.py:351 cola/widgets/about.py:352 -#: cola/widgets/about.py:353 cola/widgets/about.py:354 -#: cola/widgets/about.py:355 cola/widgets/about.py:356 -#: cola/widgets/about.py:357 cola/widgets/about.py:358 -#: cola/widgets/about.py:359 cola/widgets/about.py:360 -#: cola/widgets/about.py:361 cola/widgets/about.py:362 -#: cola/widgets/about.py:363 cola/widgets/about.py:364 -#: cola/widgets/about.py:365 cola/widgets/about.py:366 -#: cola/widgets/about.py:367 cola/widgets/about.py:368 -#: cola/widgets/about.py:369 cola/widgets/about.py:370 -#: cola/widgets/about.py:371 cola/widgets/about.py:372 -#: cola/widgets/about.py:373 cola/widgets/about.py:374 -#: cola/widgets/about.py:375 cola/widgets/about.py:376 -#: cola/widgets/about.py:377 cola/widgets/about.py:378 -#: cola/widgets/about.py:379 cola/widgets/about.py:380 +#: cola/widgets/about.py:254 cola/widgets/about.py:257 +#: cola/widgets/about.py:260 cola/widgets/about.py:261 +#: cola/widgets/about.py:262 cola/widgets/about.py:263 +#: cola/widgets/about.py:264 cola/widgets/about.py:265 +#: cola/widgets/about.py:266 cola/widgets/about.py:267 +#: cola/widgets/about.py:268 cola/widgets/about.py:269 +#: cola/widgets/about.py:270 cola/widgets/about.py:271 +#: cola/widgets/about.py:272 cola/widgets/about.py:273 +#: cola/widgets/about.py:274 cola/widgets/about.py:275 +#: cola/widgets/about.py:276 cola/widgets/about.py:277 +#: cola/widgets/about.py:278 cola/widgets/about.py:279 +#: cola/widgets/about.py:280 cola/widgets/about.py:281 +#: cola/widgets/about.py:282 cola/widgets/about.py:283 +#: cola/widgets/about.py:284 cola/widgets/about.py:285 +#: cola/widgets/about.py:286 cola/widgets/about.py:287 +#: cola/widgets/about.py:288 cola/widgets/about.py:289 +#: cola/widgets/about.py:290 cola/widgets/about.py:291 +#: cola/widgets/about.py:292 cola/widgets/about.py:293 +#: cola/widgets/about.py:294 cola/widgets/about.py:295 +#: cola/widgets/about.py:296 cola/widgets/about.py:297 +#: cola/widgets/about.py:298 cola/widgets/about.py:299 +#: cola/widgets/about.py:300 cola/widgets/about.py:301 +#: cola/widgets/about.py:302 cola/widgets/about.py:303 +#: cola/widgets/about.py:304 cola/widgets/about.py:305 +#: cola/widgets/about.py:306 cola/widgets/about.py:307 +#: cola/widgets/about.py:308 cola/widgets/about.py:309 +#: cola/widgets/about.py:310 cola/widgets/about.py:311 +#: cola/widgets/about.py:312 cola/widgets/about.py:313 +#: cola/widgets/about.py:314 cola/widgets/about.py:315 +#: cola/widgets/about.py:316 cola/widgets/about.py:317 +#: cola/widgets/about.py:318 cola/widgets/about.py:319 +#: cola/widgets/about.py:320 cola/widgets/about.py:321 +#: cola/widgets/about.py:322 cola/widgets/about.py:323 +#: cola/widgets/about.py:324 cola/widgets/about.py:325 +#: cola/widgets/about.py:326 cola/widgets/about.py:327 +#: cola/widgets/about.py:328 cola/widgets/about.py:329 +#: cola/widgets/about.py:330 cola/widgets/about.py:331 +#: cola/widgets/about.py:332 cola/widgets/about.py:333 +#: cola/widgets/about.py:334 cola/widgets/about.py:335 +#: cola/widgets/about.py:336 cola/widgets/about.py:337 +#: cola/widgets/about.py:338 cola/widgets/about.py:339 +#: cola/widgets/about.py:340 cola/widgets/about.py:341 +#: cola/widgets/about.py:342 cola/widgets/about.py:343 +#: cola/widgets/about.py:344 cola/widgets/about.py:345 +#: cola/widgets/about.py:346 cola/widgets/about.py:347 +#: cola/widgets/about.py:348 cola/widgets/about.py:349 +#: cola/widgets/about.py:350 cola/widgets/about.py:351 +#: cola/widgets/about.py:352 cola/widgets/about.py:353 +#: cola/widgets/about.py:354 cola/widgets/about.py:355 +#: cola/widgets/about.py:356 cola/widgets/about.py:357 +#: cola/widgets/about.py:358 cola/widgets/about.py:359 +#: cola/widgets/about.py:360 cola/widgets/about.py:361 +#: cola/widgets/about.py:362 cola/widgets/about.py:363 msgid "Developer" msgstr "Розробник" -#: cola/guicmds.py:185 cola/widgets/dag.py:764 cola/widgets/diff.py:781 -#: cola/widgets/main.py:177 cola/widgets/main.py:797 +#: cola/guicmds.py:184 cola/widgets/dag.py:830 cola/widgets/diff.py:809 +#: cola/widgets/main.py:175 cola/widgets/main.py:810 msgid "Diff" msgstr "Різниця" -#: cola/guicmds.py:185 +#: cola/guicmds.py:184 msgid "Diff Against Commit" msgstr "" @@ -1418,36 +1459,36 @@ msgstr "" msgid "Diff Against Predecessor..." msgstr "Різниця до попередника..." -#: cola/widgets/main.py:1159 +#: cola/widgets/main.py:1172 msgid "Diff Mode" msgstr "" -#: cola/widgets/diff.py:772 cola/widgets/diff.py:796 +#: cola/widgets/diff.py:800 cola/widgets/diff.py:824 msgid "Diff Options" msgstr "Опції порівняння" -#: cola/widgets/prefs.py:256 +#: cola/widgets/prefs.py:277 msgid "Diff Tool" msgstr "Інструмент порівняння" -#: cola/widgets/dag.py:364 +#: cola/widgets/dag.py:363 msgid "Diff selected -> this" msgstr "Порівняти виділене з цим" -#: cola/widgets/dag.py:358 +#: cola/widgets/dag.py:357 msgid "Diff this -> selected" msgstr "Порівняти це з виділеним" -#: cola/widgets/main.py:218 +#: cola/widgets/main.py:217 msgid "Diffstat" msgstr "Список різниць" -#: cola/cmds.py:3262 +#: cola/difftool.py:324 #, fuzzy msgid "Difftool" msgstr "Інструмент порівняння" -#: cola/widgets/clone.py:207 +#: cola/widgets/clone.py:205 msgid "Directory Exists" msgstr "Каталог існує" @@ -1455,85 +1496,89 @@ msgstr "Каталог існує" msgid "Disable" msgstr "" -#: cola/widgets/prefs.py:180 +#: cola/widgets/prefs.py:202 msgid "Display Untracked Files" msgstr "Показати файли, що не відслідковуються" -#: cola/cmds.py:2094 +#: cola/widgets/remote.py:176 +msgid "Display remote messages in a separate dialog" +msgstr "" + +#: cola/cmds.py:2045 msgid "Do not update stacked branches" msgstr "" -#: cola/widgets/main.py:471 +#: cola/widgets/main.py:484 msgid "Documentation" msgstr "Документація" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop" msgstr "Видалити" -#: cola/widgets/stash.py:258 +#: cola/widgets/stash.py:276 msgid "Drop Stash" msgstr "Видалити сховок" -#: cola/widgets/stash.py:255 +#: cola/widgets/stash.py:273 msgid "Drop Stash?" msgstr "Видалити сховок?" -#: cola/widgets/stash.py:257 +#: cola/widgets/stash.py:275 #, python-format msgid "Drop the \"%s\" stash?" msgstr "Видалити \"%s\" сховок?" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop the selected stash" msgstr "Видалити вибраний сховок" -#: cola/qtutils.py:764 cola/sequenceeditor.py:357 cola/widgets/grep.py:102 +#: cola/qtutils.py:795 cola/sequenceeditor.py:353 cola/widgets/grep.py:100 #, fuzzy msgid "Edit" msgstr "Редагувати" -#: cola/widgets/diff.py:1019 +#: cola/widgets/diff.py:1058 msgid "Edit Diff Hunk to Revert..." msgstr "" -#: cola/widgets/diff.py:1017 +#: cola/widgets/diff.py:1056 msgid "Edit Diff Hunk to Stage..." msgstr "" -#: cola/widgets/diff.py:1062 +#: cola/widgets/diff.py:1124 msgid "Edit Diff Hunk to Unstage..." msgstr "" -#: cola/cmds.py:2166 +#: cola/cmds.py:2117 msgid "Edit Rebase" msgstr "Редагувати переміщення (rebase)" -#: cola/widgets/editremotes.py:36 +#: cola/widgets/editremotes.py:35 msgid "Edit Remotes" msgstr "Редагувати віддалені репозиторіїї" -#: cola/widgets/main.py:298 +#: cola/widgets/main.py:293 msgid "Edit Remotes..." msgstr "Редагувати віддалені репозиторіїї..." -#: cola/widgets/diff.py:1014 +#: cola/widgets/diff.py:1053 msgid "Edit Selected Lines to Revert..." msgstr "" -#: cola/widgets/diff.py:1012 +#: cola/widgets/diff.py:1051 msgid "Edit Selected Lines to Stage..." msgstr "" -#: cola/widgets/diff.py:1059 +#: cola/widgets/diff.py:1122 msgid "Edit Selected Lines to Unstage..." msgstr "" -#: cola/widgets/editremotes.py:44 +#: cola/widgets/editremotes.py:43 msgid "Edit remotes by selecting them from the list" msgstr "" -#: cola/widgets/browse.py:197 cola/widgets/common.py:39 +#: cola/widgets/browse.py:198 cola/widgets/common.py:38 msgid "Edit selected paths" msgstr "Редагувати вибрані шляхи" @@ -1549,11 +1594,11 @@ msgstr "" msgid "Edit the following patch, which will then be applied to the worktree to revert the changes:" msgstr "" -#: cola/widgets/main.py:604 +#: cola/widgets/main.py:617 msgid "Edit..." msgstr "Редагувати..." -#: cola/widgets/prefs.py:253 +#: cola/widgets/prefs.py:274 msgid "Editor" msgstr "Редактор" @@ -1562,156 +1607,161 @@ msgstr "Редактор" msgid "Editor returned %s exit code. Not applying patch." msgstr "" -#: cola/widgets/prefs.py:167 +#: cola/widgets/prefs.py:190 msgid "Email Address" msgstr "Адреса електронної пошти" -#: cola/widgets/about.py:258 cola/widgets/about.py:401 +#: cola/widgets/about.py:241 cola/widgets/about.py:384 msgid "Email contributor" msgstr "Електронна пошта учасника" -#: cola/widgets/prefs.py:182 +#: cola/widgets/prefs.py:204 msgid "Enable Gravatar Icons" msgstr "" -#: cola/widgets/prefs.py:160 +#: cola/widgets/prefs.py:183 msgid "Enable path autocompletion in tools" msgstr "" -#: cola/widgets/diff.py:768 +#: cola/widgets/diff.py:796 msgid "Enable word wrapping" msgstr "" -#: cola/sequenceeditor.py:322 +#: cola/sequenceeditor.py:319 msgid "Enabled" msgstr "" -#: cola/guicmds.py:333 cola/widgets/branch.py:445 +#: cola/guicmds.py:332 cola/widgets/branch.py:478 msgid "Enter New Branch Name" msgstr "Введіть ім'я для нової гілки" -#: cola/guicmds.py:147 +#: cola/guicmds.py:146 #, fuzzy msgid "Enter a name for the new bare repo" msgstr "Введіть назву для сховка" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Enter a name for the stash" msgstr "Введіть назву для сховка" -#: cola/cmds.py:146 cola/cmds.py:176 cola/cmds.py:207 cola/cmds.py:283 -#: cola/cmds.py:292 cola/cmds.py:307 cola/cmds.py:317 cola/cmds.py:460 -#: cola/cmds.py:496 cola/cmds.py:534 cola/cmds.py:633 cola/cmds.py:751 -#: cola/cmds.py:1067 cola/cmds.py:1164 cola/cmds.py:2005 cola/cmds.py:2394 -#: cola/cmds.py:2637 cola/cmds.py:2643 cola/cmds.py:2651 cola/cmds.py:2872 -#: cola/cmds.py:2890 cola/cmds.py:3180 cola/gitcmds.py:984 cola/guicmds.py:157 -#: cola/models/stash.py:70 cola/models/stash.py:87 cola/models/stash.py:108 -#: cola/widgets/bookmarks.py:482 cola/widgets/branch.py:777 +#: cola/widgets/stash.py:216 +msgid "Enter a new name for the stash" +msgstr "" + +#: cola/cmds.py:145 cola/cmds.py:175 cola/cmds.py:206 cola/cmds.py:284 +#: cola/cmds.py:293 cola/cmds.py:308 cola/cmds.py:318 cola/cmds.py:461 +#: cola/cmds.py:497 cola/cmds.py:535 cola/cmds.py:635 cola/cmds.py:753 +#: cola/cmds.py:1068 cola/cmds.py:1165 cola/cmds.py:1956 cola/cmds.py:2345 +#: cola/cmds.py:2579 cola/cmds.py:2585 cola/cmds.py:2593 cola/cmds.py:2818 +#: cola/cmds.py:2836 cola/cmds.py:3125 cola/gitcmds.py:994 cola/guicmds.py:156 +#: cola/models/stash.py:70 cola/models/stash.py:90 cola/models/stash.py:112 +#: cola/models/stash.py:138 cola/widgets/bookmarks.py:481 +#: cola/widgets/branch.py:829 msgid "Error" msgstr "Помилка" -#: cola/widgets/clone.py:191 +#: cola/widgets/clone.py:189 msgid "Error Cloning" msgstr "Помилка клонування" -#: cola/widgets/createbranch.py:314 +#: cola/widgets/createbranch.py:312 msgid "Error Creating Branch" msgstr "Помилка при створенні гілки" -#: cola/app.py:502 cola/guicmds.py:101 +#: cola/app.py:505 cola/guicmds.py:100 msgid "Error Creating Repository" msgstr "Помилка створення репозиторію" -#: cola/cmds.py:1202 +#: cola/cmds.py:1206 msgid "Error Deleting Remote Branch" msgstr "Не вдалось видалити віддалену гілку" -#: cola/cmds.py:1585 +#: cola/cmds.py:1573 msgid "Error Editing File" msgstr "Помилка редагування файла" -#: cola/cmds.py:559 +#: cola/cmds.py:560 msgid "Error Launching Blame Viewer" msgstr "Помилка запуску переглядача анотацій (blame)" -#: cola/cmds.py:3145 +#: cola/cmds.py:3091 msgid "Error Launching History Browser" msgstr "Помилка запуску браузера історії" -#: cola/app.py:489 +#: cola/app.py:492 msgid "Error Opening Repository" msgstr "" -#: cola/widgets/browse.py:566 +#: cola/models/stash.py:144 +msgid "Error Renaming Stash" +msgstr "" + +#: cola/widgets/browse.py:567 msgid "Error Saving File" msgstr "" -#: cola/cmds.py:914 +#: cola/cmds.py:912 #, python-format msgid "Error creating remote \"%s\"" msgstr "Не вдалось створити віддалений репозиторій \"%s\"" -#: cola/models/stash.py:197 +#: cola/models/stash.py:233 #, fuzzy msgid "Error creating stash" msgstr "Помилка при створенні гілки" -#: cola/cmds.py:1126 +#: cola/cmds.py:1127 #, python-format msgid "Error deleting branch \"%s\"" msgstr "" -#: cola/cmds.py:932 +#: cola/cmds.py:930 #, python-format msgid "Error deleting remote \"%s\"" msgstr "Не вдалось видалити віддалений репозиторій \"%s\"" -#: cola/cmds.py:956 +#: cola/cmds.py:955 #, fuzzy, python-format msgid "Error renaming \"%(name)s\" to \"%(new_name)s\"" msgstr "Позначення \"%(revision)s\" як \"%(name)s\"" -#: cola/cmds.py:1771 +#: cola/cmds.py:1722 msgid "Error running prepare-commitmsg hook" msgstr "Помилка застосування prepare-commitmsg гака (hook)" -#: cola/cmds.py:3043 cola/cmds.py:3089 +#: cola/cmds.py:2989 cola/cmds.py:3035 #, fuzzy, python-format msgid "Error updating submodule %s" msgstr "Не вдалось створити віддалений репозиторій \"%s\"" -#: cola/cmds.py:3125 +#: cola/cmds.py:3071 #, fuzzy msgid "Error updating submodules" msgstr "Помилка редагування файла" -#: cola/widgets/diff.py:1326 +#: cola/widgets/diff.py:1400 msgid "Error writing patch" msgstr "" -#: cola/cmds.py:1710 +#: cola/cmds.py:1662 msgid "Error: Cannot find commit template" msgstr "Помилка: Не вдається знайти шаблон коміту" -#: cola/widgets/stash.py:235 -msgid "Error: Stash exists" -msgstr "Помилка: сховок вже існує" - -#: cola/cmds.py:1732 +#: cola/cmds.py:1684 msgid "Error: Unconfigured commit template" msgstr "Помилка: Шаблон коміту не сконфігуровано" -#: cola/widgets/clone.py:53 +#: cola/widgets/clone.py:52 #, python-format msgid "Error: could not clone \"%s\"" msgstr "Помилка: не вдалось клонувати \"%s\"" -#: cola/cmds.py:2835 +#: cola/cmds.py:2781 #, python-format msgid "Error: could not create tag \"%s\"" msgstr "Помилка: не вдалось створити теґ \"%s\"" -#: cola/widgets/branch.py:421 +#: cola/widgets/branch.py:433 #, python-format msgid "Executing action %s" msgstr "Виконання дії %s" @@ -1720,112 +1770,116 @@ msgstr "Виконання дії %s" msgid "Exit \"Diff\" mode" msgstr "" -#: cola/widgets/action.py:67 +#: cola/widgets/action.py:81 msgid "Exit Diff" msgstr "" -#: cola/widgets/main.py:528 +#: cola/widgets/main.py:541 msgid "Exit Diff Mode" msgstr "" -#: cola/widgets/action.py:68 +#: cola/widgets/action.py:81 msgid "Exit Diff mode" msgstr "" -#: cola/widgets/recent.py:67 +#: cola/widgets/recent.py:65 msgid "Expand all" msgstr "Розгорнути все" -#: cola/widgets/diff.py:1223 +#: cola/widgets/diff.py:1297 msgid "Export Patch" msgstr "" -#: cola/guicmds.py:168 cola/widgets/search.py:75 +#: cola/guicmds.py:167 cola/widgets/search.py:74 msgid "Export Patches" msgstr "Експорт латок" -#: cola/widgets/main.py:273 +#: cola/widgets/main.py:268 msgid "Export Patches..." msgstr "Експортувати латки..." -#: cola/widgets/main.py:533 +#: cola/widgets/main.py:546 msgid "Expression..." msgstr "Вираз..." -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Extended Regexp" msgstr "Розширений регулярний вираз" -#: cola/widgets/commitmsg.py:612 +#: cola/widgets/commitmsg.py:638 msgid "Extended description..." msgstr "Розширений опис..." -#: cola/cmds.py:387 +#: cola/cmds.py:388 msgid "Failed to commit and continue applying patches" msgstr "" -#: cola/cmds.py:403 +#: cola/cmds.py:404 msgid "Failed to continue applying patches after skipping the current patch" msgstr "" -#: cola/widgets/createbranch.py:124 +#: cola/widgets/createbranch.py:122 msgid "Fast Forward Only" msgstr "Лише перемотка (fast-forward)" -#: cola/widgets/remote.py:177 +#: cola/widgets/remote.py:181 msgid "Fast-forward only" msgstr "Лише перемотка (fast-forward)" -#: cola/widgets/bookmarks.py:91 +#: cola/widgets/bookmarks.py:90 msgid "Favorite repositories" msgstr "Улюблені репозиторіїї" -#: cola/widgets/main.py:111 +#: cola/widgets/main.py:109 msgid "Favorites" msgstr "Улюбене" -#: cola/widgets/remote.py:673 +#: cola/widgets/remote.py:735 msgid "Fetch" msgstr "Отримати" -#: cola/widgets/createbranch.py:127 +#: cola/widgets/createbranch.py:125 msgid "Fetch Tracking Branch" msgstr "Отримати гілку, що відстежується" -#: cola/widgets/action.py:63 cola/widgets/main.py:387 +#: cola/widgets/action.py:67 cola/widgets/main.py:384 +msgid "Fetch from one or more remotes using \"git fetch\"" +msgstr "" + +#: cola/widgets/action.py:65 cola/widgets/main.py:383 msgid "Fetch..." msgstr "Отримати" -#: cola/widgets/main.py:588 +#: cola/widgets/main.py:601 msgid "File Browser..." msgstr "Переглядач файлів..." -#: cola/widgets/compare.py:75 +#: cola/widgets/compare.py:74 msgid "File Differences" msgstr "Різниця між файлами" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 msgid "File Saved" msgstr "Файл збережено" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 #, python-format msgid "File saved to \"%s\"" msgstr "Дайл збережено до \"%s\"" -#: cola/fsmonitor.py:517 +#: cola/fsmonitor.py:528 msgid "File system change monitoring: disabled because \"cola.inotify\" is false.\n" msgstr "Відстеження змін файлової системи: вимкнено, тому що \"cola.inotify\" є хибним (false).\n" -#: cola/fsmonitor.py:534 +#: cola/fsmonitor.py:545 msgid "File system change monitoring: disabled because libc does not support the inotify system calls.\n" msgstr "Відстеження змін файлової системи: вимкнено, тому що libc не підтримує системних викликів inotify.\n" -#: cola/fsmonitor.py:528 +#: cola/fsmonitor.py:539 msgid "File system change monitoring: disabled because pywin32 is not installed.\n" msgstr "Відстеження змін файлової системи: вимкнено, тому що не встановлено pywin32.\n" -#: cola/fsmonitor.py:181 +#: cola/fsmonitor.py:184 msgid "" "File system change monitoring: disabled because the limit on the total number of inotify watches was reached. You may be able to increase the limit on the number of watches by running:\n" "\n" @@ -1835,299 +1889,307 @@ msgstr "" "\n" " echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n" -#: cola/fsmonitor.py:142 +#: cola/fsmonitor.py:145 msgid "File system change monitoring: enabled.\n" msgstr "Відстеження змін файлової системи: увімкнено.\n" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Filename" msgstr "Ім'я файла" -#: cola/widgets/dag.py:755 +#: cola/widgets/dag.py:821 msgid "Files" msgstr "Файли" -#: cola/widgets/branch.py:785 +#: cola/widgets/branch.py:837 msgid "Filter branches..." msgstr "Фільтрувати гілки..." -#: cola/widgets/status.py:1333 +#: cola/widgets/status.py:1334 msgid "Filter paths..." msgstr "Фільтрувати шляхи..." -#: cola/widgets/finder.py:113 cola/widgets/main.py:312 +#: cola/widgets/finder.py:112 cola/widgets/main.py:307 msgid "Find Files" msgstr "Пошук файлів" -#: cola/widgets/text.py:388 +#: cola/widgets/text.py:385 msgid "Find in diff" msgstr "" -#: cola/widgets/text.py:425 +#: cola/widgets/text.py:422 msgid "Find next item" msgstr "" -#: cola/widgets/text.py:431 +#: cola/widgets/text.py:428 msgid "Find previous item" msgstr "" -#: cola/widgets/text.py:395 +#: cola/widgets/text.py:392 msgid "Find the next occurrence of the phrase" msgstr "" -#: cola/widgets/text.py:391 +#: cola/widgets/text.py:388 msgid "Find the previous occurrence of the phrase" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Fixed String" msgstr "Фіксована послідовність знаків" -#: cola/widgets/prefs.py:251 +#: cola/widgets/prefs.py:270 msgid "Fixed-Width Font" msgstr "Моноширний шрифт" -#: cola/sequenceeditor.py:362 +#: cola/sequenceeditor.py:358 msgid "Fixup" msgstr "" -#: cola/widgets/commitmsg.py:148 +#: cola/widgets/commitmsg.py:154 msgid "Fixup Previous Commit" msgstr "Виправити попередній коміт" -#: cola/themes.py:672 +#: cola/themes.py:684 msgid "Flat dark blue" msgstr "" -#: cola/themes.py:693 +#: cola/themes.py:705 msgid "Flat dark green" msgstr "" -#: cola/themes.py:686 +#: cola/themes.py:698 msgid "Flat dark grey" msgstr "" -#: cola/themes.py:679 +#: cola/themes.py:691 msgid "Flat dark red" msgstr "" -#: cola/themes.py:644 +#: cola/themes.py:656 msgid "Flat light blue" msgstr "" -#: cola/themes.py:665 +#: cola/themes.py:677 msgid "Flat light green" msgstr "" -#: cola/themes.py:658 +#: cola/themes.py:670 msgid "Flat light grey" msgstr "" -#: cola/themes.py:651 +#: cola/themes.py:663 msgid "Flat light red" msgstr "" -#: cola/widgets/startup.py:73 +#: cola/widgets/startup.py:72 msgid "Folder" msgstr "" -#: cola/widgets/toolbar.py:177 +#: cola/widgets/toolbar.py:181 msgid "Follow System Style" msgstr "" -#: cola/widgets/prefs.py:252 +#: cola/widgets/prefs.py:271 msgid "Font Size" msgstr "Розмір шрифта" -#: cola/widgets/remote.py:193 +#: cola/widgets/remote.py:197 msgid "Force" msgstr "Надіслати примусово" -#: cola/widgets/remote.py:617 +#: cola/widgets/remote.py:652 msgid "Force Fetch" msgstr "Отримати примусово" -#: cola/widgets/remote.py:614 +#: cola/widgets/remote.py:649 msgid "Force Fetch?" msgstr "Отримати примусово?" -#: cola/widgets/remote.py:625 +#: cola/widgets/remote.py:660 msgid "Force Push" msgstr "Надіслати примусово" -#: cola/widgets/remote.py:619 +#: cola/widgets/remote.py:654 msgid "Force Push?" msgstr "Надіслати примусово?" -#: cola/widgets/remote.py:616 +#: cola/widgets/remote.py:651 #, python-format msgid "Force fetching from %s?" msgstr "Примусове отримання з %s?" -#: cola/widgets/remote.py:624 +#: cola/widgets/remote.py:659 #, python-format msgid "Force push to %s?" msgstr "Надіслати примусово до %s?" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 #, fuzzy msgid "Format String" msgstr "Фіксована послідовність знаків" -#: cola/widgets/about.py:430 cola/widgets/about.py:431 +#: cola/widgets/about.py:413 cola/widgets/about.py:414 msgid "French translation" msgstr "Французький переклад" -#: cola/widgets/merge.py:80 +#: cola/widgets/merge.py:78 msgid "GPG-sign the merge commit" msgstr "Підписати-GPG коміт злиття" -#: cola/widgets/prefs.py:344 +#: cola/widgets/prefs.py:364 msgid "GUI theme" msgstr "" -#: cola/widgets/editremotes.py:318 +#: cola/widgets/editremotes.py:317 #, python-format msgid "Gathering info for \"%s\"..." msgstr "Збирання інформації для \"%s\"..." -#: cola/widgets/about.py:420 cola/widgets/about.py:428 -#: cola/widgets/about.py:429 +#: cola/widgets/about.py:403 cola/widgets/about.py:411 +#: cola/widgets/about.py:412 msgid "German translation" msgstr "Німецький переклад" -#: cola/widgets/main.py:511 +#: cola/widgets/main.py:524 msgid "Get Commit Message Template" msgstr "Отримати шаблон тексту коміту" -#: cola/widgets/dag.py:520 +#: cola/widgets/dag.py:586 msgid "Go Down" msgstr "Вниз" -#: cola/widgets/dag.py:516 +#: cola/widgets/dag.py:582 msgid "Go Up" msgstr "Вгору" -#: cola/widgets/dag.py:467 cola/widgets/filelist.py:42 +#: cola/widgets/dag.py:466 cola/widgets/filelist.py:39 msgid "Grab File..." msgstr "Взяти файл..." -#: cola/widgets/dag.py:782 +#: cola/widgets/dag.py:848 msgid "Graph" msgstr "Графік" -#: cola/widgets/main.py:358 +#: cola/widgets/main.py:353 msgid "Grep" msgstr "Пошук (grep)" -#: cola/widgets/remote.py:662 +#: cola/widgets/remote.py:707 msgid "Have you rebased/pulled lately?" msgstr "Чи ви робили переміщення/стягнення останнім часом?" -#: cola/sequenceeditor.py:110 cola/sequenceeditor.py:171 -#: cola/widgets/finder.py:138 cola/widgets/main.py:854 +#: cola/sequenceeditor.py:108 cola/sequenceeditor.py:169 +#: cola/widgets/finder.py:137 cola/widgets/main.py:867 msgid "Help" msgstr "Допомога" -#: cola/widgets/status.py:1322 +#: cola/widgets/status.py:1323 msgid "Help - Custom Copy Actions" msgstr "" -#: cola/widgets/finder.py:79 +#: cola/widgets/finder.py:78 msgid "Help - Find Files" msgstr "Допомога - Пошук файлів" -#: cola/sequenceeditor.py:737 +#: cola/sequenceeditor.py:732 msgid "Help - git-cola-sequence-editor" msgstr "" -#: cola/widgets/prefs.py:346 +#: cola/widgets/prefs.py:366 msgid "High DPI" msgstr "" -#: cola/gitcmds.py:876 +#: cola/gitcmds.py:886 msgid "Hint: The \"Actions > Abort Cherry-Pick\" menu action can be used to cancel the current cherry-pick." msgstr "" -#: cola/widgets/prefs.py:254 +#: cola/widgets/prefs.py:275 msgid "History Browser" msgstr "Переглядач історії" -#: cola/widgets/about.py:427 cola/widgets/about.py:441 +#: cola/widgets/about.py:410 cola/widgets/about.py:424 #, fuzzy msgid "Hungarian translation" msgstr "Російський переклад" -#: cola/widgets/toolbar.py:178 +#: cola/widgets/toolbar.py:182 msgid "Icon Only" msgstr "" -#: cola/widgets/prefs.py:345 +#: cola/widgets/prefs.py:365 msgid "Icon theme" msgstr "" -#: cola/widgets/diff.py:758 +#: cola/widgets/diff.py:787 msgid "Ignore all whitespace" msgstr "Ігнорувати всі пробіли" -#: cola/widgets/diff.py:755 +#: cola/widgets/diff.py:785 msgid "Ignore changes in amount of whitespace" msgstr "Ігнорувати зміни в кількості пробілів" -#: cola/widgets/diff.py:751 +#: cola/widgets/diff.py:782 msgid "Ignore changes in whitespace at EOL" msgstr "Ігнорувати зміни в пробільних знаках в кінці рядка" -#: cola/widgets/gitignore.py:46 +#: cola/widgets/gitignore.py:45 #, fuzzy msgid "Ignore custom pattern" msgstr "Ігнорувати специфічний шаблон" -#: cola/widgets/gitignore.py:44 +#: cola/widgets/gitignore.py:43 msgid "Ignore exact filename" msgstr "Ігнорувати точне ім'я файлу" -#: cola/widgets/gitignore.py:32 +#: cola/widgets/gitignore.py:31 msgid "Ignore filename or pattern" msgstr "Ігнорувати ім'я файлу або шаблон" -#: cola/widgets/status.py:933 +#: cola/widgets/dag.py:498 +msgid "Ignore merge commits" +msgstr "" + +#: cola/widgets/status.py:934 msgid "Ignore..." msgstr "" -#: cola/widgets/remote.py:203 +#: cola/widgets/remote.py:207 msgid "Include tags " msgstr "Включити теґ" -#: cola/widgets/prefs.py:349 +#: cola/widgets/prefs.py:369 msgid "Indent Status paths" msgstr "" -#: cola/widgets/about.py:419 cola/widgets/about.py:426 +#: cola/widgets/about.py:402 cola/widgets/about.py:409 msgid "Indonesian translation" msgstr "Індонезійський переклад" -#: cola/widgets/main.py:643 +#: cola/widgets/main.py:656 msgid "Initialize Git Annex" msgstr "" -#: cola/widgets/main.py:647 +#: cola/widgets/main.py:660 msgid "Initialize Git LFS" msgstr "" -#: cola/widgets/clone.py:116 +#: cola/widgets/clone.py:114 msgid "Inititalize submodules" msgstr "" -#: cola/widgets/prefs.py:260 +#: cola/widgets/prefs.py:281 msgid "Insert spaces instead of tabs" msgstr "" -#: cola/cmds.py:2130 +#: cola/widgets/action.py:73 cola/widgets/main.py:402 +msgid "Integrate changes using \"git pull\"" +msgstr "" + +#: cola/cmds.py:2081 msgid "Interactive Rebase" msgstr "Інтерактивне переміщення" -#: cola/cmds.py:2364 +#: cola/cmds.py:2315 msgid "Invalid Revision" msgstr "Неправильна ревізія" @@ -2135,47 +2197,47 @@ msgstr "Неправильна ревізія" msgid "It is not necessary to update the hunk header lines as they will be regenerated automatically." msgstr "" -#: cola/widgets/about.py:421 cola/widgets/about.py:424 +#: cola/widgets/about.py:404 cola/widgets/about.py:407 msgid "Japanese translation" msgstr "" -#: cola/widgets/prefs.py:262 +#: cola/widgets/prefs.py:283 msgid "Keep *.orig Merge Backups" msgstr "Зберігати резервні копії *.orig файлів після злиття" -#: cola/widgets/stash.py:71 +#: cola/widgets/stash.py:73 msgid "Keep Index" msgstr "Зберегти індекс" -#: cola/widgets/main.py:477 +#: cola/widgets/main.py:490 msgid "Keyboard Shortcuts" msgstr "Поєднання клавіш" -#: cola/cmds.py:1608 cola/sequenceeditor.py:165 cola/sequenceeditor.py:338 -#: cola/widgets/dag.py:395 cola/widgets/filelist.py:34 +#: cola/difftool.py:27 cola/sequenceeditor.py:163 cola/sequenceeditor.py:334 +#: cola/widgets/dag.py:394 cola/widgets/filelist.py:31 msgid "Launch Diff Tool" msgstr "Запустити інструмент порівняння" -#: cola/widgets/dag.py:402 +#: cola/widgets/dag.py:401 msgid "Launch Directory Diff Tool" msgstr "Запустити каталоговий інструмент порівняння" -#: cola/cmds.py:1541 cola/cmds.py:1679 cola/widgets/filelist.py:38 +#: cola/cmds.py:1529 cola/cmds.py:1631 cola/widgets/filelist.py:35 msgid "Launch Editor" msgstr "Відкрити редактор" -#: cola/cmds.py:1644 +#: cola/cmds.py:1596 msgid "Launch Terminal" msgstr "Запустити термінал" -#: cola/sequenceeditor.py:166 +#: cola/sequenceeditor.py:164 msgid "" "Launch external diff tool\n" "Shortcut: Ctrl+D" msgstr "" -#: cola/widgets/diff.py:1005 cola/widgets/diff.py:1051 -#: cola/widgets/status.py:852 cola/widgets/status.py:948 +#: cola/widgets/diff.py:1044 cola/widgets/diff.py:1106 +#: cola/widgets/status.py:853 cola/widgets/status.py:949 msgid "Launch git-cola" msgstr "Запустити git-cola" @@ -2187,7 +2249,7 @@ msgstr "Запустити git-difftool до попередньої версії msgid "Launch git-difftool on the current path" msgstr "Запустити git-difftool для поточного шляху" -#: cola/icons.py:56 +#: cola/icons.py:55 msgid "Light Theme" msgstr "" @@ -2196,168 +2258,184 @@ msgstr "" msgid "Lines starting with '%s' will be ignored." msgstr "" -#: cola/widgets/startup.py:74 +#: cola/widgets/startup.py:73 msgid "List" msgstr "" -#: cola/guicmds.py:267 +#: cola/guicmds.py:266 msgid "Load Commit Message" msgstr "Завантажити повідомлення коміту" -#: cola/widgets/main.py:339 +#: cola/widgets/main.py:334 msgid "Load Commit Message..." msgstr "Завантажити текст коміту..." -#: cola/widgets/commitmsg.py:144 +#: cola/widgets/commitmsg.py:150 msgid "Load Previous Commit Message" msgstr "Завантажити повідомлення попереднього коміту" -#: cola/widgets/diff.py:264 +#: cola/widgets/diff.py:265 msgid "Loading..." msgstr "Завантаження..." -#: cola/widgets/branch.py:169 cola/widgets/branch.py:240 -#: cola/widgets/branch.py:281 cola/widgets/compare.py:38 -#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/branch.py:173 cola/widgets/branch.py:250 +#: cola/widgets/branch.py:290 cola/widgets/compare.py:37 +#: cola/widgets/compare.py:52 cola/widgets/compare.py:57 msgid "Local" msgstr "Локальна" -#: cola/widgets/cfgactions.py:227 cola/widgets/merge.py:46 -#: cola/widgets/remote.py:138 +#: cola/widgets/cfgactions.py:225 cola/widgets/merge.py:44 +#: cola/widgets/remote.py:136 msgid "Local Branch" msgstr "Локальна гілка" -#: cola/widgets/createbranch.py:114 +#: cola/widgets/createbranch.py:112 msgid "Local branch" msgstr "Локальна гілка" -#: cola/widgets/dag.py:788 cola/widgets/main.py:651 +#: cola/widgets/dag.py:854 cola/widgets/main.py:664 msgid "Lock Layout" msgstr "Закріпити положення елементів" -#: cola/widgets/dag.py:750 +#: cola/widgets/dag.py:816 msgid "Log" msgstr "Журнал подій" -#: cola/widgets/prefs.py:170 +#: cola/widgets/prefs.py:191 msgid "Log Date Format" msgstr "" -#: cola/widgets/about.py:268 +#: cola/themes.py:769 +msgid "MacOS Aqua dark" +msgstr "" + +#: cola/themes.py:765 +msgid "MacOS Aqua light" +msgstr "" + +#: cola/themes.py:781 +msgid "MacOS Vibrant dark" +msgstr "" + +#: cola/themes.py:775 +msgid "MacOS Vibrant light" +msgstr "" + +#: cola/widgets/about.py:251 msgid "Maintainer (since 2007) and developer" msgstr "Супроводжуючий (з 2007) та розробник" -#: cola/widgets/text.py:398 +#: cola/widgets/text.py:395 msgid "Match Case" msgstr "" -#: cola/widgets/merge.py:88 +#: cola/widgets/merge.py:86 msgid "Merge" msgstr "Злиття" -#: cola/widgets/merge.py:162 +#: cola/widgets/merge.py:160 #, python-format msgid "Merge \"%(revision)s\" into \"%(branch)s\"" msgstr "Злити \"%(revision)s\" в \"%(branch)s\"" -#: cola/widgets/prefs.py:257 +#: cola/widgets/prefs.py:278 msgid "Merge Tool" msgstr "Інструмент злиття" -#: cola/widgets/prefs.py:171 +#: cola/widgets/prefs.py:193 msgid "Merge Verbosity" msgstr "Детальність злиття" -#: cola/cmds.py:1829 +#: cola/cmds.py:1780 msgid "Merge failed. Conflict resolution is required." msgstr "" -#: cola/widgets/merge.py:167 +#: cola/widgets/merge.py:165 #, python-format msgid "Merge into \"%s\"" msgstr "Злити в \"%s\"" -#: cola/widgets/branch.py:231 +#: cola/widgets/branch.py:242 msgid "Merge into current branch" msgstr "Злити до поточної гілки" -#: cola/widgets/main.py:363 +#: cola/widgets/main.py:358 msgid "Merge..." msgstr "Злиття" -#: cola/widgets/main.py:1163 +#: cola/widgets/main.py:1176 msgid "Merging" msgstr "Злиття" -#: cola/models/browse.py:33 cola/widgets/createtag.py:78 +#: cola/models/browse.py:32 cola/widgets/createtag.py:76 msgid "Message" msgstr "Повідомлення" -#: cola/widgets/commitmsg.py:417 +#: cola/widgets/commitmsg.py:425 msgid "Missing Commit Message" msgstr "Відсутнє повідомлення коміту" -#: cola/widgets/createbranch.py:252 +#: cola/widgets/createbranch.py:250 msgid "Missing Data" msgstr "Дані відсутні" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Missing Name" msgstr "Назва відсутня" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Missing Revision" msgstr "Ревізія відсутня" -#: cola/cmds.py:2801 +#: cola/cmds.py:2747 msgid "Missing Tag Message" msgstr "Назва теґу відсутня" -#: cola/models/browse.py:332 cola/widgets/status.py:158 -#: cola/widgets/status.py:631 +#: cola/models/browse.py:331 cola/widgets/status.py:158 +#: cola/widgets/status.py:632 msgid "Modified" msgstr "Змінене" -#: cola/widgets/commitmsg.py:506 +#: cola/widgets/commitmsg.py:532 msgid "More..." msgstr "Більше..." -#: cola/widgets/standard.py:243 cola/widgets/status.py:233 +#: cola/widgets/standard.py:242 cola/widgets/status.py:234 msgid "Move Down" msgstr "Перемістити вниз" -#: cola/widgets/standard.py:235 cola/widgets/status.py:225 +#: cola/widgets/standard.py:234 cola/widgets/status.py:226 msgid "Move Up" msgstr "Перемістити вгору" -#: cola/widgets/status.py:300 +#: cola/widgets/status.py:301 msgid "Move files to trash" msgstr "Перемістити файл до смітника" -#: cola/models/browse.py:33 cola/widgets/bookmarks.py:467 -#: cola/widgets/createtag.py:61 cola/widgets/editremotes.py:450 -#: cola/widgets/status.py:1452 cola/widgets/toolbar.py:312 +#: cola/models/browse.py:32 cola/widgets/bookmarks.py:466 +#: cola/widgets/createtag.py:59 cola/widgets/editremotes.py:448 +#: cola/widgets/status.py:1453 cola/widgets/toolbar.py:317 msgid "Name" msgstr "Ім'я" -#: cola/widgets/editremotes.py:434 +#: cola/widgets/editremotes.py:432 msgid "Name for the new remote" msgstr "Назва нового віддаленого репозиторію" -#: cola/guicmds.py:148 cola/widgets/main.py:285 +#: cola/guicmds.py:147 cola/widgets/main.py:280 #, fuzzy msgid "New Bare Repository..." msgstr "Новий репозиторій..." -#: cola/guicmds.py:87 cola/widgets/main.py:280 +#: cola/guicmds.py:86 cola/widgets/main.py:275 msgid "New Repository..." msgstr "Новий репозиторій..." -#: cola/widgets/main.py:983 +#: cola/widgets/main.py:996 msgid "New Toolbar" msgstr "" -#: cola/widgets/startup.py:53 +#: cola/widgets/startup.py:52 msgid "New..." msgstr "Новий..." @@ -2365,15 +2443,19 @@ msgstr "Новий..." msgid "Next File" msgstr "Наступний файл" -#: cola/widgets/createbranch.py:123 cola/widgets/standard.py:1065 +#: cola/widgets/createbranch.py:121 cola/widgets/standard.py:1183 msgid "No" msgstr "Ні" -#: cola/widgets/merge.py:217 cola/widgets/merge.py:227 +#: cola/widgets/merge.py:215 cola/widgets/merge.py:225 msgid "No Revision Specified" msgstr "Ревізію не вказано" -#: cola/widgets/commitmsg.py:427 +#: cola/widgets/stash.py:225 +msgid "No change made" +msgstr "" + +#: cola/widgets/commitmsg.py:435 msgid "" "No changes to commit.\n" "\n" @@ -2383,27 +2465,27 @@ msgstr "" "\n" "Ви маєте проіндексувати принаймні 1 файл перед тим, як ви зможете зробити коміт." -#: cola/widgets/selectcommits.py:118 +#: cola/widgets/selectcommits.py:117 msgid "No commits exist in this branch." msgstr "На цій гілці немає комітів." -#: cola/widgets/merge.py:65 +#: cola/widgets/merge.py:63 msgid "No fast forward" msgstr "Без перемотки (fast-forward)" -#: cola/widgets/remote.py:186 +#: cola/widgets/remote.py:190 msgid "No fast-forward" msgstr "Без перемотки" -#: cola/widgets/remote.py:577 +#: cola/widgets/remote.py:612 msgid "No repository selected." msgstr "Не вибрано жодного репозиторію." -#: cola/widgets/remote.py:615 +#: cola/widgets/remote.py:650 msgid "Non-fast-forward fetch overwrites local history!" msgstr "Отримання без використання методу перемотки перезапише локальну історію!" -#: cola/widgets/remote.py:621 +#: cola/widgets/remote.py:656 msgid "" "Non-fast-forward push overwrites published history!\n" "(Did you pull first?)" @@ -2411,7 +2493,7 @@ msgstr "" "Надсилання без використання методу перемотки перезапише опубліковану історію!\n" "(Чи всі зміни стягнуто?)" -#: cola/widgets/commitmsg.py:444 +#: cola/widgets/commitmsg.py:452 msgid "Nothing to commit" msgstr "Немає що комітувати" @@ -2419,81 +2501,81 @@ msgstr "Немає що комітувати" msgid "Nothing to do" msgstr "Нічого робити" -#: cola/widgets/prefs.py:172 +#: cola/widgets/prefs.py:194 msgid "Number of Diff Context Lines" msgstr "Число рядків контексту різниці" -#: cola/widgets/bookmarks.py:79 cola/widgets/bookmarks.py:213 -#: cola/widgets/startup.py:336 +#: cola/widgets/bookmarks.py:78 cola/widgets/bookmarks.py:212 +#: cola/widgets/startup.py:335 msgid "Open" msgstr "Відкрити" -#: cola/widgets/text.py:230 +#: cola/widgets/text.py:228 #, python-format msgid "Open \"%s\"" msgstr "" -#: cola/cmds.py:1857 +#: cola/cmds.py:1808 msgid "Open Directory" msgstr "" -#: cola/guicmds.py:205 cola/guicmds.py:214 cola/widgets/editremotes.py:473 -#: cola/widgets/startup.py:55 cola/widgets/startup.py:215 +#: cola/guicmds.py:204 cola/guicmds.py:213 cola/widgets/editremotes.py:471 +#: cola/widgets/startup.py:54 cola/widgets/startup.py:214 msgid "Open Git Repository" msgstr "Відкрити Git репозиторій" -#: cola/widgets/submodules.py:49 +#: cola/widgets/submodules.py:48 #, fuzzy msgid "Open Parent" msgstr "Відкрити останній" -#: cola/cmds.py:1877 +#: cola/cmds.py:1828 msgid "Open Parent Directory" msgstr "Відкрити батьківський каталог" -#: cola/widgets/main.py:679 +#: cola/widgets/main.py:692 msgid "Open Recent" msgstr "Відкрити останній" -#: cola/cmds.py:1840 +#: cola/cmds.py:1791 msgid "Open Using Default Application" msgstr "Відкрити, використовуючи застосунок за замовчуванням" -#: cola/cmds.py:1890 +#: cola/cmds.py:1841 msgid "Open Worktree" msgstr "" -#: cola/widgets/bookmarks.py:221 cola/widgets/startup.py:344 +#: cola/widgets/bookmarks.py:220 cola/widgets/startup.py:343 msgid "Open in New Window" msgstr "Відкрити в новому вікні" -#: cola/widgets/main.py:408 +#: cola/widgets/main.py:415 msgid "Open in New Window..." msgstr "Відкрити в новому вікні..." -#: cola/widgets/main.py:402 +#: cola/widgets/main.py:409 msgid "Open..." msgstr "Відкрити" -#: cola/widgets/branch.py:345 +#: cola/widgets/branch.py:354 #, fuzzy msgid "Other branches" msgstr "Фільтрувати гілки..." -#: cola/widgets/archive.py:210 +#: cola/widgets/archive.py:208 msgid "Overwrite" msgstr "Перезаписати" -#: cola/widgets/archive.py:209 +#: cola/widgets/archive.py:207 #, python-format msgid "Overwrite \"%s\"?" msgstr "Перезаписати \"%s\"?" -#: cola/widgets/archive.py:207 +#: cola/widgets/archive.py:205 msgid "Overwrite File?" msgstr "Перезаписати файл?" -#: cola/widgets/grep.py:144 +#: cola/widgets/grep.py:142 msgid "" "Parse arguments using a shell.\n" "Queries with spaces will require \"double quotes\"." @@ -2501,63 +2583,67 @@ msgstr "" "Розібрати аргументи використовуючи командну стрічку.\n" "Запити з пробілами вимагатимуть \"лапок\"." -#: cola/models/browse.py:330 +#: cola/models/browse.py:329 msgid "Partially Staged" msgstr "Частково проіндексоване" -#: cola/widgets/main.py:744 +#: cola/widgets/main.py:757 msgid "Paste" msgstr "" -#: cola/cmds.py:363 +#: cola/cmds.py:364 msgid "Patch failed to apply" msgstr "" -#: cola/cmds.py:375 +#: cola/cmds.py:376 msgid "Patch(es) Applied" msgstr "Латку(и) застосовано" -#: cola/widgets/diff.py:1219 cola/widgets/main.py:695 +#: cola/widgets/diff.py:1293 cola/widgets/main.py:708 msgid "Patches" msgstr "" -#: cola/widgets/prefs.py:173 +#: cola/widgets/prefs.py:195 msgid "Patches Directory" msgstr "" -#: cola/widgets/bookmarks.py:468 cola/widgets/submodules.py:118 +#: cola/widgets/bookmarks.py:467 cola/widgets/submodules.py:117 msgid "Path" msgstr "Шлях" -#: cola/widgets/clone.py:112 +#: cola/widgets/clone.py:110 msgid "Path or URL to clone (Env. $VARS okay)" msgstr "Шлях або URL для клонування (Env. $VARS okay)" -#: cola/sequenceeditor.py:346 +#: cola/sequenceeditor.py:342 msgid "Pick" msgstr "" -#: cola/widgets/diff.py:781 +#: cola/widgets/dag.py:490 +msgid "Pickaxe search for changes containing text" +msgstr "" + +#: cola/widgets/diff.py:809 msgid "Pixel XOR" msgstr "" -#: cola/widgets/createbranch.py:253 +#: cola/widgets/createbranch.py:251 msgid "Please provide both a branch name and revision expression." msgstr "Будь ласка, надайте як ім'я гілки так і вираз ревізії." -#: cola/cmds.py:2348 +#: cola/cmds.py:2299 msgid "Please select a file" msgstr "Будь ласка, виберіть файл" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Please specify a name for the new tag." msgstr "Будь ласка, вкажіть назву для теґу." -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Please specify a revision to tag." msgstr "Будь ласка, вкажіть ревізію для теґу." -#: cola/widgets/commitmsg.py:410 +#: cola/widgets/commitmsg.py:418 msgid "" "Please supply a commit message.\n" "\n" @@ -2575,31 +2661,31 @@ msgstr "" "- Другий рядок: Пусто\n" "- Решта рядків: Опишіть, чому ці зміни хороші.\n" -#: cola/cmds.py:653 +#: cola/cmds.py:655 msgid "Point the current branch head to a new commit?" msgstr "Встановити HEAD поточної гілки на новий коміт?" -#: cola/widgets/about.py:416 +#: cola/widgets/about.py:399 msgid "Polish translation" msgstr "Польський переклад" -#: cola/widgets/stash.py:63 cola/widgets/stash.py:111 cola/widgets/stash.py:115 +#: cola/widgets/stash.py:65 cola/widgets/stash.py:114 cola/widgets/stash.py:118 msgid "Pop" msgstr "" -#: cola/widgets/main.py:293 cola/widgets/prefs.py:395 +#: cola/widgets/main.py:288 cola/widgets/prefs.py:433 msgid "Preferences" msgstr "Налаштування" -#: cola/widgets/archive.py:129 +#: cola/widgets/archive.py:127 msgid "Prefix" msgstr "Префікс" -#: cola/widgets/main.py:345 +#: cola/widgets/main.py:340 msgid "Prepare Commit Message" msgstr "Підготувати текст коміту" -#: cola/widgets/prefs.py:157 +#: cola/widgets/prefs.py:180 msgid "Prevent \"Stage\" from staging all files when nothing is selected" msgstr "" @@ -2607,218 +2693,230 @@ msgstr "" msgid "Previous File" msgstr "Попередній файл" -#: cola/widgets/remote.py:171 +#: cola/widgets/remote.py:169 msgid "Prompt on creation" msgstr "Підказати при створенні" -#: cola/widgets/remote.py:172 +#: cola/widgets/remote.py:170 msgid "Prompt when pushing creates new remote branches" msgstr "Підказати коли надсилаются новостворені віддалені гілки" -#: cola/widgets/remote.py:208 +#: cola/widgets/remote.py:212 msgid "Prune " msgstr "" -#: cola/widgets/bookmarks.py:255 cola/widgets/startup.py:376 +#: cola/widgets/bookmarks.py:254 cola/widgets/startup.py:375 msgid "Prune Missing Entries" msgstr "" -#: cola/widgets/branch.py:247 cola/widgets/remote.py:728 +#: cola/widgets/branch.py:256 cola/widgets/remote.py:783 msgid "Pull" msgstr "Стягнути" -#: cola/widgets/action.py:65 cola/widgets/main.py:397 +#: cola/widgets/action.py:73 cola/widgets/main.py:401 msgid "Pull..." msgstr "Стягнути" -#: cola/widgets/branch.py:253 cola/widgets/remote.py:593 -#: cola/widgets/remote.py:698 +#: cola/widgets/branch.py:262 cola/widgets/remote.py:628 +#: cola/widgets/remote.py:758 msgid "Push" msgstr "Надіслати" -#: cola/widgets/action.py:64 cola/widgets/main.py:392 +#: cola/widgets/action.py:70 cola/widgets/main.py:393 +msgid "Push to one or more remotes using \"git push\"" +msgstr "" + +#: cola/widgets/action.py:70 cola/widgets/main.py:392 msgid "Push..." msgstr "Надіслати" -#: cola/guicmds.py:252 +#: cola/guicmds.py:251 msgid "Quick Open Repository" msgstr "" -#: cola/widgets/main.py:660 +#: cola/widgets/main.py:673 msgid "Quick Open..." msgstr "" -#: cola/widgets/main.py:355 +#: cola/widgets/main.py:350 msgid "Quit" msgstr "Вихід" -#: cola/cmds.py:2144 cola/cmds.py:2180 cola/cmds.py:2181 cola/cmds.py:2194 -#: cola/cmds.py:2195 cola/sequenceeditor.py:158 cola/sequenceeditor.py:199 -#: cola/widgets/main.py:822 cola/widgets/remote.py:211 +#: cola/cmds.py:2095 cola/cmds.py:2131 cola/cmds.py:2132 cola/cmds.py:2145 +#: cola/cmds.py:2146 cola/sequenceeditor.py:156 cola/sequenceeditor.py:197 +#: cola/widgets/main.py:835 cola/widgets/remote.py:215 msgid "Rebase" msgstr "Перемістити (rebase)" -#: cola/cmds.py:2143 +#: cola/cmds.py:2094 #, python-format msgid "Rebase onto %s" msgstr "Перемістити (rebase) на %s" -#: cola/cmds.py:2156 +#: cola/cmds.py:2107 #, fuzzy msgid "Rebase stopped" msgstr "Перемістити (rebase) на %s" -#: cola/widgets/remote.py:210 +#: cola/widgets/remote.py:214 msgid "Rebase the current branch instead of merging" msgstr "Перемістити поточну гілку замість злиття" -#: cola/widgets/dag.py:419 +#: cola/widgets/dag.py:418 msgid "Rebase to this commit" msgstr "" -#: cola/widgets/main.py:1165 +#: cola/widgets/main.py:1178 msgid "Rebasing" msgstr "Переміщення" -#: cola/widgets/main.py:120 +#: cola/widgets/main.py:118 msgid "Recent" msgstr "Недавнє" -#: cola/widgets/bookmarks.py:93 +#: cola/widgets/bookmarks.py:92 msgid "Recent repositories" msgstr "Недавні репозиторіїї" -#: cola/widgets/prefs.py:258 +#: cola/widgets/prefs.py:279 #, fuzzy msgid "Recent repository count" msgstr "Недавні репозиторіїї" -#: cola/widgets/recent.py:46 +#: cola/widgets/recent.py:44 msgid "Recently Modified Files" msgstr "Недавно змінені файли" -#: cola/widgets/main.py:320 +#: cola/widgets/main.py:315 msgid "Recently Modified Files..." msgstr "Недавно змінені файли..." -#: cola/widgets/stash.py:256 +#: cola/widgets/stash.py:274 msgid "Recovering a dropped stash is not possible." msgstr "Неможливо відновити видалений сховок." -#: cola/widgets/createbranch.py:283 +#: cola/widgets/createbranch.py:281 msgid "Recovering lost commits may not be easy." msgstr "Відновлення втрачених комітів може бути нелегким." -#: cola/widgets/main.py:737 +#: cola/widgets/main.py:750 msgid "Redo" msgstr "" -#: cola/widgets/clone.py:121 +#: cola/widgets/clone.py:119 msgid "Reduce commit history to minimum" msgstr "" -#: cola/widgets/submodules.py:121 +#: cola/widgets/submodules.py:120 msgid "Reference Repository" msgstr "" -#: cola/widgets/submodules.py:105 +#: cola/widgets/submodules.py:104 msgid "Reference URL" msgstr "" -#: cola/widgets/submodules.py:106 +#: cola/widgets/submodules.py:105 msgid "Reference repository to use when cloning (optional)" msgstr "" -#: cola/cmds.py:2222 cola/qtutils.py:770 cola/widgets/action.py:62 -#: cola/widgets/dag.py:792 cola/widgets/editremotes.py:85 -#: cola/widgets/grep.py:105 cola/widgets/recent.py:116 -#: cola/widgets/submodules.py:45 +#: cola/cmds.py:2173 cola/qtutils.py:801 cola/widgets/action.py:63 +#: cola/widgets/dag.py:858 cola/widgets/editremotes.py:84 +#: cola/widgets/grep.py:103 cola/widgets/recent.py:114 +#: cola/widgets/submodules.py:44 msgid "Refresh" msgstr "Оновити" -#: cola/widgets/remote.py:179 +#: cola/widgets/remote.py:183 msgid "Refuse to merge unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward" msgstr "Відмовтесь від злиття за винятком, коли поточний HEAD є оновленим або злиття може бети вирішено методом перемотки" -#: cola/widgets/branch.py:173 cola/widgets/branch.py:225 -#: cola/widgets/branch.py:269 cola/widgets/branch.py:470 -#: cola/widgets/compare.py:54 cola/widgets/compare.py:59 -#: cola/widgets/remote.py:147 +#: cola/widgets/branch.py:177 cola/widgets/branch.py:236 +#: cola/widgets/branch.py:278 cola/widgets/branch.py:513 +#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/remote.py:145 msgid "Remote" msgstr "Віддалений репозиторій" -#: cola/widgets/remote.py:162 +#: cola/widgets/remote.py:160 msgid "Remote Branch" msgstr "Віддалена гілка" -#: cola/cmds.py:1196 +#: cola/cmds.py:1197 msgid "Remote Branch Deleted" msgstr "Видалено віддалену гілку" -#: cola/widgets/editremotes.py:49 +#: cola/widgets/log.py:99 +msgid "Remote Messages" +msgstr "" + +#: cola/widgets/editremotes.py:48 msgid "Remote git repositories - double-click to rename" msgstr "Віддалені репозиторіїї git - подвійний клік для перейменування" -#: cola/cmds.py:1029 cola/widgets/patch.py:107 cola/widgets/patch.py:122 -#: cola/widgets/startup.py:265 cola/widgets/status.py:1382 +#: cola/cmds.py:1030 cola/widgets/diff.py:1701 cola/widgets/diff.py:1716 +#: cola/widgets/startup.py:264 cola/widgets/status.py:1383 msgid "Remove" msgstr "Видалити" -#: cola/cmds.py:1027 +#: cola/cmds.py:1028 #, python-format msgid "Remove %s from the recent list?" msgstr "Видалити %s зі списку останніх?" -#: cola/widgets/toolbar.py:316 +#: cola/widgets/toolbar.py:321 msgid "Remove Element" msgstr "Видалити елемент" -#: cola/widgets/remote.py:206 +#: cola/widgets/remote.py:210 msgid "Remove remote-tracking branches that no longer exist on the remote" msgstr "" -#: cola/widgets/patch.py:109 +#: cola/widgets/diff.py:1703 msgid "Remove selected (Delete)" msgstr "Видалити виділене (Видалити)" -#: cola/widgets/bookmarks.py:258 cola/widgets/startup.py:379 +#: cola/widgets/bookmarks.py:257 cola/widgets/startup.py:378 msgid "Remove stale entries for repositories that no longer exist" msgstr "" -#: cola/guicmds.py:333 cola/widgets/browse.py:159 +#: cola/guicmds.py:332 cola/widgets/browse.py:159 cola/widgets/stash.py:44 msgid "Rename" msgstr "Перейменувати" -#: cola/cmds.py:1153 +#: cola/cmds.py:1154 #, fuzzy, python-format msgid "Rename \"%s\"" msgstr "Перейменувати" -#: cola/widgets/branch.py:259 +#: cola/widgets/branch.py:268 msgid "Rename Branch" msgstr "Перейменувати гілку" -#: cola/widgets/main.py:570 +#: cola/widgets/main.py:583 msgid "Rename Branch..." msgstr "Перейменувати гілку..." -#: cola/guicmds.py:330 +#: cola/guicmds.py:329 msgid "Rename Existing Branch" msgstr "Перейменувати існуючу гілку" -#: cola/cmds.py:944 +#: cola/cmds.py:942 msgid "Rename Remote" msgstr "Перейменувати віддалений репозиторій" -#: cola/widgets/bookmarks.py:233 cola/widgets/startup.py:356 +#: cola/widgets/bookmarks.py:232 cola/widgets/startup.py:355 msgid "Rename Repository" msgstr "Перейменувати репозиторій" -#: cola/widgets/branch.py:445 +#: cola/widgets/stash.py:218 +msgid "Rename Stash" +msgstr "" + +#: cola/widgets/branch.py:478 msgid "Rename branch" msgstr "Перейменувати гілку" -#: cola/cmds.py:945 +#: cola/cmds.py:943 #, python-format msgid "Rename remote \"%(current)s\" to \"%(new)s\"?" msgstr "Перейменувати віддалений репозиторій \"%(current)s\" в \"%(new)s\"?" @@ -2828,179 +2926,183 @@ msgstr "Перейменувати віддалений репозиторій \ msgid "Rename selected paths" msgstr "Редагувати вибрані шляхи" -#: cola/app.py:497 cola/widgets/startup.py:262 +#: cola/widgets/stash.py:45 +msgid "Rename the selected stash" +msgstr "" + +#: cola/app.py:500 cola/widgets/startup.py:261 msgid "Repository Not Found" msgstr "" -#: cola/widgets/browse.py:87 cola/widgets/main.py:1095 +#: cola/widgets/browse.py:87 cola/widgets/main.py:1108 #, python-format msgid "Repository: %s" msgstr "Репозиторій: %s" -#: cola/guicmds.py:351 cola/widgets/createbranch.py:125 cola/widgets/dag.py:331 -#: cola/widgets/editremotes.py:58 cola/widgets/main.py:832 +#: cola/guicmds.py:350 cola/widgets/createbranch.py:123 cola/widgets/dag.py:330 +#: cola/widgets/editremotes.py:57 cola/widgets/main.py:845 msgid "Reset" msgstr "Скинути" -#: cola/widgets/createbranch.py:286 +#: cola/widgets/createbranch.py:284 #, python-format msgid "Reset \"%(branch)s\" to \"%(revision)s\"?" msgstr "Скинути \"%(branch)s\" до \"%(revision)s\"?" -#: cola/guicmds.py:359 +#: cola/guicmds.py:358 msgid "Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/cmds.py:655 cola/cmds.py:706 cola/guicmds.py:342 -#: cola/widgets/createbranch.py:295 +#: cola/cmds.py:657 cola/cmds.py:708 cola/guicmds.py:341 +#: cola/widgets/createbranch.py:293 msgid "Reset Branch" msgstr "Скинути гілку" -#: cola/cmds.py:703 cola/guicmds.py:341 cola/widgets/dag.py:425 -#: cola/widgets/main.py:419 +#: cola/cmds.py:705 cola/guicmds.py:340 cola/widgets/dag.py:424 +#: cola/widgets/main.py:431 msgid "Reset Branch (Soft)" msgstr "" -#: cola/cmds.py:652 cola/guicmds.py:350 cola/widgets/dag.py:431 -#: cola/widgets/main.py:426 +#: cola/cmds.py:654 cola/guicmds.py:349 cola/widgets/dag.py:430 +#: cola/widgets/main.py:439 msgid "Reset Branch and Stage (Mixed)" msgstr "" -#: cola/widgets/createbranch.py:292 +#: cola/widgets/createbranch.py:290 msgid "Reset Branch?" msgstr "Скинути гілку?" -#: cola/widgets/main.py:655 +#: cola/widgets/main.py:668 msgid "Reset Layout" msgstr "" -#: cola/cmds.py:687 +#: cola/cmds.py:689 msgid "Reset Worktree and Reset All?" msgstr "" -#: cola/cmds.py:672 cola/cmds.py:689 cola/cmds.py:723 cola/guicmds.py:360 -#: cola/guicmds.py:373 cola/guicmds.py:382 +#: cola/cmds.py:674 cola/cmds.py:691 cola/cmds.py:725 cola/guicmds.py:359 +#: cola/guicmds.py:372 cola/guicmds.py:381 msgid "Reset and Restore" msgstr "" -#: cola/cmds.py:704 +#: cola/cmds.py:706 msgid "Reset branch?" msgstr "" -#: cola/widgets/createbranch.py:266 +#: cola/widgets/createbranch.py:264 #, python-format msgid "Resetting \"%(branch)s\" to \"%(revision)s\" will lose commits." msgstr "Скидання \"%(branch)s\" до \"%(revision)s\" призведе до втрати комітів." -#: cola/widgets/prefs.py:264 +#: cola/widgets/prefs.py:285 msgid "Resize File Browser columns" msgstr "" -#: cola/widgets/prefs.py:374 +#: cola/widgets/prefs.py:412 msgid "Restart the application after changing appearance settings." msgstr "" -#: cola/cmds.py:757 cola/cmds.py:760 cola/guicmds.py:390 cola/guicmds.py:391 -#: cola/widgets/dag.py:461 cola/widgets/main.py:457 +#: cola/cmds.py:759 cola/cmds.py:762 cola/guicmds.py:389 cola/guicmds.py:390 +#: cola/widgets/dag.py:460 cola/widgets/main.py:471 msgid "Restore Worktree" msgstr "" -#: cola/cmds.py:720 cola/guicmds.py:381 cola/widgets/dag.py:454 -#: cola/widgets/main.py:450 +#: cola/cmds.py:722 cola/guicmds.py:380 cola/widgets/dag.py:453 +#: cola/widgets/main.py:463 msgid "Restore Worktree and Reset All (Hard)" msgstr "" -#: cola/cmds.py:669 cola/widgets/main.py:434 +#: cola/cmds.py:671 cola/widgets/main.py:447 msgid "Restore Worktree and Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/widgets/dag.py:438 +#: cola/widgets/dag.py:437 msgid "Restore Worktree and Reset All (Keep Unstaged Edits)" msgstr "" -#: cola/cmds.py:686 cola/guicmds.py:372 cola/widgets/dag.py:446 -#: cola/widgets/main.py:442 +#: cola/cmds.py:688 cola/guicmds.py:371 cola/widgets/dag.py:445 +#: cola/widgets/main.py:455 msgid "Restore Worktree and Reset All (Merge)" msgstr "" -#: cola/cmds.py:721 +#: cola/cmds.py:723 msgid "Restore Worktree and Reset All?" msgstr "" -#: cola/cmds.py:758 +#: cola/cmds.py:760 #, python-format msgid "Restore Worktree to %s?" msgstr "" -#: cola/cmds.py:670 +#: cola/cmds.py:672 msgid "Restore worktree, reset, and preserve unstaged edits?" msgstr "" -#: cola/widgets/dag.py:390 +#: cola/widgets/dag.py:389 msgid "Revert" msgstr "" -#: cola/widgets/diff.py:1153 +#: cola/widgets/diff.py:1227 msgid "Revert Diff Hunk" msgstr "Скасувати частину різниці" -#: cola/widgets/diff.py:1018 +#: cola/widgets/diff.py:1057 msgid "Revert Diff Hunk..." msgstr "Скасувати частину різниці..." -#: cola/widgets/diff.py:1152 +#: cola/widgets/diff.py:1226 msgid "Revert Diff Hunk?" msgstr "Скасувати частину різниці?" -#: cola/widgets/diff.py:1150 +#: cola/widgets/diff.py:1224 msgid "Revert Selected Lines" msgstr "Скасувати виділені рядки" -#: cola/widgets/diff.py:1013 +#: cola/widgets/diff.py:1052 msgid "Revert Selected Lines..." msgstr "Скасування виділених рядків..." -#: cola/widgets/diff.py:1149 +#: cola/widgets/diff.py:1223 msgid "Revert Selected Lines?" msgstr "Скасувати виділені рядки?" -#: cola/cmds.py:2311 +#: cola/cmds.py:2262 msgid "Revert Uncommitted Changes" msgstr "Відмінити незакомітовані зміни" -#: cola/cmds.py:2305 +#: cola/cmds.py:2256 msgid "Revert Uncommitted Changes?" msgstr "Відмінити незакомітовані зміни?" -#: cola/cmds.py:2298 +#: cola/cmds.py:2249 msgid "Revert Uncommitted Edits..." msgstr "Відмінити незакомітовані зміни..." -#: cola/cmds.py:2289 +#: cola/cmds.py:2240 msgid "Revert Unstaged Changes" msgstr "Відмінити непроіндексовані зміни" -#: cola/cmds.py:2283 +#: cola/cmds.py:2234 msgid "Revert Unstaged Changes?" msgstr "Відмінити непроіндексовані зміни?" -#: cola/cmds.py:2275 +#: cola/cmds.py:2226 msgid "Revert Unstaged Edits..." msgstr "Відмінити непроіндексовані зміни..." -#: cola/cmds.py:598 +#: cola/cmds.py:599 msgid "Revert failed" msgstr "" -#: cola/cmds.py:2310 cola/widgets/diff.py:1161 +#: cola/cmds.py:2261 cola/widgets/diff.py:1235 msgid "Revert the uncommitted changes?" msgstr "Відмінити незакомітовані зміни?" -#: cola/cmds.py:2288 +#: cola/cmds.py:2239 msgid "Revert the unstaged changes?" msgstr "Відмінити непроіндексовані зміни?" -#: cola/widgets/browse.py:189 +#: cola/widgets/browse.py:190 msgid "Revert uncommitted changes to selected paths" msgstr "Відмінити незакомітовані зміни на вибраних шляхах" @@ -3008,301 +3110,309 @@ msgstr "Відмінити незакомітовані зміни на вибр msgid "Revert unstaged changes to selected paths" msgstr "Відмінити непроіндексовані зміни на вибраних шляхах" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Review" msgstr "Перевірка" -#: cola/widgets/main.py:583 +#: cola/widgets/main.py:596 msgid "Review..." msgstr "Перевірка..." -#: cola/widgets/cfgactions.py:233 cola/widgets/createtag.py:84 +#: cola/widgets/cfgactions.py:231 cola/widgets/createtag.py:82 msgid "Revision" msgstr "Ревізія" -#: cola/widgets/selectcommits.py:62 +#: cola/widgets/selectcommits.py:61 msgid "Revision Expression:" msgstr "Вираз для визначення ревізії:" -#: cola/widgets/merge.py:39 cola/widgets/merge.py:42 +#: cola/widgets/merge.py:37 cola/widgets/merge.py:40 msgid "Revision to Merge" msgstr "Ревізія для злиття" -#: cola/sequenceeditor.py:351 +#: cola/sequenceeditor.py:347 msgid "Reword" msgstr "" -#: cola/cmds.py:776 cola/widgets/commitmsg.py:456 +#: cola/cmds.py:778 cola/widgets/commitmsg.py:464 msgid "Rewrite Published Commit?" msgstr "Перезаписати опублікований коміт?" -#: cola/widgets/log.py:31 +#: cola/widgets/log.py:31 cola/widgets/log.py:133 msgid "Right-click links to open:" msgstr "" -#: cola/interaction.py:127 cola/widgets/cfgactions.py:245 +#: cola/interaction.py:125 cola/widgets/cfgactions.py:243 msgid "Run" msgstr "Запустити" -#: cola/cmds.py:2341 +#: cola/cmds.py:2292 #, python-format msgid "Run \"%s\"?" msgstr "Виконати \"%s\"?" -#: cola/interaction.py:124 +#: cola/interaction.py:122 #, python-format msgid "Run %s?" msgstr "Запустити %s?" -#: cola/interaction.py:125 +#: cola/interaction.py:123 #, python-format msgid "Run the \"%s\" command?" msgstr "Виконати команду \"%s\"?" -#: cola/cmds.py:2380 +#: cola/cmds.py:2331 #, python-format msgid "Running command: %s" msgstr "Запуск команди: %s" -#: cola/widgets/about.py:422 +#: cola/widgets/about.py:405 msgid "Russian translation" msgstr "Російський переклад" -#: cola/sequenceeditor.py:324 +#: cola/sequenceeditor.py:321 #, fuzzy msgid "SHA-1" msgstr "Скопіювати SHA-1" -#: cola/widgets/prefs.py:183 +#: cola/widgets/prefs.py:205 #, fuzzy msgid "Safe Mode" msgstr "Проіндексувати зміни" -#: cola/cmds.py:2167 cola/widgets/archive.py:126 cola/widgets/browse.py:609 -#: cola/widgets/editremotes.py:54 cola/widgets/stash.py:52 -#: cola/widgets/status.py:1388 +#: cola/cmds.py:2118 cola/widgets/archive.py:124 cola/widgets/browse.py:610 +#: cola/widgets/editremotes.py:53 cola/widgets/stash.py:54 +#: cola/widgets/status.py:1389 msgid "Save" msgstr "Зберегти" -#: cola/widgets/archive.py:113 +#: cola/widgets/archive.py:111 msgid "Save Archive" msgstr "Зберегти архів" -#: cola/widgets/dag.py:382 cola/widgets/main.py:351 +#: cola/widgets/dag.py:381 cola/widgets/main.py:346 msgid "Save As Tarball/Zip..." msgstr "Зберегти як Tarball/Zip..." -#: cola/widgets/prefs.py:263 +#: cola/widgets/prefs.py:284 msgid "Save GUI Settings" msgstr "Зберегти налаштування графічного інтерфейсу" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Save Stash" msgstr "Зберегти сховок" -#: cola/widgets/stash.py:53 +#: cola/widgets/stash.py:55 msgid "Save modified state to new stash" msgstr "Зберегти змінений стан до нового сховка" -#: cola/widgets/browse.py:570 +#: cola/widgets/browse.py:571 #, python-format msgid "Saved \"%(filename)s\" from \"%(ref)s\" to \"%(destination)s\"" msgstr "Збережено \"%(filename)s\" з \"%(ref)s\" до \"%(destination)s\"" -#: cola/widgets/bookmarks.py:83 cola/widgets/grep.py:98 -#: cola/widgets/search.py:42 cola/widgets/search.py:62 +#: cola/widgets/bookmarks.py:82 cola/widgets/grep.py:96 +#: cola/widgets/search.py:41 cola/widgets/search.py:61 msgid "Search" msgstr "Пошук" -#: cola/widgets/search.py:226 +#: cola/widgets/search.py:225 msgid "Search Authors" msgstr "Пошук авторів" -#: cola/widgets/search.py:224 +#: cola/widgets/search.py:223 msgid "Search Commit Messages" msgstr "Пошук тексту коіта" -#: cola/widgets/search.py:227 +#: cola/widgets/search.py:226 msgid "Search Committers" msgstr "Пошук комітерів" -#: cola/widgets/search.py:228 +#: cola/widgets/search.py:227 msgid "Search Date Range" msgstr "Пошук діапазону дат" -#: cola/widgets/search.py:225 +#: cola/widgets/search.py:224 msgid "Search Diffs" msgstr "Пошук різниць" -#: cola/widgets/search.py:222 +#: cola/widgets/search.py:221 msgid "Search by Expression" msgstr "Пошук за виразом" -#: cola/widgets/search.py:223 +#: cola/widgets/search.py:222 msgid "Search by Path" msgstr "Пошук за шляхом" -#: cola/widgets/grep.py:124 +#: cola/widgets/dag.py:494 +msgid "Search commit messages" +msgstr "" + +#: cola/widgets/grep.py:122 msgid "Search for a fixed string" msgstr "Шукати фіксовану послідовність знаків" -#: cola/widgets/diff.py:519 cola/widgets/diff.py:1514 +#: cola/widgets/diff.py:526 cola/widgets/diff.py:1576 msgid "Search in Diff" msgstr "" -#: cola/guicmds.py:253 cola/widgets/bookmarks.py:62 +#: cola/guicmds.py:252 cola/widgets/bookmarks.py:61 msgid "Search repositories by name..." msgstr "" -#: cola/widgets/grep.py:122 +#: cola/widgets/grep.py:120 msgid "Search using a POSIX basic regular expression" msgstr "Шукати, використовуючи базовий регулярний вираз POSIX" -#: cola/widgets/grep.py:123 +#: cola/widgets/grep.py:121 msgid "Search using a POSIX extended regular expression" msgstr "Шукати, використовуючи розширений регулярний вираз POSIX" -#: cola/widgets/main.py:493 +#: cola/widgets/main.py:506 msgid "Search..." msgstr "Пошук..." -#: cola/widgets/selectcommits.py:67 +#: cola/widgets/selectcommits.py:66 msgid "Search:" msgstr "" -#: cola/guicmds.py:330 cola/widgets/selectcommits.py:74 +#: cola/guicmds.py:329 cola/widgets/selectcommits.py:73 msgid "Select" msgstr "Вибрати" -#: cola/widgets/main.py:750 +#: cola/widgets/main.py:763 msgid "Select All" msgstr "Виділити все" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Select Branch to Review" msgstr "Виберіть гілку для перевірки" -#: cola/widgets/dag.py:1610 +#: cola/widgets/dag.py:1667 msgid "Select Child" msgstr "Вибрати потомка" -#: cola/widgets/commitmsg.py:512 +#: cola/widgets/commitmsg.py:538 msgid "Select Commit" msgstr "Вибрати коміт" -#: cola/guicmds.py:137 +#: cola/guicmds.py:136 #, fuzzy msgid "Select Directory..." msgstr "Вибрати репозиторій..." -#: cola/cmds.py:2129 +#: cola/cmds.py:2080 msgid "Select New Upstream" msgstr "Вибрати нове віддалене джерело" -#: cola/widgets/dag.py:1614 +#: cola/widgets/dag.py:1671 msgid "Select Newest Child" msgstr "Вибрати найновішого потомка" -#: cola/widgets/dag.py:1604 +#: cola/widgets/dag.py:1661 msgid "Select Oldest Parent" msgstr "Вибрати найстаршого предка" -#: cola/widgets/dag.py:1599 +#: cola/widgets/dag.py:1656 msgid "Select Parent" msgstr "Вибрати предка" -#: cola/widgets/browse.py:525 +#: cola/widgets/browse.py:526 msgid "Select Previous Version" msgstr "Вибрати попередню версію" -#: cola/widgets/clone.py:197 +#: cola/widgets/clone.py:195 msgid "Select a parent directory for the new clone" msgstr "Виберіть батьківський каталог для нового клонування" -#: cola/widgets/standard.py:756 cola/widgets/standard.py:779 +#: cola/widgets/standard.py:826 cola/widgets/standard.py:848 msgid "Select directory" msgstr "" -#: cola/widgets/selectcommits.py:162 +#: cola/widgets/selectcommits.py:161 #, fuzzy msgid "Select output dir" msgstr "Вибрати коміт" -#: cola/widgets/selectcommits.py:183 +#: cola/widgets/selectcommits.py:182 #, fuzzy msgid "Select output directory" msgstr "Вибрати репозиторій..." -#: cola/widgets/patch.py:175 +#: cola/widgets/diff.py:1769 msgid "Select patch file(s)..." msgstr "Виберіть файл(и) латки(ок)..." -#: cola/widgets/editremotes.py:437 +#: cola/widgets/editremotes.py:435 #, fuzzy msgid "Select repository" msgstr "Вибрати репозиторій..." -#: cola/widgets/bookmarks.py:225 cola/widgets/startup.py:348 +#: cola/widgets/bookmarks.py:224 cola/widgets/startup.py:347 msgid "Set Default Repository" msgstr "Встановити репозиторій за замовчуванням" -#: cola/widgets/branch.py:282 +#: cola/widgets/branch.py:291 #, fuzzy msgid "Set Upstream Branch" msgstr "Встановити віддалене джерело" -#: cola/widgets/branch.py:72 +#: cola/widgets/branch.py:74 msgid "" "Set the sort order for branches and tags.\n" "Toggle between date-based and version-name-based sorting." msgstr "" -#: cola/widgets/remote.py:213 +#: cola/widgets/remote.py:217 msgid "Set upstream" msgstr "Встановити віддалене джерело" -#: cola/widgets/prefs.py:405 +#: cola/widgets/prefs.py:443 msgid "Settings" msgstr "Налаштування" -#: cola/widgets/grep.py:142 +#: cola/widgets/grep.py:140 msgid "Shell arguments" msgstr "Аргументи командної стрічки" -#: cola/sequenceeditor.py:375 +#: cola/sequenceeditor.py:371 msgid "Shift Down" msgstr "" -#: cola/sequenceeditor.py:379 +#: cola/sequenceeditor.py:375 msgid "Shift Up" msgstr "" -#: cola/widgets/about.py:499 +#: cola/widgets/about.py:482 msgid "Shortcuts" msgstr "Поєднання клавіш" -#: cola/widgets/prefs.py:179 +#: cola/widgets/prefs.py:201 msgid "Show Diffstat After Merge" msgstr "Показати список різниць після злиття" -#: cola/widgets/prefs.py:178 +#: cola/widgets/prefs.py:200 msgid "Show Full Paths in the Window Title" msgstr "" -#: cola/sequenceeditor.py:106 cola/widgets/finder.py:187 -#: cola/widgets/status.py:1384 +#: cola/sequenceeditor.py:104 cola/widgets/finder.py:186 +#: cola/widgets/status.py:1385 msgid "Show Help" msgstr "Показати допомогу" -#: cola/widgets/filelist.py:30 +#: cola/widgets/filelist.py:27 msgid "Show History" msgstr "Показати історію" -#: cola/widgets/prefs.py:348 +#: cola/widgets/prefs.py:368 msgid "Show file counts in Status titles" msgstr "" -#: cola/sequenceeditor.py:171 cola/widgets/finder.py:138 +#: cola/widgets/diff.py:794 +msgid "Show filenames" +msgstr "" + +#: cola/sequenceeditor.py:169 cola/widgets/finder.py:137 msgid "" "Show help\n" "Shortcut: ?" @@ -3310,138 +3420,146 @@ msgstr "" "Показати допомогу\n" "Клавіша: ?" -#: cola/widgets/diff.py:765 +#: cola/widgets/diff.py:792 msgid "Show line numbers" msgstr "Показати нумерацію рядків" -#: cola/widgets/diff.py:761 +#: cola/widgets/remote.py:175 +msgid "Show remote messages" +msgstr "" + +#: cola/widgets/diff.py:789 msgid "Show whole surrounding functions of changes" msgstr "Показати всі оточуючі функції при змінах" -#: cola/widgets/recent.py:58 +#: cola/widgets/recent.py:56 msgid "Showing changes since" msgstr "Показ змін від" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "Side by side" msgstr "" -#: cola/cmds.py:2512 +#: cola/cmds.py:2463 msgid "Sign Off" msgstr "Підписати" -#: cola/widgets/createtag.py:71 +#: cola/widgets/createtag.py:69 msgid "Sign Tag" msgstr "Підписати теґ" -#: cola/widgets/commitmsg.py:55 +#: cola/widgets/commitmsg.py:56 msgid "Sign off on this commit" msgstr "Підписатись під цим комітом" -#: cola/widgets/about.py:412 cola/widgets/about.py:425 +#: cola/widgets/about.py:395 cola/widgets/about.py:408 #, fuzzy msgid "Simplified Chinese translation" msgstr "Китайський переклад" -#: cola/cmds.py:2587 +#: cola/cmds.py:2529 msgid "Skip" msgstr "Пропустити" -#: cola/widgets/main.py:264 cola/widgets/main.py:617 +#: cola/widgets/main.py:260 cola/widgets/main.py:630 msgid "Skip Current Patch" msgstr "Пропустити поточну латку" -#: cola/widgets/main.py:267 +#: cola/widgets/main.py:261 msgid "Skip applying the current patch and continue applying patches" msgstr "" -#: cola/widgets/prefs.py:261 +#: cola/widgets/prefs.py:282 msgid "Sort bookmarks alphabetically" msgstr "Сортувати закладки за алфавітом" -#: cola/widgets/about.py:413 cola/widgets/about.py:436 -#: cola/widgets/about.py:440 +#: cola/widgets/about.py:396 cola/widgets/about.py:419 +#: cola/widgets/about.py:423 msgid "Spanish translation" msgstr "Іспанський переклад" -#: cola/widgets/createtag.py:88 +#: cola/widgets/createtag.py:86 msgid "Specifies the SHA-1 to tag" msgstr "Визначає SHA-1 теґу" -#: cola/widgets/createtag.py:81 +#: cola/widgets/createtag.py:79 msgid "Specifies the tag message" msgstr "Визначає повідомлення теґу" -#: cola/widgets/createtag.py:65 +#: cola/widgets/createtag.py:63 msgid "Specifies the tag name" msgstr "Задає ім'я теґу" -#: cola/widgets/spellcheck.py:46 +#: cola/widgets/spellcheck.py:45 msgid "Spelling Suggestions" msgstr "Поради з правопису" -#: cola/sequenceeditor.py:369 cola/widgets/merge.py:58 +#: cola/sequenceeditor.py:365 cola/widgets/merge.py:56 msgid "Squash" msgstr "Об'єднати" -#: cola/widgets/merge.py:57 +#: cola/widgets/merge.py:55 msgid "Squash the merged commits into a single commit" msgstr "Об'єднати злиті коміти в один коміт" -#: cola/cmds.py:2598 cola/widgets/action.py:60 cola/widgets/diff.py:982 +#: cola/cmds.py:2540 cola/widgets/action.py:58 cola/widgets/diff.py:1168 msgid "Stage" msgstr "Проіндексувати" -#: cola/cmds.py:2753 +#: cola/cmds.py:2699 msgid "Stage / Unstage" msgstr "Проіндексувати / Видалити з проіндексованого" -#: cola/cmds.py:2735 +#: cola/cmds.py:2681 msgid "Stage / Unstage All" msgstr "" -#: cola/widgets/diff.py:1016 +#: cola/widgets/diff.py:1055 msgid "Stage Diff Hunk" msgstr "Додати частину різниці до проіндексованого" -#: cola/cmds.py:2691 +#: cola/cmds.py:2633 msgid "Stage Modified" msgstr "Проіндексувати зміни" -#: cola/cmds.py:2724 +#: cola/cmds.py:2670 msgid "Stage Modified and Untracked" msgstr "" -#: cola/widgets/status.py:872 cola/widgets/status.py:894 -#: cola/widgets/status.py:962 +#: cola/widgets/status.py:873 cola/widgets/status.py:895 +#: cola/widgets/status.py:963 msgid "Stage Selected" msgstr "Додати виділене до проіндексованого" -#: cola/widgets/diff.py:1011 +#: cola/widgets/diff.py:1050 msgid "Stage Selected Lines" msgstr "Додати виділені рядки до проіндексованого" -#: cola/cmds.py:2702 +#: cola/cmds.py:2644 msgid "Stage Unmerged" msgstr "Проіндексувати незлите" -#: cola/cmds.py:2713 +#: cola/cmds.py:2655 msgid "Stage Untracked" msgstr "Проіндексувати файли, що не відслідковуються" -#: cola/widgets/commitmsg.py:438 +#: cola/widgets/commitmsg.py:446 msgid "Stage and Commit" msgstr "Проіндексувати та закомітувати" -#: cola/widgets/commitmsg.py:435 +#: cola/widgets/commitmsg.py:443 msgid "Stage and commit?" msgstr "Проіндексувати та закомітувати?" -#: cola/cmds.py:2586 +#: cola/widgets/action.py:58 +msgid "Stage changes using \"git add\"" +msgstr "" + +#: cola/cmds.py:2528 msgid "Stage conflicts" msgstr "Проіндексувати конфлікт" -#: cola/cmds.py:2577 +#: cola/cmds.py:2519 msgid "Stage conflicts?" msgstr "Проіндексувати конфлікт?" @@ -3449,48 +3567,48 @@ msgstr "Проіндексувати конфлікт?" msgid "Stage/unstage selected paths for commit" msgstr "Додати/видалити з проіндексованого шляхи для коміту" -#: cola/models/browse.py:334 cola/widgets/status.py:156 -#: cola/widgets/status.py:620 +#: cola/models/browse.py:333 cola/widgets/status.py:156 +#: cola/widgets/status.py:621 msgid "Staged" msgstr "Проіндексоване" -#: cola/cmds.py:2605 +#: cola/cmds.py:2547 #, python-format msgid "Staging: %s" msgstr "Індексація: %s" -#: cola/widgets/main.py:597 +#: cola/widgets/main.py:610 msgid "Start Interactive Rebase..." msgstr "Розпочати інтерактивне переміщення..." -#: cola/widgets/createbranch.py:107 +#: cola/widgets/createbranch.py:105 msgid "Starting Revision" msgstr "Початкова ревізія" -#: cola/widgets/stash.py:40 +#: cola/widgets/stash.py:36 msgid "Stash" msgstr "Сховати (stash)" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 #, fuzzy msgid "Stash Index" msgstr "Сховати (stash)" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 #, fuzzy msgid "Stash staged changes only" msgstr "Закомітувати проіндексовані зміни" -#: cola/widgets/stash.py:73 +#: cola/widgets/stash.py:75 #, fuzzy msgid "Stash unstaged changes only, keeping staged changes" msgstr "Відмінити непроіндексовані зміни на вибраних шляхах" -#: cola/widgets/action.py:66 cola/widgets/main.py:414 +#: cola/widgets/action.py:76 cola/widgets/main.py:422 msgid "Stash..." msgstr "Сховок" -#: cola/models/browse.py:33 cola/widgets/main.py:102 +#: cola/models/browse.py:32 cola/widgets/main.py:100 msgid "Status" msgstr "Статус" @@ -3498,151 +3616,159 @@ msgstr "Статус" msgid "Stop tracking paths" msgstr "Перестати відслідковувати виділене" -#: cola/widgets/submodules.py:82 +#: cola/widgets/submodules.py:81 msgid "Submodule URL (can be relative, ex: ../repo.git)" msgstr "" -#: cola/widgets/submodules.py:90 +#: cola/widgets/submodules.py:89 msgid "Submodule branch to track (optional)" msgstr "" -#: cola/widgets/submodules.py:86 +#: cola/widgets/submodules.py:85 msgid "Submodule path within the current repository (optional)" msgstr "" -#: cola/widgets/main.py:143 cola/widgets/submodules.py:32 +#: cola/widgets/main.py:141 cola/widgets/submodules.py:31 msgid "Submodules" msgstr "" -#: cola/widgets/prefs.py:174 +#: cola/widgets/prefs.py:196 msgid "Summarize Merge Commits" msgstr "Підсумувати коміти злиття" -#: cola/sequenceeditor.py:325 cola/widgets/dag.py:506 +#: cola/sequenceeditor.py:322 cola/widgets/dag.py:572 msgid "Summary" msgstr "Опис" -#: cola/widgets/prefs.py:168 +#: cola/widgets/prefs.py:273 msgid "Tab Width" msgstr "Ширина табуляції" -#: cola/widgets/cfgactions.py:229 cola/widgets/createbranch.py:116 -#: cola/widgets/merge.py:48 +#: cola/widgets/cfgactions.py:227 cola/widgets/createbranch.py:114 +#: cola/widgets/merge.py:46 msgid "Tag" msgstr "Теґ" -#: cola/cmds.py:2842 +#: cola/cmds.py:2788 msgid "Tag Created" msgstr "Теґ створено" -#: cola/widgets/createtag.py:80 +#: cola/widgets/createtag.py:78 msgid "Tag message..." msgstr "Повідомлення теґу..." -#: cola/cmds.py:2802 +#: cola/cmds.py:2748 msgid "Tag-signing was requested but the tag message is empty." msgstr "Вібувся запит на підписання теґу, але повідомлення для теґу порожнє." -#: cola/widgets/branch.py:179 cola/widgets/branch.py:238 +#: cola/widgets/branch.py:183 cola/widgets/branch.py:248 msgid "Tags" msgstr "Теґи" -#: cola/widgets/toolbar.py:180 +#: cola/widgets/action.py:78 cola/widgets/main.py:423 +msgid "Temporarily stash away uncommitted changes using \"git stash\"" +msgstr "" + +#: cola/widgets/toolbar.py:184 msgid "Text Beside Icon" msgstr "" -#: cola/widgets/toolbar.py:179 +#: cola/widgets/toolbar.py:183 msgid "Text Only" msgstr "" -#: cola/widgets/toolbar.py:181 +#: cola/widgets/toolbar.py:185 msgid "Text Under Icon" msgstr "" -#: cola/widgets/prefs.py:169 +#: cola/widgets/prefs.py:272 msgid "Text Width" msgstr "Ширина тексту" -#: cola/cmds.py:1116 +#: cola/cmds.py:1117 msgid "The branch will be no longer available." msgstr "Гілка не буде більше доступна." -#: cola/cmds.py:648 +#: cola/cmds.py:650 #, python-format msgid "The branch will be reset using \"git reset --mixed %s\"" msgstr "Глку буде скинуто, використовуючи \"git reset --mixed %s\"" -#: cola/cmds.py:699 cola/cmds.py:790 +#: cola/cmds.py:701 cola/cmds.py:792 #, fuzzy, python-format msgid "The branch will be reset using \"git reset --soft %s\"" msgstr "Глку буде скинуто, використовуючи \"git reset --mixed %s\"" -#: cola/widgets/commitmsg.py:303 +#: cola/widgets/commitmsg.py:311 msgid "The commit message will be cleared." msgstr "Повідомлення коміту буде очищено." -#: cola/widgets/prefs.py:146 +#: cola/widgets/prefs.py:169 msgid "" "The date-time format used when displaying dates in Git DAG.\n" "This value is passed to git log --date=" msgstr "" -#: cola/widgets/archive.py:208 +#: cola/widgets/archive.py:206 #, python-format msgid "The file \"%s\" exists and will be overwritten." msgstr "Файл \"%s\" вже існує і буде перезаписаний." -#: cola/cmds.py:1086 +#: cola/cmds.py:1087 msgid "The following files will be deleted:" msgstr "Наступні файли будуть видалені:" -#: cola/widgets/status.py:1646 +#: cola/widgets/status.py:1647 msgid "The number of leading paths to strip" msgstr "" -#: cola/cmds.py:716 +#: cola/cmds.py:718 #, python-format msgid "The repository will be reset using \"git reset --hard %s\"" msgstr "" -#: cola/cmds.py:665 +#: cola/cmds.py:667 #, python-format msgid "The repository will be reset using \"git reset --keep %s\"" msgstr "" -#: cola/cmds.py:682 +#: cola/cmds.py:684 #, python-format msgid "The repository will be reset using \"git reset --merge %s\"" msgstr "" -#: cola/cmds.py:2365 +#: cola/cmds.py:2316 msgid "The revision expression cannot be empty." msgstr "Поле ревізії не може бути порожнім." -#: cola/cmds.py:3029 +#: cola/widgets/stash.py:225 +msgid "The stash has not been renamed" +msgstr "" + +#: cola/cmds.py:2975 #, python-format msgid "" "The submodule will be added using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:3074 +#: cola/cmds.py:3020 #, python-format msgid "" "The submodule will be updated using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:736 +#: cola/cmds.py:738 #, python-format msgid "The worktree will be restored using \"git read-tree --reset -u %s\"" msgstr "" -#: cola/widgets/commitmsg.py:304 +#: cola/widgets/commitmsg.py:312 msgid "This cannot be undone. Clear commit message?" msgstr "Це неможливо буде відмінити. Очистити повідомлення коміту?" -#: cola/cmds.py:778 cola/widgets/commitmsg.py:458 +#: cola/cmds.py:780 cola/widgets/commitmsg.py:466 msgid "" "This commit has already been published.\n" "This operation will rewrite published history.\n" @@ -3652,7 +3778,7 @@ msgstr "" "Ця операція перезапише опубліковану історію.\n" "Скоріш за все ви не хочете цього." -#: cola/widgets/diff.py:1158 +#: cola/widgets/diff.py:1232 #, fuzzy msgid "" "This operation drops uncommitted changes.\n" @@ -3661,7 +3787,7 @@ msgstr "" "Ця операція відмінить незакомітовані зміни.\n" "Ці зміни не можна буде відновити." -#: cola/cmds.py:2307 +#: cola/cmds.py:2258 msgid "" "This operation removes uncommitted edits from selected files.\n" "These changes cannot be recovered." @@ -3669,7 +3795,7 @@ msgstr "" "Ця операція відмінить незакомітовані зміни.\n" "Ці зміни не можна буде відновити." -#: cola/cmds.py:2285 +#: cola/cmds.py:2236 msgid "" "This operation removes unstaged edits from selected files.\n" "These changes cannot be recovered." @@ -3677,27 +3803,27 @@ msgstr "" "Ця операція відмінить непроіндексовані зміни.\n" "Ці зміни не можна буде відновити." -#: cola/cmds.py:475 +#: cola/cmds.py:476 msgid "" "This operation will replace the selected unmerged files with content from the branch being merged using \"git checkout --theirs\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:513 +#: cola/cmds.py:514 msgid "" "This operation will replace the selected unmerged files with content from your current branch using \"git checkout --ours\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/widgets/main.py:1109 +#: cola/widgets/main.py:1122 msgid "" "This repository has unresolved conflicts after applying a patch.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1102 +#: cola/widgets/main.py:1115 msgid "" "This repository is currently being rebased.\n" "Resolve conflicts, commit changes, and run:\n" @@ -3707,13 +3833,13 @@ msgstr "" "Виправте конфлікти, закомітуйте зміни, і виконайте:\n" " Перемістити (rebase) > Продовжити" -#: cola/widgets/main.py:1115 +#: cola/widgets/main.py:1128 msgid "" "This repository is in the middle of a cherry-pick.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1121 +#: cola/widgets/main.py:1134 msgid "" "This repository is in the middle of a merge.\n" "Resolve conflicts and commit changes." @@ -3733,15 +3859,15 @@ msgstr "" msgid "To avoid applying removal lines ('-'), change them to context lines (' ')." msgstr "" -#: cola/sequenceeditor.py:342 +#: cola/sequenceeditor.py:338 msgid "Toggle Enabled" msgstr "" -#: cola/widgets/diff.py:776 +#: cola/widgets/diff.py:804 msgid "Toggle image diff" msgstr "" -#: cola/widgets/branch.py:63 +#: cola/widgets/branch.py:65 msgid "Toggle the branches filter" msgstr "Перемкнути фільтр гілок" @@ -3749,51 +3875,51 @@ msgstr "Перемкнути фільтр гілок" msgid "Toggle the paths filter" msgstr "Перемкнути фільтр шляхів" -#: cola/widgets/toolbar.py:317 +#: cola/widgets/toolbar.py:322 msgid "Toolbar Style:" msgstr "" -#: cola/widgets/cfgactions.py:228 cola/widgets/merge.py:47 +#: cola/widgets/cfgactions.py:226 cola/widgets/merge.py:45 msgid "Tracking Branch" msgstr "Гілка, що відслідковуються" -#: cola/widgets/createbranch.py:115 +#: cola/widgets/createbranch.py:113 msgid "Tracking branch" msgstr "Гілка, що відстежується" -#: cola/widgets/about.py:408 cola/widgets/about.py:434 -#: cola/widgets/about.py:445 +#: cola/widgets/about.py:391 cola/widgets/about.py:417 +#: cola/widgets/about.py:428 msgid "Traditional Chinese (Taiwan) translation" msgstr "Традиційний китайський (Тайвань) переклад" -#: cola/widgets/about.py:439 +#: cola/widgets/about.py:422 msgid "Translation" msgstr "" -#: cola/widgets/about.py:94 +#: cola/widgets/about.py:92 msgid "Translators" msgstr "Перекладачі" -#: cola/widgets/about.py:418 cola/widgets/about.py:423 -#: cola/widgets/about.py:438 +#: cola/widgets/about.py:401 cola/widgets/about.py:406 +#: cola/widgets/about.py:421 msgid "Turkish translation" msgstr "Турецький переклад" -#: cola/widgets/clone.py:109 cola/widgets/editremotes.py:451 -#: cola/widgets/submodules.py:117 +#: cola/widgets/clone.py:107 cola/widgets/editremotes.py:449 +#: cola/widgets/submodules.py:116 msgid "URL" msgstr "Адреса URL" -#: cola/widgets/remote.py:463 +#: cola/widgets/remote.py:497 #, python-format msgid "URL: %s" msgstr "Адреса URL: %s" -#: cola/widgets/about.py:415 +#: cola/widgets/about.py:398 msgid "Ukranian translation" msgstr "Український переклад" -#: cola/cmds.py:2122 +#: cola/cmds.py:2073 msgid "Unable to rebase" msgstr "Не вдалось перемістити (rebase)" @@ -3802,53 +3928,58 @@ msgstr "Не вдалось перемістити (rebase)" msgid "Unable to set URL for \"%(name)s\" to \"%(url)s\"" msgstr "" -#: cola/widgets/diff.py:1327 +#: cola/widgets/diff.py:1401 #, python-format msgid "Unable to write patch to \"%s\". Check permissions?" msgstr "" -#: cola/widgets/main.py:735 +#: cola/widgets/main.py:748 msgid "Undo" msgstr "" -#: cola/cmds.py:783 cola/cmds.py:788 cola/cmds.py:791 cola/widgets/main.py:208 +#: cola/cmds.py:785 cola/cmds.py:790 cola/cmds.py:793 cola/widgets/main.py:207 msgid "Undo Last Commit" msgstr "" -#: cola/cmds.py:789 +#: cola/cmds.py:791 msgid "Undo last commit?" msgstr "" -#: cola/cmds.py:782 +#: cola/cmds.py:784 msgid "Undo the published commit?" msgstr "" -#: cola/models/browse.py:328 cola/widgets/status.py:157 -#: cola/widgets/status.py:640 +#: cola/models/browse.py:327 cola/widgets/status.py:157 +#: cola/widgets/status.py:641 msgid "Unmerged" msgstr "Незлите" -#: cola/cmds.py:2855 cola/widgets/action.py:61 cola/widgets/diff.py:985 +#: cola/cmds.py:2801 cola/widgets/action.py:61 cola/widgets/diff.py:1165 +#: cola/widgets/main.py:212 msgid "Unstage" msgstr "Видалити з індексу" -#: cola/widgets/main.py:203 cola/widgets/status.py:790 +#: cola/widgets/main.py:202 cola/widgets/status.py:791 msgid "Unstage All" msgstr "Видалити все з проіндексованого" -#: cola/widgets/diff.py:1061 +#: cola/widgets/diff.py:1017 msgid "Unstage Diff Hunk" msgstr "Видалити частину різниці з проіндексованого" -#: cola/widgets/status.py:823 cola/widgets/status.py:858 +#: cola/widgets/status.py:824 cola/widgets/status.py:859 msgid "Unstage Selected" msgstr "Видалити виділене з проіндексованого" -#: cola/widgets/diff.py:1058 +#: cola/widgets/diff.py:1015 msgid "Unstage Selected Lines" msgstr "Видалити виділені рядки з проіндексованого" -#: cola/cmds.py:2867 +#: cola/widgets/action.py:61 +msgid "Unstage changes using \"git reset\"" +msgstr "" + +#: cola/cmds.py:2813 #, python-format msgid "Unstaging: %s" msgstr "Видалення з проіндексованого: %s" @@ -3857,85 +3988,84 @@ msgstr "Видалення з проіндексованого: %s" msgid "Untrack Selected" msgstr "Не відслідковувати виділене" -#: cola/widgets/status.py:159 cola/widgets/status.py:646 +#: cola/widgets/status.py:159 cola/widgets/status.py:647 msgid "Untracked" msgstr "Не відслідковується" -#: cola/cmds.py:1141 cola/cmds.py:2923 +#: cola/cmds.py:1142 cola/cmds.py:2869 #, python-format msgid "Untracking: %s" msgstr "Видалення зі списку файлів, що відслідковуються: %s" -#: cola/widgets/main.py:374 +#: cola/widgets/main.py:369 msgid "Update All Submodules..." msgstr "" -#: cola/widgets/createbranch.py:121 +#: cola/widgets/createbranch.py:119 msgid "Update Existing Branch:" msgstr "Оновити існуючу гілку:" -#: cola/cmds.py:3075 +#: cola/cmds.py:3021 msgid "Update Submodule" msgstr "" -#: cola/cmds.py:3072 +#: cola/cmds.py:3018 msgid "Update Submodule..." msgstr "" -#: cola/cmds.py:3111 +#: cola/cmds.py:3057 msgid "Update Submodules" msgstr "" -#: cola/cmds.py:3109 +#: cola/cmds.py:3055 msgid "Update all submodules?" msgstr "" -#: cola/cmds.py:2093 +#: cola/cmds.py:2044 msgid "Update stacked branches" msgstr "" -#: cola/cmds.py:2085 cola/cmds.py:2092 +#: cola/cmds.py:2036 cola/cmds.py:2043 msgid "Update stacked branches when rebasing?" msgstr "" -#: cola/cmds.py:3108 +#: cola/cmds.py:3054 msgid "Update submodules..." msgstr "" -#: cola/widgets/status.py:953 +#: cola/widgets/status.py:954 msgid "Update this submodule" msgstr "" -#: cola/cmds.py:3073 +#: cola/cmds.py:3019 msgid "Update this submodule?" msgstr "" -#: cola/widgets/branch.py:421 cola/widgets/createbranch.py:302 -#: cola/widgets/remote.py:135 +#: cola/widgets/branch.py:433 cola/widgets/createbranch.py:300 msgid "Updating" msgstr "Оновлення" -#: cola/widgets/prefs.py:350 +#: cola/widgets/prefs.py:370 msgid "Use a block cursor in diff editors" msgstr "" -#: cola/widgets/prefs.py:154 +#: cola/widgets/prefs.py:177 msgid "Use gravatar.com to lookup icons for author emails" msgstr "" -#: cola/widgets/prefs.py:166 +#: cola/widgets/prefs.py:189 msgid "User Name" msgstr "Ім'я користувача" -#: cola/widgets/about.py:92 +#: cola/widgets/about.py:90 msgid "Version" msgstr "Версія" -#: cola/widgets/dag.py:800 cola/widgets/main.py:845 cola/widgets/main.py:966 +#: cola/widgets/dag.py:866 cola/widgets/main.py:858 cola/widgets/main.py:979 msgid "View" msgstr "Вигляд" -#: cola/widgets/browse.py:137 cola/widgets/status.py:278 +#: cola/widgets/browse.py:137 cola/widgets/status.py:279 msgid "View History..." msgstr "Переглянути історію..." @@ -3943,39 +4073,39 @@ msgstr "Переглянути історію..." msgid "View history for selected paths" msgstr "Подивитись історію для вибраних шляхів" -#: cola/widgets/merge.py:54 +#: cola/widgets/branch.py:224 cola/widgets/merge.py:52 msgid "Visualize" msgstr "Відобразити" -#: cola/widgets/main.py:488 +#: cola/widgets/main.py:501 msgid "Visualize All Branches..." msgstr "Відобразити всі гілки..." -#: cola/widgets/main.py:482 +#: cola/widgets/main.py:495 msgid "Visualize Current Branch..." msgstr "Відобразити поточну гілку..." -#: cola/widgets/createtag.py:73 +#: cola/widgets/createtag.py:71 msgid "Whether to sign the tag (git tag -s)" msgstr "Визначає, чи піписувати теґ (git tag -s)" -#: cola/widgets/text.py:399 +#: cola/widgets/text.py:396 msgid "Whole Words" msgstr "" -#: cola/widgets/commitmsg.py:432 +#: cola/widgets/commitmsg.py:440 msgid "Would you like to stage and commit all modified files?" msgstr "Хочете проіндексувати та закомітувати всі змінені файли?" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "XOR" msgstr "" -#: cola/widgets/standard.py:1064 +#: cola/widgets/standard.py:1182 msgid "Yes" msgstr "" -#: cola/cmds.py:256 +#: cola/cmds.py:255 msgid "" "You are in the middle of a merge.\n" "Cannot amend while merging." @@ -3983,36 +4113,36 @@ msgstr "" "Ви знаходитесь в процесі злиття.\n" "Не можна робити зміни під час злиття." -#: cola/cmds.py:2123 +#: cola/cmds.py:2074 msgid "You cannot rebase with uncommitted changes." msgstr "Не можна робити переміщення (rebase), якщо є незакомітовані зміни." -#: cola/widgets/merge.py:227 +#: cola/widgets/merge.py:225 msgid "You must specify a revision to merge." msgstr "Ви маєте вказати ревізію для злиття." -#: cola/widgets/merge.py:217 +#: cola/widgets/merge.py:215 msgid "You must specify a revision to view." msgstr "Ви маєте вказати ревізію для перегляду." -#: cola/widgets/dag.py:710 cola/widgets/dag.py:1588 +#: cola/widgets/dag.py:776 cola/widgets/dag.py:1645 msgid "Zoom In" msgstr "Приблизити" -#: cola/widgets/dag.py:706 cola/widgets/dag.py:1594 +#: cola/widgets/dag.py:772 cola/widgets/dag.py:1651 msgid "Zoom Out" msgstr "Віддалити" -#: cola/widgets/dag.py:524 cola/widgets/dag.py:714 cola/widgets/dag.py:1596 -#: cola/widgets/diff.py:785 +#: cola/widgets/dag.py:590 cola/widgets/dag.py:780 cola/widgets/dag.py:1653 +#: cola/widgets/diff.py:813 msgid "Zoom to Fit" msgstr "Допасувати за розміром" -#: cola/widgets/grep.py:112 +#: cola/widgets/grep.py:110 msgid "command-line arguments" msgstr "аргументи командного рядка" -#: cola/widgets/main.py:932 cola/widgets/main.py:938 +#: cola/widgets/main.py:945 cola/widgets/main.py:951 msgid "error: unable to execute git" msgstr "" @@ -4021,45 +4151,41 @@ msgstr "" msgid "exit code %s" msgstr "код завершення %s" -#: cola/app.py:301 +#: cola/app.py:304 #, python-format msgid "fatal: \"%s\" is not a directory. Please specify a correct --repo ." msgstr "критично: \"%s\" не є каталогом. Будь ласка, вкажіть коректний --repo <шлях>." -#: cola/widgets/main.py:928 +#: cola/widgets/main.py:941 #, python-format msgid "git cola version %s" msgstr "версія git cola %s" -#: cola/widgets/startup.py:35 +#: cola/widgets/startup.py:34 msgid "git-cola" msgstr "git-cola" -#: cola/difftool.py:63 +#: cola/difftool.py:82 msgid "git-cola diff" msgstr "Різниця git-cola" -#: cola/widgets/submodules.py:81 +#: cola/widgets/submodules.py:80 msgid "git://git.example.com/repo.git" msgstr "" -#: cola/widgets/grep.py:132 +#: cola/widgets/grep.py:130 msgid "grep result..." msgstr "шукати в результатах..." -#: cola/widgets/about.py:486 +#: cola/widgets/about.py:469 msgid "hotkeys.html" msgstr "" -#: cola/widgets/submodules.py:85 +#: cola/widgets/submodules.py:84 msgid "path/to/submodule" msgstr "" -#: cola/cmds.py:2537 -msgid "unknown" -msgstr "невідомий" - -#: cola/widgets/createtag.py:63 +#: cola/widgets/createtag.py:61 msgid "vX.Y.Z" msgstr "vX.Y.Z" @@ -4068,14 +4194,18 @@ msgid "x 1" msgstr "" #: cola/hidpi.py:44 -msgid "x 1.5" +msgid "x 1.25" msgstr "" #: cola/hidpi.py:45 +msgid "x 1.5" +msgstr "" + +#: cola/hidpi.py:46 msgid "x 2" msgstr "" -#: cola/widgets/search.py:53 cola/widgets/search.py:58 +#: cola/widgets/search.py:52 cola/widgets/search.py:57 msgid "yyyy-MM-dd" msgstr "рррр-ММ-дд" @@ -4085,6 +4215,10 @@ msgstr "рррр-ММ-дд" #~ msgid "\"git commit\" returned exit code %s" #~ msgstr "команда \"git commit\" поверула код виходу %s" +#, python-format +#~ msgid "A stash named \"%s\" already exists" +#~ msgstr "Сховок з назвою \"%s\" вже існує" + #~ msgid "Already up-to-date." #~ msgstr "Вже оновлено." @@ -4100,6 +4234,9 @@ msgstr "рррр-ММ-дд" #~ msgid "Error %s" #~ msgstr "Помилка %s" +#~ msgid "Error: Stash exists" +#~ msgstr "Помилка: сховок вже існує" + #~ msgid "Errors: %s" #~ msgstr "Помилки: %s" @@ -4194,3 +4331,6 @@ msgstr "рррр-ММ-дд" #~ msgid "git tag returned exit code %s" #~ msgstr "команда git tag завершилась з кодом %s" + +#~ msgid "unknown" +#~ msgstr "невідомий" diff --git a/cola/i18n/zh_CN.po b/cola/i18n/zh_CN.po index f3247cdf..b19c61fa 100644 --- a/cola/i18n/zh_CN.po +++ b/cola/i18n/zh_CN.po @@ -41,7 +41,7 @@ msgstr "" "X-Source-Language: C\n" "X-Generator: Poedit 2.2.1\n" -#: cola/widgets/patch.py:86 +#: cola/widgets/diff.py:1680 msgid "" "\n" "

\n" @@ -57,7 +57,7 @@ msgstr "" "

\n" " " -#: cola/widgets/about.py:455 +#: cola/widgets/about.py:438 #, python-format msgid "" "\n" @@ -86,7 +86,7 @@ msgid "" " " msgstr "" -#: cola/widgets/about.py:180 +#: cola/widgets/about.py:182 #, python-format msgid "" "\n" @@ -103,7 +103,7 @@ msgid "" " " msgstr "" -#: cola/widgets/about.py:387 +#: cola/widgets/about.py:370 #, python-format msgid "" "\n" @@ -113,7 +113,7 @@ msgid "" " " msgstr "" -#: cola/widgets/status.py:1310 +#: cola/widgets/status.py:1311 #, python-format msgid "" "\n" @@ -128,7 +128,7 @@ msgid "" " %(ext)s = file extension\n" msgstr "" -#: cola/sequenceeditor.py:700 +#: cola/sequenceeditor.py:695 msgid "" "\n" "Commands\n" @@ -167,7 +167,7 @@ msgid "" "ctrl+d = launch difftool\n" msgstr "" -#: cola/widgets/finder.py:65 +#: cola/widgets/finder.py:64 #, fuzzy msgid "" "\n" @@ -196,45 +196,71 @@ msgstr "" "在文本输入区和结果区之间\n" "使用向上/向下键以切换聚焦\n" -#: cola/widgets/dag.py:894 +#: cola/widgets/prefs.py:133 +msgid "" +"\n" +"This option determines how the supplied commit message should be\n" +"cleaned up before committing.\n" +"\n" +"The can be strip, whitespace, verbatim, scissors or default.\n" +"\n" +"strip\n" +" Strip leading and trailing empty lines, trailing whitespace,\n" +" commentary and collapse consecutive empty lines.\n" +"\n" +"whitespace\n" +" Same as strip except #commentary is not removed.\n" +"\n" +"verbatim\n" +" Do not change the message at all.\n" +"\n" +"scissors\n" +" Same as whitespace except that everything from (and including) the line\n" +" found below is truncated, if the message is to be edited.\n" +" \"#\" can be customized with core.commentChar.\n" +"\n" +" # ------------------------ >8 ------------------------" +msgstr "" + +#: cola/widgets/dag.py:960 msgid " - DAG" msgstr " - 历史视图" -#: cola/widgets/recent.py:54 +#: cola/widgets/recent.py:52 msgid " commits ago" msgstr " 个提交之前" -#: cola/cmds.py:1197 +#: cola/cmds.py:1198 #, python-format msgid "\"%(branch)s\" has been deleted from \"%(remote)s\"." msgstr "已从远程 \"%(remote)s\" 删除分支 \"%(branch)s\"." -#: cola/widgets/createbranch.py:316 +#: cola/widgets/createbranch.py:314 #, python-format msgid "\"%(command)s\" returned exit status \"%(status)d\"" msgstr "\"%(command)s\" 命令返回状态 \"%(status)d\"" -#: cola/interaction.py:39 +#: cola/interaction.py:38 #, python-format msgid "\"%(command)s\" returned exit status %(status)d" msgstr "\"%(command)s\" 命令返回状态 %(status)d" -#: cola/guicmds.py:157 +#: cola/guicmds.py:156 #, fuzzy, python-format msgid "\"%s\" already exists" msgstr "分支 '%s' 已经存在." -#: cola/widgets/clone.py:206 +#: cola/widgets/clone.py:204 #, python-format msgid "\"%s\" already exists, cola will create a new directory" msgstr "\"%s\" 已经存在, 程序会新建文件夹" -#: cola/cmds.py:2349 +#: cola/cmds.py:2300 #, python-format msgid "\"%s\" requires a selected file." msgstr "\"%s\" 需要选择一个文件." -#: cola/cmds.py:2087 +#: cola/cmds.py:2038 msgid "" "\"git rebase --update-refs\" automatically force-updates any\n" "branches that point to commits that are being rebased.\n" @@ -244,7 +270,11 @@ msgid "" "Using this feature is helpful for \"stacked\" branch workflows." msgstr "" -#: cola/sequenceeditor.py:321 +#: cola/models/stash.py:145 +msgid "\"git stash drop\" did not return a ref to rename." +msgstr "" + +#: cola/sequenceeditor.py:318 msgid "#" msgstr "" @@ -253,37 +283,37 @@ msgstr "" msgid "%(project)s: %(branch)s - Browse" msgstr "%(project)s: %(branch)s - 浏览器" -#: cola/widgets/dag.py:887 +#: cola/widgets/dag.py:953 #, python-format msgid "%(project)s: %(ref)s - DAG" msgstr "%(project)s: %(ref)s - 历史视图" -#: cola/models/browse.py:315 +#: cola/models/browse.py:314 #, python-format msgid "%d days ago" msgstr "%d 天前" -#: cola/models/browse.py:314 +#: cola/models/browse.py:313 #, python-format msgid "%d hours ago" msgstr "%d 小时前" -#: cola/models/browse.py:307 cola/models/browse.py:311 +#: cola/models/browse.py:306 cola/models/browse.py:310 #, python-format msgid "%d minutes ago" msgstr "%d 分钟前" -#: cola/cmds.py:376 +#: cola/cmds.py:377 #, python-format msgid "%d patch(es) applied." msgstr "已应用 %d 个补丁." -#: cola/widgets/createbranch.py:281 +#: cola/widgets/createbranch.py:279 #, python-format msgid "%d skipped" msgstr "%d 已跳过" -#: cola/cmds.py:2580 +#: cola/cmds.py:2522 #, python-format msgid "" "%s appears to contain merge conflicts.\n" @@ -292,36 +322,36 @@ msgid "" "Stage it anyways?" msgstr "" -#: cola/widgets/startup.py:263 +#: cola/widgets/startup.py:262 #, python-format msgid "%s could not be opened. Remove from bookmarks?" msgstr "" -#: cola/app.py:498 cola/widgets/bookmarks.py:482 +#: cola/app.py:501 cola/widgets/bookmarks.py:481 #, python-format msgid "%s is not a Git repository." msgstr "%s 不是 Git 版本库。" -#: cola/cmds.py:1015 +#: cola/cmds.py:1016 #, python-format msgid "%s will be removed from your bookmarks." msgstr "%s 会将被从书签中移除。" -#: cola/cmds.py:1028 +#: cola/cmds.py:1029 #, python-format msgid "%s will be removed from your recent repositories." msgstr "%s 将从最近使用的版本库列表中被移除。" -#: cola/cmds.py:1711 +#: cola/cmds.py:1663 #, python-format msgid "%s: No such file or directory." msgstr "%s: 此文件或文件夹不存在." -#: cola/widgets/main.py:734 +#: cola/widgets/main.py:747 msgid "&Edit" msgstr "编辑" -#: cola/widgets/main.py:676 +#: cola/widgets/main.py:689 msgid "&File" msgstr "文件" @@ -329,43 +359,43 @@ msgstr "文件" msgid "(Amending)" msgstr "(正在修正)" -#: cola/widgets/compare.py:36 +#: cola/widgets/compare.py:35 msgid "*** Branch Point ***" msgstr "*** 分支点 ***" -#: cola/widgets/compare.py:37 +#: cola/widgets/compare.py:36 msgid "*** Sandbox ***" msgstr "*** 沙盒 ***" -#: cola/widgets/diff.py:788 +#: cola/widgets/diff.py:816 msgid "100%" msgstr "100%" -#: cola/widgets/diff.py:789 +#: cola/widgets/diff.py:817 msgid "200%" msgstr "200%" -#: cola/widgets/diff.py:786 +#: cola/widgets/diff.py:814 msgid "25%" msgstr "25%" -#: cola/widgets/diff.py:790 +#: cola/widgets/diff.py:818 msgid "400%" msgstr "400%" -#: cola/widgets/diff.py:787 +#: cola/widgets/diff.py:815 msgid "50%" msgstr "50%" -#: cola/widgets/diff.py:791 +#: cola/widgets/diff.py:819 msgid "800%" msgstr "800%" -#: cola/widgets/finder.py:119 +#: cola/widgets/finder.py:118 msgid " ..." msgstr "<路径> ..." -#: cola/cmds.py:1734 +#: cola/cmds.py:1686 msgid "" "A commit template has not been configured.\n" "Use \"git config\" to define \"commit.template\"\n" @@ -375,81 +405,76 @@ msgstr "" "使用 \"git config\" 定义 \"commit template\"\n" "而指定一个提交模板." -#: cola/cmds.py:1784 +#: cola/cmds.py:1735 #, python-format msgid "A hook must be provided at \"%s\"" msgstr "钩子必须位于 \"%s\"" -#: cola/widgets/stash.py:236 -#, python-format -msgid "A stash named \"%s\" already exists" -msgstr "名为 \"%s\" 的暂存已存在" - -#: cola/widgets/cfgactions.py:82 cola/widgets/main.py:622 +#: cola/widgets/cfgactions.py:81 cola/widgets/main.py:635 msgid "Abort" msgstr "中止" -#: cola/widgets/cfgactions.py:149 cola/widgets/cfgactions.py:155 +#: cola/widgets/cfgactions.py:148 cola/widgets/cfgactions.py:154 msgid "Abort Action" msgstr "中止操作" -#: cola/cmds.py:132 +#: cola/cmds.py:131 msgid "Abort Applying Patch" msgstr "" -#: cola/cmds.py:126 +#: cola/cmds.py:125 msgid "Abort Applying Patch..." msgstr "" -#: cola/widgets/main.py:245 +#: cola/widgets/main.py:244 msgid "Abort Applying Patches..." msgstr "" -#: cola/cmds.py:162 +#: cola/cmds.py:161 msgid "Abort Cherry-Pick" msgstr "" -#: cola/cmds.py:156 cola/widgets/main.py:334 +#: cola/cmds.py:155 cola/widgets/main.py:329 msgid "Abort Cherry-Pick..." msgstr "" -#: cola/cmds.py:193 +#: cola/cmds.py:192 msgid "Abort Merge" msgstr "中止合并" -#: cola/cmds.py:186 cola/widgets/main.py:368 +#: cola/cmds.py:185 cola/widgets/main.py:363 msgid "Abort Merge..." msgstr "中止合并..." -#: cola/widgets/cfgactions.py:154 +#: cola/widgets/cfgactions.py:153 msgid "Abort the action?" msgstr "终止此操作?" -#: cola/widgets/main.py:250 +#: cola/widgets/main.py:245 msgid "Abort the current \"git am\" patch session" msgstr "" -#: cola/cmds.py:159 +#: cola/cmds.py:158 msgid "" "Aborting a cherry-pick can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:129 +#: cola/cmds.py:128 msgid "" "Aborting a patch can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:127 +#: cola/cmds.py:126 msgid "Aborting applying the current patch?" msgstr "" -#: cola/cmds.py:157 +#: cola/cmds.py:156 msgid "Aborting the current cherry-pick?" msgstr "" -#: cola/cmds.py:189 +#: cola/cmds.py:188 msgid "" "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." @@ -457,23 +482,23 @@ msgstr "" "中止当前的合并会丢失所有未提交的修改.\n" "将无法恢复未提交的修改." -#: cola/cmds.py:187 +#: cola/cmds.py:186 msgid "Aborting the current merge?" msgstr "终止当前合并吗?" -#: cola/widgets/about.py:91 cola/widgets/main.py:517 +#: cola/widgets/about.py:89 cola/widgets/main.py:530 msgid "About" msgstr "关于" -#: cola/widgets/about.py:67 +#: cola/widgets/about.py:65 msgid "About git-cola" msgstr "关于 git-cola" -#: cola/widgets/bookmarks.py:217 cola/widgets/startup.py:340 +#: cola/widgets/bookmarks.py:216 cola/widgets/startup.py:339 msgid "Accept" msgstr "接受" -#: cola/sequenceeditor.py:159 +#: cola/sequenceeditor.py:157 msgid "" "Accept changes and rebase\n" "Shortcut: Ctrl+Enter" @@ -481,50 +506,50 @@ msgstr "" "接受变更并衍合\n" "快捷键：Ctrl+Enter" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Action Name" msgstr "操作名称" -#: cola/sequenceeditor.py:528 cola/widgets/bookmarks.py:321 -#: cola/widgets/branch.py:217 cola/widgets/browse.py:374 -#: cola/widgets/commitmsg.py:99 cola/widgets/dag.py:315 -#: cola/widgets/filelist.py:110 cola/widgets/main.py:95 -#: cola/widgets/main.py:757 cola/widgets/startup.py:436 +#: cola/sequenceeditor.py:524 cola/widgets/bookmarks.py:320 +#: cola/widgets/branch.py:221 cola/widgets/browse.py:375 +#: cola/widgets/commitmsg.py:105 cola/widgets/dag.py:314 +#: cola/widgets/filelist.py:107 cola/widgets/main.py:93 +#: cola/widgets/main.py:770 cola/widgets/startup.py:435 msgid "Actions" msgstr "操作" -#: cola/widgets/commitmsg.py:101 +#: cola/widgets/commitmsg.py:107 msgid "Actions..." msgstr "操作..." -#: cola/widgets/bookmarks.py:71 cola/widgets/gitignore.py:64 -#: cola/widgets/patch.py:103 cola/widgets/patch.py:117 -#: cola/widgets/status.py:1381 +#: cola/widgets/bookmarks.py:70 cola/widgets/diff.py:1697 +#: cola/widgets/diff.py:1711 cola/widgets/gitignore.py:63 +#: cola/widgets/status.py:1382 msgid "Add" msgstr "添加" -#: cola/widgets/bookmarks.py:470 +#: cola/widgets/bookmarks.py:469 msgid "Add Favorite" msgstr "添加收藏" -#: cola/widgets/editremotes.py:374 +#: cola/widgets/editremotes.py:373 msgid "Add Remote" msgstr "添加远程" -#: cola/widgets/toolbar.py:315 +#: cola/widgets/toolbar.py:320 msgid "Add Separator" msgstr "添加分隔符" -#: cola/cmds.py:3030 cola/widgets/submodules.py:42 -#: cola/widgets/submodules.py:111 +#: cola/cmds.py:2976 cola/widgets/submodules.py:41 +#: cola/widgets/submodules.py:110 msgid "Add Submodule" msgstr "" -#: cola/cmds.py:3027 cola/widgets/main.py:381 +#: cola/cmds.py:2973 cola/widgets/main.py:376 msgid "Add Submodule..." msgstr "" -#: cola/widgets/editremotes.py:62 +#: cola/widgets/editremotes.py:61 msgid "" "Add and remove remote repositories using the \n" "Add(+) and Delete(-) buttons on the left-hand side.\n" @@ -538,98 +563,98 @@ msgstr "" "从列表中选定可为远程改名\n" "完成后按回车键或直接双击." -#: cola/widgets/editremotes.py:81 +#: cola/widgets/editremotes.py:80 msgid "Add new remote git repository" msgstr "添加新远程版本库" -#: cola/widgets/patch.py:103 +#: cola/widgets/diff.py:1697 msgid "Add patches (+)" msgstr "添加补丁 (+)" -#: cola/widgets/editremotes.py:433 +#: cola/widgets/editremotes.py:431 msgid "Add remote" msgstr "添加远程" -#: cola/cmds.py:3028 +#: cola/cmds.py:2974 msgid "Add this submodule?" msgstr "" -#: cola/widgets/gitignore.py:54 +#: cola/widgets/gitignore.py:53 msgid "Add to .gitignore" msgstr "添加至 .gitignore" -#: cola/widgets/status.py:286 +#: cola/widgets/status.py:287 msgid "Add to Git Annex" msgstr "添加至 Git Annex" -#: cola/widgets/status.py:290 +#: cola/widgets/status.py:291 msgid "Add to Git LFS" msgstr "添加至 Git LFS" -#: cola/widgets/gitignore.py:28 +#: cola/widgets/gitignore.py:27 msgid "Add to exclusions" msgstr "" -#: cola/widgets/gitignore.py:55 +#: cola/widgets/gitignore.py:54 msgid "Add to local .git/info/exclude" msgstr "" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Additions" msgstr "添加内容" -#: cola/widgets/archive.py:134 +#: cola/widgets/archive.py:132 msgid "Advanced" msgstr "高级" -#: cola/widgets/main.py:522 +#: cola/widgets/main.py:535 msgid "Against Commit... (Diff Mode)" msgstr "" -#: cola/models/browse.py:33 +#: cola/models/browse.py:32 msgid "Age" msgstr "修改时间" -#: cola/widgets/prefs.py:403 +#: cola/widgets/prefs.py:441 msgid "All Repositories" msgstr "全部版本库" -#: cola/cmds.py:3110 +#: cola/cmds.py:3056 #, python-format msgid "" "All submodules will be updated using\n" "\"%s\"" msgstr "" -#: cola/widgets/remote.py:195 +#: cola/widgets/remote.py:199 msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care" msgstr "" -#: cola/widgets/merge.py:61 +#: cola/widgets/merge.py:59 msgid "Always create a merge commit when enabled, even when the merge is a fast-forward update" msgstr "启用时总是在合并时创建一个提交,即使是快进合并方式" -#: cola/cmds.py:221 +#: cola/cmds.py:220 msgid "Amend" msgstr "修正" -#: cola/widgets/commitmsg.py:463 +#: cola/widgets/commitmsg.py:471 msgid "Amend Commit" msgstr "修正提交" -#: cola/widgets/commitmsg.py:110 cola/widgets/main.py:194 +#: cola/widgets/commitmsg.py:116 cola/widgets/main.py:193 msgid "Amend Last Commit" msgstr "修正上次提交" -#: cola/widgets/commitmsg.py:462 +#: cola/widgets/commitmsg.py:470 msgid "Amend the published commit?" msgstr "修正已发布的提交吗?" -#: cola/widgets/main.py:1157 +#: cola/widgets/main.py:1170 msgid "Amending" msgstr "修正中" -#: cola/widgets/cfgactions.py:151 +#: cola/widgets/cfgactions.py:150 msgid "" "An action is still running.\n" "Terminating it could result in data loss." @@ -637,7 +662,7 @@ msgstr "" "操作正在进行中.\n" "若终止有可能造成数据损失." -#: cola/cmds.py:2804 +#: cola/cmds.py:2750 msgid "" "An unsigned, lightweight tag will be created instead.\n" "Create an unsigned tag?" @@ -645,56 +670,56 @@ msgstr "" "一个无签名的轻量标签会取而代之.\n" "创建无签名标签吗?" -#: cola/widgets/prefs.py:406 +#: cola/widgets/prefs.py:444 msgid "Appearance" msgstr "外观" -#: cola/widgets/diff.py:1230 +#: cola/widgets/diff.py:1304 msgid "Append Patch" msgstr "" -#: cola/widgets/diff.py:1299 +#: cola/widgets/diff.py:1373 msgid "Append Patch..." msgstr "" -#: cola/widgets/patch.py:112 cola/widgets/stash.py:48 cola/widgets/stash.py:107 -#: cola/widgets/toolbar.py:323 +#: cola/widgets/diff.py:1706 cola/widgets/stash.py:50 cola/widgets/stash.py:110 +#: cola/widgets/toolbar.py:328 msgid "Apply" msgstr "应用" -#: cola/widgets/patch.py:75 +#: cola/widgets/diff.py:1669 msgid "Apply Patches" msgstr "应用补丁" -#: cola/widgets/main.py:239 +#: cola/widgets/main.py:238 msgid "Apply Patches..." msgstr "应用补丁..." -#: cola/widgets/stash.py:64 +#: cola/widgets/stash.py:66 msgid "Apply and drop the selected stash (git stash pop)" msgstr "应用并丢弃所选暂存 (git stash pop)" -#: cola/widgets/stash.py:48 +#: cola/widgets/stash.py:50 msgid "Apply the selected stash" msgstr "应用所选暂存" -#: cola/widgets/main.py:1167 +#: cola/widgets/main.py:1180 msgid "Applying Patch" msgstr "" -#: cola/widgets/cfgactions.py:207 +#: cola/widgets/cfgactions.py:205 msgid "Arguments" msgstr "参数" -#: cola/qtutils.py:850 +#: cola/qtutils.py:887 msgid "Attach" msgstr "结合" -#: cola/models/browse.py:33 cola/models/browse.py:72 cola/widgets/dag.py:506 +#: cola/models/browse.py:32 cola/models/browse.py:71 cola/widgets/dag.py:572 msgid "Author" msgstr "作者" -#: cola/widgets/about.py:93 +#: cola/widgets/about.py:91 msgid "Authors" msgstr "作者" @@ -702,44 +727,44 @@ msgstr "作者" msgid "Auto" msgstr "自动" -#: cola/widgets/commitmsg.py:137 cola/widgets/prefs.py:259 +#: cola/widgets/commitmsg.py:143 cola/widgets/prefs.py:280 msgid "Auto-Wrap Lines" msgstr "自动换行" -#: cola/widgets/prefs.py:184 +#: cola/widgets/prefs.py:206 msgid "Autocomplete Paths" msgstr "" -#: cola/widgets/prefs.py:176 +#: cola/widgets/prefs.py:198 msgid "Automatically Load Commit Message Template" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Basic Regexp" msgstr "基本正则表达式" -#: cola/widgets/prefs.py:255 +#: cola/widgets/prefs.py:276 msgid "Blame Viewer" msgstr "问责查看器" -#: cola/widgets/browse.py:205 +#: cola/widgets/browse.py:206 #, fuzzy msgid "Blame selected paths" msgstr "编辑所选路径" -#: cola/cmds.py:545 cola/widgets/status.py:282 +#: cola/cmds.py:546 cola/widgets/status.py:283 msgid "Blame..." msgstr "问责..." -#: cola/widgets/prefs.py:347 +#: cola/widgets/prefs.py:367 msgid "Bold on dark headers instead of italic" msgstr "暗色背景粗体字体而斜体头部" -#: cola/widgets/main.py:806 cola/widgets/submodules.py:119 +#: cola/widgets/main.py:819 cola/widgets/submodules.py:118 msgid "Branch" msgstr "分支" -#: cola/widgets/remote.py:600 +#: cola/widgets/remote.py:635 #, python-format msgid "" "Branch \"%(branch)s\" does not exist in \"%(remote)s\".\n" @@ -748,84 +773,84 @@ msgstr "" "远程 \"%(remote)s\" 不存在分支 \"%(branch)s\".\n" "一个新的远程分支会被建立." -#: cola/widgets/createbranch.py:258 +#: cola/widgets/createbranch.py:256 #, python-format msgid "Branch \"%s\" already exists." msgstr "分支 '%s' 已经存在." -#: cola/widgets/compare.py:44 +#: cola/widgets/compare.py:43 msgid "Branch Diff Viewer" msgstr "分支差异查看器" -#: cola/widgets/createbranch.py:259 cola/widgets/createbranch.py:271 +#: cola/widgets/createbranch.py:257 cola/widgets/createbranch.py:269 msgid "Branch Exists" msgstr "分支已存在" -#: cola/widgets/createbranch.py:98 +#: cola/widgets/createbranch.py:96 msgid "Branch Name" msgstr "分支名" -#: cola/widgets/submodules.py:89 +#: cola/widgets/submodules.py:88 msgid "Branch name" msgstr "" -#: cola/widgets/browse.py:89 cola/widgets/main.py:1097 +#: cola/widgets/browse.py:89 cola/widgets/main.py:1110 #, python-format msgid "Branch: %s" msgstr "分支: %s" -#: cola/widgets/branch.py:85 cola/widgets/main.py:131 +#: cola/widgets/branch.py:87 cola/widgets/main.py:129 msgid "Branches" msgstr "分支" -#: cola/widgets/main.py:538 +#: cola/widgets/main.py:551 msgid "Branches..." msgstr "分支..." -#: cola/widgets/about.py:414 cola/widgets/about.py:417 -#: cola/widgets/about.py:437 +#: cola/widgets/about.py:397 cola/widgets/about.py:400 +#: cola/widgets/about.py:420 msgid "Brazilian translation" msgstr "巴西语翻译" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse" msgstr "浏览" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse Commits..." msgstr "浏览提交..." -#: cola/widgets/main.py:499 +#: cola/widgets/main.py:512 msgid "Browse Current Branch..." msgstr "浏览当前分支上的文件..." -#: cola/widgets/main.py:505 +#: cola/widgets/main.py:518 msgid "Browse Other Branch..." msgstr "浏览其他分支..." -#: cola/widgets/editremotes.py:437 cola/widgets/search.py:46 -#: cola/widgets/startup.py:65 cola/widgets/startup.py:285 +#: cola/widgets/editremotes.py:435 cola/widgets/search.py:45 +#: cola/widgets/startup.py:64 cola/widgets/startup.py:284 msgid "Browse..." msgstr "浏览..." -#: cola/widgets/main.py:89 +#: cola/widgets/main.py:87 msgid "Browser" msgstr "浏览器" -#: cola/widgets/browse.py:589 +#: cola/widgets/browse.py:590 #, python-format msgid "Browsing %s" msgstr "浏览 %s" -#: cola/widgets/commitmsg.py:118 +#: cola/widgets/commitmsg.py:124 msgid "Bypass Commit Hooks" msgstr "跳过提交钩子" -#: cola/sequenceeditor.py:175 cola/widgets/standard.py:991 +#: cola/sequenceeditor.py:173 cola/widgets/standard.py:1058 msgid "Cancel" msgstr "取消" -#: cola/sequenceeditor.py:176 +#: cola/sequenceeditor.py:174 msgid "" "Cancel rebase\n" "Shortcut: Ctrl+Q" @@ -833,188 +858,200 @@ msgstr "" "取消衍合\n" "快捷键: Ctrl+Q" -#: cola/cmds.py:254 +#: cola/cmds.py:253 msgid "Cannot Amend" msgstr "无法修正" -#: cola/cmds.py:560 +#: cola/cmds.py:561 #, python-format msgid "Cannot exec \"%s\": please configure a blame viewer" msgstr "无法执行 \"%s\": 请配置问责查看器" -#: cola/cmds.py:3146 +#: cola/cmds.py:3092 #, python-format msgid "Cannot exec \"%s\": please configure a history browser" msgstr "无法执行 \"%s\": 请配置历史浏览器" -#: cola/cmds.py:1583 +#: cola/cmds.py:1571 #, python-format msgid "Cannot exec \"%s\": please configure your editor" msgstr "无法执行 \"%s\": 请配置编辑器" -#: cola/models/browse.py:336 +#: cola/models/browse.py:335 msgid "Changed Upstream" msgstr "上游已更改" -#: cola/widgets/prefs.py:186 +#: cola/widgets/prefs.py:208 msgid "Check Published Commits when Amending" msgstr "" -#: cola/widgets/commitmsg.py:130 +#: cola/widgets/commitmsg.py:136 msgid "Check Spelling" msgstr "检查拼写" -#: cola/widgets/prefs.py:265 +#: cola/widgets/prefs.py:286 msgid "Check spelling" msgstr "检查拼写" -#: cola/widgets/prefs.py:163 +#: cola/widgets/prefs.py:186 msgid "Check whether a commit has been published when amending" msgstr "" -#: cola/guicmds.py:62 cola/widgets/branch.py:222 +#: cola/guicmds.py:61 cola/widgets/branch.py:233 msgid "Checkout" msgstr "签出" -#: cola/widgets/createbranch.py:130 +#: cola/widgets/createbranch.py:128 msgid "Checkout After Creation" msgstr "在创建后签出" -#: cola/guicmds.py:62 cola/widgets/dag.py:410 +#: cola/guicmds.py:61 cola/widgets/dag.py:409 msgid "Checkout Branch" msgstr "签出分支" -#: cola/widgets/dag.py:414 +#: cola/widgets/dag.py:413 msgid "Checkout Detached HEAD" msgstr "签出分离的 HEAD" -#: cola/cmds.py:480 cola/cmds.py:518 +#: cola/cmds.py:481 cola/cmds.py:519 msgid "Checkout Files" msgstr "" -#: cola/widgets/branch.py:226 +#: cola/widgets/branch.py:237 msgid "Checkout as new branch" msgstr "签出为新分支" -#: cola/cmds.py:507 +#: cola/cmds.py:508 msgid "Checkout files from our branch (HEAD)" msgstr "" -#: cola/cmds.py:511 +#: cola/cmds.py:512 msgid "Checkout files from our branch?" msgstr "" -#: cola/cmds.py:469 +#: cola/cmds.py:470 msgid "Checkout files from their branch (MERGE_HEAD)" msgstr "" -#: cola/cmds.py:473 +#: cola/cmds.py:474 msgid "Checkout files from their branch?" msgstr "" -#: cola/widgets/main.py:576 +#: cola/widgets/main.py:589 msgid "Checkout..." msgstr "签出..." -#: cola/widgets/dag.py:387 cola/widgets/search.py:79 +#: cola/widgets/dag.py:386 cola/widgets/search.py:78 msgid "Cherry Pick" msgstr "挑取(Cherry Pick)" -#: cola/guicmds.py:73 +#: cola/guicmds.py:72 msgid "Cherry-Pick Commit" msgstr "挑取(Cherry-Pick)提交" -#: cola/widgets/main.py:328 +#: cola/widgets/main.py:323 msgid "Cherry-Pick..." msgstr "挑取(Cherry-Pick)..." -#: cola/cmds.py:584 +#: cola/cmds.py:585 msgid "Cherry-pick failed" msgstr "" -#: cola/widgets/main.py:1161 +#: cola/widgets/main.py:1174 msgid "Cherry-picking" msgstr "" -#: cola/widgets/diff.py:1247 +#: cola/widgets/diff.py:1321 msgid "Choose Patch..." msgstr "" -#: cola/widgets/search.py:319 +#: cola/widgets/search.py:318 msgid "Choose Paths" msgstr "选择路径" -#: cola/widgets/grep.py:116 +#: cola/widgets/grep.py:114 msgid "Choose the \"git grep\" regular expression mode" msgstr "选择 \"git grep\" 正则表达式模式" -#: cola/widgets/bookmarks.py:229 cola/widgets/startup.py:352 +#: cola/widgets/bookmarks.py:228 cola/widgets/startup.py:351 msgid "Clear Default Repository" msgstr "清除默认版本库" -#: cola/widgets/commitmsg.py:305 +#: cola/widgets/commitmsg.py:313 msgid "Clear commit message" msgstr "清除提交信息" -#: cola/widgets/commitmsg.py:302 +#: cola/widgets/commitmsg.py:310 msgid "Clear commit message?" msgstr "清除提交消息吗?" -#: cola/widgets/commitmsg.py:62 +#: cola/widgets/commitmsg.py:63 msgid "Clear..." msgstr "清除..." -#: cola/widgets/clone.py:126 +#: cola/widgets/clone.py:124 msgid "Clone" msgstr "克隆" -#: cola/widgets/clone.py:62 cola/widgets/clone.py:104 +#: cola/widgets/clone.py:61 cola/widgets/clone.py:102 msgid "Clone Repository" msgstr "克隆已有版本库" -#: cola/widgets/main.py:465 cola/widgets/startup.py:58 +#: cola/widgets/main.py:478 cola/widgets/startup.py:57 msgid "Clone..." msgstr "克隆(clone)..." -#: cola/widgets/clone.py:62 +#: cola/widgets/clone.py:61 #, python-format msgid "Cloning repository at %s" msgstr "克隆位于 %s 的已有版本库" -#: cola/qtutils.py:757 cola/qtutils.py:807 cola/widgets/about.py:508 -#: cola/widgets/remote.py:328 cola/widgets/text.py:1094 +#: cola/qtutils.py:788 cola/qtutils.py:838 cola/widgets/about.py:491 +#: cola/widgets/remote.py:362 cola/widgets/text.py:1090 msgid "Close" msgstr "关闭" -#: cola/widgets/text.py:402 +#: cola/widgets/remote.py:222 +msgid "Close dialog when completed" +msgstr "" + +#: cola/widgets/remote.py:221 +msgid "Close on completion" +msgstr "" + +#: cola/widgets/text.py:399 msgid "Close the find bar" msgstr "" -#: cola/qtutils.py:623 +#: cola/qtutils.py:651 msgid "Close..." msgstr "关闭..." -#: cola/widgets/recent.py:71 +#: cola/widgets/recent.py:69 msgid "Collapse all" msgstr "全部合起" -#: cola/sequenceeditor.py:323 +#: cola/sequenceeditor.py:320 msgid "Command" msgstr "命令" -#: cola/widgets/main.py:163 cola/widgets/merge.py:74 +#: cola/widgets/main.py:161 cola/widgets/merge.py:72 msgid "Commit" msgstr "提交" -#: cola/cmds.py:837 +#: cola/widgets/prefs.py:192 +msgid "Commit Message Cleanup" +msgstr "" + +#: cola/widgets/commitmsg.py:495 msgid "Commit failed" msgstr "克隆失败" -#: cola/widgets/commitmsg.py:61 +#: cola/widgets/commitmsg.py:62 msgid "Commit staged changes" msgstr "提交已缓存修改" -#: cola/widgets/commitmsg.py:93 +#: cola/widgets/commitmsg.py:94 msgid "" "Commit staged changes\n" "Shortcut: Ctrl+Enter" @@ -1022,363 +1059,367 @@ msgstr "" "提交已缓存变更\n" "快捷键: Ctrl+Enter" -#: cola/widgets/commitmsg.py:564 +#: cola/widgets/commitmsg.py:590 msgid "Commit summary" msgstr "提交概要" -#: cola/widgets/main.py:259 +#: cola/widgets/main.py:253 msgid "Commit the current state and continue applying patches" msgstr "" -#: cola/widgets/merge.py:70 +#: cola/widgets/merge.py:68 msgid "Commit the merge if there are no conflicts. Uncheck to leave the merge uncommitted" msgstr "若合并无冲突即可提交.取消勾选以保持此合并操作的未提交状态" -#: cola/widgets/commitmsg.py:58 cola/widgets/commitmsg.py:95 -#: cola/widgets/main.py:778 cola/widgets/main.py:779 +#: cola/widgets/commitmsg.py:59 cola/widgets/commitmsg.py:96 +#: cola/widgets/main.py:791 cola/widgets/main.py:792 msgid "Commit@@verb" msgstr "提交@@verb" -#: cola/difftool.py:78 cola/widgets/compare.py:70 +#: cola/widgets/dag.py:487 +msgid "Commits authored by me" +msgstr "" + +#: cola/difftool.py:97 cola/widgets/compare.py:69 msgid "Compare" msgstr "比较" -#: cola/difftool.py:83 +#: cola/difftool.py:102 msgid "Compare All" msgstr "比较全部" -#: cola/widgets/toolbar.py:269 cola/widgets/toolbar.py:306 +#: cola/widgets/toolbar.py:274 cola/widgets/toolbar.py:311 msgid "Configure Toolbar" msgstr "配置工具栏" -#: cola/widgets/remote.py:214 +#: cola/widgets/remote.py:218 msgid "Configure the remote branch as the the new upstream" msgstr "将远程分支设为新的上游" -#: cola/widgets/main.py:170 +#: cola/widgets/main.py:168 msgid "Console" msgstr "控制台" -#: cola/interaction.py:111 cola/widgets/main.py:610 +#: cola/interaction.py:109 cola/widgets/main.py:623 msgid "Continue" msgstr "继续" -#: cola/widgets/main.py:255 +#: cola/widgets/main.py:252 msgid "Continue Applying Patches" msgstr "" -#: cola/widgets/bookmarks.py:248 cola/widgets/main.py:742 -#: cola/widgets/startup.py:371 +#: cola/widgets/bookmarks.py:247 cola/widgets/main.py:755 +#: cola/widgets/startup.py:370 msgid "Copy" msgstr "复制" -#: cola/widgets/status.py:268 +#: cola/widgets/status.py:269 msgid "Copy Basename to Clipboard" msgstr "复制基名到剪贴板" -#: cola/widgets/diff.py:208 +#: cola/widgets/diff.py:209 msgid "Copy Diff" msgstr "" -#: cola/widgets/status.py:745 +#: cola/widgets/status.py:746 msgid "Copy Leading Path to Clipboard" msgstr "复制前导路径到剪贴板" -#: cola/widgets/status.py:251 +#: cola/widgets/status.py:252 msgid "Copy Path to Clipboard" msgstr "复制路径到剪贴板" -#: cola/widgets/status.py:259 +#: cola/widgets/status.py:260 msgid "Copy Relative Path to Clipboard" msgstr "复制相对路径到剪贴板" -#: cola/sequenceeditor.py:334 cola/widgets/dag.py:474 +#: cola/sequenceeditor.py:330 cola/widgets/dag.py:473 msgid "Copy SHA-1" msgstr "复制 SHA-1" -#: cola/widgets/status.py:737 +#: cola/widgets/status.py:738 #, fuzzy msgid "Copy..." msgstr "复制" -#: cola/app.py:490 +#: cola/app.py:493 #, python-format msgid "Could not open %s." msgstr "" -#: cola/widgets/clone.py:191 cola/widgets/clone.py:193 +#: cola/widgets/clone.py:189 cola/widgets/clone.py:191 #, python-format msgid "Could not parse Git URL: \"%s\"" msgstr "无法解析 URL \"%s\"" -#: cola/app.py:500 +#: cola/app.py:503 msgid "Create" msgstr "" -#: cola/widgets/createbranch.py:86 cola/widgets/createbranch.py:135 -#: cola/widgets/createbranch.py:301 cola/widgets/dag.py:369 +#: cola/widgets/createbranch.py:84 cola/widgets/createbranch.py:133 +#: cola/widgets/createbranch.py:299 cola/widgets/dag.py:368 msgid "Create Branch" msgstr "创建分支" -#: cola/widgets/dag.py:373 +#: cola/widgets/dag.py:372 msgid "Create Patch" msgstr "创建补丁" -#: cola/widgets/remote.py:606 +#: cola/widgets/remote.py:641 msgid "Create Remote Branch" msgstr "创建远程分支" -#: cola/widgets/commitmsg.py:124 cola/widgets/merge.py:78 +#: cola/widgets/commitmsg.py:130 cola/widgets/merge.py:76 msgid "Create Signed Commit" msgstr "创建带签名提交: %s" -#: cola/widgets/createtag.py:55 cola/widgets/createtag.py:91 -#: cola/widgets/dag.py:377 +#: cola/widgets/createtag.py:53 cola/widgets/createtag.py:89 +#: cola/widgets/dag.py:376 msgid "Create Tag" msgstr "创建标签" -#: cola/widgets/main.py:544 +#: cola/widgets/main.py:557 msgid "Create Tag..." msgstr "新建标签..." -#: cola/cmds.py:2807 +#: cola/cmds.py:2753 msgid "Create Unsigned Tag" msgstr "创建无签名标签" -#: cola/widgets/remote.py:188 +#: cola/widgets/remote.py:192 #, fuzzy msgid "Create a merge commit even when the merge resolves as a fast-forward" msgstr "启用时总是在合并时创建一个提交,即使是快进合并方式" -#: cola/widgets/remote.py:605 +#: cola/widgets/remote.py:640 msgid "Create a new remote branch?" msgstr "创建远程分支吗?" -#: cola/app.py:499 +#: cola/app.py:502 msgid "Create a new repository at that location?" msgstr "" -#: cola/widgets/submodules.py:100 +#: cola/widgets/submodules.py:99 msgid "Create a shallow clone with history truncated to the specified number of revisions. 0 performs a full clone." msgstr "" -#: cola/widgets/main.py:551 +#: cola/widgets/main.py:564 msgid "Create..." msgstr "新建..." -#: cola/cmds.py:2843 +#: cola/cmds.py:2789 #, python-format msgid "Created a new tag named \"%s\"" msgstr "创建了名为“%s”的新标签" -#: cola/widgets/prefs.py:266 +#: cola/widgets/prefs.py:287 msgid "Ctrl+MouseWheel to Zoom" msgstr "" -#: cola/widgets/prefs.py:404 +#: cola/widgets/prefs.py:442 msgid "Current Repository" msgstr "当前版本库" -#: cola/widgets/status.py:1371 +#: cola/widgets/status.py:1372 msgid "Custom Copy Actions" msgstr "自定义复制操作" -#: cola/widgets/status.py:273 +#: cola/widgets/status.py:274 msgid "Customize..." msgstr "自定义..." -#: cola/widgets/main.py:740 +#: cola/widgets/main.py:753 msgid "Cut" msgstr "剪切" -#: cola/widgets/about.py:411 cola/widgets/about.py:442 +#: cola/widgets/about.py:394 cola/widgets/about.py:425 msgid "Czech translation" msgstr "捷克语翻译" -#: cola/widgets/main.py:592 +#: cola/widgets/main.py:605 msgid "DAG..." msgstr "历史视图..." -#: cola/icons.py:55 +#: cola/icons.py:54 msgid "Dark Theme" msgstr "" -#: cola/widgets/dag.py:506 +#: cola/widgets/dag.py:572 msgid "Date, Time" msgstr "日期, 时间" -#: cola/icons.py:54 cola/themes.py:637 +#: cola/icons.py:53 cola/themes.py:643 msgid "Default" msgstr "默认" -#: cola/widgets/prefs.py:126 +#: cola/widgets/prefs.py:124 msgid "" "Default directory when exporting patches.\n" "Relative paths are relative to the current repository.\n" "Absolute path are used as-is." msgstr "" -#: cola/cmds.py:925 cola/guicmds.py:26 cola/guicmds.py:35 -#: cola/widgets/bookmarks.py:75 cola/widgets/bookmarks.py:251 -#: cola/widgets/main.py:746 cola/widgets/startup.py:373 +#: cola/cmds.py:923 cola/guicmds.py:25 cola/guicmds.py:34 +#: cola/widgets/bookmarks.py:74 cola/widgets/bookmarks.py:250 +#: cola/widgets/main.py:759 cola/widgets/startup.py:372 msgid "Delete" msgstr "删除" -#: cola/cmds.py:1088 +#: cola/cmds.py:1089 #, python-format msgid "Delete %d file(s)?" msgstr "删除 %d 个文件吗?" -#: cola/cmds.py:1016 +#: cola/cmds.py:1017 msgid "Delete Bookmark" msgstr "删除书签" -#: cola/cmds.py:1014 +#: cola/cmds.py:1015 msgid "Delete Bookmark?" msgstr "删除书签吗?" -#: cola/cmds.py:1114 cola/cmds.py:1117 cola/guicmds.py:26 -#: cola/widgets/branch.py:268 +#: cola/cmds.py:1115 cola/cmds.py:1118 cola/guicmds.py:25 +#: cola/widgets/branch.py:277 msgid "Delete Branch" msgstr "删除分支" -#: cola/cmds.py:1089 +#: cola/cmds.py:1090 msgid "Delete Files" msgstr "删除文件" -#: cola/widgets/status.py:311 +#: cola/widgets/status.py:312 msgid "Delete Files..." msgstr "删除文件..." -#: cola/cmds.py:1085 +#: cola/cmds.py:1086 msgid "Delete Files?" msgstr "删除文件吗?" -#: cola/cmds.py:922 +#: cola/cmds.py:920 msgid "Delete Remote" msgstr "删除远程" -#: cola/guicmds.py:35 cola/widgets/branch.py:270 +#: cola/guicmds.py:34 cola/widgets/branch.py:279 msgid "Delete Remote Branch" msgstr "删除远程分支" -#: cola/widgets/main.py:564 +#: cola/widgets/main.py:577 msgid "Delete Remote Branch..." msgstr "删除远程分支..." -#: cola/widgets/toolbar.py:271 +#: cola/widgets/toolbar.py:276 msgid "Delete Toolbar" msgstr "删除工具栏" -#: cola/cmds.py:1115 +#: cola/cmds.py:1116 #, python-format msgid "Delete branch \"%s\"?" msgstr "" -#: cola/widgets/editremotes.py:88 +#: cola/widgets/editremotes.py:87 msgid "Delete remote" msgstr "删除远程" -#: cola/cmds.py:924 +#: cola/cmds.py:922 #, python-format msgid "Delete remote \"%s\"" msgstr "删除远程 \"%s\"" -#: cola/cmds.py:923 +#: cola/cmds.py:921 msgid "Delete remote?" msgstr "删除远程吗?" -#: cola/widgets/main.py:558 +#: cola/widgets/main.py:571 msgid "Delete..." msgstr "删除..." -#: cola/cmds.py:1067 +#: cola/cmds.py:1068 #, python-format msgid "Deleting \"%s\" failed" msgstr "删除 \"%s\" 失败" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Deletions" msgstr "删除内容" -#: cola/widgets/submodules.py:120 +#: cola/widgets/submodules.py:119 msgid "Depth" msgstr "" -#: cola/qtutils.py:811 cola/qtutils.py:852 +#: cola/qtutils.py:842 cola/qtutils.py:889 msgid "Detach" msgstr "分离" -#: cola/widgets/prefs.py:181 +#: cola/widgets/prefs.py:203 msgid "Detect Conflict Markers" msgstr "检测冲突标记" -#: cola/widgets/prefs.py:151 +#: cola/widgets/prefs.py:174 msgid "Detect conflict markers in unmerged files" msgstr "在未合并文件中检测冲突标记" -#: cola/widgets/about.py:271 cola/widgets/about.py:274 -#: cola/widgets/about.py:277 cola/widgets/about.py:278 -#: cola/widgets/about.py:279 cola/widgets/about.py:280 -#: cola/widgets/about.py:281 cola/widgets/about.py:282 -#: cola/widgets/about.py:283 cola/widgets/about.py:284 -#: cola/widgets/about.py:285 cola/widgets/about.py:286 -#: cola/widgets/about.py:287 cola/widgets/about.py:288 -#: cola/widgets/about.py:289 cola/widgets/about.py:290 -#: cola/widgets/about.py:291 cola/widgets/about.py:292 -#: cola/widgets/about.py:293 cola/widgets/about.py:294 -#: cola/widgets/about.py:295 cola/widgets/about.py:296 -#: cola/widgets/about.py:297 cola/widgets/about.py:298 -#: cola/widgets/about.py:299 cola/widgets/about.py:300 -#: cola/widgets/about.py:301 cola/widgets/about.py:302 -#: cola/widgets/about.py:303 cola/widgets/about.py:304 -#: cola/widgets/about.py:305 cola/widgets/about.py:306 -#: cola/widgets/about.py:307 cola/widgets/about.py:308 -#: cola/widgets/about.py:309 cola/widgets/about.py:310 -#: cola/widgets/about.py:311 cola/widgets/about.py:312 -#: cola/widgets/about.py:313 cola/widgets/about.py:314 -#: cola/widgets/about.py:315 cola/widgets/about.py:316 -#: cola/widgets/about.py:317 cola/widgets/about.py:318 -#: cola/widgets/about.py:319 cola/widgets/about.py:320 -#: cola/widgets/about.py:321 cola/widgets/about.py:322 -#: cola/widgets/about.py:323 cola/widgets/about.py:324 -#: cola/widgets/about.py:325 cola/widgets/about.py:326 -#: cola/widgets/about.py:327 cola/widgets/about.py:328 -#: cola/widgets/about.py:329 cola/widgets/about.py:330 -#: cola/widgets/about.py:331 cola/widgets/about.py:332 -#: cola/widgets/about.py:333 cola/widgets/about.py:334 -#: cola/widgets/about.py:335 cola/widgets/about.py:336 -#: cola/widgets/about.py:337 cola/widgets/about.py:338 -#: cola/widgets/about.py:339 cola/widgets/about.py:340 -#: cola/widgets/about.py:341 cola/widgets/about.py:342 -#: cola/widgets/about.py:343 cola/widgets/about.py:344 -#: cola/widgets/about.py:345 cola/widgets/about.py:346 -#: cola/widgets/about.py:347 cola/widgets/about.py:348 -#: cola/widgets/about.py:349 cola/widgets/about.py:350 -#: cola/widgets/about.py:351 cola/widgets/about.py:352 -#: cola/widgets/about.py:353 cola/widgets/about.py:354 -#: cola/widgets/about.py:355 cola/widgets/about.py:356 -#: cola/widgets/about.py:357 cola/widgets/about.py:358 -#: cola/widgets/about.py:359 cola/widgets/about.py:360 -#: cola/widgets/about.py:361 cola/widgets/about.py:362 -#: cola/widgets/about.py:363 cola/widgets/about.py:364 -#: cola/widgets/about.py:365 cola/widgets/about.py:366 -#: cola/widgets/about.py:367 cola/widgets/about.py:368 -#: cola/widgets/about.py:369 cola/widgets/about.py:370 -#: cola/widgets/about.py:371 cola/widgets/about.py:372 -#: cola/widgets/about.py:373 cola/widgets/about.py:374 -#: cola/widgets/about.py:375 cola/widgets/about.py:376 -#: cola/widgets/about.py:377 cola/widgets/about.py:378 -#: cola/widgets/about.py:379 cola/widgets/about.py:380 +#: cola/widgets/about.py:254 cola/widgets/about.py:257 +#: cola/widgets/about.py:260 cola/widgets/about.py:261 +#: cola/widgets/about.py:262 cola/widgets/about.py:263 +#: cola/widgets/about.py:264 cola/widgets/about.py:265 +#: cola/widgets/about.py:266 cola/widgets/about.py:267 +#: cola/widgets/about.py:268 cola/widgets/about.py:269 +#: cola/widgets/about.py:270 cola/widgets/about.py:271 +#: cola/widgets/about.py:272 cola/widgets/about.py:273 +#: cola/widgets/about.py:274 cola/widgets/about.py:275 +#: cola/widgets/about.py:276 cola/widgets/about.py:277 +#: cola/widgets/about.py:278 cola/widgets/about.py:279 +#: cola/widgets/about.py:280 cola/widgets/about.py:281 +#: cola/widgets/about.py:282 cola/widgets/about.py:283 +#: cola/widgets/about.py:284 cola/widgets/about.py:285 +#: cola/widgets/about.py:286 cola/widgets/about.py:287 +#: cola/widgets/about.py:288 cola/widgets/about.py:289 +#: cola/widgets/about.py:290 cola/widgets/about.py:291 +#: cola/widgets/about.py:292 cola/widgets/about.py:293 +#: cola/widgets/about.py:294 cola/widgets/about.py:295 +#: cola/widgets/about.py:296 cola/widgets/about.py:297 +#: cola/widgets/about.py:298 cola/widgets/about.py:299 +#: cola/widgets/about.py:300 cola/widgets/about.py:301 +#: cola/widgets/about.py:302 cola/widgets/about.py:303 +#: cola/widgets/about.py:304 cola/widgets/about.py:305 +#: cola/widgets/about.py:306 cola/widgets/about.py:307 +#: cola/widgets/about.py:308 cola/widgets/about.py:309 +#: cola/widgets/about.py:310 cola/widgets/about.py:311 +#: cola/widgets/about.py:312 cola/widgets/about.py:313 +#: cola/widgets/about.py:314 cola/widgets/about.py:315 +#: cola/widgets/about.py:316 cola/widgets/about.py:317 +#: cola/widgets/about.py:318 cola/widgets/about.py:319 +#: cola/widgets/about.py:320 cola/widgets/about.py:321 +#: cola/widgets/about.py:322 cola/widgets/about.py:323 +#: cola/widgets/about.py:324 cola/widgets/about.py:325 +#: cola/widgets/about.py:326 cola/widgets/about.py:327 +#: cola/widgets/about.py:328 cola/widgets/about.py:329 +#: cola/widgets/about.py:330 cola/widgets/about.py:331 +#: cola/widgets/about.py:332 cola/widgets/about.py:333 +#: cola/widgets/about.py:334 cola/widgets/about.py:335 +#: cola/widgets/about.py:336 cola/widgets/about.py:337 +#: cola/widgets/about.py:338 cola/widgets/about.py:339 +#: cola/widgets/about.py:340 cola/widgets/about.py:341 +#: cola/widgets/about.py:342 cola/widgets/about.py:343 +#: cola/widgets/about.py:344 cola/widgets/about.py:345 +#: cola/widgets/about.py:346 cola/widgets/about.py:347 +#: cola/widgets/about.py:348 cola/widgets/about.py:349 +#: cola/widgets/about.py:350 cola/widgets/about.py:351 +#: cola/widgets/about.py:352 cola/widgets/about.py:353 +#: cola/widgets/about.py:354 cola/widgets/about.py:355 +#: cola/widgets/about.py:356 cola/widgets/about.py:357 +#: cola/widgets/about.py:358 cola/widgets/about.py:359 +#: cola/widgets/about.py:360 cola/widgets/about.py:361 +#: cola/widgets/about.py:362 cola/widgets/about.py:363 msgid "Developer" msgstr "开发者" -#: cola/guicmds.py:185 cola/widgets/dag.py:764 cola/widgets/diff.py:781 -#: cola/widgets/main.py:177 cola/widgets/main.py:797 +#: cola/guicmds.py:184 cola/widgets/dag.py:830 cola/widgets/diff.py:809 +#: cola/widgets/main.py:175 cola/widgets/main.py:810 msgid "Diff" msgstr "差异比较" -#: cola/guicmds.py:185 +#: cola/guicmds.py:184 msgid "Diff Against Commit" msgstr "" @@ -1386,35 +1427,35 @@ msgstr "" msgid "Diff Against Predecessor..." msgstr "与之前提交比较差异..." -#: cola/widgets/main.py:1159 +#: cola/widgets/main.py:1172 msgid "Diff Mode" msgstr "" -#: cola/widgets/diff.py:772 cola/widgets/diff.py:796 +#: cola/widgets/diff.py:800 cola/widgets/diff.py:824 msgid "Diff Options" msgstr "差异选项" -#: cola/widgets/prefs.py:256 +#: cola/widgets/prefs.py:277 msgid "Diff Tool" msgstr "差异比较工具" -#: cola/widgets/dag.py:364 +#: cola/widgets/dag.py:363 msgid "Diff selected -> this" msgstr "所选文件 -> 此文件 比较差异" -#: cola/widgets/dag.py:358 +#: cola/widgets/dag.py:357 msgid "Diff this -> selected" msgstr "此文件 -> 所选文件 比较差异" -#: cola/widgets/main.py:218 +#: cola/widgets/main.py:217 msgid "Diffstat" msgstr "差异统计" -#: cola/cmds.py:3262 +#: cola/difftool.py:324 msgid "Difftool" msgstr "差异工具" -#: cola/widgets/clone.py:207 +#: cola/widgets/clone.py:205 msgid "Directory Exists" msgstr "目录已存在" @@ -1422,84 +1463,88 @@ msgstr "目录已存在" msgid "Disable" msgstr "" -#: cola/widgets/prefs.py:180 +#: cola/widgets/prefs.py:202 msgid "Display Untracked Files" msgstr "显示未跟踪文件" -#: cola/cmds.py:2094 +#: cola/widgets/remote.py:176 +msgid "Display remote messages in a separate dialog" +msgstr "" + +#: cola/cmds.py:2045 msgid "Do not update stacked branches" msgstr "" -#: cola/widgets/main.py:471 +#: cola/widgets/main.py:484 msgid "Documentation" msgstr "帮助文档" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop" msgstr "丢弃" -#: cola/widgets/stash.py:258 +#: cola/widgets/stash.py:276 msgid "Drop Stash" msgstr "丢弃暂存" -#: cola/widgets/stash.py:255 +#: cola/widgets/stash.py:273 msgid "Drop Stash?" msgstr "丢弃暂存吗?" -#: cola/widgets/stash.py:257 +#: cola/widgets/stash.py:275 #, python-format msgid "Drop the \"%s\" stash?" msgstr "丢弃暂存 \"%s\" 吗?" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop the selected stash" msgstr "丢弃所选暂存" -#: cola/qtutils.py:764 cola/sequenceeditor.py:357 cola/widgets/grep.py:102 +#: cola/qtutils.py:795 cola/sequenceeditor.py:353 cola/widgets/grep.py:100 msgid "Edit" msgstr "编辑" -#: cola/widgets/diff.py:1019 +#: cola/widgets/diff.py:1058 msgid "Edit Diff Hunk to Revert..." msgstr "" -#: cola/widgets/diff.py:1017 +#: cola/widgets/diff.py:1056 msgid "Edit Diff Hunk to Stage..." msgstr "" -#: cola/widgets/diff.py:1062 +#: cola/widgets/diff.py:1124 msgid "Edit Diff Hunk to Unstage..." msgstr "" -#: cola/cmds.py:2166 +#: cola/cmds.py:2117 msgid "Edit Rebase" msgstr "编辑衍合" -#: cola/widgets/editremotes.py:36 +#: cola/widgets/editremotes.py:35 msgid "Edit Remotes" msgstr "编辑远程" -#: cola/widgets/main.py:298 +#: cola/widgets/main.py:293 msgid "Edit Remotes..." msgstr "编辑远程..." -#: cola/widgets/diff.py:1014 +#: cola/widgets/diff.py:1053 msgid "Edit Selected Lines to Revert..." msgstr "" -#: cola/widgets/diff.py:1012 +#: cola/widgets/diff.py:1051 msgid "Edit Selected Lines to Stage..." msgstr "" -#: cola/widgets/diff.py:1059 +#: cola/widgets/diff.py:1122 msgid "Edit Selected Lines to Unstage..." msgstr "" -#: cola/widgets/editremotes.py:44 +#: cola/widgets/editremotes.py:43 msgid "Edit remotes by selecting them from the list" msgstr "从列表中选择远程进行编辑" -#: cola/widgets/browse.py:197 cola/widgets/common.py:39 +#: cola/widgets/browse.py:198 cola/widgets/common.py:38 msgid "Edit selected paths" msgstr "编辑所选路径" @@ -1515,11 +1560,11 @@ msgstr "" msgid "Edit the following patch, which will then be applied to the worktree to revert the changes:" msgstr "" -#: cola/widgets/main.py:604 +#: cola/widgets/main.py:617 msgid "Edit..." msgstr "编辑..." -#: cola/widgets/prefs.py:253 +#: cola/widgets/prefs.py:274 msgid "Editor" msgstr "编辑器" @@ -1528,154 +1573,159 @@ msgstr "编辑器" msgid "Editor returned %s exit code. Not applying patch." msgstr "" -#: cola/widgets/prefs.py:167 +#: cola/widgets/prefs.py:190 msgid "Email Address" msgstr "电子邮件地址" -#: cola/widgets/about.py:258 cola/widgets/about.py:401 +#: cola/widgets/about.py:241 cola/widgets/about.py:384 msgid "Email contributor" msgstr "电子邮件贡献者" -#: cola/widgets/prefs.py:182 +#: cola/widgets/prefs.py:204 msgid "Enable Gravatar Icons" msgstr "" -#: cola/widgets/prefs.py:160 +#: cola/widgets/prefs.py:183 msgid "Enable path autocompletion in tools" msgstr "" -#: cola/widgets/diff.py:768 +#: cola/widgets/diff.py:796 msgid "Enable word wrapping" msgstr "" -#: cola/sequenceeditor.py:322 +#: cola/sequenceeditor.py:319 msgid "Enabled" msgstr "已启用" -#: cola/guicmds.py:333 cola/widgets/branch.py:445 +#: cola/guicmds.py:332 cola/widgets/branch.py:478 msgid "Enter New Branch Name" msgstr "输入新分支名" -#: cola/guicmds.py:147 +#: cola/guicmds.py:146 #, fuzzy msgid "Enter a name for the new bare repo" msgstr "为暂存输入名称" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Enter a name for the stash" msgstr "为暂存输入名称" -#: cola/cmds.py:146 cola/cmds.py:176 cola/cmds.py:207 cola/cmds.py:283 -#: cola/cmds.py:292 cola/cmds.py:307 cola/cmds.py:317 cola/cmds.py:460 -#: cola/cmds.py:496 cola/cmds.py:534 cola/cmds.py:633 cola/cmds.py:751 -#: cola/cmds.py:1067 cola/cmds.py:1164 cola/cmds.py:2005 cola/cmds.py:2394 -#: cola/cmds.py:2637 cola/cmds.py:2643 cola/cmds.py:2651 cola/cmds.py:2872 -#: cola/cmds.py:2890 cola/cmds.py:3180 cola/gitcmds.py:984 cola/guicmds.py:157 -#: cola/models/stash.py:70 cola/models/stash.py:87 cola/models/stash.py:108 -#: cola/widgets/bookmarks.py:482 cola/widgets/branch.py:777 +#: cola/widgets/stash.py:216 +msgid "Enter a new name for the stash" +msgstr "" + +#: cola/cmds.py:145 cola/cmds.py:175 cola/cmds.py:206 cola/cmds.py:284 +#: cola/cmds.py:293 cola/cmds.py:308 cola/cmds.py:318 cola/cmds.py:461 +#: cola/cmds.py:497 cola/cmds.py:535 cola/cmds.py:635 cola/cmds.py:753 +#: cola/cmds.py:1068 cola/cmds.py:1165 cola/cmds.py:1956 cola/cmds.py:2345 +#: cola/cmds.py:2579 cola/cmds.py:2585 cola/cmds.py:2593 cola/cmds.py:2818 +#: cola/cmds.py:2836 cola/cmds.py:3125 cola/gitcmds.py:994 cola/guicmds.py:156 +#: cola/models/stash.py:70 cola/models/stash.py:90 cola/models/stash.py:112 +#: cola/models/stash.py:138 cola/widgets/bookmarks.py:481 +#: cola/widgets/branch.py:829 msgid "Error" msgstr "错误" -#: cola/widgets/clone.py:191 +#: cola/widgets/clone.py:189 msgid "Error Cloning" msgstr "克隆出错" -#: cola/widgets/createbranch.py:314 +#: cola/widgets/createbranch.py:312 msgid "Error Creating Branch" msgstr "创建分支出错" -#: cola/app.py:502 cola/guicmds.py:101 +#: cola/app.py:505 cola/guicmds.py:100 msgid "Error Creating Repository" msgstr "创建版本库出错" -#: cola/cmds.py:1202 +#: cola/cmds.py:1206 msgid "Error Deleting Remote Branch" msgstr "删除远程分支出错" -#: cola/cmds.py:1585 +#: cola/cmds.py:1573 msgid "Error Editing File" msgstr "编辑文件出错" -#: cola/cmds.py:559 +#: cola/cmds.py:560 msgid "Error Launching Blame Viewer" msgstr "启动问责查看器出错" -#: cola/cmds.py:3145 +#: cola/cmds.py:3091 msgid "Error Launching History Browser" msgstr "启动历史浏览器出错" -#: cola/app.py:489 +#: cola/app.py:492 msgid "Error Opening Repository" msgstr "" -#: cola/widgets/browse.py:566 +#: cola/models/stash.py:144 +msgid "Error Renaming Stash" +msgstr "" + +#: cola/widgets/browse.py:567 msgid "Error Saving File" msgstr "" -#: cola/cmds.py:914 +#: cola/cmds.py:912 #, python-format msgid "Error creating remote \"%s\"" msgstr "创建远程 \"%s\" 出错" -#: cola/models/stash.py:197 +#: cola/models/stash.py:233 msgid "Error creating stash" msgstr "创建暂存出错" -#: cola/cmds.py:1126 +#: cola/cmds.py:1127 #, python-format msgid "Error deleting branch \"%s\"" msgstr "" -#: cola/cmds.py:932 +#: cola/cmds.py:930 #, python-format msgid "Error deleting remote \"%s\"" msgstr "删除远程 \"%s\" 出错" -#: cola/cmds.py:956 +#: cola/cmds.py:955 #, python-format msgid "Error renaming \"%(name)s\" to \"%(new_name)s\"" msgstr "重命名 \"%(name)s\" 为 \"%(new_name)s\" 出错" -#: cola/cmds.py:1771 +#: cola/cmds.py:1722 msgid "Error running prepare-commitmsg hook" msgstr "运行 prepare-commitmsg 钩子出错" -#: cola/cmds.py:3043 cola/cmds.py:3089 +#: cola/cmds.py:2989 cola/cmds.py:3035 #, python-format msgid "Error updating submodule %s" msgstr "更新子模块 \"%s\" 出错" -#: cola/cmds.py:3125 +#: cola/cmds.py:3071 msgid "Error updating submodules" msgstr "更新子模块出错" -#: cola/widgets/diff.py:1326 +#: cola/widgets/diff.py:1400 msgid "Error writing patch" msgstr "" -#: cola/cmds.py:1710 +#: cola/cmds.py:1662 msgid "Error: Cannot find commit template" msgstr "错误: 无法找到提交模板" -#: cola/widgets/stash.py:235 -msgid "Error: Stash exists" -msgstr "错误: 暂存已存在" - -#: cola/cmds.py:1732 +#: cola/cmds.py:1684 msgid "Error: Unconfigured commit template" msgstr "错误: 未配置提交模板" -#: cola/widgets/clone.py:53 +#: cola/widgets/clone.py:52 #, python-format msgid "Error: could not clone \"%s\"" msgstr "错误: 无法克隆 \"%s\"" -#: cola/cmds.py:2835 +#: cola/cmds.py:2781 #, python-format msgid "Error: could not create tag \"%s\"" msgstr "错误: 无法创建标签 \"%s\"" -#: cola/widgets/branch.py:421 +#: cola/widgets/branch.py:433 #, python-format msgid "Executing action %s" msgstr "执行动作 %s" @@ -1684,410 +1734,422 @@ msgstr "执行动作 %s" msgid "Exit \"Diff\" mode" msgstr "" -#: cola/widgets/action.py:67 +#: cola/widgets/action.py:81 msgid "Exit Diff" msgstr "" -#: cola/widgets/main.py:528 +#: cola/widgets/main.py:541 msgid "Exit Diff Mode" msgstr "" -#: cola/widgets/action.py:68 +#: cola/widgets/action.py:81 msgid "Exit Diff mode" msgstr "" -#: cola/widgets/recent.py:67 +#: cola/widgets/recent.py:65 msgid "Expand all" msgstr "全部展开" -#: cola/widgets/diff.py:1223 +#: cola/widgets/diff.py:1297 msgid "Export Patch" msgstr "" -#: cola/guicmds.py:168 cola/widgets/search.py:75 +#: cola/guicmds.py:167 cola/widgets/search.py:74 msgid "Export Patches" msgstr "导出补丁" -#: cola/widgets/main.py:273 +#: cola/widgets/main.py:268 msgid "Export Patches..." msgstr "导出补丁..." -#: cola/widgets/main.py:533 +#: cola/widgets/main.py:546 msgid "Expression..." msgstr "表达式..." -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Extended Regexp" msgstr "拓展正则表达式" -#: cola/widgets/commitmsg.py:612 +#: cola/widgets/commitmsg.py:638 msgid "Extended description..." msgstr "拓展描述..." -#: cola/cmds.py:387 +#: cola/cmds.py:388 msgid "Failed to commit and continue applying patches" msgstr "" -#: cola/cmds.py:403 +#: cola/cmds.py:404 msgid "Failed to continue applying patches after skipping the current patch" msgstr "" -#: cola/widgets/createbranch.py:124 +#: cola/widgets/createbranch.py:122 msgid "Fast Forward Only" msgstr "仅快速合并" -#: cola/widgets/remote.py:177 +#: cola/widgets/remote.py:181 msgid "Fast-forward only" msgstr "仅快速合并" -#: cola/widgets/bookmarks.py:91 +#: cola/widgets/bookmarks.py:90 msgid "Favorite repositories" msgstr "版本库收藏夹" -#: cola/widgets/main.py:111 +#: cola/widgets/main.py:109 msgid "Favorites" msgstr "收藏夹" -#: cola/widgets/remote.py:673 +#: cola/widgets/remote.py:735 msgid "Fetch" msgstr "获取" -#: cola/widgets/createbranch.py:127 +#: cola/widgets/createbranch.py:125 msgid "Fetch Tracking Branch" msgstr "获取跟踪分支" -#: cola/widgets/action.py:63 cola/widgets/main.py:387 +#: cola/widgets/action.py:67 cola/widgets/main.py:384 +msgid "Fetch from one or more remotes using \"git fetch\"" +msgstr "" + +#: cola/widgets/action.py:65 cola/widgets/main.py:383 msgid "Fetch..." msgstr "获取..." -#: cola/widgets/main.py:588 +#: cola/widgets/main.py:601 msgid "File Browser..." msgstr "文件浏览器..." -#: cola/widgets/compare.py:75 +#: cola/widgets/compare.py:74 msgid "File Differences" msgstr "文件差异" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 msgid "File Saved" msgstr "文件已保存" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 #, python-format msgid "File saved to \"%s\"" msgstr "文件保存为 \"%s\"" -#: cola/fsmonitor.py:517 +#: cola/fsmonitor.py:528 msgid "File system change monitoring: disabled because \"cola.inotify\" is false.\n" msgstr "监视文件系统更改：已禁用，因为 cola.notify 选项设置为 false。\n" -#: cola/fsmonitor.py:534 +#: cola/fsmonitor.py:545 msgid "File system change monitoring: disabled because libc does not support the inotify system calls.\n" msgstr "" -#: cola/fsmonitor.py:528 +#: cola/fsmonitor.py:539 msgid "File system change monitoring: disabled because pywin32 is not installed.\n" msgstr "" -#: cola/fsmonitor.py:181 +#: cola/fsmonitor.py:184 msgid "" "File system change monitoring: disabled because the limit on the total number of inotify watches was reached. You may be able to increase the limit on the number of watches by running:\n" "\n" " echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n" msgstr "" -#: cola/fsmonitor.py:142 +#: cola/fsmonitor.py:145 msgid "File system change monitoring: enabled.\n" msgstr "监视文件系统更改：已开启。\n" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Filename" msgstr "文件名" -#: cola/widgets/dag.py:755 +#: cola/widgets/dag.py:821 msgid "Files" msgstr "文件" -#: cola/widgets/branch.py:785 +#: cola/widgets/branch.py:837 msgid "Filter branches..." msgstr "过滤分支..." -#: cola/widgets/status.py:1333 +#: cola/widgets/status.py:1334 msgid "Filter paths..." msgstr "对路径进行过滤..." -#: cola/widgets/finder.py:113 cola/widgets/main.py:312 +#: cola/widgets/finder.py:112 cola/widgets/main.py:307 msgid "Find Files" msgstr "查找文件" -#: cola/widgets/text.py:388 +#: cola/widgets/text.py:385 msgid "Find in diff" msgstr "" -#: cola/widgets/text.py:425 +#: cola/widgets/text.py:422 msgid "Find next item" msgstr "" -#: cola/widgets/text.py:431 +#: cola/widgets/text.py:428 msgid "Find previous item" msgstr "" -#: cola/widgets/text.py:395 +#: cola/widgets/text.py:392 msgid "Find the next occurrence of the phrase" msgstr "" -#: cola/widgets/text.py:391 +#: cola/widgets/text.py:388 msgid "Find the previous occurrence of the phrase" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Fixed String" msgstr "特定字符串" -#: cola/widgets/prefs.py:251 +#: cola/widgets/prefs.py:270 msgid "Fixed-Width Font" msgstr "等宽字体" -#: cola/sequenceeditor.py:362 +#: cola/sequenceeditor.py:358 msgid "Fixup" msgstr "修正" -#: cola/widgets/commitmsg.py:148 +#: cola/widgets/commitmsg.py:154 msgid "Fixup Previous Commit" msgstr "修正前一次提交" -#: cola/themes.py:672 +#: cola/themes.py:684 msgid "Flat dark blue" msgstr "扁平深蓝" -#: cola/themes.py:693 +#: cola/themes.py:705 msgid "Flat dark green" msgstr "扁平深绿" -#: cola/themes.py:686 +#: cola/themes.py:698 msgid "Flat dark grey" msgstr "扁平深灰" -#: cola/themes.py:679 +#: cola/themes.py:691 msgid "Flat dark red" msgstr "扁平深红" -#: cola/themes.py:644 +#: cola/themes.py:656 msgid "Flat light blue" msgstr "扁平浅蓝" -#: cola/themes.py:665 +#: cola/themes.py:677 msgid "Flat light green" msgstr "扁平浅绿" -#: cola/themes.py:658 +#: cola/themes.py:670 msgid "Flat light grey" msgstr "扁平浅灰" -#: cola/themes.py:651 +#: cola/themes.py:663 msgid "Flat light red" msgstr "扁平浅红" -#: cola/widgets/startup.py:73 +#: cola/widgets/startup.py:72 msgid "Folder" msgstr "" -#: cola/widgets/toolbar.py:177 +#: cola/widgets/toolbar.py:181 msgid "Follow System Style" msgstr "" -#: cola/widgets/prefs.py:252 +#: cola/widgets/prefs.py:271 msgid "Font Size" msgstr "字体大小" -#: cola/widgets/remote.py:193 +#: cola/widgets/remote.py:197 msgid "Force" msgstr "强制" -#: cola/widgets/remote.py:617 +#: cola/widgets/remote.py:652 msgid "Force Fetch" msgstr "强制获取" -#: cola/widgets/remote.py:614 +#: cola/widgets/remote.py:649 msgid "Force Fetch?" msgstr "强制获取?" -#: cola/widgets/remote.py:625 +#: cola/widgets/remote.py:660 msgid "Force Push" msgstr "强制推送" -#: cola/widgets/remote.py:619 +#: cola/widgets/remote.py:654 msgid "Force Push?" msgstr "强制推送吗?" -#: cola/widgets/remote.py:616 +#: cola/widgets/remote.py:651 #, python-format msgid "Force fetching from %s?" msgstr "强制获取从 %s 吗?" -#: cola/widgets/remote.py:624 +#: cola/widgets/remote.py:659 #, python-format msgid "Force push to %s?" msgstr "强制推送到 %s 吗?" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Format String" msgstr "格式化字符串" -#: cola/widgets/about.py:430 cola/widgets/about.py:431 +#: cola/widgets/about.py:413 cola/widgets/about.py:414 msgid "French translation" msgstr "法语翻译" -#: cola/widgets/merge.py:80 +#: cola/widgets/merge.py:78 msgid "GPG-sign the merge commit" msgstr "GPG 签名合并提交" -#: cola/widgets/prefs.py:344 +#: cola/widgets/prefs.py:364 msgid "GUI theme" msgstr "界面主题" -#: cola/widgets/editremotes.py:318 +#: cola/widgets/editremotes.py:317 #, python-format msgid "Gathering info for \"%s\"..." msgstr "为 \"%s\" 收集信息..." -#: cola/widgets/about.py:420 cola/widgets/about.py:428 -#: cola/widgets/about.py:429 +#: cola/widgets/about.py:403 cola/widgets/about.py:411 +#: cola/widgets/about.py:412 msgid "German translation" msgstr "德语翻译" -#: cola/widgets/main.py:511 +#: cola/widgets/main.py:524 msgid "Get Commit Message Template" msgstr "取得提交信息模板" -#: cola/widgets/dag.py:520 +#: cola/widgets/dag.py:586 msgid "Go Down" msgstr "下一项" -#: cola/widgets/dag.py:516 +#: cola/widgets/dag.py:582 msgid "Go Up" msgstr "上一项" -#: cola/widgets/dag.py:467 cola/widgets/filelist.py:42 +#: cola/widgets/dag.py:466 cola/widgets/filelist.py:39 msgid "Grab File..." msgstr "抓取文件..." -#: cola/widgets/dag.py:782 +#: cola/widgets/dag.py:848 msgid "Graph" msgstr "图示" -#: cola/widgets/main.py:358 +#: cola/widgets/main.py:353 msgid "Grep" msgstr "筛选 (grep)" -#: cola/widgets/remote.py:662 +#: cola/widgets/remote.py:707 msgid "Have you rebased/pulled lately?" msgstr "最近有衍合或拉取操作吗?" -#: cola/sequenceeditor.py:110 cola/sequenceeditor.py:171 -#: cola/widgets/finder.py:138 cola/widgets/main.py:854 +#: cola/sequenceeditor.py:108 cola/sequenceeditor.py:169 +#: cola/widgets/finder.py:137 cola/widgets/main.py:867 msgid "Help" msgstr "帮助" -#: cola/widgets/status.py:1322 +#: cola/widgets/status.py:1323 msgid "Help - Custom Copy Actions" msgstr "帮助 - 自定义复制操作" -#: cola/widgets/finder.py:79 +#: cola/widgets/finder.py:78 msgid "Help - Find Files" msgstr "帮助 - 查找文件" -#: cola/sequenceeditor.py:737 +#: cola/sequenceeditor.py:732 msgid "Help - git-cola-sequence-editor" msgstr "帮助 - git-cola-sequence-editor" -#: cola/widgets/prefs.py:346 +#: cola/widgets/prefs.py:366 msgid "High DPI" msgstr "高分辨率" -#: cola/gitcmds.py:876 +#: cola/gitcmds.py:886 msgid "Hint: The \"Actions > Abort Cherry-Pick\" menu action can be used to cancel the current cherry-pick." msgstr "" -#: cola/widgets/prefs.py:254 +#: cola/widgets/prefs.py:275 msgid "History Browser" msgstr "历史浏览器" -#: cola/widgets/about.py:427 cola/widgets/about.py:441 +#: cola/widgets/about.py:410 cola/widgets/about.py:424 msgid "Hungarian translation" msgstr "匈牙利语翻译" -#: cola/widgets/toolbar.py:178 +#: cola/widgets/toolbar.py:182 msgid "Icon Only" msgstr "" -#: cola/widgets/prefs.py:345 +#: cola/widgets/prefs.py:365 msgid "Icon theme" msgstr "" -#: cola/widgets/diff.py:758 +#: cola/widgets/diff.py:787 msgid "Ignore all whitespace" msgstr "忽略所有空格" -#: cola/widgets/diff.py:755 +#: cola/widgets/diff.py:785 msgid "Ignore changes in amount of whitespace" msgstr "忽略空格数量" -#: cola/widgets/diff.py:751 +#: cola/widgets/diff.py:782 msgid "Ignore changes in whitespace at EOL" msgstr "行尾忽略空格" -#: cola/widgets/gitignore.py:46 +#: cola/widgets/gitignore.py:45 msgid "Ignore custom pattern" msgstr "忽略自定义模式" -#: cola/widgets/gitignore.py:44 +#: cola/widgets/gitignore.py:43 msgid "Ignore exact filename" msgstr "忽略精确文件名" -#: cola/widgets/gitignore.py:32 +#: cola/widgets/gitignore.py:31 msgid "Ignore filename or pattern" msgstr "忽略文件名或匹配模式" -#: cola/widgets/status.py:933 +#: cola/widgets/dag.py:498 +msgid "Ignore merge commits" +msgstr "" + +#: cola/widgets/status.py:934 msgid "Ignore..." msgstr "" -#: cola/widgets/remote.py:203 +#: cola/widgets/remote.py:207 msgid "Include tags " msgstr "包含标签 " -#: cola/widgets/prefs.py:349 +#: cola/widgets/prefs.py:369 msgid "Indent Status paths" msgstr "缩进状态路径" -#: cola/widgets/about.py:419 cola/widgets/about.py:426 +#: cola/widgets/about.py:402 cola/widgets/about.py:409 msgid "Indonesian translation" msgstr "印尼语翻译" -#: cola/widgets/main.py:643 +#: cola/widgets/main.py:656 #, fuzzy msgid "Initialize Git Annex" msgstr "初始化..." -#: cola/widgets/main.py:647 +#: cola/widgets/main.py:660 #, fuzzy msgid "Initialize Git LFS" msgstr "初始化..." -#: cola/widgets/clone.py:116 +#: cola/widgets/clone.py:114 msgid "Inititalize submodules" msgstr "初始化子模块" -#: cola/widgets/prefs.py:260 +#: cola/widgets/prefs.py:281 msgid "Insert spaces instead of tabs" msgstr "插入空格而非制表符" -#: cola/cmds.py:2130 +#: cola/widgets/action.py:73 cola/widgets/main.py:402 +msgid "Integrate changes using \"git pull\"" +msgstr "" + +#: cola/cmds.py:2081 msgid "Interactive Rebase" msgstr "交互式衍合" -#: cola/cmds.py:2364 +#: cola/cmds.py:2315 msgid "Invalid Revision" msgstr "无效版本" @@ -2095,40 +2157,40 @@ msgstr "无效版本" msgid "It is not necessary to update the hunk header lines as they will be regenerated automatically." msgstr "" -#: cola/widgets/about.py:421 cola/widgets/about.py:424 +#: cola/widgets/about.py:404 cola/widgets/about.py:407 msgid "Japanese translation" msgstr "" -#: cola/widgets/prefs.py:262 +#: cola/widgets/prefs.py:283 msgid "Keep *.orig Merge Backups" msgstr "保留合并备份 (*.orig)" -#: cola/widgets/stash.py:71 +#: cola/widgets/stash.py:73 msgid "Keep Index" msgstr "保留索引" -#: cola/widgets/main.py:477 +#: cola/widgets/main.py:490 msgid "Keyboard Shortcuts" msgstr "键盘快捷键" -#: cola/cmds.py:1608 cola/sequenceeditor.py:165 cola/sequenceeditor.py:338 -#: cola/widgets/dag.py:395 cola/widgets/filelist.py:34 +#: cola/difftool.py:27 cola/sequenceeditor.py:163 cola/sequenceeditor.py:334 +#: cola/widgets/dag.py:394 cola/widgets/filelist.py:31 msgid "Launch Diff Tool" msgstr "启动差异工具" -#: cola/widgets/dag.py:402 +#: cola/widgets/dag.py:401 msgid "Launch Directory Diff Tool" msgstr "启动目录差异工具" -#: cola/cmds.py:1541 cola/cmds.py:1679 cola/widgets/filelist.py:38 +#: cola/cmds.py:1529 cola/cmds.py:1631 cola/widgets/filelist.py:35 msgid "Launch Editor" msgstr "启动编辑器" -#: cola/cmds.py:1644 +#: cola/cmds.py:1596 msgid "Launch Terminal" msgstr "启动终端" -#: cola/sequenceeditor.py:166 +#: cola/sequenceeditor.py:164 msgid "" "Launch external diff tool\n" "Shortcut: Ctrl+D" @@ -2136,8 +2198,8 @@ msgstr "" "加载外部差异工具\n" "快捷键: Ctrl+D" -#: cola/widgets/diff.py:1005 cola/widgets/diff.py:1051 -#: cola/widgets/status.py:852 cola/widgets/status.py:948 +#: cola/widgets/diff.py:1044 cola/widgets/diff.py:1106 +#: cola/widgets/status.py:853 cola/widgets/status.py:949 msgid "Launch git-cola" msgstr "启动 git-cola" @@ -2149,7 +2211,7 @@ msgstr "对之前的版本启动 git-difftool" msgid "Launch git-difftool on the current path" msgstr "在当前路径运行 git-difftool" -#: cola/icons.py:56 +#: cola/icons.py:55 msgid "Light Theme" msgstr "" @@ -2158,167 +2220,183 @@ msgstr "" msgid "Lines starting with '%s' will be ignored." msgstr "" -#: cola/widgets/startup.py:74 +#: cola/widgets/startup.py:73 msgid "List" msgstr "" -#: cola/guicmds.py:267 +#: cola/guicmds.py:266 msgid "Load Commit Message" msgstr "加载提交消息" -#: cola/widgets/main.py:339 +#: cola/widgets/main.py:334 msgid "Load Commit Message..." msgstr "加载提交信息..." -#: cola/widgets/commitmsg.py:144 +#: cola/widgets/commitmsg.py:150 msgid "Load Previous Commit Message" msgstr "加载前一次提交信息" -#: cola/widgets/diff.py:264 +#: cola/widgets/diff.py:265 msgid "Loading..." msgstr "加载中..." -#: cola/widgets/branch.py:169 cola/widgets/branch.py:240 -#: cola/widgets/branch.py:281 cola/widgets/compare.py:38 -#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/branch.py:173 cola/widgets/branch.py:250 +#: cola/widgets/branch.py:290 cola/widgets/compare.py:37 +#: cola/widgets/compare.py:52 cola/widgets/compare.py:57 msgid "Local" msgstr "本地" -#: cola/widgets/cfgactions.py:227 cola/widgets/merge.py:46 -#: cola/widgets/remote.py:138 +#: cola/widgets/cfgactions.py:225 cola/widgets/merge.py:44 +#: cola/widgets/remote.py:136 msgid "Local Branch" msgstr "本地分支" -#: cola/widgets/createbranch.py:114 +#: cola/widgets/createbranch.py:112 msgid "Local branch" msgstr "本地分支" -#: cola/widgets/dag.py:788 cola/widgets/main.py:651 +#: cola/widgets/dag.py:854 cola/widgets/main.py:664 msgid "Lock Layout" msgstr "锁定布局" -#: cola/widgets/dag.py:750 +#: cola/widgets/dag.py:816 msgid "Log" msgstr "记录" -#: cola/widgets/prefs.py:170 +#: cola/widgets/prefs.py:191 msgid "Log Date Format" msgstr "" -#: cola/widgets/about.py:268 +#: cola/themes.py:769 +msgid "MacOS Aqua dark" +msgstr "" + +#: cola/themes.py:765 +msgid "MacOS Aqua light" +msgstr "" + +#: cola/themes.py:781 +msgid "MacOS Vibrant dark" +msgstr "" + +#: cola/themes.py:775 +msgid "MacOS Vibrant light" +msgstr "" + +#: cola/widgets/about.py:251 msgid "Maintainer (since 2007) and developer" msgstr "维护者 (从 2007 年开始) 和开发者" -#: cola/widgets/text.py:398 +#: cola/widgets/text.py:395 msgid "Match Case" msgstr "" -#: cola/widgets/merge.py:88 +#: cola/widgets/merge.py:86 msgid "Merge" msgstr "合并" -#: cola/widgets/merge.py:162 +#: cola/widgets/merge.py:160 #, python-format msgid "Merge \"%(revision)s\" into \"%(branch)s\"" msgstr "合并 \"%(revision)s\" 到分支 \"%(branch)s\"" -#: cola/widgets/prefs.py:257 +#: cola/widgets/prefs.py:278 msgid "Merge Tool" msgstr "合并工具" -#: cola/widgets/prefs.py:171 +#: cola/widgets/prefs.py:193 msgid "Merge Verbosity" msgstr "合并冗余度" -#: cola/cmds.py:1829 +#: cola/cmds.py:1780 msgid "Merge failed. Conflict resolution is required." msgstr "合并失败. 需要解决冲突." -#: cola/widgets/merge.py:167 +#: cola/widgets/merge.py:165 #, python-format msgid "Merge into \"%s\"" msgstr "合并到 \"%s\"" -#: cola/widgets/branch.py:231 +#: cola/widgets/branch.py:242 msgid "Merge into current branch" msgstr "合并到当前分支" -#: cola/widgets/main.py:363 +#: cola/widgets/main.py:358 msgid "Merge..." msgstr "合并 (merge)..." -#: cola/widgets/main.py:1163 +#: cola/widgets/main.py:1176 msgid "Merging" msgstr "合并中" -#: cola/models/browse.py:33 cola/widgets/createtag.py:78 +#: cola/models/browse.py:32 cola/widgets/createtag.py:76 msgid "Message" msgstr "消息" -#: cola/widgets/commitmsg.py:417 +#: cola/widgets/commitmsg.py:425 msgid "Missing Commit Message" msgstr "提交信息不存在" -#: cola/widgets/createbranch.py:252 +#: cola/widgets/createbranch.py:250 msgid "Missing Data" msgstr "数据不存在" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Missing Name" msgstr "名称不存在" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Missing Revision" msgstr "版本不存在" -#: cola/cmds.py:2801 +#: cola/cmds.py:2747 msgid "Missing Tag Message" msgstr "标签信息不存在" -#: cola/models/browse.py:332 cola/widgets/status.py:158 -#: cola/widgets/status.py:631 +#: cola/models/browse.py:331 cola/widgets/status.py:158 +#: cola/widgets/status.py:632 msgid "Modified" msgstr "已修改" -#: cola/widgets/commitmsg.py:506 +#: cola/widgets/commitmsg.py:532 msgid "More..." msgstr "更多..." -#: cola/widgets/standard.py:243 cola/widgets/status.py:233 +#: cola/widgets/standard.py:242 cola/widgets/status.py:234 msgid "Move Down" msgstr "下移" -#: cola/widgets/standard.py:235 cola/widgets/status.py:225 +#: cola/widgets/standard.py:234 cola/widgets/status.py:226 msgid "Move Up" msgstr "上移" -#: cola/widgets/status.py:300 +#: cola/widgets/status.py:301 msgid "Move files to trash" msgstr "移动文件到回收站" -#: cola/models/browse.py:33 cola/widgets/bookmarks.py:467 -#: cola/widgets/createtag.py:61 cola/widgets/editremotes.py:450 -#: cola/widgets/status.py:1452 cola/widgets/toolbar.py:312 +#: cola/models/browse.py:32 cola/widgets/bookmarks.py:466 +#: cola/widgets/createtag.py:59 cola/widgets/editremotes.py:448 +#: cola/widgets/status.py:1453 cola/widgets/toolbar.py:317 msgid "Name" msgstr "名称" -#: cola/widgets/editremotes.py:434 +#: cola/widgets/editremotes.py:432 msgid "Name for the new remote" msgstr "新远程的名称" -#: cola/guicmds.py:148 cola/widgets/main.py:285 +#: cola/guicmds.py:147 cola/widgets/main.py:280 msgid "New Bare Repository..." msgstr "新建空版本库..." -#: cola/guicmds.py:87 cola/widgets/main.py:280 +#: cola/guicmds.py:86 cola/widgets/main.py:275 msgid "New Repository..." msgstr "新建版本库..." -#: cola/widgets/main.py:983 +#: cola/widgets/main.py:996 msgid "New Toolbar" msgstr "添加工具栏" -#: cola/widgets/startup.py:53 +#: cola/widgets/startup.py:52 msgid "New..." msgstr "新建..." @@ -2326,15 +2404,19 @@ msgstr "新建..." msgid "Next File" msgstr "下一个文件" -#: cola/widgets/createbranch.py:123 cola/widgets/standard.py:1065 +#: cola/widgets/createbranch.py:121 cola/widgets/standard.py:1183 msgid "No" msgstr "号码" -#: cola/widgets/merge.py:217 cola/widgets/merge.py:227 +#: cola/widgets/merge.py:215 cola/widgets/merge.py:225 msgid "No Revision Specified" msgstr "没有指定版本" -#: cola/widgets/commitmsg.py:427 +#: cola/widgets/stash.py:225 +msgid "No change made" +msgstr "" + +#: cola/widgets/commitmsg.py:435 msgid "" "No changes to commit.\n" "\n" @@ -2344,27 +2426,27 @@ msgstr "" "\n" "提交前你必须首先缓存至少一个文件." -#: cola/widgets/selectcommits.py:118 +#: cola/widgets/selectcommits.py:117 msgid "No commits exist in this branch." msgstr "此分支内没有提交." -#: cola/widgets/merge.py:65 +#: cola/widgets/merge.py:63 msgid "No fast forward" msgstr "不进行快速合并" -#: cola/widgets/remote.py:186 +#: cola/widgets/remote.py:190 msgid "No fast-forward" msgstr "不进行快速合并" -#: cola/widgets/remote.py:577 +#: cola/widgets/remote.py:612 msgid "No repository selected." msgstr "没有选择版本库." -#: cola/widgets/remote.py:615 +#: cola/widgets/remote.py:650 msgid "Non-fast-forward fetch overwrites local history!" msgstr "非快进合并式获取会覆盖本地历史!" -#: cola/widgets/remote.py:621 +#: cola/widgets/remote.py:656 msgid "" "Non-fast-forward push overwrites published history!\n" "(Did you pull first?)" @@ -2372,7 +2454,7 @@ msgstr "" "非快进合并式上传会覆盖远程历史!\n" "(之前拉取了吗?)" -#: cola/widgets/commitmsg.py:444 +#: cola/widgets/commitmsg.py:452 msgid "Nothing to commit" msgstr "没有改动可提交" @@ -2380,79 +2462,79 @@ msgstr "没有改动可提交" msgid "Nothing to do" msgstr "不做操作" -#: cola/widgets/prefs.py:172 +#: cola/widgets/prefs.py:194 msgid "Number of Diff Context Lines" msgstr "Diff 上下文行数" -#: cola/widgets/bookmarks.py:79 cola/widgets/bookmarks.py:213 -#: cola/widgets/startup.py:336 +#: cola/widgets/bookmarks.py:78 cola/widgets/bookmarks.py:212 +#: cola/widgets/startup.py:335 msgid "Open" msgstr "打开" -#: cola/widgets/text.py:230 +#: cola/widgets/text.py:228 #, python-format msgid "Open \"%s\"" msgstr "" -#: cola/cmds.py:1857 +#: cola/cmds.py:1808 msgid "Open Directory" msgstr "" -#: cola/guicmds.py:205 cola/guicmds.py:214 cola/widgets/editremotes.py:473 -#: cola/widgets/startup.py:55 cola/widgets/startup.py:215 +#: cola/guicmds.py:204 cola/guicmds.py:213 cola/widgets/editremotes.py:471 +#: cola/widgets/startup.py:54 cola/widgets/startup.py:214 msgid "Open Git Repository" msgstr "打开已有版本库" -#: cola/widgets/submodules.py:49 +#: cola/widgets/submodules.py:48 msgid "Open Parent" msgstr "打开父级" -#: cola/cmds.py:1877 +#: cola/cmds.py:1828 msgid "Open Parent Directory" msgstr "打开上级目录" -#: cola/widgets/main.py:679 +#: cola/widgets/main.py:692 msgid "Open Recent" msgstr "打开最近版本库" -#: cola/cmds.py:1840 +#: cola/cmds.py:1791 msgid "Open Using Default Application" msgstr "用默认程序打开" -#: cola/cmds.py:1890 +#: cola/cmds.py:1841 msgid "Open Worktree" msgstr "" -#: cola/widgets/bookmarks.py:221 cola/widgets/startup.py:344 +#: cola/widgets/bookmarks.py:220 cola/widgets/startup.py:343 msgid "Open in New Window" msgstr "新窗口打开" -#: cola/widgets/main.py:408 +#: cola/widgets/main.py:415 msgid "Open in New Window..." msgstr "在新窗口打开..." -#: cola/widgets/main.py:402 +#: cola/widgets/main.py:409 msgid "Open..." msgstr "打开..." -#: cola/widgets/branch.py:345 +#: cola/widgets/branch.py:354 msgid "Other branches" msgstr "其他分支" -#: cola/widgets/archive.py:210 +#: cola/widgets/archive.py:208 msgid "Overwrite" msgstr "覆盖" -#: cola/widgets/archive.py:209 +#: cola/widgets/archive.py:207 #, python-format msgid "Overwrite \"%s\"?" msgstr "覆盖 \"%s\" 吗?" -#: cola/widgets/archive.py:207 +#: cola/widgets/archive.py:205 msgid "Overwrite File?" msgstr "覆盖文件吗?" -#: cola/widgets/grep.py:144 +#: cola/widgets/grep.py:142 msgid "" "Parse arguments using a shell.\n" "Queries with spaces will require \"double quotes\"." @@ -2460,63 +2542,67 @@ msgstr "" "用 Shell 解析参数\n" "若命令行条目包含空格, 请添加双引号." -#: cola/models/browse.py:330 +#: cola/models/browse.py:329 msgid "Partially Staged" msgstr "部分已缓存" -#: cola/widgets/main.py:744 +#: cola/widgets/main.py:757 msgid "Paste" msgstr "粘贴" -#: cola/cmds.py:363 +#: cola/cmds.py:364 msgid "Patch failed to apply" msgstr "" -#: cola/cmds.py:375 +#: cola/cmds.py:376 msgid "Patch(es) Applied" msgstr "已应用补丁" -#: cola/widgets/diff.py:1219 cola/widgets/main.py:695 +#: cola/widgets/diff.py:1293 cola/widgets/main.py:708 msgid "Patches" msgstr "" -#: cola/widgets/prefs.py:173 +#: cola/widgets/prefs.py:195 msgid "Patches Directory" msgstr "" -#: cola/widgets/bookmarks.py:468 cola/widgets/submodules.py:118 +#: cola/widgets/bookmarks.py:467 cola/widgets/submodules.py:117 msgid "Path" msgstr "路径" -#: cola/widgets/clone.py:112 +#: cola/widgets/clone.py:110 msgid "Path or URL to clone (Env. $VARS okay)" msgstr "克隆路径或 URL (可以使用环境变量)" -#: cola/sequenceeditor.py:346 +#: cola/sequenceeditor.py:342 msgid "Pick" msgstr "" -#: cola/widgets/diff.py:781 +#: cola/widgets/dag.py:490 +msgid "Pickaxe search for changes containing text" +msgstr "" + +#: cola/widgets/diff.py:809 msgid "Pixel XOR" msgstr "像素异或" -#: cola/widgets/createbranch.py:253 +#: cola/widgets/createbranch.py:251 msgid "Please provide both a branch name and revision expression." msgstr "请同时提供分支名称和版本表达式." -#: cola/cmds.py:2348 +#: cola/cmds.py:2299 msgid "Please select a file" msgstr "请选择一个文件" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Please specify a name for the new tag." msgstr "请为新标签指定名称." -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Please specify a revision to tag." msgstr "请指定一个版本进行标记." -#: cola/widgets/commitmsg.py:410 +#: cola/widgets/commitmsg.py:418 msgid "" "Please supply a commit message.\n" "\n" @@ -2534,31 +2620,31 @@ msgstr "" "- 第二行: 空行\n" "- 剩余行: 请描述为什么你做的这些改动是好的.\n" -#: cola/cmds.py:653 +#: cola/cmds.py:655 msgid "Point the current branch head to a new commit?" msgstr "" -#: cola/widgets/about.py:416 +#: cola/widgets/about.py:399 msgid "Polish translation" msgstr "波兰语翻译" -#: cola/widgets/stash.py:63 cola/widgets/stash.py:111 cola/widgets/stash.py:115 +#: cola/widgets/stash.py:65 cola/widgets/stash.py:114 cola/widgets/stash.py:118 msgid "Pop" msgstr "弹出" -#: cola/widgets/main.py:293 cola/widgets/prefs.py:395 +#: cola/widgets/main.py:288 cola/widgets/prefs.py:433 msgid "Preferences" msgstr "首选项" -#: cola/widgets/archive.py:129 +#: cola/widgets/archive.py:127 msgid "Prefix" msgstr "前缀" -#: cola/widgets/main.py:345 +#: cola/widgets/main.py:340 msgid "Prepare Commit Message" msgstr "准备提交信息" -#: cola/widgets/prefs.py:157 +#: cola/widgets/prefs.py:180 msgid "Prevent \"Stage\" from staging all files when nothing is selected" msgstr "" @@ -2566,216 +2652,228 @@ msgstr "" msgid "Previous File" msgstr "上一个文件" -#: cola/widgets/remote.py:171 +#: cola/widgets/remote.py:169 msgid "Prompt on creation" msgstr "在创建时提醒" -#: cola/widgets/remote.py:172 +#: cola/widgets/remote.py:170 msgid "Prompt when pushing creates new remote branches" msgstr "推送创建远程分支时提醒" -#: cola/widgets/remote.py:208 +#: cola/widgets/remote.py:212 msgid "Prune " msgstr "从..清除(prune) " -#: cola/widgets/bookmarks.py:255 cola/widgets/startup.py:376 +#: cola/widgets/bookmarks.py:254 cola/widgets/startup.py:375 msgid "Prune Missing Entries" msgstr "" -#: cola/widgets/branch.py:247 cola/widgets/remote.py:728 +#: cola/widgets/branch.py:256 cola/widgets/remote.py:783 msgid "Pull" msgstr "拉取" -#: cola/widgets/action.py:65 cola/widgets/main.py:397 +#: cola/widgets/action.py:73 cola/widgets/main.py:401 msgid "Pull..." msgstr "拉取..." -#: cola/widgets/branch.py:253 cola/widgets/remote.py:593 -#: cola/widgets/remote.py:698 +#: cola/widgets/branch.py:262 cola/widgets/remote.py:628 +#: cola/widgets/remote.py:758 msgid "Push" msgstr "推送" -#: cola/widgets/action.py:64 cola/widgets/main.py:392 +#: cola/widgets/action.py:70 cola/widgets/main.py:393 +msgid "Push to one or more remotes using \"git push\"" +msgstr "" + +#: cola/widgets/action.py:70 cola/widgets/main.py:392 msgid "Push..." msgstr "上传..." -#: cola/guicmds.py:252 +#: cola/guicmds.py:251 msgid "Quick Open Repository" msgstr "" -#: cola/widgets/main.py:660 +#: cola/widgets/main.py:673 msgid "Quick Open..." msgstr "" -#: cola/widgets/main.py:355 +#: cola/widgets/main.py:350 msgid "Quit" msgstr "退出" -#: cola/cmds.py:2144 cola/cmds.py:2180 cola/cmds.py:2181 cola/cmds.py:2194 -#: cola/cmds.py:2195 cola/sequenceeditor.py:158 cola/sequenceeditor.py:199 -#: cola/widgets/main.py:822 cola/widgets/remote.py:211 +#: cola/cmds.py:2095 cola/cmds.py:2131 cola/cmds.py:2132 cola/cmds.py:2145 +#: cola/cmds.py:2146 cola/sequenceeditor.py:156 cola/sequenceeditor.py:197 +#: cola/widgets/main.py:835 cola/widgets/remote.py:215 msgid "Rebase" msgstr "衍合" -#: cola/cmds.py:2143 +#: cola/cmds.py:2094 #, python-format msgid "Rebase onto %s" msgstr "衍合到 %s" -#: cola/cmds.py:2156 +#: cola/cmds.py:2107 msgid "Rebase stopped" msgstr "衍合已停止" -#: cola/widgets/remote.py:210 +#: cola/widgets/remote.py:214 msgid "Rebase the current branch instead of merging" msgstr "衍合当前分支而不是合并" -#: cola/widgets/dag.py:419 +#: cola/widgets/dag.py:418 msgid "Rebase to this commit" msgstr "" -#: cola/widgets/main.py:1165 +#: cola/widgets/main.py:1178 msgid "Rebasing" msgstr "衍合中" -#: cola/widgets/main.py:120 +#: cola/widgets/main.py:118 msgid "Recent" msgstr "最近" -#: cola/widgets/bookmarks.py:93 +#: cola/widgets/bookmarks.py:92 msgid "Recent repositories" msgstr "最近使用版本库" -#: cola/widgets/prefs.py:258 +#: cola/widgets/prefs.py:279 msgid "Recent repository count" msgstr "最近使用版本库数目" -#: cola/widgets/recent.py:46 +#: cola/widgets/recent.py:44 msgid "Recently Modified Files" msgstr "最近修改过的文件" -#: cola/widgets/main.py:320 +#: cola/widgets/main.py:315 msgid "Recently Modified Files..." msgstr "最近修改过的文件 ..." -#: cola/widgets/stash.py:256 +#: cola/widgets/stash.py:274 msgid "Recovering a dropped stash is not possible." msgstr "已丢弃的暂存是无法恢复的." -#: cola/widgets/createbranch.py:283 +#: cola/widgets/createbranch.py:281 msgid "Recovering lost commits may not be easy." msgstr "恢复丢失的提交是比较困难的." -#: cola/widgets/main.py:737 +#: cola/widgets/main.py:750 msgid "Redo" msgstr "重做" -#: cola/widgets/clone.py:121 +#: cola/widgets/clone.py:119 msgid "Reduce commit history to minimum" msgstr "尽量减少提交历史" -#: cola/widgets/submodules.py:121 +#: cola/widgets/submodules.py:120 msgid "Reference Repository" msgstr "" -#: cola/widgets/submodules.py:105 +#: cola/widgets/submodules.py:104 msgid "Reference URL" msgstr "" -#: cola/widgets/submodules.py:106 +#: cola/widgets/submodules.py:105 msgid "Reference repository to use when cloning (optional)" msgstr "" -#: cola/cmds.py:2222 cola/qtutils.py:770 cola/widgets/action.py:62 -#: cola/widgets/dag.py:792 cola/widgets/editremotes.py:85 -#: cola/widgets/grep.py:105 cola/widgets/recent.py:116 -#: cola/widgets/submodules.py:45 +#: cola/cmds.py:2173 cola/qtutils.py:801 cola/widgets/action.py:63 +#: cola/widgets/dag.py:858 cola/widgets/editremotes.py:84 +#: cola/widgets/grep.py:103 cola/widgets/recent.py:114 +#: cola/widgets/submodules.py:44 msgid "Refresh" msgstr "刷新" -#: cola/widgets/remote.py:179 +#: cola/widgets/remote.py:183 msgid "Refuse to merge unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward" msgstr "" -#: cola/widgets/branch.py:173 cola/widgets/branch.py:225 -#: cola/widgets/branch.py:269 cola/widgets/branch.py:470 -#: cola/widgets/compare.py:54 cola/widgets/compare.py:59 -#: cola/widgets/remote.py:147 +#: cola/widgets/branch.py:177 cola/widgets/branch.py:236 +#: cola/widgets/branch.py:278 cola/widgets/branch.py:513 +#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/remote.py:145 msgid "Remote" msgstr "远程(remote)" -#: cola/widgets/remote.py:162 +#: cola/widgets/remote.py:160 msgid "Remote Branch" msgstr "远程分支" -#: cola/cmds.py:1196 +#: cola/cmds.py:1197 msgid "Remote Branch Deleted" msgstr "远程分支已删除" -#: cola/widgets/editremotes.py:49 +#: cola/widgets/log.py:99 +msgid "Remote Messages" +msgstr "" + +#: cola/widgets/editremotes.py:48 msgid "Remote git repositories - double-click to rename" msgstr "远程版本库 - 双击以改名" -#: cola/cmds.py:1029 cola/widgets/patch.py:107 cola/widgets/patch.py:122 -#: cola/widgets/startup.py:265 cola/widgets/status.py:1382 +#: cola/cmds.py:1030 cola/widgets/diff.py:1701 cola/widgets/diff.py:1716 +#: cola/widgets/startup.py:264 cola/widgets/status.py:1383 msgid "Remove" msgstr "移除" -#: cola/cmds.py:1027 +#: cola/cmds.py:1028 #, python-format msgid "Remove %s from the recent list?" msgstr "将 %s 从最近使用列表中移除吗?" -#: cola/widgets/toolbar.py:316 +#: cola/widgets/toolbar.py:321 msgid "Remove Element" msgstr "移除元素" -#: cola/widgets/remote.py:206 +#: cola/widgets/remote.py:210 msgid "Remove remote-tracking branches that no longer exist on the remote" msgstr "" -#: cola/widgets/patch.py:109 +#: cola/widgets/diff.py:1703 msgid "Remove selected (Delete)" msgstr "移除所选 (删除)" -#: cola/widgets/bookmarks.py:258 cola/widgets/startup.py:379 +#: cola/widgets/bookmarks.py:257 cola/widgets/startup.py:378 msgid "Remove stale entries for repositories that no longer exist" msgstr "" -#: cola/guicmds.py:333 cola/widgets/browse.py:159 +#: cola/guicmds.py:332 cola/widgets/browse.py:159 cola/widgets/stash.py:44 msgid "Rename" msgstr "重命名" -#: cola/cmds.py:1153 +#: cola/cmds.py:1154 #, python-format msgid "Rename \"%s\"" msgstr "重命名 \"%s\"" -#: cola/widgets/branch.py:259 +#: cola/widgets/branch.py:268 msgid "Rename Branch" msgstr "重命名分支" -#: cola/widgets/main.py:570 +#: cola/widgets/main.py:583 msgid "Rename Branch..." msgstr "重命名分支..." -#: cola/guicmds.py:330 +#: cola/guicmds.py:329 msgid "Rename Existing Branch" msgstr "重命名已有分支" -#: cola/cmds.py:944 +#: cola/cmds.py:942 msgid "Rename Remote" msgstr "重命名远程" -#: cola/widgets/bookmarks.py:233 cola/widgets/startup.py:356 +#: cola/widgets/bookmarks.py:232 cola/widgets/startup.py:355 msgid "Rename Repository" msgstr "重命名版本库" -#: cola/widgets/branch.py:445 +#: cola/widgets/stash.py:218 +msgid "Rename Stash" +msgstr "" + +#: cola/widgets/branch.py:478 msgid "Rename branch" msgstr "重命名分支" -#: cola/cmds.py:945 +#: cola/cmds.py:943 #, python-format msgid "Rename remote \"%(current)s\" to \"%(new)s\"?" msgstr "重命名远程 \"%(current)s\" 为 \"%(new)s\"?" @@ -2784,179 +2882,183 @@ msgstr "重命名远程 \"%(current)s\" 为 \"%(new)s\"?" msgid "Rename selected paths" msgstr "重命名所选路径" -#: cola/app.py:497 cola/widgets/startup.py:262 +#: cola/widgets/stash.py:45 +msgid "Rename the selected stash" +msgstr "" + +#: cola/app.py:500 cola/widgets/startup.py:261 msgid "Repository Not Found" msgstr "" -#: cola/widgets/browse.py:87 cola/widgets/main.py:1095 +#: cola/widgets/browse.py:87 cola/widgets/main.py:1108 #, python-format msgid "Repository: %s" msgstr "版本库: %s" -#: cola/guicmds.py:351 cola/widgets/createbranch.py:125 cola/widgets/dag.py:331 -#: cola/widgets/editremotes.py:58 cola/widgets/main.py:832 +#: cola/guicmds.py:350 cola/widgets/createbranch.py:123 cola/widgets/dag.py:330 +#: cola/widgets/editremotes.py:57 cola/widgets/main.py:845 msgid "Reset" msgstr "复位" -#: cola/widgets/createbranch.py:286 +#: cola/widgets/createbranch.py:284 #, python-format msgid "Reset \"%(branch)s\" to \"%(revision)s\"?" msgstr "复位分支 \"%(branch)s\" 到 \"%(revision)s\" 吗?" -#: cola/guicmds.py:359 +#: cola/guicmds.py:358 msgid "Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/cmds.py:655 cola/cmds.py:706 cola/guicmds.py:342 -#: cola/widgets/createbranch.py:295 +#: cola/cmds.py:657 cola/cmds.py:708 cola/guicmds.py:341 +#: cola/widgets/createbranch.py:293 msgid "Reset Branch" msgstr "重置分支" -#: cola/cmds.py:703 cola/guicmds.py:341 cola/widgets/dag.py:425 -#: cola/widgets/main.py:419 +#: cola/cmds.py:705 cola/guicmds.py:340 cola/widgets/dag.py:424 +#: cola/widgets/main.py:431 msgid "Reset Branch (Soft)" msgstr "" -#: cola/cmds.py:652 cola/guicmds.py:350 cola/widgets/dag.py:431 -#: cola/widgets/main.py:426 +#: cola/cmds.py:654 cola/guicmds.py:349 cola/widgets/dag.py:430 +#: cola/widgets/main.py:439 msgid "Reset Branch and Stage (Mixed)" msgstr "" -#: cola/widgets/createbranch.py:292 +#: cola/widgets/createbranch.py:290 msgid "Reset Branch?" msgstr "重置分支吗?" -#: cola/widgets/main.py:655 +#: cola/widgets/main.py:668 msgid "Reset Layout" msgstr "" -#: cola/cmds.py:687 +#: cola/cmds.py:689 msgid "Reset Worktree and Reset All?" msgstr "" -#: cola/cmds.py:672 cola/cmds.py:689 cola/cmds.py:723 cola/guicmds.py:360 -#: cola/guicmds.py:373 cola/guicmds.py:382 +#: cola/cmds.py:674 cola/cmds.py:691 cola/cmds.py:725 cola/guicmds.py:359 +#: cola/guicmds.py:372 cola/guicmds.py:381 msgid "Reset and Restore" msgstr "" -#: cola/cmds.py:704 +#: cola/cmds.py:706 msgid "Reset branch?" msgstr "" -#: cola/widgets/createbranch.py:266 +#: cola/widgets/createbranch.py:264 #, python-format msgid "Resetting \"%(branch)s\" to \"%(revision)s\" will lose commits." msgstr "复位 \"%(branch)s\" to \"%(revision)s\" 将丢失提交." -#: cola/widgets/prefs.py:264 +#: cola/widgets/prefs.py:285 msgid "Resize File Browser columns" msgstr "" -#: cola/widgets/prefs.py:374 +#: cola/widgets/prefs.py:412 msgid "Restart the application after changing appearance settings." msgstr "" -#: cola/cmds.py:757 cola/cmds.py:760 cola/guicmds.py:390 cola/guicmds.py:391 -#: cola/widgets/dag.py:461 cola/widgets/main.py:457 +#: cola/cmds.py:759 cola/cmds.py:762 cola/guicmds.py:389 cola/guicmds.py:390 +#: cola/widgets/dag.py:460 cola/widgets/main.py:471 msgid "Restore Worktree" msgstr "" -#: cola/cmds.py:720 cola/guicmds.py:381 cola/widgets/dag.py:454 -#: cola/widgets/main.py:450 +#: cola/cmds.py:722 cola/guicmds.py:380 cola/widgets/dag.py:453 +#: cola/widgets/main.py:463 msgid "Restore Worktree and Reset All (Hard)" msgstr "" -#: cola/cmds.py:669 cola/widgets/main.py:434 +#: cola/cmds.py:671 cola/widgets/main.py:447 msgid "Restore Worktree and Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/widgets/dag.py:438 +#: cola/widgets/dag.py:437 msgid "Restore Worktree and Reset All (Keep Unstaged Edits)" msgstr "" -#: cola/cmds.py:686 cola/guicmds.py:372 cola/widgets/dag.py:446 -#: cola/widgets/main.py:442 +#: cola/cmds.py:688 cola/guicmds.py:371 cola/widgets/dag.py:445 +#: cola/widgets/main.py:455 msgid "Restore Worktree and Reset All (Merge)" msgstr "" -#: cola/cmds.py:721 +#: cola/cmds.py:723 msgid "Restore Worktree and Reset All?" msgstr "" -#: cola/cmds.py:758 +#: cola/cmds.py:760 #, python-format msgid "Restore Worktree to %s?" msgstr "" -#: cola/cmds.py:670 +#: cola/cmds.py:672 msgid "Restore worktree, reset, and preserve unstaged edits?" msgstr "" -#: cola/widgets/dag.py:390 +#: cola/widgets/dag.py:389 msgid "Revert" msgstr "撤销" -#: cola/widgets/diff.py:1153 +#: cola/widgets/diff.py:1227 msgid "Revert Diff Hunk" msgstr "撤销差异区域" -#: cola/widgets/diff.py:1018 +#: cola/widgets/diff.py:1057 msgid "Revert Diff Hunk..." msgstr "撤销差异区域..." -#: cola/widgets/diff.py:1152 +#: cola/widgets/diff.py:1226 msgid "Revert Diff Hunk?" msgstr "撤销差异区域吗?" -#: cola/widgets/diff.py:1150 +#: cola/widgets/diff.py:1224 msgid "Revert Selected Lines" msgstr "撤销所选行" -#: cola/widgets/diff.py:1013 +#: cola/widgets/diff.py:1052 msgid "Revert Selected Lines..." msgstr "撤销所选行..." -#: cola/widgets/diff.py:1149 +#: cola/widgets/diff.py:1223 msgid "Revert Selected Lines?" msgstr "撤销所选行吗?" -#: cola/cmds.py:2311 +#: cola/cmds.py:2262 msgid "Revert Uncommitted Changes" msgstr "撤销未提交的修改" -#: cola/cmds.py:2305 +#: cola/cmds.py:2256 msgid "Revert Uncommitted Changes?" msgstr "撤销未提交的修改吗?" -#: cola/cmds.py:2298 +#: cola/cmds.py:2249 msgid "Revert Uncommitted Edits..." msgstr "撤销未缓存修订..." -#: cola/cmds.py:2289 +#: cola/cmds.py:2240 msgid "Revert Unstaged Changes" msgstr "恢复未缓存的改动" -#: cola/cmds.py:2283 +#: cola/cmds.py:2234 msgid "Revert Unstaged Changes?" msgstr "恢复未缓存的改动?" -#: cola/cmds.py:2275 +#: cola/cmds.py:2226 msgid "Revert Unstaged Edits..." msgstr "恢复未缓存修订..." -#: cola/cmds.py:598 +#: cola/cmds.py:599 msgid "Revert failed" msgstr "" -#: cola/cmds.py:2310 cola/widgets/diff.py:1161 +#: cola/cmds.py:2261 cola/widgets/diff.py:1235 msgid "Revert the uncommitted changes?" msgstr "撤销未提交的修改吗?" -#: cola/cmds.py:2288 +#: cola/cmds.py:2239 msgid "Revert the unstaged changes?" msgstr "恢复这个未缓存的改动?" -#: cola/widgets/browse.py:189 +#: cola/widgets/browse.py:190 msgid "Revert uncommitted changes to selected paths" msgstr "撤销所选路径未提交的改动" @@ -2964,296 +3066,304 @@ msgstr "撤销所选路径未提交的改动" msgid "Revert unstaged changes to selected paths" msgstr "撤销所选路径未缓存的改动" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Review" msgstr "审阅" -#: cola/widgets/main.py:583 +#: cola/widgets/main.py:596 msgid "Review..." msgstr "审阅..." -#: cola/widgets/cfgactions.py:233 cola/widgets/createtag.py:84 +#: cola/widgets/cfgactions.py:231 cola/widgets/createtag.py:82 msgid "Revision" msgstr "版本" -#: cola/widgets/selectcommits.py:62 +#: cola/widgets/selectcommits.py:61 msgid "Revision Expression:" msgstr "版本表达式:" -#: cola/widgets/merge.py:39 cola/widgets/merge.py:42 +#: cola/widgets/merge.py:37 cola/widgets/merge.py:40 msgid "Revision to Merge" msgstr "要合并的版本" -#: cola/sequenceeditor.py:351 +#: cola/sequenceeditor.py:347 msgid "Reword" msgstr "改写" -#: cola/cmds.py:776 cola/widgets/commitmsg.py:456 +#: cola/cmds.py:778 cola/widgets/commitmsg.py:464 msgid "Rewrite Published Commit?" msgstr "重写已发布的提交吗?" -#: cola/widgets/log.py:31 +#: cola/widgets/log.py:31 cola/widgets/log.py:133 msgid "Right-click links to open:" msgstr "" -#: cola/interaction.py:127 cola/widgets/cfgactions.py:245 +#: cola/interaction.py:125 cola/widgets/cfgactions.py:243 msgid "Run" msgstr "运行" -#: cola/cmds.py:2341 +#: cola/cmds.py:2292 #, python-format msgid "Run \"%s\"?" msgstr "运行 \"%s\"?" -#: cola/interaction.py:124 +#: cola/interaction.py:122 #, python-format msgid "Run %s?" msgstr "运行 %s?" -#: cola/interaction.py:125 +#: cola/interaction.py:123 #, python-format msgid "Run the \"%s\" command?" msgstr "运行 \"%s\" 命令吗?" -#: cola/cmds.py:2380 +#: cola/cmds.py:2331 #, python-format msgid "Running command: %s" msgstr "正运行命令:%s" -#: cola/widgets/about.py:422 +#: cola/widgets/about.py:405 msgid "Russian translation" msgstr "俄语翻译" -#: cola/sequenceeditor.py:324 +#: cola/sequenceeditor.py:321 msgid "SHA-1" msgstr "SHA-1" -#: cola/widgets/prefs.py:183 +#: cola/widgets/prefs.py:205 msgid "Safe Mode" msgstr "安全模式" -#: cola/cmds.py:2167 cola/widgets/archive.py:126 cola/widgets/browse.py:609 -#: cola/widgets/editremotes.py:54 cola/widgets/stash.py:52 -#: cola/widgets/status.py:1388 +#: cola/cmds.py:2118 cola/widgets/archive.py:124 cola/widgets/browse.py:610 +#: cola/widgets/editremotes.py:53 cola/widgets/stash.py:54 +#: cola/widgets/status.py:1389 msgid "Save" msgstr "保存" -#: cola/widgets/archive.py:113 +#: cola/widgets/archive.py:111 msgid "Save Archive" msgstr "保存归档" -#: cola/widgets/dag.py:382 cola/widgets/main.py:351 +#: cola/widgets/dag.py:381 cola/widgets/main.py:346 msgid "Save As Tarball/Zip..." msgstr "存为压缩存档 Tar/Zip..." -#: cola/widgets/prefs.py:263 +#: cola/widgets/prefs.py:284 msgid "Save GUI Settings" msgstr "保存界面设定" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Save Stash" msgstr "进行暂存" -#: cola/widgets/stash.py:53 +#: cola/widgets/stash.py:55 msgid "Save modified state to new stash" msgstr "保存修改状态到新暂存" -#: cola/widgets/browse.py:570 +#: cola/widgets/browse.py:571 #, python-format msgid "Saved \"%(filename)s\" from \"%(ref)s\" to \"%(destination)s\"" msgstr "已从 \"%(ref)s\" 保存 \"%(filename)s\" 到 \"%(destination)s\"" -#: cola/widgets/bookmarks.py:83 cola/widgets/grep.py:98 -#: cola/widgets/search.py:42 cola/widgets/search.py:62 +#: cola/widgets/bookmarks.py:82 cola/widgets/grep.py:96 +#: cola/widgets/search.py:41 cola/widgets/search.py:61 msgid "Search" msgstr "搜寻" -#: cola/widgets/search.py:226 +#: cola/widgets/search.py:225 msgid "Search Authors" msgstr "查找作者" -#: cola/widgets/search.py:224 +#: cola/widgets/search.py:223 msgid "Search Commit Messages" msgstr "查找提交信息" -#: cola/widgets/search.py:227 +#: cola/widgets/search.py:226 msgid "Search Committers" msgstr "查找提交者" -#: cola/widgets/search.py:228 +#: cola/widgets/search.py:227 msgid "Search Date Range" msgstr "查找日期范围" -#: cola/widgets/search.py:225 +#: cola/widgets/search.py:224 msgid "Search Diffs" msgstr "查找差异" -#: cola/widgets/search.py:222 +#: cola/widgets/search.py:221 msgid "Search by Expression" msgstr "按表达式查找" -#: cola/widgets/search.py:223 +#: cola/widgets/search.py:222 msgid "Search by Path" msgstr "按路径查找" -#: cola/widgets/grep.py:124 +#: cola/widgets/dag.py:494 +msgid "Search commit messages" +msgstr "" + +#: cola/widgets/grep.py:122 msgid "Search for a fixed string" msgstr "用特定字符串查找" -#: cola/widgets/diff.py:519 cola/widgets/diff.py:1514 +#: cola/widgets/diff.py:526 cola/widgets/diff.py:1576 msgid "Search in Diff" msgstr "" -#: cola/guicmds.py:253 cola/widgets/bookmarks.py:62 +#: cola/guicmds.py:252 cola/widgets/bookmarks.py:61 msgid "Search repositories by name..." msgstr "" -#: cola/widgets/grep.py:122 +#: cola/widgets/grep.py:120 msgid "Search using a POSIX basic regular expression" msgstr "使用 POSIX 基本正则表达式查找" -#: cola/widgets/grep.py:123 +#: cola/widgets/grep.py:121 msgid "Search using a POSIX extended regular expression" msgstr "使用 POSIX 拓展正则表达式查找" -#: cola/widgets/main.py:493 +#: cola/widgets/main.py:506 msgid "Search..." msgstr "查找..." -#: cola/widgets/selectcommits.py:67 +#: cola/widgets/selectcommits.py:66 msgid "Search:" msgstr "" -#: cola/guicmds.py:330 cola/widgets/selectcommits.py:74 +#: cola/guicmds.py:329 cola/widgets/selectcommits.py:73 msgid "Select" msgstr "选择" -#: cola/widgets/main.py:750 +#: cola/widgets/main.py:763 msgid "Select All" msgstr "全选" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Select Branch to Review" msgstr "选择分支进行审阅" -#: cola/widgets/dag.py:1610 +#: cola/widgets/dag.py:1667 msgid "Select Child" msgstr "选择子项目" -#: cola/widgets/commitmsg.py:512 +#: cola/widgets/commitmsg.py:538 msgid "Select Commit" msgstr "选择提交" -#: cola/guicmds.py:137 +#: cola/guicmds.py:136 msgid "Select Directory..." msgstr "选择目录..." -#: cola/cmds.py:2129 +#: cola/cmds.py:2080 msgid "Select New Upstream" msgstr "选择上游项目" -#: cola/widgets/dag.py:1614 +#: cola/widgets/dag.py:1671 msgid "Select Newest Child" msgstr "选择最新子项目" -#: cola/widgets/dag.py:1604 +#: cola/widgets/dag.py:1661 msgid "Select Oldest Parent" msgstr "选择最旧父项目" -#: cola/widgets/dag.py:1599 +#: cola/widgets/dag.py:1656 msgid "Select Parent" msgstr "选择父项目" -#: cola/widgets/browse.py:525 +#: cola/widgets/browse.py:526 msgid "Select Previous Version" msgstr "选择之前版本" -#: cola/widgets/clone.py:197 +#: cola/widgets/clone.py:195 msgid "Select a parent directory for the new clone" msgstr "为新克隆选择上级文件夹" -#: cola/widgets/standard.py:756 cola/widgets/standard.py:779 +#: cola/widgets/standard.py:826 cola/widgets/standard.py:848 msgid "Select directory" msgstr "" -#: cola/widgets/selectcommits.py:162 +#: cola/widgets/selectcommits.py:161 msgid "Select output dir" msgstr "选择输出目录" -#: cola/widgets/selectcommits.py:183 +#: cola/widgets/selectcommits.py:182 #, fuzzy msgid "Select output directory" msgstr "选择版本库..." -#: cola/widgets/patch.py:175 +#: cola/widgets/diff.py:1769 msgid "Select patch file(s)..." msgstr "选择补丁文件..." -#: cola/widgets/editremotes.py:437 +#: cola/widgets/editremotes.py:435 #, fuzzy msgid "Select repository" msgstr "选择版本库..." -#: cola/widgets/bookmarks.py:225 cola/widgets/startup.py:348 +#: cola/widgets/bookmarks.py:224 cola/widgets/startup.py:347 msgid "Set Default Repository" msgstr "选择默认版本库" -#: cola/widgets/branch.py:282 +#: cola/widgets/branch.py:291 msgid "Set Upstream Branch" msgstr "设置上游分支" -#: cola/widgets/branch.py:72 +#: cola/widgets/branch.py:74 msgid "" "Set the sort order for branches and tags.\n" "Toggle between date-based and version-name-based sorting." msgstr "" -#: cola/widgets/remote.py:213 +#: cola/widgets/remote.py:217 msgid "Set upstream" msgstr "设置上游" -#: cola/widgets/prefs.py:405 +#: cola/widgets/prefs.py:443 msgid "Settings" msgstr "设置" -#: cola/widgets/grep.py:142 +#: cola/widgets/grep.py:140 msgid "Shell arguments" msgstr "Shell 参数" -#: cola/sequenceeditor.py:375 +#: cola/sequenceeditor.py:371 msgid "Shift Down" msgstr "Shift 上箭" -#: cola/sequenceeditor.py:379 +#: cola/sequenceeditor.py:375 msgid "Shift Up" msgstr "Shift 下键" -#: cola/widgets/about.py:499 +#: cola/widgets/about.py:482 msgid "Shortcuts" msgstr "快捷键" -#: cola/widgets/prefs.py:179 +#: cola/widgets/prefs.py:201 msgid "Show Diffstat After Merge" msgstr "在合并后显示 Diffstat" -#: cola/widgets/prefs.py:178 +#: cola/widgets/prefs.py:200 msgid "Show Full Paths in the Window Title" msgstr "在窗口标题中显示完整路径" -#: cola/sequenceeditor.py:106 cola/widgets/finder.py:187 -#: cola/widgets/status.py:1384 +#: cola/sequenceeditor.py:104 cola/widgets/finder.py:186 +#: cola/widgets/status.py:1385 msgid "Show Help" msgstr "显示帮助" -#: cola/widgets/filelist.py:30 +#: cola/widgets/filelist.py:27 msgid "Show History" msgstr "显示历史" -#: cola/widgets/prefs.py:348 +#: cola/widgets/prefs.py:368 msgid "Show file counts in Status titles" msgstr "在状态标题中显示文件计数" -#: cola/sequenceeditor.py:171 cola/widgets/finder.py:138 +#: cola/widgets/diff.py:794 +msgid "Show filenames" +msgstr "" + +#: cola/sequenceeditor.py:169 cola/widgets/finder.py:137 msgid "" "Show help\n" "Shortcut: ?" @@ -3261,137 +3371,145 @@ msgstr "" "显示帮助\n" "快捷键: ?" -#: cola/widgets/diff.py:765 +#: cola/widgets/diff.py:792 msgid "Show line numbers" msgstr "显示行号" -#: cola/widgets/diff.py:761 +#: cola/widgets/remote.py:175 +msgid "Show remote messages" +msgstr "" + +#: cola/widgets/diff.py:789 msgid "Show whole surrounding functions of changes" msgstr "显示包含修改的整个函数" -#: cola/widgets/recent.py:58 +#: cola/widgets/recent.py:56 msgid "Showing changes since" msgstr "显示改动自" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "Side by side" msgstr "并排" -#: cola/cmds.py:2512 +#: cola/cmds.py:2463 msgid "Sign Off" msgstr "签名(Sign Off)" -#: cola/widgets/createtag.py:71 +#: cola/widgets/createtag.py:69 msgid "Sign Tag" msgstr "为标签签名" -#: cola/widgets/commitmsg.py:55 +#: cola/widgets/commitmsg.py:56 msgid "Sign off on this commit" msgstr "对本次提交签名" -#: cola/widgets/about.py:412 cola/widgets/about.py:425 +#: cola/widgets/about.py:395 cola/widgets/about.py:408 msgid "Simplified Chinese translation" msgstr "简体中文翻译" -#: cola/cmds.py:2587 +#: cola/cmds.py:2529 msgid "Skip" msgstr "跳过" -#: cola/widgets/main.py:264 cola/widgets/main.py:617 +#: cola/widgets/main.py:260 cola/widgets/main.py:630 msgid "Skip Current Patch" msgstr "跳过当前补丁" -#: cola/widgets/main.py:267 +#: cola/widgets/main.py:261 msgid "Skip applying the current patch and continue applying patches" msgstr "" -#: cola/widgets/prefs.py:261 +#: cola/widgets/prefs.py:282 msgid "Sort bookmarks alphabetically" msgstr "按字母顺序排列书签" -#: cola/widgets/about.py:413 cola/widgets/about.py:436 -#: cola/widgets/about.py:440 +#: cola/widgets/about.py:396 cola/widgets/about.py:419 +#: cola/widgets/about.py:423 msgid "Spanish translation" msgstr "西班牙语翻译" -#: cola/widgets/createtag.py:88 +#: cola/widgets/createtag.py:86 msgid "Specifies the SHA-1 to tag" msgstr "指定标签的 SHA-1 值" -#: cola/widgets/createtag.py:81 +#: cola/widgets/createtag.py:79 msgid "Specifies the tag message" msgstr "指定标签信息" -#: cola/widgets/createtag.py:65 +#: cola/widgets/createtag.py:63 msgid "Specifies the tag name" msgstr "指定标签名称" -#: cola/widgets/spellcheck.py:46 +#: cola/widgets/spellcheck.py:45 msgid "Spelling Suggestions" msgstr "拼写建议" -#: cola/sequenceeditor.py:369 cola/widgets/merge.py:58 +#: cola/sequenceeditor.py:365 cola/widgets/merge.py:56 msgid "Squash" msgstr "压缩" -#: cola/widgets/merge.py:57 +#: cola/widgets/merge.py:55 msgid "Squash the merged commits into a single commit" msgstr "压缩合并中提交成单一提交" -#: cola/cmds.py:2598 cola/widgets/action.py:60 cola/widgets/diff.py:982 +#: cola/cmds.py:2540 cola/widgets/action.py:58 cola/widgets/diff.py:1168 msgid "Stage" msgstr "缓存" -#: cola/cmds.py:2753 +#: cola/cmds.py:2699 msgid "Stage / Unstage" msgstr "缓存 / 取消缓存" -#: cola/cmds.py:2735 +#: cola/cmds.py:2681 msgid "Stage / Unstage All" msgstr "" -#: cola/widgets/diff.py:1016 +#: cola/widgets/diff.py:1055 msgid "Stage Diff Hunk" msgstr "缓存差异区域" -#: cola/cmds.py:2691 +#: cola/cmds.py:2633 msgid "Stage Modified" msgstr "缓存已修改的文件" -#: cola/cmds.py:2724 +#: cola/cmds.py:2670 msgid "Stage Modified and Untracked" msgstr "" -#: cola/widgets/status.py:872 cola/widgets/status.py:894 -#: cola/widgets/status.py:962 +#: cola/widgets/status.py:873 cola/widgets/status.py:895 +#: cola/widgets/status.py:963 msgid "Stage Selected" msgstr "缓存已选项目" -#: cola/widgets/diff.py:1011 +#: cola/widgets/diff.py:1050 msgid "Stage Selected Lines" msgstr "缓存所选行" -#: cola/cmds.py:2702 +#: cola/cmds.py:2644 msgid "Stage Unmerged" msgstr "缓存未合并的文件" -#: cola/cmds.py:2713 +#: cola/cmds.py:2655 msgid "Stage Untracked" msgstr "缓存未跟踪的文件" -#: cola/widgets/commitmsg.py:438 +#: cola/widgets/commitmsg.py:446 msgid "Stage and Commit" msgstr "缓存并提交" -#: cola/widgets/commitmsg.py:435 +#: cola/widgets/commitmsg.py:443 msgid "Stage and commit?" msgstr "缓存并提交吗?" -#: cola/cmds.py:2586 +#: cola/widgets/action.py:58 +msgid "Stage changes using \"git add\"" +msgstr "" + +#: cola/cmds.py:2528 msgid "Stage conflicts" msgstr "缓存冲突" -#: cola/cmds.py:2577 +#: cola/cmds.py:2519 msgid "Stage conflicts?" msgstr "缓存冲突?" @@ -3399,47 +3517,47 @@ msgstr "缓存冲突?" msgid "Stage/unstage selected paths for commit" msgstr "缓存/取消缓存已选路径以提交" -#: cola/models/browse.py:334 cola/widgets/status.py:156 -#: cola/widgets/status.py:620 +#: cola/models/browse.py:333 cola/widgets/status.py:156 +#: cola/widgets/status.py:621 msgid "Staged" msgstr "已缓存" -#: cola/cmds.py:2605 +#: cola/cmds.py:2547 #, python-format msgid "Staging: %s" msgstr "正在缓存: %s" -#: cola/widgets/main.py:597 +#: cola/widgets/main.py:610 msgid "Start Interactive Rebase..." msgstr "开始交互式衍合..." -#: cola/widgets/createbranch.py:107 +#: cola/widgets/createbranch.py:105 msgid "Starting Revision" msgstr "起始版本" -#: cola/widgets/stash.py:40 +#: cola/widgets/stash.py:36 msgid "Stash" msgstr "暂存" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash Index" msgstr "暂存索引" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 #, fuzzy msgid "Stash staged changes only" msgstr "提交已缓存修改" -#: cola/widgets/stash.py:73 +#: cola/widgets/stash.py:75 #, fuzzy msgid "Stash unstaged changes only, keeping staged changes" msgstr "撤销所选路径未缓存的改动" -#: cola/widgets/action.py:66 cola/widgets/main.py:414 +#: cola/widgets/action.py:76 cola/widgets/main.py:422 msgid "Stash..." msgstr "暂存..." -#: cola/models/browse.py:33 cola/widgets/main.py:102 +#: cola/models/browse.py:32 cola/widgets/main.py:100 msgid "Status" msgstr "状态" @@ -3447,151 +3565,159 @@ msgstr "状态" msgid "Stop tracking paths" msgstr "停止跟踪路径" -#: cola/widgets/submodules.py:82 +#: cola/widgets/submodules.py:81 msgid "Submodule URL (can be relative, ex: ../repo.git)" msgstr "" -#: cola/widgets/submodules.py:90 +#: cola/widgets/submodules.py:89 msgid "Submodule branch to track (optional)" msgstr "" -#: cola/widgets/submodules.py:86 +#: cola/widgets/submodules.py:85 msgid "Submodule path within the current repository (optional)" msgstr "" -#: cola/widgets/main.py:143 cola/widgets/submodules.py:32 +#: cola/widgets/main.py:141 cola/widgets/submodules.py:31 msgid "Submodules" msgstr "子模块" -#: cola/widgets/prefs.py:174 +#: cola/widgets/prefs.py:196 msgid "Summarize Merge Commits" msgstr "概述合并提交" -#: cola/sequenceeditor.py:325 cola/widgets/dag.py:506 +#: cola/sequenceeditor.py:322 cola/widgets/dag.py:572 msgid "Summary" msgstr "概要" -#: cola/widgets/prefs.py:168 +#: cola/widgets/prefs.py:273 msgid "Tab Width" msgstr "Tab 宽度" -#: cola/widgets/cfgactions.py:229 cola/widgets/createbranch.py:116 -#: cola/widgets/merge.py:48 +#: cola/widgets/cfgactions.py:227 cola/widgets/createbranch.py:114 +#: cola/widgets/merge.py:46 msgid "Tag" msgstr "标签" -#: cola/cmds.py:2842 +#: cola/cmds.py:2788 msgid "Tag Created" msgstr "标签已创建" -#: cola/widgets/createtag.py:80 +#: cola/widgets/createtag.py:78 msgid "Tag message..." msgstr "标签信息..." -#: cola/cmds.py:2802 +#: cola/cmds.py:2748 msgid "Tag-signing was requested but the tag message is empty." msgstr "标签需要签名但其内容为空." -#: cola/widgets/branch.py:179 cola/widgets/branch.py:238 +#: cola/widgets/branch.py:183 cola/widgets/branch.py:248 msgid "Tags" msgstr "标签" -#: cola/widgets/toolbar.py:180 +#: cola/widgets/action.py:78 cola/widgets/main.py:423 +msgid "Temporarily stash away uncommitted changes using \"git stash\"" +msgstr "" + +#: cola/widgets/toolbar.py:184 msgid "Text Beside Icon" msgstr "" -#: cola/widgets/toolbar.py:179 +#: cola/widgets/toolbar.py:183 msgid "Text Only" msgstr "" -#: cola/widgets/toolbar.py:181 +#: cola/widgets/toolbar.py:185 msgid "Text Under Icon" msgstr "" -#: cola/widgets/prefs.py:169 +#: cola/widgets/prefs.py:272 msgid "Text Width" msgstr "字符宽度" -#: cola/cmds.py:1116 +#: cola/cmds.py:1117 msgid "The branch will be no longer available." msgstr "分支已不可用。" -#: cola/cmds.py:648 +#: cola/cmds.py:650 #, python-format msgid "The branch will be reset using \"git reset --mixed %s\"" msgstr "" -#: cola/cmds.py:699 cola/cmds.py:790 +#: cola/cmds.py:701 cola/cmds.py:792 #, python-format msgid "The branch will be reset using \"git reset --soft %s\"" msgstr "" -#: cola/widgets/commitmsg.py:303 +#: cola/widgets/commitmsg.py:311 msgid "The commit message will be cleared." msgstr "提交消息会被清除。" -#: cola/widgets/prefs.py:146 +#: cola/widgets/prefs.py:169 msgid "" "The date-time format used when displaying dates in Git DAG.\n" "This value is passed to git log --date=" msgstr "" -#: cola/widgets/archive.py:208 +#: cola/widgets/archive.py:206 #, python-format msgid "The file \"%s\" exists and will be overwritten." msgstr "文件 \"%s\" 已存在,将被覆盖." -#: cola/cmds.py:1086 +#: cola/cmds.py:1087 msgid "The following files will be deleted:" msgstr "如下文件会被删除:" -#: cola/widgets/status.py:1646 +#: cola/widgets/status.py:1647 msgid "The number of leading paths to strip" msgstr "" -#: cola/cmds.py:716 +#: cola/cmds.py:718 #, python-format msgid "The repository will be reset using \"git reset --hard %s\"" msgstr "" -#: cola/cmds.py:665 +#: cola/cmds.py:667 #, python-format msgid "The repository will be reset using \"git reset --keep %s\"" msgstr "" -#: cola/cmds.py:682 +#: cola/cmds.py:684 #, python-format msgid "The repository will be reset using \"git reset --merge %s\"" msgstr "" -#: cola/cmds.py:2365 +#: cola/cmds.py:2316 msgid "The revision expression cannot be empty." msgstr "版本表达式不能为空." -#: cola/cmds.py:3029 +#: cola/widgets/stash.py:225 +msgid "The stash has not been renamed" +msgstr "" + +#: cola/cmds.py:2975 #, python-format msgid "" "The submodule will be added using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:3074 +#: cola/cmds.py:3020 #, python-format msgid "" "The submodule will be updated using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:736 +#: cola/cmds.py:738 #, python-format msgid "The worktree will be restored using \"git read-tree --reset -u %s\"" msgstr "" -#: cola/widgets/commitmsg.py:304 +#: cola/widgets/commitmsg.py:312 msgid "This cannot be undone. Clear commit message?" msgstr "此操作无法恢复. 清空提交消息吗?" -#: cola/cmds.py:778 cola/widgets/commitmsg.py:458 +#: cola/cmds.py:780 cola/widgets/commitmsg.py:466 msgid "" "This commit has already been published.\n" "This operation will rewrite published history.\n" @@ -3601,7 +3727,7 @@ msgstr "" "此操作会重写同步历史.\n" "很可能这不是你的心意." -#: cola/widgets/diff.py:1158 +#: cola/widgets/diff.py:1232 #, fuzzy msgid "" "This operation drops uncommitted changes.\n" @@ -3610,7 +3736,7 @@ msgstr "" "此操作将丢弃未提交的修改.\n" "造成的改动将无法撤销." -#: cola/cmds.py:2307 +#: cola/cmds.py:2258 msgid "" "This operation removes uncommitted edits from selected files.\n" "These changes cannot be recovered." @@ -3618,7 +3744,7 @@ msgstr "" "此操作将丢弃未提交的修改.\n" "造成的改动将无法撤销." -#: cola/cmds.py:2285 +#: cola/cmds.py:2236 msgid "" "This operation removes unstaged edits from selected files.\n" "These changes cannot be recovered." @@ -3626,27 +3752,27 @@ msgstr "" "这个操作会留下未缓存的改动.\n" "这些改动将无法恢复." -#: cola/cmds.py:475 +#: cola/cmds.py:476 msgid "" "This operation will replace the selected unmerged files with content from the branch being merged using \"git checkout --theirs\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:513 +#: cola/cmds.py:514 msgid "" "This operation will replace the selected unmerged files with content from your current branch using \"git checkout --ours\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/widgets/main.py:1109 +#: cola/widgets/main.py:1122 msgid "" "This repository has unresolved conflicts after applying a patch.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1102 +#: cola/widgets/main.py:1115 msgid "" "This repository is currently being rebased.\n" "Resolve conflicts, commit changes, and run:\n" @@ -3656,13 +3782,13 @@ msgstr "" "解决内容冲突, 提交更改, 并执行\n" " 衍合 > 继续" -#: cola/widgets/main.py:1115 +#: cola/widgets/main.py:1128 msgid "" "This repository is in the middle of a cherry-pick.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1121 +#: cola/widgets/main.py:1134 msgid "" "This repository is in the middle of a merge.\n" "Resolve conflicts and commit changes." @@ -3682,15 +3808,15 @@ msgstr "" msgid "To avoid applying removal lines ('-'), change them to context lines (' ')." msgstr "" -#: cola/sequenceeditor.py:342 +#: cola/sequenceeditor.py:338 msgid "Toggle Enabled" msgstr "切换已启用" -#: cola/widgets/diff.py:776 +#: cola/widgets/diff.py:804 msgid "Toggle image diff" msgstr "" -#: cola/widgets/branch.py:63 +#: cola/widgets/branch.py:65 msgid "Toggle the branches filter" msgstr "切换分支过滤器" @@ -3698,51 +3824,51 @@ msgstr "切换分支过滤器" msgid "Toggle the paths filter" msgstr "切换路径过滤器开关" -#: cola/widgets/toolbar.py:317 +#: cola/widgets/toolbar.py:322 msgid "Toolbar Style:" msgstr "" -#: cola/widgets/cfgactions.py:228 cola/widgets/merge.py:47 +#: cola/widgets/cfgactions.py:226 cola/widgets/merge.py:45 msgid "Tracking Branch" msgstr "正跟踪分支" -#: cola/widgets/createbranch.py:115 +#: cola/widgets/createbranch.py:113 msgid "Tracking branch" msgstr "跟踪分支" -#: cola/widgets/about.py:408 cola/widgets/about.py:434 -#: cola/widgets/about.py:445 +#: cola/widgets/about.py:391 cola/widgets/about.py:417 +#: cola/widgets/about.py:428 msgid "Traditional Chinese (Taiwan) translation" msgstr "繁体中文 (台湾) 翻译" -#: cola/widgets/about.py:439 +#: cola/widgets/about.py:422 msgid "Translation" msgstr "" -#: cola/widgets/about.py:94 +#: cola/widgets/about.py:92 msgid "Translators" msgstr "翻译者" -#: cola/widgets/about.py:418 cola/widgets/about.py:423 -#: cola/widgets/about.py:438 +#: cola/widgets/about.py:401 cola/widgets/about.py:406 +#: cola/widgets/about.py:421 msgid "Turkish translation" msgstr "土耳其语翻译" -#: cola/widgets/clone.py:109 cola/widgets/editremotes.py:451 -#: cola/widgets/submodules.py:117 +#: cola/widgets/clone.py:107 cola/widgets/editremotes.py:449 +#: cola/widgets/submodules.py:116 msgid "URL" msgstr "URL" -#: cola/widgets/remote.py:463 +#: cola/widgets/remote.py:497 #, python-format msgid "URL: %s" msgstr "URL: %s" -#: cola/widgets/about.py:415 +#: cola/widgets/about.py:398 msgid "Ukranian translation" msgstr "乌克兰语翻译" -#: cola/cmds.py:2122 +#: cola/cmds.py:2073 msgid "Unable to rebase" msgstr "无法进行衍合" @@ -3751,53 +3877,58 @@ msgstr "无法进行衍合" msgid "Unable to set URL for \"%(name)s\" to \"%(url)s\"" msgstr "" -#: cola/widgets/diff.py:1327 +#: cola/widgets/diff.py:1401 #, python-format msgid "Unable to write patch to \"%s\". Check permissions?" msgstr "" -#: cola/widgets/main.py:735 +#: cola/widgets/main.py:748 msgid "Undo" msgstr "撤销" -#: cola/cmds.py:783 cola/cmds.py:788 cola/cmds.py:791 cola/widgets/main.py:208 +#: cola/cmds.py:785 cola/cmds.py:790 cola/cmds.py:793 cola/widgets/main.py:207 msgid "Undo Last Commit" msgstr "" -#: cola/cmds.py:789 +#: cola/cmds.py:791 msgid "Undo last commit?" msgstr "" -#: cola/cmds.py:782 +#: cola/cmds.py:784 msgid "Undo the published commit?" msgstr "" -#: cola/models/browse.py:328 cola/widgets/status.py:157 -#: cola/widgets/status.py:640 +#: cola/models/browse.py:327 cola/widgets/status.py:157 +#: cola/widgets/status.py:641 msgid "Unmerged" msgstr "未合并" -#: cola/cmds.py:2855 cola/widgets/action.py:61 cola/widgets/diff.py:985 +#: cola/cmds.py:2801 cola/widgets/action.py:61 cola/widgets/diff.py:1165 +#: cola/widgets/main.py:212 msgid "Unstage" msgstr "取消缓存" -#: cola/widgets/main.py:203 cola/widgets/status.py:790 +#: cola/widgets/main.py:202 cola/widgets/status.py:791 msgid "Unstage All" msgstr "全部取消缓存" -#: cola/widgets/diff.py:1061 +#: cola/widgets/diff.py:1017 msgid "Unstage Diff Hunk" msgstr "取消缓存差异区域" -#: cola/widgets/status.py:823 cola/widgets/status.py:858 +#: cola/widgets/status.py:824 cola/widgets/status.py:859 msgid "Unstage Selected" msgstr "取消缓存已选项目" -#: cola/widgets/diff.py:1058 +#: cola/widgets/diff.py:1015 msgid "Unstage Selected Lines" msgstr "取消缓存所选行(&S)" -#: cola/cmds.py:2867 +#: cola/widgets/action.py:61 +msgid "Unstage changes using \"git reset\"" +msgstr "" + +#: cola/cmds.py:2813 #, python-format msgid "Unstaging: %s" msgstr "正取消缓存: %s" @@ -3806,85 +3937,84 @@ msgstr "正取消缓存: %s" msgid "Untrack Selected" msgstr "取消跟踪所选项目" -#: cola/widgets/status.py:159 cola/widgets/status.py:646 +#: cola/widgets/status.py:159 cola/widgets/status.py:647 msgid "Untracked" msgstr "未跟踪" -#: cola/cmds.py:1141 cola/cmds.py:2923 +#: cola/cmds.py:1142 cola/cmds.py:2869 #, python-format msgid "Untracking: %s" msgstr "跟踪: %s" -#: cola/widgets/main.py:374 +#: cola/widgets/main.py:369 msgid "Update All Submodules..." msgstr "更新所有子模块..." -#: cola/widgets/createbranch.py:121 +#: cola/widgets/createbranch.py:119 msgid "Update Existing Branch:" msgstr "更新已有分支:" -#: cola/cmds.py:3075 +#: cola/cmds.py:3021 msgid "Update Submodule" msgstr "更新子模块" -#: cola/cmds.py:3072 +#: cola/cmds.py:3018 msgid "Update Submodule..." msgstr "更新子模块..." -#: cola/cmds.py:3111 +#: cola/cmds.py:3057 msgid "Update Submodules" msgstr "更新子模块" -#: cola/cmds.py:3109 +#: cola/cmds.py:3055 msgid "Update all submodules?" msgstr "更新所有子模块?" -#: cola/cmds.py:2093 +#: cola/cmds.py:2044 msgid "Update stacked branches" msgstr "" -#: cola/cmds.py:2085 cola/cmds.py:2092 +#: cola/cmds.py:2036 cola/cmds.py:2043 msgid "Update stacked branches when rebasing?" msgstr "" -#: cola/cmds.py:3108 +#: cola/cmds.py:3054 msgid "Update submodules..." msgstr "更新子模块..." -#: cola/widgets/status.py:953 +#: cola/widgets/status.py:954 msgid "Update this submodule" msgstr "更新此子模块" -#: cola/cmds.py:3073 +#: cola/cmds.py:3019 msgid "Update this submodule?" msgstr "更新此子模块?" -#: cola/widgets/branch.py:421 cola/widgets/createbranch.py:302 -#: cola/widgets/remote.py:135 +#: cola/widgets/branch.py:433 cola/widgets/createbranch.py:300 msgid "Updating" msgstr "更新" -#: cola/widgets/prefs.py:350 +#: cola/widgets/prefs.py:370 msgid "Use a block cursor in diff editors" msgstr "" -#: cola/widgets/prefs.py:154 +#: cola/widgets/prefs.py:177 msgid "Use gravatar.com to lookup icons for author emails" msgstr "" -#: cola/widgets/prefs.py:166 +#: cola/widgets/prefs.py:189 msgid "User Name" msgstr "用户名" -#: cola/widgets/about.py:92 +#: cola/widgets/about.py:90 msgid "Version" msgstr "版本" -#: cola/widgets/dag.py:800 cola/widgets/main.py:845 cola/widgets/main.py:966 +#: cola/widgets/dag.py:866 cola/widgets/main.py:858 cola/widgets/main.py:979 msgid "View" msgstr "视图" -#: cola/widgets/browse.py:137 cola/widgets/status.py:278 +#: cola/widgets/browse.py:137 cola/widgets/status.py:279 msgid "View History..." msgstr "查看历史..." @@ -3892,39 +4022,39 @@ msgstr "查看历史..." msgid "View history for selected paths" msgstr "查看所选路径历史" -#: cola/widgets/merge.py:54 +#: cola/widgets/branch.py:224 cola/widgets/merge.py:52 msgid "Visualize" msgstr "图示" -#: cola/widgets/main.py:488 +#: cola/widgets/main.py:501 msgid "Visualize All Branches..." msgstr "图示所有分支的历史..." -#: cola/widgets/main.py:482 +#: cola/widgets/main.py:495 msgid "Visualize Current Branch..." msgstr "图示当前分支的历史..." -#: cola/widgets/createtag.py:73 +#: cola/widgets/createtag.py:71 msgid "Whether to sign the tag (git tag -s)" msgstr "是否为标签签名 (git tag -s)" -#: cola/widgets/text.py:399 +#: cola/widgets/text.py:396 msgid "Whole Words" msgstr "" -#: cola/widgets/commitmsg.py:432 +#: cola/widgets/commitmsg.py:440 msgid "Would you like to stage and commit all modified files?" msgstr "要缓存并提交所有已修改文件吗?" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "XOR" msgstr "异或" -#: cola/widgets/standard.py:1064 +#: cola/widgets/standard.py:1182 msgid "Yes" msgstr "是" -#: cola/cmds.py:256 +#: cola/cmds.py:255 msgid "" "You are in the middle of a merge.\n" "Cannot amend while merging." @@ -3932,36 +4062,36 @@ msgstr "" "合并正在进行中.\n" "在合并过程中无法修正." -#: cola/cmds.py:2123 +#: cola/cmds.py:2074 msgid "You cannot rebase with uncommitted changes." msgstr "有未提交修改时无法衍合。" -#: cola/widgets/merge.py:227 +#: cola/widgets/merge.py:225 msgid "You must specify a revision to merge." msgstr "指定一个版本进行合并." -#: cola/widgets/merge.py:217 +#: cola/widgets/merge.py:215 msgid "You must specify a revision to view." msgstr "指定一个版本进行查看." -#: cola/widgets/dag.py:710 cola/widgets/dag.py:1588 +#: cola/widgets/dag.py:776 cola/widgets/dag.py:1645 msgid "Zoom In" msgstr "放大" -#: cola/widgets/dag.py:706 cola/widgets/dag.py:1594 +#: cola/widgets/dag.py:772 cola/widgets/dag.py:1651 msgid "Zoom Out" msgstr "缩小" -#: cola/widgets/dag.py:524 cola/widgets/dag.py:714 cola/widgets/dag.py:1596 -#: cola/widgets/diff.py:785 +#: cola/widgets/dag.py:590 cola/widgets/dag.py:780 cola/widgets/dag.py:1653 +#: cola/widgets/diff.py:813 msgid "Zoom to Fit" msgstr "缩放到适合" -#: cola/widgets/grep.py:112 +#: cola/widgets/grep.py:110 msgid "command-line arguments" msgstr "命令行参数" -#: cola/widgets/main.py:932 cola/widgets/main.py:938 +#: cola/widgets/main.py:945 cola/widgets/main.py:951 msgid "error: unable to execute git" msgstr "错误: 无法执行 git" @@ -3970,45 +4100,41 @@ msgstr "错误: 无法执行 git" msgid "exit code %s" msgstr "退出代码 %s" -#: cola/app.py:301 +#: cola/app.py:304 #, python-format msgid "fatal: \"%s\" is not a directory. Please specify a correct --repo ." msgstr "致命错误: \"%s\" 不是有效目录. 请用 --repo <路径> 指定." -#: cola/widgets/main.py:928 +#: cola/widgets/main.py:941 #, python-format msgid "git cola version %s" msgstr "git cola 版本 %s" -#: cola/widgets/startup.py:35 +#: cola/widgets/startup.py:34 msgid "git-cola" msgstr "git-cola" -#: cola/difftool.py:63 +#: cola/difftool.py:82 msgid "git-cola diff" msgstr "git-cola 比较差异" -#: cola/widgets/submodules.py:81 +#: cola/widgets/submodules.py:80 msgid "git://git.example.com/repo.git" msgstr "" -#: cola/widgets/grep.py:132 +#: cola/widgets/grep.py:130 msgid "grep result..." msgstr "筛选结果..." -#: cola/widgets/about.py:486 +#: cola/widgets/about.py:469 msgid "hotkeys.html" msgstr "hotkeys_zh_CN.html" -#: cola/widgets/submodules.py:85 +#: cola/widgets/submodules.py:84 msgid "path/to/submodule" msgstr "" -#: cola/cmds.py:2537 -msgid "unknown" -msgstr "未知" - -#: cola/widgets/createtag.py:63 +#: cola/widgets/createtag.py:61 msgid "vX.Y.Z" msgstr "vX.Y.Z" @@ -4017,14 +4143,18 @@ msgid "x 1" msgstr "x 1" #: cola/hidpi.py:44 +msgid "x 1.25" +msgstr "" + +#: cola/hidpi.py:45 msgid "x 1.5" msgstr "x 1.5" -#: cola/hidpi.py:45 +#: cola/hidpi.py:46 msgid "x 2" msgstr "x 2" -#: cola/widgets/search.py:53 cola/widgets/search.py:58 +#: cola/widgets/search.py:52 cola/widgets/search.py:57 msgid "yyyy-MM-dd" msgstr "yyyy-MM-dd" @@ -4072,6 +4202,10 @@ msgstr "yyyy-MM-dd" #~ msgid "A branch is required for 'Merged Into'." #~ msgstr "'合并到' 需要指定某个分支" +#, python-format +#~ msgid "A stash named \"%s\" already exists" +#~ msgstr "名为 \"%s\" 的暂存已存在" + #~ msgid "Abort completed. Ready." #~ msgstr "中止完成. 就绪." @@ -4304,6 +4438,9 @@ msgstr "yyyy-MM-dd" #~ msgid "Error: Command Failed" #~ msgstr "错误: 命令失败" +#~ msgid "Error: Stash exists" +#~ msgstr "错误: 暂存已存在" + #~ msgid "Errors: %s" #~ msgstr "错误: %s" @@ -5082,6 +5219,9 @@ msgstr "yyyy-MM-dd" #~ msgid "remote prune %s" #~ msgstr "清除远程 %s" +#~ msgid "unknown" +#~ msgstr "未知" + #~ msgid "update-ref failed:" #~ msgstr "update-ref 失败:" diff --git a/cola/i18n/zh_TW.po b/cola/i18n/zh_TW.po index 95ada29a..74d4ce70 100644 --- a/cola/i18n/zh_TW.po +++ b/cola/i18n/zh_TW.po @@ -22,7 +22,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n>1);\n" -#: cola/widgets/patch.py:86 +#: cola/widgets/diff.py:1680 msgid "" "\n" "

\n" @@ -38,7 +38,7 @@ msgstr "" "

\n" " " -#: cola/widgets/about.py:455 +#: cola/widgets/about.py:438 #, python-format msgid "" "\n" @@ -91,7 +91,7 @@ msgstr "" "\n" " " -#: cola/widgets/about.py:180 +#: cola/widgets/about.py:182 #, python-format msgid "" "\n" @@ -120,7 +120,7 @@ msgstr "" " \n" " " -#: cola/widgets/about.py:387 +#: cola/widgets/about.py:370 #, python-format msgid "" "\n" @@ -135,7 +135,7 @@ msgstr "" "
\n" " " -#: cola/widgets/status.py:1310 +#: cola/widgets/status.py:1311 #, python-format msgid "" "\n" @@ -160,7 +160,7 @@ msgstr "" " %(basename)s = 檔名（去副檔名）\n" " %(ext)s = 副檔名\n" -#: cola/sequenceeditor.py:700 +#: cola/sequenceeditor.py:695 msgid "" "\n" "Commands\n" @@ -199,7 +199,7 @@ msgid "" "ctrl+d = launch difftool\n" msgstr "" -#: cola/widgets/finder.py:65 +#: cola/widgets/finder.py:64 msgid "" "\n" "Keyboard Shortcuts\n" @@ -227,45 +227,71 @@ msgstr "" "用上、下方向鍵在文字輸入欄位與執行結果間\n" "變更焦點。\n" -#: cola/widgets/dag.py:894 +#: cola/widgets/prefs.py:133 +msgid "" +"\n" +"This option determines how the supplied commit message should be\n" +"cleaned up before committing.\n" +"\n" +"The can be strip, whitespace, verbatim, scissors or default.\n" +"\n" +"strip\n" +" Strip leading and trailing empty lines, trailing whitespace,\n" +" commentary and collapse consecutive empty lines.\n" +"\n" +"whitespace\n" +" Same as strip except #commentary is not removed.\n" +"\n" +"verbatim\n" +" Do not change the message at all.\n" +"\n" +"scissors\n" +" Same as whitespace except that everything from (and including) the line\n" +" found below is truncated, if the message is to be edited.\n" +" \"#\" can be customized with core.commentChar.\n" +"\n" +" # ------------------------ >8 ------------------------" +msgstr "" + +#: cola/widgets/dag.py:960 msgid " - DAG" msgstr " - 有向無環圖(DAG)" -#: cola/widgets/recent.py:54 +#: cola/widgets/recent.py:52 msgid " commits ago" msgstr " 個修訂版提交前" -#: cola/cmds.py:1197 +#: cola/cmds.py:1198 #, python-format msgid "\"%(branch)s\" has been deleted from \"%(remote)s\"." msgstr "「%(branch)s」分支已從「%(remote)s」版控庫中移除。" -#: cola/widgets/createbranch.py:316 +#: cola/widgets/createbranch.py:314 #, python-format msgid "\"%(command)s\" returned exit status \"%(status)d\"" msgstr "「%(command)s」命令傳回了 %(status)d 結束狀態代碼" -#: cola/interaction.py:39 +#: cola/interaction.py:38 #, python-format msgid "\"%(command)s\" returned exit status %(status)d" msgstr "「%(command)s」命令傳回了 %(status)d 結束狀態碼" -#: cola/guicmds.py:157 +#: cola/guicmds.py:156 #, python-format msgid "\"%s\" already exists" msgstr "「%s」早已存在" -#: cola/widgets/clone.py:206 +#: cola/widgets/clone.py:204 #, python-format msgid "\"%s\" already exists, cola will create a new directory" msgstr "「%s」目錄已存在，cola 將會另外建立一個新的目錄" -#: cola/cmds.py:2349 +#: cola/cmds.py:2300 #, python-format msgid "\"%s\" requires a selected file." msgstr "「%s」操作需要有選取檔案才能執行。" -#: cola/cmds.py:2087 +#: cola/cmds.py:2038 msgid "" "\"git rebase --update-refs\" automatically force-updates any\n" "branches that point to commits that are being rebased.\n" @@ -275,7 +301,11 @@ msgid "" "Using this feature is helpful for \"stacked\" branch workflows." msgstr "" -#: cola/sequenceeditor.py:321 +#: cola/models/stash.py:145 +msgid "\"git stash drop\" did not return a ref to rename." +msgstr "" + +#: cola/sequenceeditor.py:318 msgid "#" msgstr "" @@ -284,37 +314,37 @@ msgstr "" msgid "%(project)s: %(branch)s - Browse" msgstr "%(project)s：%(branch)s - 瀏覽" -#: cola/widgets/dag.py:887 +#: cola/widgets/dag.py:953 #, python-format msgid "%(project)s: %(ref)s - DAG" msgstr "%(project)s: %(ref)s - 有向無環圖(DAG)" -#: cola/models/browse.py:315 +#: cola/models/browse.py:314 #, python-format msgid "%d days ago" msgstr "%d 天前" -#: cola/models/browse.py:314 +#: cola/models/browse.py:313 #, python-format msgid "%d hours ago" msgstr "%d 小時前" -#: cola/models/browse.py:307 cola/models/browse.py:311 +#: cola/models/browse.py:306 cola/models/browse.py:310 #, python-format msgid "%d minutes ago" msgstr "%d 分鐘前" -#: cola/cmds.py:376 +#: cola/cmds.py:377 #, python-format msgid "%d patch(es) applied." msgstr "已套用 %d 個修正。" -#: cola/widgets/createbranch.py:281 +#: cola/widgets/createbranch.py:279 #, python-format msgid "%d skipped" msgstr "%d 個跳過了" -#: cola/cmds.py:2580 +#: cola/cmds.py:2522 #, python-format msgid "" "%s appears to contain merge conflicts.\n" @@ -327,36 +357,36 @@ msgstr "" "您可能應該要跳過這個檔案。\n" "無論如何都要將它移入新修訂版準備區域嗎？" -#: cola/widgets/startup.py:263 +#: cola/widgets/startup.py:262 #, python-format msgid "%s could not be opened. Remove from bookmarks?" msgstr "" -#: cola/app.py:498 cola/widgets/bookmarks.py:482 +#: cola/app.py:501 cola/widgets/bookmarks.py:481 #, python-format msgid "%s is not a Git repository." msgstr "%s 不是一個 Git 版控庫。" -#: cola/cmds.py:1015 +#: cola/cmds.py:1016 #, python-format msgid "%s will be removed from your bookmarks." msgstr "「%s」版控庫將會從您的書籤中被刪除。" -#: cola/cmds.py:1028 +#: cola/cmds.py:1029 #, python-format msgid "%s will be removed from your recent repositories." msgstr "「%s」版控庫將從您最近使用的版控庫中移除。" -#: cola/cmds.py:1711 +#: cola/cmds.py:1663 #, python-format msgid "%s: No such file or directory." msgstr "%s：無此檔案或目錄。" -#: cola/widgets/main.py:734 +#: cola/widgets/main.py:747 msgid "&Edit" msgstr "編輯" -#: cola/widgets/main.py:676 +#: cola/widgets/main.py:689 msgid "&File" msgstr "檔案" @@ -364,43 +394,43 @@ msgstr "檔案" msgid "(Amending)" msgstr "（正在修正前一個修訂版提交）" -#: cola/widgets/compare.py:36 +#: cola/widgets/compare.py:35 msgid "*** Branch Point ***" msgstr "*** 分支點 ***" -#: cola/widgets/compare.py:37 +#: cola/widgets/compare.py:36 msgid "*** Sandbox ***" msgstr "*** 沙盒 ***" -#: cola/widgets/diff.py:788 +#: cola/widgets/diff.py:816 msgid "100%" msgstr "100%" -#: cola/widgets/diff.py:789 +#: cola/widgets/diff.py:817 msgid "200%" msgstr "200%" -#: cola/widgets/diff.py:786 +#: cola/widgets/diff.py:814 msgid "25%" msgstr "25%" -#: cola/widgets/diff.py:790 +#: cola/widgets/diff.py:818 msgid "400%" msgstr "400%" -#: cola/widgets/diff.py:787 +#: cola/widgets/diff.py:815 msgid "50%" msgstr "50%" -#: cola/widgets/diff.py:791 +#: cola/widgets/diff.py:819 msgid "800%" msgstr "800%" -#: cola/widgets/finder.py:119 +#: cola/widgets/finder.py:118 msgid " ..." msgstr "〈路徑〉……" -#: cola/cmds.py:1734 +#: cola/cmds.py:1686 msgid "" "A commit template has not been configured.\n" "Use \"git config\" to define \"commit.template\"\n" @@ -410,81 +440,76 @@ msgstr "" "使用「git config」命令來定義「commit.template」設定值\n" "使其指向一個修訂版提交範本。" -#: cola/cmds.py:1784 +#: cola/cmds.py:1735 #, python-format msgid "A hook must be provided at \"%s\"" msgstr "一個掛勾程式必須在「%s」被提供" -#: cola/widgets/stash.py:236 -#, python-format -msgid "A stash named \"%s\" already exists" -msgstr "名為「%s」的珍藏項目已經存在" - -#: cola/widgets/cfgactions.py:82 cola/widgets/main.py:622 +#: cola/widgets/cfgactions.py:81 cola/widgets/main.py:635 msgid "Abort" msgstr "中止" -#: cola/widgets/cfgactions.py:149 cola/widgets/cfgactions.py:155 +#: cola/widgets/cfgactions.py:148 cola/widgets/cfgactions.py:154 msgid "Abort Action" msgstr "中止操作" -#: cola/cmds.py:132 +#: cola/cmds.py:131 msgid "Abort Applying Patch" msgstr "" -#: cola/cmds.py:126 +#: cola/cmds.py:125 msgid "Abort Applying Patch..." msgstr "" -#: cola/widgets/main.py:245 +#: cola/widgets/main.py:244 msgid "Abort Applying Patches..." msgstr "" -#: cola/cmds.py:162 +#: cola/cmds.py:161 msgid "Abort Cherry-Pick" msgstr "" -#: cola/cmds.py:156 cola/widgets/main.py:334 +#: cola/cmds.py:155 cola/widgets/main.py:329 msgid "Abort Cherry-Pick..." msgstr "" -#: cola/cmds.py:193 +#: cola/cmds.py:192 msgid "Abort Merge" msgstr "中止分支合併(merge)" -#: cola/cmds.py:186 cola/widgets/main.py:368 +#: cola/cmds.py:185 cola/widgets/main.py:363 msgid "Abort Merge..." msgstr "中止分支合併(merge)……" -#: cola/widgets/cfgactions.py:154 +#: cola/widgets/cfgactions.py:153 msgid "Abort the action?" msgstr "要中止操作嗎？" -#: cola/widgets/main.py:250 +#: cola/widgets/main.py:245 msgid "Abort the current \"git am\" patch session" msgstr "" -#: cola/cmds.py:159 +#: cola/cmds.py:158 msgid "" "Aborting a cherry-pick can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:129 +#: cola/cmds.py:128 msgid "" "Aborting a patch can cause uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:127 +#: cola/cmds.py:126 msgid "Aborting applying the current patch?" msgstr "" -#: cola/cmds.py:157 +#: cola/cmds.py:156 msgid "Aborting the current cherry-pick?" msgstr "" -#: cola/cmds.py:189 +#: cola/cmds.py:188 msgid "" "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" "Recovering uncommitted changes is not possible." @@ -492,23 +517,23 @@ msgstr "" "中止目前的分支合併操作將導致 *所有* 尚未提交到版控庫的內容變更遺失，\n" "且所有遺失的變更將無法被復原或找回。" -#: cola/cmds.py:187 +#: cola/cmds.py:186 msgid "Aborting the current merge?" msgstr "中止目前正在進行的分支合併？" -#: cola/widgets/about.py:91 cola/widgets/main.py:517 +#: cola/widgets/about.py:89 cola/widgets/main.py:530 msgid "About" msgstr "關於" -#: cola/widgets/about.py:67 +#: cola/widgets/about.py:65 msgid "About git-cola" msgstr "關於 git-cola" -#: cola/widgets/bookmarks.py:217 cola/widgets/startup.py:340 +#: cola/widgets/bookmarks.py:216 cola/widgets/startup.py:339 msgid "Accept" msgstr "接受" -#: cola/sequenceeditor.py:159 +#: cola/sequenceeditor.py:157 msgid "" "Accept changes and rebase\n" "Shortcut: Ctrl+Enter" @@ -516,50 +541,50 @@ msgstr "" "接受變更並變更基底(rebase)\n" "鍵盤快捷鍵：Ctrl+Enter" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Action Name" msgstr "操作名稱" -#: cola/sequenceeditor.py:528 cola/widgets/bookmarks.py:321 -#: cola/widgets/branch.py:217 cola/widgets/browse.py:374 -#: cola/widgets/commitmsg.py:99 cola/widgets/dag.py:315 -#: cola/widgets/filelist.py:110 cola/widgets/main.py:95 -#: cola/widgets/main.py:757 cola/widgets/startup.py:436 +#: cola/sequenceeditor.py:524 cola/widgets/bookmarks.py:320 +#: cola/widgets/branch.py:221 cola/widgets/browse.py:375 +#: cola/widgets/commitmsg.py:105 cola/widgets/dag.py:314 +#: cola/widgets/filelist.py:107 cola/widgets/main.py:93 +#: cola/widgets/main.py:770 cola/widgets/startup.py:435 msgid "Actions" msgstr "操作" -#: cola/widgets/commitmsg.py:101 +#: cola/widgets/commitmsg.py:107 msgid "Actions..." msgstr "操作……" -#: cola/widgets/bookmarks.py:71 cola/widgets/gitignore.py:64 -#: cola/widgets/patch.py:103 cola/widgets/patch.py:117 -#: cola/widgets/status.py:1381 +#: cola/widgets/bookmarks.py:70 cola/widgets/diff.py:1697 +#: cola/widgets/diff.py:1711 cola/widgets/gitignore.py:63 +#: cola/widgets/status.py:1382 msgid "Add" msgstr "新增" -#: cola/widgets/bookmarks.py:470 +#: cola/widgets/bookmarks.py:469 msgid "Add Favorite" msgstr "新增喜愛的版控庫" -#: cola/widgets/editremotes.py:374 +#: cola/widgets/editremotes.py:373 msgid "Add Remote" msgstr "新增遠端版控庫" -#: cola/widgets/toolbar.py:315 +#: cola/widgets/toolbar.py:320 msgid "Add Separator" msgstr "新增分隔器" -#: cola/cmds.py:3030 cola/widgets/submodules.py:42 -#: cola/widgets/submodules.py:111 +#: cola/cmds.py:2976 cola/widgets/submodules.py:41 +#: cola/widgets/submodules.py:110 msgid "Add Submodule" msgstr "" -#: cola/cmds.py:3027 cola/widgets/main.py:381 +#: cola/cmds.py:2973 cola/widgets/main.py:376 msgid "Add Submodule..." msgstr "" -#: cola/widgets/editremotes.py:62 +#: cola/widgets/editremotes.py:61 msgid "" "Add and remove remote repositories using the \n" "Add(+) and Delete(-) buttons on the left-hand side.\n" @@ -573,98 +598,98 @@ msgstr "" "選取其中一個清單中的遠端版控庫\n" "再按下 Enter 或是連續點兩下就可以將其重新命名。" -#: cola/widgets/editremotes.py:81 +#: cola/widgets/editremotes.py:80 msgid "Add new remote git repository" msgstr "加一個新的遠端 Git 版控庫" -#: cola/widgets/patch.py:103 +#: cola/widgets/diff.py:1697 msgid "Add patches (+)" msgstr "加入修正檔 (+)" -#: cola/widgets/editremotes.py:433 +#: cola/widgets/editremotes.py:431 msgid "Add remote" msgstr "新增遠端版控庫" -#: cola/cmds.py:3028 +#: cola/cmds.py:2974 msgid "Add this submodule?" msgstr "" -#: cola/widgets/gitignore.py:54 +#: cola/widgets/gitignore.py:53 msgid "Add to .gitignore" msgstr "新增到 Git 忽略規則(.gitignore)" -#: cola/widgets/status.py:286 +#: cola/widgets/status.py:287 msgid "Add to Git Annex" msgstr "新增到 Git Annex" -#: cola/widgets/status.py:290 +#: cola/widgets/status.py:291 msgid "Add to Git LFS" msgstr "新增到 Git LFS" -#: cola/widgets/gitignore.py:28 +#: cola/widgets/gitignore.py:27 msgid "Add to exclusions" msgstr "" -#: cola/widgets/gitignore.py:55 +#: cola/widgets/gitignore.py:54 msgid "Add to local .git/info/exclude" msgstr "" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Additions" msgstr "新增行數" -#: cola/widgets/archive.py:134 +#: cola/widgets/archive.py:132 msgid "Advanced" msgstr "進階選項" -#: cola/widgets/main.py:522 +#: cola/widgets/main.py:535 msgid "Against Commit... (Diff Mode)" msgstr "" -#: cola/models/browse.py:33 +#: cola/models/browse.py:32 msgid "Age" msgstr "建立時間" -#: cola/widgets/prefs.py:403 +#: cola/widgets/prefs.py:441 msgid "All Repositories" msgstr "所有的版控庫" -#: cola/cmds.py:3110 +#: cola/cmds.py:3056 #, python-format msgid "" "All submodules will be updated using\n" "\"%s\"" msgstr "" -#: cola/widgets/remote.py:195 +#: cola/widgets/remote.py:199 msgid "Allow non-fast-forward updates. Using \"force\" can cause the remote repository to lose commits; use it with care" msgstr "允許非快速前移式更新。使用「強制」可能會造成遠端版控庫遺失修訂版提交；請小心使用" -#: cola/widgets/merge.py:61 +#: cola/widgets/merge.py:59 msgid "Always create a merge commit when enabled, even when the merge is a fast-forward update" msgstr "於啟用時，就算該合併是一個快速前移式更新也總是建立一個合併修訂版提交" -#: cola/cmds.py:221 +#: cola/cmds.py:220 msgid "Amend" msgstr "修正前一次的修訂版提交" -#: cola/widgets/commitmsg.py:463 +#: cola/widgets/commitmsg.py:471 msgid "Amend Commit" msgstr "修正前一個修訂版提交" -#: cola/widgets/commitmsg.py:110 cola/widgets/main.py:194 +#: cola/widgets/commitmsg.py:116 cola/widgets/main.py:193 msgid "Amend Last Commit" msgstr "修正上次提交" -#: cola/widgets/commitmsg.py:462 +#: cola/widgets/commitmsg.py:470 msgid "Amend the published commit?" msgstr "要修正已被推送出去的修訂版提交嗎？" -#: cola/widgets/main.py:1157 +#: cola/widgets/main.py:1170 msgid "Amending" msgstr "正在修正前一個修訂版提交" -#: cola/widgets/cfgactions.py:151 +#: cola/widgets/cfgactions.py:150 msgid "" "An action is still running.\n" "Terminating it could result in data loss." @@ -672,7 +697,7 @@ msgstr "" "一個操作仍在進行。\n" "將其中止可能會造成資料損失。" -#: cola/cmds.py:2804 +#: cola/cmds.py:2750 msgid "" "An unsigned, lightweight tag will be created instead.\n" "Create an unsigned tag?" @@ -680,56 +705,56 @@ msgstr "" "一個無簽名的，輕量的標籤將會被建立。\n" "要建立此無簽名的標籤嗎？" -#: cola/widgets/prefs.py:406 +#: cola/widgets/prefs.py:444 msgid "Appearance" msgstr "" -#: cola/widgets/diff.py:1230 +#: cola/widgets/diff.py:1304 msgid "Append Patch" msgstr "" -#: cola/widgets/diff.py:1299 +#: cola/widgets/diff.py:1373 msgid "Append Patch..." msgstr "" -#: cola/widgets/patch.py:112 cola/widgets/stash.py:48 cola/widgets/stash.py:107 -#: cola/widgets/toolbar.py:323 +#: cola/widgets/diff.py:1706 cola/widgets/stash.py:50 cola/widgets/stash.py:110 +#: cola/widgets/toolbar.py:328 msgid "Apply" msgstr "套用" -#: cola/widgets/patch.py:75 +#: cola/widgets/diff.py:1669 msgid "Apply Patches" msgstr "套用修正" -#: cola/widgets/main.py:239 +#: cola/widgets/main.py:238 msgid "Apply Patches..." msgstr "套用修正……" -#: cola/widgets/stash.py:64 +#: cola/widgets/stash.py:66 msgid "Apply and drop the selected stash (git stash pop)" msgstr "套用並丟棄被選取的珍藏項目(git stash pop)" -#: cola/widgets/stash.py:48 +#: cola/widgets/stash.py:50 msgid "Apply the selected stash" msgstr "套用被選取的珍藏項目" -#: cola/widgets/main.py:1167 +#: cola/widgets/main.py:1180 msgid "Applying Patch" msgstr "" -#: cola/widgets/cfgactions.py:207 +#: cola/widgets/cfgactions.py:205 msgid "Arguments" msgstr "參數" -#: cola/qtutils.py:850 +#: cola/qtutils.py:887 msgid "Attach" msgstr "連接" -#: cola/models/browse.py:33 cola/models/browse.py:72 cola/widgets/dag.py:506 +#: cola/models/browse.py:32 cola/models/browse.py:71 cola/widgets/dag.py:572 msgid "Author" msgstr "作者" -#: cola/widgets/about.py:93 +#: cola/widgets/about.py:91 msgid "Authors" msgstr "作者群" @@ -737,44 +762,44 @@ msgstr "作者群" msgid "Auto" msgstr "" -#: cola/widgets/commitmsg.py:137 cola/widgets/prefs.py:259 +#: cola/widgets/commitmsg.py:143 cola/widgets/prefs.py:280 msgid "Auto-Wrap Lines" msgstr "自動折行" -#: cola/widgets/prefs.py:184 +#: cola/widgets/prefs.py:206 msgid "Autocomplete Paths" msgstr "" -#: cola/widgets/prefs.py:176 +#: cola/widgets/prefs.py:198 msgid "Automatically Load Commit Message Template" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Basic Regexp" msgstr "基本正規表達式" -#: cola/widgets/prefs.py:255 +#: cola/widgets/prefs.py:276 msgid "Blame Viewer" msgstr "指謫(blame)查看器" -#: cola/widgets/browse.py:205 +#: cola/widgets/browse.py:206 #, fuzzy msgid "Blame selected paths" msgstr "重新命名選取的路徑" -#: cola/cmds.py:545 cola/widgets/status.py:282 +#: cola/cmds.py:546 cola/widgets/status.py:283 msgid "Blame..." msgstr "指摘(Blame)..." -#: cola/widgets/prefs.py:347 +#: cola/widgets/prefs.py:367 msgid "Bold on dark headers instead of italic" msgstr "標題用帶深色底色的粗體而非斜體" -#: cola/widgets/main.py:806 cola/widgets/submodules.py:119 +#: cola/widgets/main.py:819 cola/widgets/submodules.py:118 msgid "Branch" msgstr "分支" -#: cola/widgets/remote.py:600 +#: cola/widgets/remote.py:635 #, python-format msgid "" "Branch \"%(branch)s\" does not exist in \"%(remote)s\".\n" @@ -783,84 +808,84 @@ msgstr "" "「%(branch)s」分支並無存在於「%(remote)s」遠端版控庫。\n" "一個新的遠端方支將被發佈。" -#: cola/widgets/createbranch.py:258 +#: cola/widgets/createbranch.py:256 #, python-format msgid "Branch \"%s\" already exists." msgstr "「%s」分支早已存在。" -#: cola/widgets/compare.py:44 +#: cola/widgets/compare.py:43 msgid "Branch Diff Viewer" msgstr "分支差異檢視器" -#: cola/widgets/createbranch.py:259 cola/widgets/createbranch.py:271 +#: cola/widgets/createbranch.py:257 cola/widgets/createbranch.py:269 msgid "Branch Exists" msgstr "分支已存在" -#: cola/widgets/createbranch.py:98 +#: cola/widgets/createbranch.py:96 msgid "Branch Name" msgstr "分支名稱" -#: cola/widgets/submodules.py:89 +#: cola/widgets/submodules.py:88 msgid "Branch name" msgstr "" -#: cola/widgets/browse.py:89 cola/widgets/main.py:1097 +#: cola/widgets/browse.py:89 cola/widgets/main.py:1110 #, python-format msgid "Branch: %s" msgstr "分支：%s" -#: cola/widgets/branch.py:85 cola/widgets/main.py:131 +#: cola/widgets/branch.py:87 cola/widgets/main.py:129 msgid "Branches" msgstr "分支" -#: cola/widgets/main.py:538 +#: cola/widgets/main.py:551 msgid "Branches..." msgstr "比較分支之間的內容差異……" -#: cola/widgets/about.py:414 cola/widgets/about.py:417 -#: cola/widgets/about.py:437 +#: cola/widgets/about.py:397 cola/widgets/about.py:400 +#: cola/widgets/about.py:420 msgid "Brazilian translation" msgstr "巴西語翻譯" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse" msgstr "瀏覽" -#: cola/guicmds.py:53 +#: cola/guicmds.py:52 msgid "Browse Commits..." msgstr "瀏覽修訂版提交……" -#: cola/widgets/main.py:499 +#: cola/widgets/main.py:512 msgid "Browse Current Branch..." msgstr "瀏覽目前分支中的檔案……" -#: cola/widgets/main.py:505 +#: cola/widgets/main.py:518 msgid "Browse Other Branch..." msgstr "瀏覽其他分支中的檔案……" -#: cola/widgets/editremotes.py:437 cola/widgets/search.py:46 -#: cola/widgets/startup.py:65 cola/widgets/startup.py:285 +#: cola/widgets/editremotes.py:435 cola/widgets/search.py:45 +#: cola/widgets/startup.py:64 cola/widgets/startup.py:284 msgid "Browse..." msgstr "瀏覽……" -#: cola/widgets/main.py:89 +#: cola/widgets/main.py:87 msgid "Browser" msgstr "檔案瀏覽器" -#: cola/widgets/browse.py:589 +#: cola/widgets/browse.py:590 #, python-format msgid "Browsing %s" msgstr "正在瀏覽 %s" -#: cola/widgets/commitmsg.py:118 +#: cola/widgets/commitmsg.py:124 msgid "Bypass Commit Hooks" msgstr "不執行提交掛勾程式" -#: cola/sequenceeditor.py:175 cola/widgets/standard.py:991 +#: cola/sequenceeditor.py:173 cola/widgets/standard.py:1058 msgid "Cancel" msgstr "取消" -#: cola/sequenceeditor.py:176 +#: cola/sequenceeditor.py:174 msgid "" "Cancel rebase\n" "Shortcut: Ctrl+Q" @@ -868,190 +893,202 @@ msgstr "" "取消變更基底\n" "鍵盤快捷鍵：Ctrl+Q" -#: cola/cmds.py:254 +#: cola/cmds.py:253 msgid "Cannot Amend" msgstr "無法修正前一次的修訂版提交" -#: cola/cmds.py:560 +#: cola/cmds.py:561 #, python-format msgid "Cannot exec \"%s\": please configure a blame viewer" msgstr "無法執行「%s」：請設定您慣用的 Blame 檢視器" -#: cola/cmds.py:3146 +#: cola/cmds.py:3092 #, python-format msgid "Cannot exec \"%s\": please configure a history browser" msgstr "無法執行「%s」：請設定一個變動紀錄瀏覽器" -#: cola/cmds.py:1583 +#: cola/cmds.py:1571 #, python-format msgid "Cannot exec \"%s\": please configure your editor" msgstr "無法執行「%s」：請設定您慣用的文字編輯器" -#: cola/models/browse.py:336 +#: cola/models/browse.py:335 msgid "Changed Upstream" msgstr "在上游被變更" -#: cola/widgets/prefs.py:186 +#: cola/widgets/prefs.py:208 msgid "Check Published Commits when Amending" msgstr "" -#: cola/widgets/commitmsg.py:130 +#: cola/widgets/commitmsg.py:136 msgid "Check Spelling" msgstr "檢查拼字問題" -#: cola/widgets/prefs.py:265 +#: cola/widgets/prefs.py:286 msgid "Check spelling" msgstr "檢查拼字問題" -#: cola/widgets/prefs.py:163 +#: cola/widgets/prefs.py:186 msgid "Check whether a commit has been published when amending" msgstr "" -#: cola/guicmds.py:62 cola/widgets/branch.py:222 +#: cola/guicmds.py:61 cola/widgets/branch.py:233 msgid "Checkout" msgstr "取出" -#: cola/widgets/createbranch.py:130 +#: cola/widgets/createbranch.py:128 msgid "Checkout After Creation" msgstr "在建立新分支後取出該分支" -#: cola/guicmds.py:62 cola/widgets/dag.py:410 +#: cola/guicmds.py:61 cola/widgets/dag.py:409 msgid "Checkout Branch" msgstr "取出分支內容" -#: cola/widgets/dag.py:414 +#: cola/widgets/dag.py:413 msgid "Checkout Detached HEAD" msgstr "取出脫離的 HEAD 指標版本" -#: cola/cmds.py:480 cola/cmds.py:518 +#: cola/cmds.py:481 cola/cmds.py:519 msgid "Checkout Files" msgstr "" -#: cola/widgets/branch.py:226 +#: cola/widgets/branch.py:237 msgid "Checkout as new branch" msgstr "取出為一新分支" -#: cola/cmds.py:507 +#: cola/cmds.py:508 msgid "Checkout files from our branch (HEAD)" msgstr "" -#: cola/cmds.py:511 +#: cola/cmds.py:512 msgid "Checkout files from our branch?" msgstr "" -#: cola/cmds.py:469 +#: cola/cmds.py:470 msgid "Checkout files from their branch (MERGE_HEAD)" msgstr "" -#: cola/cmds.py:473 +#: cola/cmds.py:474 msgid "Checkout files from their branch?" msgstr "" -#: cola/widgets/main.py:576 +#: cola/widgets/main.py:589 msgid "Checkout..." msgstr "取出……" -#: cola/widgets/dag.py:387 cola/widgets/search.py:79 +#: cola/widgets/dag.py:386 cola/widgets/search.py:78 msgid "Cherry Pick" msgstr "挑取(cherry-pick)" -#: cola/guicmds.py:73 +#: cola/guicmds.py:72 msgid "Cherry-Pick Commit" msgstr "挑取(cherry-pick)修訂版提交並合併至當前分支" -#: cola/widgets/main.py:328 +#: cola/widgets/main.py:323 msgid "Cherry-Pick..." msgstr "挑取(cherry-pick)……" -#: cola/cmds.py:584 +#: cola/cmds.py:585 msgid "Cherry-pick failed" msgstr "" -#: cola/widgets/main.py:1161 +#: cola/widgets/main.py:1174 msgid "Cherry-picking" msgstr "" -#: cola/widgets/diff.py:1247 +#: cola/widgets/diff.py:1321 msgid "Choose Patch..." msgstr "" -#: cola/widgets/search.py:319 +#: cola/widgets/search.py:318 msgid "Choose Paths" msgstr "選取路徑" -#: cola/widgets/grep.py:116 +#: cola/widgets/grep.py:114 msgid "Choose the \"git grep\" regular expression mode" msgstr "選擇「git grep」命令的正規表達式模式" -#: cola/widgets/bookmarks.py:229 cola/widgets/startup.py:352 +#: cola/widgets/bookmarks.py:228 cola/widgets/startup.py:351 msgid "Clear Default Repository" msgstr "清除預設版控庫" -#: cola/widgets/commitmsg.py:305 +#: cola/widgets/commitmsg.py:313 msgid "Clear commit message" msgstr "清除修訂版提交訊息" -#: cola/widgets/commitmsg.py:302 +#: cola/widgets/commitmsg.py:310 msgid "Clear commit message?" msgstr "清除修訂版提交訊息？" -#: cola/widgets/commitmsg.py:62 +#: cola/widgets/commitmsg.py:63 msgid "Clear..." msgstr "清除……" -#: cola/widgets/clone.py:126 +#: cola/widgets/clone.py:124 msgid "Clone" msgstr "克隆" -#: cola/widgets/clone.py:62 cola/widgets/clone.py:104 +#: cola/widgets/clone.py:61 cola/widgets/clone.py:102 msgid "Clone Repository" msgstr "克隆版控庫" -#: cola/widgets/main.py:465 cola/widgets/startup.py:58 +#: cola/widgets/main.py:478 cola/widgets/startup.py:57 msgid "Clone..." msgstr "克隆另一個版控庫……" -#: cola/widgets/clone.py:62 +#: cola/widgets/clone.py:61 #, python-format msgid "Cloning repository at %s" msgstr "正在克隆位於 %s 的版控庫" -#: cola/qtutils.py:757 cola/qtutils.py:807 cola/widgets/about.py:508 -#: cola/widgets/remote.py:328 cola/widgets/text.py:1094 +#: cola/qtutils.py:788 cola/qtutils.py:838 cola/widgets/about.py:491 +#: cola/widgets/remote.py:362 cola/widgets/text.py:1090 msgid "Close" msgstr "關閉" -#: cola/widgets/text.py:402 +#: cola/widgets/remote.py:222 +msgid "Close dialog when completed" +msgstr "" + +#: cola/widgets/remote.py:221 +msgid "Close on completion" +msgstr "" + +#: cola/widgets/text.py:399 msgid "Close the find bar" msgstr "" -#: cola/qtutils.py:623 +#: cola/qtutils.py:651 msgid "Close..." msgstr "關閉……" -#: cola/widgets/recent.py:71 +#: cola/widgets/recent.py:69 msgid "Collapse all" msgstr "全部折疊" # Ｖ字龍：注意此應翻譯為動詞。 -#: cola/sequenceeditor.py:323 +#: cola/sequenceeditor.py:320 msgid "Command" msgstr "命令" # Ｖ字龍：注意此應翻譯為動詞。 -#: cola/widgets/main.py:163 cola/widgets/merge.py:74 +#: cola/widgets/main.py:161 cola/widgets/merge.py:72 msgid "Commit" msgstr "提交變更" -#: cola/cmds.py:837 +#: cola/widgets/prefs.py:192 +msgid "Commit Message Cleanup" +msgstr "" + +#: cola/widgets/commitmsg.py:495 msgid "Commit failed" msgstr "提交失敗" -#: cola/widgets/commitmsg.py:61 +#: cola/widgets/commitmsg.py:62 msgid "Commit staged changes" msgstr "提交新修訂版準備區域中的變更" -#: cola/widgets/commitmsg.py:93 +#: cola/widgets/commitmsg.py:94 msgid "" "Commit staged changes\n" "Shortcut: Ctrl+Enter" @@ -1059,362 +1096,366 @@ msgstr "" "提交新修訂版準備區域中的變更\n" "鍵盤快捷鍵：Ctrl+Enter" -#: cola/widgets/commitmsg.py:564 +#: cola/widgets/commitmsg.py:590 msgid "Commit summary" msgstr "修訂版提交描述" -#: cola/widgets/main.py:259 +#: cola/widgets/main.py:253 msgid "Commit the current state and continue applying patches" msgstr "" -#: cola/widgets/merge.py:70 +#: cola/widgets/merge.py:68 msgid "Commit the merge if there are no conflicts. Uncheck to leave the merge uncommitted" msgstr "若不存在版本衝突時提交該合併。取消勾選以保持合併於尚未提交狀態" -#: cola/widgets/commitmsg.py:58 cola/widgets/commitmsg.py:95 -#: cola/widgets/main.py:778 cola/widgets/main.py:779 +#: cola/widgets/commitmsg.py:59 cola/widgets/commitmsg.py:96 +#: cola/widgets/main.py:791 cola/widgets/main.py:792 msgid "Commit@@verb" msgstr "提交" -#: cola/difftool.py:78 cola/widgets/compare.py:70 +#: cola/widgets/dag.py:487 +msgid "Commits authored by me" +msgstr "" + +#: cola/difftool.py:97 cola/widgets/compare.py:69 msgid "Compare" msgstr "比較差異" -#: cola/difftool.py:83 +#: cola/difftool.py:102 msgid "Compare All" msgstr "比較全部檔案差異" -#: cola/widgets/toolbar.py:269 cola/widgets/toolbar.py:306 +#: cola/widgets/toolbar.py:274 cola/widgets/toolbar.py:311 msgid "Configure Toolbar" msgstr "設定工具列" -#: cola/widgets/remote.py:214 +#: cola/widgets/remote.py:218 msgid "Configure the remote branch as the the new upstream" msgstr "將此遠端分支設為新的上游分支" -#: cola/widgets/main.py:170 +#: cola/widgets/main.py:168 msgid "Console" msgstr "終端機輸出" -#: cola/interaction.py:111 cola/widgets/main.py:610 +#: cola/interaction.py:109 cola/widgets/main.py:623 msgid "Continue" msgstr "繼續" -#: cola/widgets/main.py:255 +#: cola/widgets/main.py:252 msgid "Continue Applying Patches" msgstr "" -#: cola/widgets/bookmarks.py:248 cola/widgets/main.py:742 -#: cola/widgets/startup.py:371 +#: cola/widgets/bookmarks.py:247 cola/widgets/main.py:755 +#: cola/widgets/startup.py:370 msgid "Copy" msgstr "複製" -#: cola/widgets/status.py:268 +#: cola/widgets/status.py:269 msgid "Copy Basename to Clipboard" msgstr "將基底檔名複製到剪貼簿" -#: cola/widgets/diff.py:208 +#: cola/widgets/diff.py:209 msgid "Copy Diff" msgstr "" -#: cola/widgets/status.py:745 +#: cola/widgets/status.py:746 msgid "Copy Leading Path to Clipboard" msgstr "將前導路徑複製到剪貼簿" -#: cola/widgets/status.py:251 +#: cola/widgets/status.py:252 msgid "Copy Path to Clipboard" msgstr "將路徑複製到剪貼簿" -#: cola/widgets/status.py:259 +#: cola/widgets/status.py:260 msgid "Copy Relative Path to Clipboard" msgstr "將相對路徑複製到剪貼簿" -#: cola/sequenceeditor.py:334 cola/widgets/dag.py:474 +#: cola/sequenceeditor.py:330 cola/widgets/dag.py:473 msgid "Copy SHA-1" msgstr "複製 SHA-1 雜湊" -#: cola/widgets/status.py:737 +#: cola/widgets/status.py:738 msgid "Copy..." msgstr "複製……" -#: cola/app.py:490 +#: cola/app.py:493 #, python-format msgid "Could not open %s." msgstr "" -#: cola/widgets/clone.py:191 cola/widgets/clone.py:193 +#: cola/widgets/clone.py:189 cola/widgets/clone.py:191 #, python-format msgid "Could not parse Git URL: \"%s\"" msgstr "無法分析 Git URL：「%s」" -#: cola/app.py:500 +#: cola/app.py:503 msgid "Create" msgstr "" -#: cola/widgets/createbranch.py:86 cola/widgets/createbranch.py:135 -#: cola/widgets/createbranch.py:301 cola/widgets/dag.py:369 +#: cola/widgets/createbranch.py:84 cola/widgets/createbranch.py:133 +#: cola/widgets/createbranch.py:299 cola/widgets/dag.py:368 msgid "Create Branch" msgstr "建立一個新的分支" -#: cola/widgets/dag.py:373 +#: cola/widgets/dag.py:372 msgid "Create Patch" msgstr "產生修正檔" -#: cola/widgets/remote.py:606 +#: cola/widgets/remote.py:641 msgid "Create Remote Branch" msgstr "建立新的遠端分支" -#: cola/widgets/commitmsg.py:124 cola/widgets/merge.py:78 +#: cola/widgets/commitmsg.py:130 cola/widgets/merge.py:76 msgid "Create Signed Commit" msgstr "建立經 GPG 簽署過的修訂版提交" -#: cola/widgets/createtag.py:55 cola/widgets/createtag.py:91 -#: cola/widgets/dag.py:377 +#: cola/widgets/createtag.py:53 cola/widgets/createtag.py:89 +#: cola/widgets/dag.py:376 msgid "Create Tag" msgstr "建立新的標籤" -#: cola/widgets/main.py:544 +#: cola/widgets/main.py:557 msgid "Create Tag..." msgstr "建立新的標籤(tag)……" -#: cola/cmds.py:2807 +#: cola/cmds.py:2753 msgid "Create Unsigned Tag" msgstr "建立一個無簽名的標籤" -#: cola/widgets/remote.py:188 +#: cola/widgets/remote.py:192 msgid "Create a merge commit even when the merge resolves as a fast-forward" msgstr "就算該合併是一個快速前移式合併也總是建立一個合併修訂版提交" -#: cola/widgets/remote.py:605 +#: cola/widgets/remote.py:640 msgid "Create a new remote branch?" msgstr "要建立新的遠端分支嗎？" -#: cola/app.py:499 +#: cola/app.py:502 msgid "Create a new repository at that location?" msgstr "" -#: cola/widgets/submodules.py:100 +#: cola/widgets/submodules.py:99 msgid "Create a shallow clone with history truncated to the specified number of revisions. 0 performs a full clone." msgstr "" -#: cola/widgets/main.py:551 +#: cola/widgets/main.py:564 msgid "Create..." msgstr "新建……" -#: cola/cmds.py:2843 +#: cola/cmds.py:2789 #, python-format msgid "Created a new tag named \"%s\"" msgstr "建立了一個名為「%s」的新標籤" -#: cola/widgets/prefs.py:266 +#: cola/widgets/prefs.py:287 msgid "Ctrl+MouseWheel to Zoom" msgstr "" -#: cola/widgets/prefs.py:404 +#: cola/widgets/prefs.py:442 msgid "Current Repository" msgstr "當前的版控庫" -#: cola/widgets/status.py:1371 +#: cola/widgets/status.py:1372 msgid "Custom Copy Actions" msgstr "自訂複製操作" -#: cola/widgets/status.py:273 +#: cola/widgets/status.py:274 msgid "Customize..." msgstr "自訂……" -#: cola/widgets/main.py:740 +#: cola/widgets/main.py:753 msgid "Cut" msgstr "剪切" -#: cola/widgets/about.py:411 cola/widgets/about.py:442 +#: cola/widgets/about.py:394 cola/widgets/about.py:425 msgid "Czech translation" msgstr "捷克語翻譯" -#: cola/widgets/main.py:592 +#: cola/widgets/main.py:605 msgid "DAG..." msgstr "有向無環圖(DAG)……" -#: cola/icons.py:55 +#: cola/icons.py:54 msgid "Dark Theme" msgstr "" -#: cola/widgets/dag.py:506 +#: cola/widgets/dag.py:572 msgid "Date, Time" msgstr "時間，日期" -#: cola/icons.py:54 cola/themes.py:637 +#: cola/icons.py:53 cola/themes.py:643 #, fuzzy msgid "Default" msgstr "恢復默認值" -#: cola/widgets/prefs.py:126 +#: cola/widgets/prefs.py:124 msgid "" "Default directory when exporting patches.\n" "Relative paths are relative to the current repository.\n" "Absolute path are used as-is." msgstr "" -#: cola/cmds.py:925 cola/guicmds.py:26 cola/guicmds.py:35 -#: cola/widgets/bookmarks.py:75 cola/widgets/bookmarks.py:251 -#: cola/widgets/main.py:746 cola/widgets/startup.py:373 +#: cola/cmds.py:923 cola/guicmds.py:25 cola/guicmds.py:34 +#: cola/widgets/bookmarks.py:74 cola/widgets/bookmarks.py:250 +#: cola/widgets/main.py:759 cola/widgets/startup.py:372 msgid "Delete" msgstr "移除" -#: cola/cmds.py:1088 +#: cola/cmds.py:1089 #, python-format msgid "Delete %d file(s)?" msgstr "刪除 %d 個檔案？" -#: cola/cmds.py:1016 +#: cola/cmds.py:1017 msgid "Delete Bookmark" msgstr "刪除書籤" -#: cola/cmds.py:1014 +#: cola/cmds.py:1015 msgid "Delete Bookmark?" msgstr "要刪除書籤嗎？" -#: cola/cmds.py:1114 cola/cmds.py:1117 cola/guicmds.py:26 -#: cola/widgets/branch.py:268 +#: cola/cmds.py:1115 cola/cmds.py:1118 cola/guicmds.py:25 +#: cola/widgets/branch.py:277 msgid "Delete Branch" msgstr "移除分支" -#: cola/cmds.py:1089 +#: cola/cmds.py:1090 msgid "Delete Files" msgstr "刪除檔案" -#: cola/widgets/status.py:311 +#: cola/widgets/status.py:312 msgid "Delete Files..." msgstr "刪除檔案……" -#: cola/cmds.py:1085 +#: cola/cmds.py:1086 msgid "Delete Files?" msgstr "要刪除檔案嗎？" -#: cola/cmds.py:922 +#: cola/cmds.py:920 msgid "Delete Remote" msgstr "移除遠端版控庫" -#: cola/guicmds.py:35 cola/widgets/branch.py:270 +#: cola/guicmds.py:34 cola/widgets/branch.py:279 msgid "Delete Remote Branch" msgstr "移除遠端分支" -#: cola/widgets/main.py:564 +#: cola/widgets/main.py:577 msgid "Delete Remote Branch..." msgstr "移除遠端分支……" -#: cola/widgets/toolbar.py:271 +#: cola/widgets/toolbar.py:276 msgid "Delete Toolbar" msgstr "刪除工具列" -#: cola/cmds.py:1115 +#: cola/cmds.py:1116 #, python-format msgid "Delete branch \"%s\"?" msgstr "" -#: cola/widgets/editremotes.py:88 +#: cola/widgets/editremotes.py:87 msgid "Delete remote" msgstr "移除遠端版控庫" -#: cola/cmds.py:924 +#: cola/cmds.py:922 #, python-format msgid "Delete remote \"%s\"" msgstr "移除「%s」遠端版控庫" -#: cola/cmds.py:923 +#: cola/cmds.py:921 msgid "Delete remote?" msgstr "要移除遠端版控庫嗎？" -#: cola/widgets/main.py:558 +#: cola/widgets/main.py:571 msgid "Delete..." msgstr "移除..." -#: cola/cmds.py:1067 +#: cola/cmds.py:1068 #, python-format msgid "Deleting \"%s\" failed" msgstr "「%s」移除失敗" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Deletions" msgstr "移除行數" -#: cola/widgets/submodules.py:120 +#: cola/widgets/submodules.py:119 msgid "Depth" msgstr "" -#: cola/qtutils.py:811 cola/qtutils.py:852 +#: cola/qtutils.py:842 cola/qtutils.py:889 msgid "Detach" msgstr "分離" -#: cola/widgets/prefs.py:181 +#: cola/widgets/prefs.py:203 msgid "Detect Conflict Markers" msgstr "偵測衝突標記" -#: cola/widgets/prefs.py:151 +#: cola/widgets/prefs.py:174 msgid "Detect conflict markers in unmerged files" msgstr "偵測尚未合併檔案中的衝突標記" -#: cola/widgets/about.py:271 cola/widgets/about.py:274 -#: cola/widgets/about.py:277 cola/widgets/about.py:278 -#: cola/widgets/about.py:279 cola/widgets/about.py:280 -#: cola/widgets/about.py:281 cola/widgets/about.py:282 -#: cola/widgets/about.py:283 cola/widgets/about.py:284 -#: cola/widgets/about.py:285 cola/widgets/about.py:286 -#: cola/widgets/about.py:287 cola/widgets/about.py:288 -#: cola/widgets/about.py:289 cola/widgets/about.py:290 -#: cola/widgets/about.py:291 cola/widgets/about.py:292 -#: cola/widgets/about.py:293 cola/widgets/about.py:294 -#: cola/widgets/about.py:295 cola/widgets/about.py:296 -#: cola/widgets/about.py:297 cola/widgets/about.py:298 -#: cola/widgets/about.py:299 cola/widgets/about.py:300 -#: cola/widgets/about.py:301 cola/widgets/about.py:302 -#: cola/widgets/about.py:303 cola/widgets/about.py:304 -#: cola/widgets/about.py:305 cola/widgets/about.py:306 -#: cola/widgets/about.py:307 cola/widgets/about.py:308 -#: cola/widgets/about.py:309 cola/widgets/about.py:310 -#: cola/widgets/about.py:311 cola/widgets/about.py:312 -#: cola/widgets/about.py:313 cola/widgets/about.py:314 -#: cola/widgets/about.py:315 cola/widgets/about.py:316 -#: cola/widgets/about.py:317 cola/widgets/about.py:318 -#: cola/widgets/about.py:319 cola/widgets/about.py:320 -#: cola/widgets/about.py:321 cola/widgets/about.py:322 -#: cola/widgets/about.py:323 cola/widgets/about.py:324 -#: cola/widgets/about.py:325 cola/widgets/about.py:326 -#: cola/widgets/about.py:327 cola/widgets/about.py:328 -#: cola/widgets/about.py:329 cola/widgets/about.py:330 -#: cola/widgets/about.py:331 cola/widgets/about.py:332 -#: cola/widgets/about.py:333 cola/widgets/about.py:334 -#: cola/widgets/about.py:335 cola/widgets/about.py:336 -#: cola/widgets/about.py:337 cola/widgets/about.py:338 -#: cola/widgets/about.py:339 cola/widgets/about.py:340 -#: cola/widgets/about.py:341 cola/widgets/about.py:342 -#: cola/widgets/about.py:343 cola/widgets/about.py:344 -#: cola/widgets/about.py:345 cola/widgets/about.py:346 -#: cola/widgets/about.py:347 cola/widgets/about.py:348 -#: cola/widgets/about.py:349 cola/widgets/about.py:350 -#: cola/widgets/about.py:351 cola/widgets/about.py:352 -#: cola/widgets/about.py:353 cola/widgets/about.py:354 -#: cola/widgets/about.py:355 cola/widgets/about.py:356 -#: cola/widgets/about.py:357 cola/widgets/about.py:358 -#: cola/widgets/about.py:359 cola/widgets/about.py:360 -#: cola/widgets/about.py:361 cola/widgets/about.py:362 -#: cola/widgets/about.py:363 cola/widgets/about.py:364 -#: cola/widgets/about.py:365 cola/widgets/about.py:366 -#: cola/widgets/about.py:367 cola/widgets/about.py:368 -#: cola/widgets/about.py:369 cola/widgets/about.py:370 -#: cola/widgets/about.py:371 cola/widgets/about.py:372 -#: cola/widgets/about.py:373 cola/widgets/about.py:374 -#: cola/widgets/about.py:375 cola/widgets/about.py:376 -#: cola/widgets/about.py:377 cola/widgets/about.py:378 -#: cola/widgets/about.py:379 cola/widgets/about.py:380 +#: cola/widgets/about.py:254 cola/widgets/about.py:257 +#: cola/widgets/about.py:260 cola/widgets/about.py:261 +#: cola/widgets/about.py:262 cola/widgets/about.py:263 +#: cola/widgets/about.py:264 cola/widgets/about.py:265 +#: cola/widgets/about.py:266 cola/widgets/about.py:267 +#: cola/widgets/about.py:268 cola/widgets/about.py:269 +#: cola/widgets/about.py:270 cola/widgets/about.py:271 +#: cola/widgets/about.py:272 cola/widgets/about.py:273 +#: cola/widgets/about.py:274 cola/widgets/about.py:275 +#: cola/widgets/about.py:276 cola/widgets/about.py:277 +#: cola/widgets/about.py:278 cola/widgets/about.py:279 +#: cola/widgets/about.py:280 cola/widgets/about.py:281 +#: cola/widgets/about.py:282 cola/widgets/about.py:283 +#: cola/widgets/about.py:284 cola/widgets/about.py:285 +#: cola/widgets/about.py:286 cola/widgets/about.py:287 +#: cola/widgets/about.py:288 cola/widgets/about.py:289 +#: cola/widgets/about.py:290 cola/widgets/about.py:291 +#: cola/widgets/about.py:292 cola/widgets/about.py:293 +#: cola/widgets/about.py:294 cola/widgets/about.py:295 +#: cola/widgets/about.py:296 cola/widgets/about.py:297 +#: cola/widgets/about.py:298 cola/widgets/about.py:299 +#: cola/widgets/about.py:300 cola/widgets/about.py:301 +#: cola/widgets/about.py:302 cola/widgets/about.py:303 +#: cola/widgets/about.py:304 cola/widgets/about.py:305 +#: cola/widgets/about.py:306 cola/widgets/about.py:307 +#: cola/widgets/about.py:308 cola/widgets/about.py:309 +#: cola/widgets/about.py:310 cola/widgets/about.py:311 +#: cola/widgets/about.py:312 cola/widgets/about.py:313 +#: cola/widgets/about.py:314 cola/widgets/about.py:315 +#: cola/widgets/about.py:316 cola/widgets/about.py:317 +#: cola/widgets/about.py:318 cola/widgets/about.py:319 +#: cola/widgets/about.py:320 cola/widgets/about.py:321 +#: cola/widgets/about.py:322 cola/widgets/about.py:323 +#: cola/widgets/about.py:324 cola/widgets/about.py:325 +#: cola/widgets/about.py:326 cola/widgets/about.py:327 +#: cola/widgets/about.py:328 cola/widgets/about.py:329 +#: cola/widgets/about.py:330 cola/widgets/about.py:331 +#: cola/widgets/about.py:332 cola/widgets/about.py:333 +#: cola/widgets/about.py:334 cola/widgets/about.py:335 +#: cola/widgets/about.py:336 cola/widgets/about.py:337 +#: cola/widgets/about.py:338 cola/widgets/about.py:339 +#: cola/widgets/about.py:340 cola/widgets/about.py:341 +#: cola/widgets/about.py:342 cola/widgets/about.py:343 +#: cola/widgets/about.py:344 cola/widgets/about.py:345 +#: cola/widgets/about.py:346 cola/widgets/about.py:347 +#: cola/widgets/about.py:348 cola/widgets/about.py:349 +#: cola/widgets/about.py:350 cola/widgets/about.py:351 +#: cola/widgets/about.py:352 cola/widgets/about.py:353 +#: cola/widgets/about.py:354 cola/widgets/about.py:355 +#: cola/widgets/about.py:356 cola/widgets/about.py:357 +#: cola/widgets/about.py:358 cola/widgets/about.py:359 +#: cola/widgets/about.py:360 cola/widgets/about.py:361 +#: cola/widgets/about.py:362 cola/widgets/about.py:363 msgid "Developer" msgstr "軟體開發者" -#: cola/guicmds.py:185 cola/widgets/dag.py:764 cola/widgets/diff.py:781 -#: cola/widgets/main.py:177 cola/widgets/main.py:797 +#: cola/guicmds.py:184 cola/widgets/dag.py:830 cola/widgets/diff.py:809 +#: cola/widgets/main.py:175 cola/widgets/main.py:810 msgid "Diff" msgstr "內容差異" -#: cola/guicmds.py:185 +#: cola/guicmds.py:184 msgid "Diff Against Commit" msgstr "" @@ -1422,35 +1463,35 @@ msgstr "" msgid "Diff Against Predecessor..." msgstr "與過去版本比較內容差異……" -#: cola/widgets/main.py:1159 +#: cola/widgets/main.py:1172 msgid "Diff Mode" msgstr "" -#: cola/widgets/diff.py:772 cola/widgets/diff.py:796 +#: cola/widgets/diff.py:800 cola/widgets/diff.py:824 msgid "Diff Options" msgstr "內容差異選項" -#: cola/widgets/prefs.py:256 +#: cola/widgets/prefs.py:277 msgid "Diff Tool" msgstr "顯示內容差異的工具" -#: cola/widgets/dag.py:364 +#: cola/widgets/dag.py:363 msgid "Diff selected -> this" msgstr "顯示被選取的修訂版→此修訂版的內容差異" -#: cola/widgets/dag.py:358 +#: cola/widgets/dag.py:357 msgid "Diff this -> selected" msgstr "顯示此修訂版→被選取的修訂版的內容差異" -#: cola/widgets/main.py:218 +#: cola/widgets/main.py:217 msgid "Diffstat" msgstr "顯示內容差異" -#: cola/cmds.py:3262 +#: cola/difftool.py:324 msgid "Difftool" msgstr "內容差異檢視器" -#: cola/widgets/clone.py:207 +#: cola/widgets/clone.py:205 msgid "Directory Exists" msgstr "目錄已存在" @@ -1458,84 +1499,88 @@ msgstr "目錄已存在" msgid "Disable" msgstr "" -#: cola/widgets/prefs.py:180 +#: cola/widgets/prefs.py:202 msgid "Display Untracked Files" msgstr "顯示未納入版本追蹤的檔案" -#: cola/cmds.py:2094 +#: cola/widgets/remote.py:176 +msgid "Display remote messages in a separate dialog" +msgstr "" + +#: cola/cmds.py:2045 msgid "Do not update stacked branches" msgstr "" -#: cola/widgets/main.py:471 +#: cola/widgets/main.py:484 msgid "Documentation" msgstr "說明文件" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop" msgstr "丟棄" -#: cola/widgets/stash.py:258 +#: cola/widgets/stash.py:276 msgid "Drop Stash" msgstr "丟棄珍藏項目" -#: cola/widgets/stash.py:255 +#: cola/widgets/stash.py:273 msgid "Drop Stash?" msgstr "要丟棄珍藏項目嗎？" -#: cola/widgets/stash.py:257 +#: cola/widgets/stash.py:275 #, python-format msgid "Drop the \"%s\" stash?" msgstr "是否要丟棄名為「%s」的珍藏項目？" -#: cola/widgets/stash.py:59 +#: cola/widgets/stash.py:61 msgid "Drop the selected stash" msgstr "丟棄被選取的珍藏項目" -#: cola/qtutils.py:764 cola/sequenceeditor.py:357 cola/widgets/grep.py:102 +#: cola/qtutils.py:795 cola/sequenceeditor.py:353 cola/widgets/grep.py:100 msgid "Edit" msgstr "編輯" -#: cola/widgets/diff.py:1019 +#: cola/widgets/diff.py:1058 msgid "Edit Diff Hunk to Revert..." msgstr "" -#: cola/widgets/diff.py:1017 +#: cola/widgets/diff.py:1056 msgid "Edit Diff Hunk to Stage..." msgstr "" -#: cola/widgets/diff.py:1062 +#: cola/widgets/diff.py:1124 msgid "Edit Diff Hunk to Unstage..." msgstr "" -#: cola/cmds.py:2166 +#: cola/cmds.py:2117 msgid "Edit Rebase" msgstr "編輯變更基底" -#: cola/widgets/editremotes.py:36 +#: cola/widgets/editremotes.py:35 msgid "Edit Remotes" msgstr "編輯遠端版控庫" -#: cola/widgets/main.py:298 +#: cola/widgets/main.py:293 msgid "Edit Remotes..." msgstr "編輯遠端版控庫……" -#: cola/widgets/diff.py:1014 +#: cola/widgets/diff.py:1053 msgid "Edit Selected Lines to Revert..." msgstr "" -#: cola/widgets/diff.py:1012 +#: cola/widgets/diff.py:1051 msgid "Edit Selected Lines to Stage..." msgstr "" -#: cola/widgets/diff.py:1059 +#: cola/widgets/diff.py:1122 msgid "Edit Selected Lines to Unstage..." msgstr "" -#: cola/widgets/editremotes.py:44 +#: cola/widgets/editremotes.py:43 msgid "Edit remotes by selecting them from the list" msgstr "藉由從清單中選取它們來編輯遠端版控庫" -#: cola/widgets/browse.py:197 cola/widgets/common.py:39 +#: cola/widgets/browse.py:198 cola/widgets/common.py:38 msgid "Edit selected paths" msgstr "編輯選取的路徑" @@ -1551,11 +1596,11 @@ msgstr "" msgid "Edit the following patch, which will then be applied to the worktree to revert the changes:" msgstr "" -#: cola/widgets/main.py:604 +#: cola/widgets/main.py:617 msgid "Edit..." msgstr "編輯……" -#: cola/widgets/prefs.py:253 +#: cola/widgets/prefs.py:274 msgid "Editor" msgstr "文字編輯器" @@ -1564,154 +1609,159 @@ msgstr "文字編輯器" msgid "Editor returned %s exit code. Not applying patch." msgstr "" -#: cola/widgets/prefs.py:167 +#: cola/widgets/prefs.py:190 msgid "Email Address" msgstr "電子郵件地址" -#: cola/widgets/about.py:258 cola/widgets/about.py:401 +#: cola/widgets/about.py:241 cola/widgets/about.py:384 msgid "Email contributor" msgstr "寄電子郵件給這位貢獻者" -#: cola/widgets/prefs.py:182 +#: cola/widgets/prefs.py:204 msgid "Enable Gravatar Icons" msgstr "" -#: cola/widgets/prefs.py:160 +#: cola/widgets/prefs.py:183 msgid "Enable path autocompletion in tools" msgstr "" -#: cola/widgets/diff.py:768 +#: cola/widgets/diff.py:796 msgid "Enable word wrapping" msgstr "" -#: cola/sequenceeditor.py:322 +#: cola/sequenceeditor.py:319 msgid "Enabled" msgstr "啟用" -#: cola/guicmds.py:333 cola/widgets/branch.py:445 +#: cola/guicmds.py:332 cola/widgets/branch.py:478 msgid "Enter New Branch Name" msgstr "輸入新的分支名稱" -#: cola/guicmds.py:147 +#: cola/guicmds.py:146 msgid "Enter a name for the new bare repo" msgstr "輸入新裸裝版本庫(bare repo)的名稱" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Enter a name for the stash" msgstr "輸入珍藏項目的名稱" -#: cola/cmds.py:146 cola/cmds.py:176 cola/cmds.py:207 cola/cmds.py:283 -#: cola/cmds.py:292 cola/cmds.py:307 cola/cmds.py:317 cola/cmds.py:460 -#: cola/cmds.py:496 cola/cmds.py:534 cola/cmds.py:633 cola/cmds.py:751 -#: cola/cmds.py:1067 cola/cmds.py:1164 cola/cmds.py:2005 cola/cmds.py:2394 -#: cola/cmds.py:2637 cola/cmds.py:2643 cola/cmds.py:2651 cola/cmds.py:2872 -#: cola/cmds.py:2890 cola/cmds.py:3180 cola/gitcmds.py:984 cola/guicmds.py:157 -#: cola/models/stash.py:70 cola/models/stash.py:87 cola/models/stash.py:108 -#: cola/widgets/bookmarks.py:482 cola/widgets/branch.py:777 +#: cola/widgets/stash.py:216 +msgid "Enter a new name for the stash" +msgstr "" + +#: cola/cmds.py:145 cola/cmds.py:175 cola/cmds.py:206 cola/cmds.py:284 +#: cola/cmds.py:293 cola/cmds.py:308 cola/cmds.py:318 cola/cmds.py:461 +#: cola/cmds.py:497 cola/cmds.py:535 cola/cmds.py:635 cola/cmds.py:753 +#: cola/cmds.py:1068 cola/cmds.py:1165 cola/cmds.py:1956 cola/cmds.py:2345 +#: cola/cmds.py:2579 cola/cmds.py:2585 cola/cmds.py:2593 cola/cmds.py:2818 +#: cola/cmds.py:2836 cola/cmds.py:3125 cola/gitcmds.py:994 cola/guicmds.py:156 +#: cola/models/stash.py:70 cola/models/stash.py:90 cola/models/stash.py:112 +#: cola/models/stash.py:138 cola/widgets/bookmarks.py:481 +#: cola/widgets/branch.py:829 msgid "Error" msgstr "發生錯誤" -#: cola/widgets/clone.py:191 +#: cola/widgets/clone.py:189 msgid "Error Cloning" msgstr "克隆發生錯誤" -#: cola/widgets/createbranch.py:314 +#: cola/widgets/createbranch.py:312 msgid "Error Creating Branch" msgstr "建立新的分支時發生錯誤" -#: cola/app.py:502 cola/guicmds.py:101 +#: cola/app.py:505 cola/guicmds.py:100 msgid "Error Creating Repository" msgstr "無法建立新的版控庫" -#: cola/cmds.py:1202 +#: cola/cmds.py:1206 msgid "Error Deleting Remote Branch" msgstr "移除遠端分支失敗" -#: cola/cmds.py:1585 +#: cola/cmds.py:1573 msgid "Error Editing File" msgstr "編輯檔案發生錯誤" -#: cola/cmds.py:559 +#: cola/cmds.py:560 msgid "Error Launching Blame Viewer" msgstr "啟動指謫(Blame)檢視器時發生錯誤" -#: cola/cmds.py:3145 +#: cola/cmds.py:3091 msgid "Error Launching History Browser" msgstr "無法啟動變動紀錄瀏覽器" -#: cola/app.py:489 +#: cola/app.py:492 msgid "Error Opening Repository" msgstr "" -#: cola/widgets/browse.py:566 +#: cola/models/stash.py:144 +msgid "Error Renaming Stash" +msgstr "" + +#: cola/widgets/browse.py:567 msgid "Error Saving File" msgstr "" -#: cola/cmds.py:914 +#: cola/cmds.py:912 #, python-format msgid "Error creating remote \"%s\"" msgstr "建立「%s」遠端分支時發生錯誤" -#: cola/models/stash.py:197 +#: cola/models/stash.py:233 msgid "Error creating stash" msgstr "建立新的珍藏項目時發生錯誤" -#: cola/cmds.py:1126 +#: cola/cmds.py:1127 #, python-format msgid "Error deleting branch \"%s\"" msgstr "" -#: cola/cmds.py:932 +#: cola/cmds.py:930 #, python-format msgid "Error deleting remote \"%s\"" msgstr "移除「%s」遠端分支時發生錯誤" -#: cola/cmds.py:956 +#: cola/cmds.py:955 #, python-format msgid "Error renaming \"%(name)s\" to \"%(new_name)s\"" msgstr "將「%(name)s」更名為「%(new_name)s」時發生錯誤" -#: cola/cmds.py:1771 +#: cola/cmds.py:1722 msgid "Error running prepare-commitmsg hook" msgstr "執行 prepare-commitmsg 掛勾程式時發生錯誤" -#: cola/cmds.py:3043 cola/cmds.py:3089 +#: cola/cmds.py:2989 cola/cmds.py:3035 #, fuzzy, python-format msgid "Error updating submodule %s" msgstr "建立「%s」遠端分支時發生錯誤" -#: cola/cmds.py:3125 +#: cola/cmds.py:3071 #, fuzzy msgid "Error updating submodules" msgstr "編輯檔案發生錯誤" -#: cola/widgets/diff.py:1326 +#: cola/widgets/diff.py:1400 msgid "Error writing patch" msgstr "" -#: cola/cmds.py:1710 +#: cola/cmds.py:1662 msgid "Error: Cannot find commit template" msgstr "錯誤：無法找到修訂版提交範本" -#: cola/widgets/stash.py:235 -msgid "Error: Stash exists" -msgstr "錯誤：珍藏項目已存在" - -#: cola/cmds.py:1732 +#: cola/cmds.py:1684 msgid "Error: Unconfigured commit template" msgstr "錯誤：未被設定的修訂版提交範本" -#: cola/widgets/clone.py:53 +#: cola/widgets/clone.py:52 #, python-format msgid "Error: could not clone \"%s\"" msgstr "錯誤：無法克隆「%s」版控庫" -#: cola/cmds.py:2835 +#: cola/cmds.py:2781 #, python-format msgid "Error: could not create tag \"%s\"" msgstr "錯誤：無法建立標籤「%s」" -#: cola/widgets/branch.py:421 +#: cola/widgets/branch.py:433 #, python-format msgid "Executing action %s" msgstr "正在執行「%s」動作" @@ -1720,112 +1770,116 @@ msgstr "正在執行「%s」動作" msgid "Exit \"Diff\" mode" msgstr "" -#: cola/widgets/action.py:67 +#: cola/widgets/action.py:81 msgid "Exit Diff" msgstr "" -#: cola/widgets/main.py:528 +#: cola/widgets/main.py:541 msgid "Exit Diff Mode" msgstr "" -#: cola/widgets/action.py:68 +#: cola/widgets/action.py:81 msgid "Exit Diff mode" msgstr "" -#: cola/widgets/recent.py:67 +#: cola/widgets/recent.py:65 msgid "Expand all" msgstr "全部展開" -#: cola/widgets/diff.py:1223 +#: cola/widgets/diff.py:1297 msgid "Export Patch" msgstr "" -#: cola/guicmds.py:168 cola/widgets/search.py:75 +#: cola/guicmds.py:167 cola/widgets/search.py:74 msgid "Export Patches" msgstr "匯出修正檔" -#: cola/widgets/main.py:273 +#: cola/widgets/main.py:268 msgid "Export Patches..." msgstr "匯出修正……" -#: cola/widgets/main.py:533 +#: cola/widgets/main.py:546 msgid "Expression..." msgstr "比較表達式之間的內容差異……" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Extended Regexp" msgstr "延伸正規表達式" -#: cola/widgets/commitmsg.py:612 +#: cola/widgets/commitmsg.py:638 msgid "Extended description..." msgstr "延伸描述……" -#: cola/cmds.py:387 +#: cola/cmds.py:388 msgid "Failed to commit and continue applying patches" msgstr "" -#: cola/cmds.py:403 +#: cola/cmds.py:404 msgid "Failed to continue applying patches after skipping the current patch" msgstr "" -#: cola/widgets/createbranch.py:124 +#: cola/widgets/createbranch.py:122 msgid "Fast Forward Only" msgstr "僅更新可進行快速前移式合併者" -#: cola/widgets/remote.py:177 +#: cola/widgets/remote.py:181 msgid "Fast-forward only" msgstr "只允許快速前移式合併" -#: cola/widgets/bookmarks.py:91 +#: cola/widgets/bookmarks.py:90 msgid "Favorite repositories" msgstr "喜愛的版控庫" -#: cola/widgets/main.py:111 +#: cola/widgets/main.py:109 msgid "Favorites" msgstr "喜愛的版控庫" -#: cola/widgets/remote.py:673 +#: cola/widgets/remote.py:735 msgid "Fetch" msgstr "自遠端版控庫撈取(fetch)" -#: cola/widgets/createbranch.py:127 +#: cola/widgets/createbranch.py:125 msgid "Fetch Tracking Branch" msgstr "撈取(fetch)追蹤分支" -#: cola/widgets/action.py:63 cola/widgets/main.py:387 +#: cola/widgets/action.py:67 cola/widgets/main.py:384 +msgid "Fetch from one or more remotes using \"git fetch\"" +msgstr "" + +#: cola/widgets/action.py:65 cola/widgets/main.py:383 msgid "Fetch..." msgstr "自遠端版控庫撈取(fetch)……" -#: cola/widgets/main.py:588 +#: cola/widgets/main.py:601 msgid "File Browser..." msgstr "檔案瀏覽器……" -#: cola/widgets/compare.py:75 +#: cola/widgets/compare.py:74 msgid "File Differences" msgstr "檔案變化" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 msgid "File Saved" msgstr "檔案已保存" -#: cola/widgets/archive.py:199 cola/widgets/browse.py:578 +#: cola/widgets/archive.py:197 cola/widgets/browse.py:579 #, python-format msgid "File saved to \"%s\"" msgstr "檔案已保存至「%s」" -#: cola/fsmonitor.py:517 +#: cola/fsmonitor.py:528 msgid "File system change monitoring: disabled because \"cola.inotify\" is false.\n" msgstr "檔案系統變動監控：因為「cola.inotify」 Git 設定值被設定為 false 而被停用。\n" -#: cola/fsmonitor.py:534 +#: cola/fsmonitor.py:545 msgid "File system change monitoring: disabled because libc does not support the inotify system calls.\n" msgstr "檔案系統變動監控：因為 libc 程式庫不支援 inotify 系統呼叫而被停用。\n" -#: cola/fsmonitor.py:528 +#: cola/fsmonitor.py:539 msgid "File system change monitoring: disabled because pywin32 is not installed.\n" msgstr "檔案系統變動監控：因為 pywin32 沒有安裝而被停用。\n" -#: cola/fsmonitor.py:181 +#: cola/fsmonitor.py:184 msgid "" "File system change monitoring: disabled because the limit on the total number of inotify watches was reached. You may be able to increase the limit on the number of watches by running:\n" "\n" @@ -1835,296 +1889,304 @@ msgstr "" "\n" " echo fs.inotify.max_user_watches=100000 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p\n" -#: cola/fsmonitor.py:142 +#: cola/fsmonitor.py:145 msgid "File system change monitoring: enabled.\n" msgstr "檔案系統變動監控：已啟用。\n" -#: cola/widgets/filelist.py:26 +#: cola/widgets/filelist.py:23 msgid "Filename" msgstr "檔案名稱" -#: cola/widgets/dag.py:755 +#: cola/widgets/dag.py:821 msgid "Files" msgstr "檔案" -#: cola/widgets/branch.py:785 +#: cola/widgets/branch.py:837 msgid "Filter branches..." msgstr "過濾分支名稱……" -#: cola/widgets/status.py:1333 +#: cola/widgets/status.py:1334 msgid "Filter paths..." msgstr "過濾檔案路徑……" -#: cola/widgets/finder.py:113 cola/widgets/main.py:312 +#: cola/widgets/finder.py:112 cola/widgets/main.py:307 msgid "Find Files" msgstr "尋找檔案" -#: cola/widgets/text.py:388 +#: cola/widgets/text.py:385 msgid "Find in diff" msgstr "" -#: cola/widgets/text.py:425 +#: cola/widgets/text.py:422 msgid "Find next item" msgstr "" -#: cola/widgets/text.py:431 +#: cola/widgets/text.py:428 msgid "Find previous item" msgstr "" -#: cola/widgets/text.py:395 +#: cola/widgets/text.py:392 msgid "Find the next occurrence of the phrase" msgstr "" -#: cola/widgets/text.py:391 +#: cola/widgets/text.py:388 msgid "Find the previous occurrence of the phrase" msgstr "" -#: cola/widgets/grep.py:117 +#: cola/widgets/grep.py:115 msgid "Fixed String" msgstr "固定內容字串" -#: cola/widgets/prefs.py:251 +#: cola/widgets/prefs.py:270 msgid "Fixed-Width Font" msgstr "等寬字型" -#: cola/sequenceeditor.py:362 +#: cola/sequenceeditor.py:358 msgid "Fixup" msgstr "修理" -#: cola/widgets/commitmsg.py:148 +#: cola/widgets/commitmsg.py:154 msgid "Fixup Previous Commit" msgstr "修理先前的修訂版提交" -#: cola/themes.py:672 +#: cola/themes.py:684 msgid "Flat dark blue" msgstr "" -#: cola/themes.py:693 +#: cola/themes.py:705 msgid "Flat dark green" msgstr "" -#: cola/themes.py:686 +#: cola/themes.py:698 msgid "Flat dark grey" msgstr "" -#: cola/themes.py:679 +#: cola/themes.py:691 msgid "Flat dark red" msgstr "" -#: cola/themes.py:644 +#: cola/themes.py:656 msgid "Flat light blue" msgstr "" -#: cola/themes.py:665 +#: cola/themes.py:677 msgid "Flat light green" msgstr "" -#: cola/themes.py:658 +#: cola/themes.py:670 msgid "Flat light grey" msgstr "" -#: cola/themes.py:651 +#: cola/themes.py:663 msgid "Flat light red" msgstr "" -#: cola/widgets/startup.py:73 +#: cola/widgets/startup.py:72 msgid "Folder" msgstr "" -#: cola/widgets/toolbar.py:177 +#: cola/widgets/toolbar.py:181 msgid "Follow System Style" msgstr "" -#: cola/widgets/prefs.py:252 +#: cola/widgets/prefs.py:271 msgid "Font Size" msgstr "字體大小" -#: cola/widgets/remote.py:193 +#: cola/widgets/remote.py:197 msgid "Force" msgstr "強制" -#: cola/widgets/remote.py:617 +#: cola/widgets/remote.py:652 msgid "Force Fetch" msgstr "強制撈取(fetch)" -#: cola/widgets/remote.py:614 +#: cola/widgets/remote.py:649 msgid "Force Fetch?" msgstr "要進行強制撈取(fetch)嗎？" -#: cola/widgets/remote.py:625 +#: cola/widgets/remote.py:660 msgid "Force Push" msgstr "強制推送" -#: cola/widgets/remote.py:619 +#: cola/widgets/remote.py:654 msgid "Force Push?" msgstr "要進行強制推送(push)嗎？" -#: cola/widgets/remote.py:616 +#: cola/widgets/remote.py:651 #, python-format msgid "Force fetching from %s?" msgstr "是否要強制自「%s」撈取(fetch)？" -#: cola/widgets/remote.py:624 +#: cola/widgets/remote.py:659 #, python-format msgid "Force push to %s?" msgstr "要強制推送至「%s」遠端版控庫嗎？" -#: cola/widgets/status.py:1376 +#: cola/widgets/status.py:1377 msgid "Format String" msgstr "格式字串" -#: cola/widgets/about.py:430 cola/widgets/about.py:431 +#: cola/widgets/about.py:413 cola/widgets/about.py:414 msgid "French translation" msgstr "法語翻譯" -#: cola/widgets/merge.py:80 +#: cola/widgets/merge.py:78 msgid "GPG-sign the merge commit" msgstr "用 GPG 簽署合併修訂版提交" -#: cola/widgets/prefs.py:344 +#: cola/widgets/prefs.py:364 msgid "GUI theme" msgstr "" -#: cola/widgets/editremotes.py:318 +#: cola/widgets/editremotes.py:317 #, python-format msgid "Gathering info for \"%s\"..." msgstr "正在蒐集「%s」遠端版控庫的資訊……" -#: cola/widgets/about.py:420 cola/widgets/about.py:428 -#: cola/widgets/about.py:429 +#: cola/widgets/about.py:403 cola/widgets/about.py:411 +#: cola/widgets/about.py:412 msgid "German translation" msgstr "德語翻譯" -#: cola/widgets/main.py:511 +#: cola/widgets/main.py:524 msgid "Get Commit Message Template" msgstr "取得修訂版提交訊息範本" -#: cola/widgets/dag.py:520 +#: cola/widgets/dag.py:586 msgid "Go Down" msgstr "往下移動" -#: cola/widgets/dag.py:516 +#: cola/widgets/dag.py:582 msgid "Go Up" msgstr "往上移動" -#: cola/widgets/dag.py:467 cola/widgets/filelist.py:42 +#: cola/widgets/dag.py:466 cola/widgets/filelist.py:39 msgid "Grab File..." msgstr "提取檔案……" -#: cola/widgets/dag.py:782 +#: cola/widgets/dag.py:848 msgid "Graph" msgstr "圖" -#: cola/widgets/main.py:358 +#: cola/widgets/main.py:353 msgid "Grep" msgstr "搜尋(grep)" -#: cola/widgets/remote.py:662 +#: cola/widgets/remote.py:707 msgid "Have you rebased/pulled lately?" msgstr "您最近有作變更基底或 pull 操作嗎？" -#: cola/sequenceeditor.py:110 cola/sequenceeditor.py:171 -#: cola/widgets/finder.py:138 cola/widgets/main.py:854 +#: cola/sequenceeditor.py:108 cola/sequenceeditor.py:169 +#: cola/widgets/finder.py:137 cola/widgets/main.py:867 msgid "Help" msgstr "尋求幫助" -#: cola/widgets/status.py:1322 +#: cola/widgets/status.py:1323 msgid "Help - Custom Copy Actions" msgstr "求助 - 自訂複製操作" -#: cola/widgets/finder.py:79 +#: cola/widgets/finder.py:78 msgid "Help - Find Files" msgstr "尋求幫助 - 尋找檔案" -#: cola/sequenceeditor.py:737 +#: cola/sequenceeditor.py:732 msgid "Help - git-cola-sequence-editor" msgstr "尋求幫助 - git-cola-sequence-editor" -#: cola/widgets/prefs.py:346 +#: cola/widgets/prefs.py:366 msgid "High DPI" msgstr "" -#: cola/gitcmds.py:876 +#: cola/gitcmds.py:886 msgid "Hint: The \"Actions > Abort Cherry-Pick\" menu action can be used to cancel the current cherry-pick." msgstr "" -#: cola/widgets/prefs.py:254 +#: cola/widgets/prefs.py:275 msgid "History Browser" msgstr "變更紀錄瀏覽器" -#: cola/widgets/about.py:427 cola/widgets/about.py:441 +#: cola/widgets/about.py:410 cola/widgets/about.py:424 msgid "Hungarian translation" msgstr "匈牙利語翻譯" -#: cola/widgets/toolbar.py:178 +#: cola/widgets/toolbar.py:182 msgid "Icon Only" msgstr "" -#: cola/widgets/prefs.py:345 +#: cola/widgets/prefs.py:365 msgid "Icon theme" msgstr "" -#: cola/widgets/diff.py:758 +#: cola/widgets/diff.py:787 msgid "Ignore all whitespace" msgstr "忽略所有的空白" -#: cola/widgets/diff.py:755 +#: cola/widgets/diff.py:785 msgid "Ignore changes in amount of whitespace" msgstr "忽略空白數量的變更" -#: cola/widgets/diff.py:751 +#: cola/widgets/diff.py:782 msgid "Ignore changes in whitespace at EOL" msgstr "忽略行結尾處空白的變更" -#: cola/widgets/gitignore.py:46 +#: cola/widgets/gitignore.py:45 msgid "Ignore custom pattern" msgstr "忽略自訂式樣" -#: cola/widgets/gitignore.py:44 +#: cola/widgets/gitignore.py:43 msgid "Ignore exact filename" msgstr "忽略完全一致的檔名" -#: cola/widgets/gitignore.py:32 +#: cola/widgets/gitignore.py:31 msgid "Ignore filename or pattern" msgstr "忽略檔案名稱或是式樣" -#: cola/widgets/status.py:933 +#: cola/widgets/dag.py:498 +msgid "Ignore merge commits" +msgstr "" + +#: cola/widgets/status.py:934 msgid "Ignore..." msgstr "" -#: cola/widgets/remote.py:203 +#: cola/widgets/remote.py:207 msgid "Include tags " msgstr "包含標籤 " -#: cola/widgets/prefs.py:349 +#: cola/widgets/prefs.py:369 msgid "Indent Status paths" msgstr "" -#: cola/widgets/about.py:419 cola/widgets/about.py:426 +#: cola/widgets/about.py:402 cola/widgets/about.py:409 msgid "Indonesian translation" msgstr "印度尼西亞語翻譯" -#: cola/widgets/main.py:643 +#: cola/widgets/main.py:656 msgid "Initialize Git Annex" msgstr "初始化 Git Annex" -#: cola/widgets/main.py:647 +#: cola/widgets/main.py:660 msgid "Initialize Git LFS" msgstr "初始化 Git LFS" -#: cola/widgets/clone.py:116 +#: cola/widgets/clone.py:114 msgid "Inititalize submodules" msgstr "初始化子模組" -#: cola/widgets/prefs.py:260 +#: cola/widgets/prefs.py:281 msgid "Insert spaces instead of tabs" msgstr "插入空白字元而非跨欄字元(tab)" -#: cola/cmds.py:2130 +#: cola/widgets/action.py:73 cola/widgets/main.py:402 +msgid "Integrate changes using \"git pull\"" +msgstr "" + +#: cola/cmds.py:2081 msgid "Interactive Rebase" msgstr "互動式變更基底" -#: cola/cmds.py:2364 +#: cola/cmds.py:2315 msgid "Invalid Revision" msgstr "無效的修訂版" @@ -2132,40 +2194,40 @@ msgstr "無效的修訂版" msgid "It is not necessary to update the hunk header lines as they will be regenerated automatically." msgstr "" -#: cola/widgets/about.py:421 cola/widgets/about.py:424 +#: cola/widgets/about.py:404 cola/widgets/about.py:407 msgid "Japanese translation" msgstr "" -#: cola/widgets/prefs.py:262 +#: cola/widgets/prefs.py:283 msgid "Keep *.orig Merge Backups" msgstr "保留 *.orig merge 備份檔" -#: cola/widgets/stash.py:71 +#: cola/widgets/stash.py:73 msgid "Keep Index" msgstr "保留 index" -#: cola/widgets/main.py:477 +#: cola/widgets/main.py:490 msgid "Keyboard Shortcuts" msgstr "鍵盤快捷鍵" -#: cola/cmds.py:1608 cola/sequenceeditor.py:165 cola/sequenceeditor.py:338 -#: cola/widgets/dag.py:395 cola/widgets/filelist.py:34 +#: cola/difftool.py:27 cola/sequenceeditor.py:163 cola/sequenceeditor.py:334 +#: cola/widgets/dag.py:394 cola/widgets/filelist.py:31 msgid "Launch Diff Tool" msgstr "啟動差異檢視工具" -#: cola/widgets/dag.py:402 +#: cola/widgets/dag.py:401 msgid "Launch Directory Diff Tool" msgstr "啟動目錄差異檢視工具" -#: cola/cmds.py:1541 cola/cmds.py:1679 cola/widgets/filelist.py:38 +#: cola/cmds.py:1529 cola/cmds.py:1631 cola/widgets/filelist.py:35 msgid "Launch Editor" msgstr "啟動文字編輯器" -#: cola/cmds.py:1644 +#: cola/cmds.py:1596 msgid "Launch Terminal" msgstr "啟動終端機" -#: cola/sequenceeditor.py:166 +#: cola/sequenceeditor.py:164 msgid "" "Launch external diff tool\n" "Shortcut: Ctrl+D" @@ -2173,8 +2235,8 @@ msgstr "" "啟動外部內容差異檢視工具\n" "鍵盤快捷鍵：Ctrl+D" -#: cola/widgets/diff.py:1005 cola/widgets/diff.py:1051 -#: cola/widgets/status.py:852 cola/widgets/status.py:948 +#: cola/widgets/diff.py:1044 cola/widgets/diff.py:1106 +#: cola/widgets/status.py:853 cola/widgets/status.py:949 msgid "Launch git-cola" msgstr "啟動 git-cola" @@ -2186,7 +2248,7 @@ msgstr "對先前的版本啟動 git-difftool" msgid "Launch git-difftool on the current path" msgstr "在當前路徑中啟動 git-difftool" -#: cola/icons.py:56 +#: cola/icons.py:55 msgid "Light Theme" msgstr "" @@ -2195,167 +2257,183 @@ msgstr "" msgid "Lines starting with '%s' will be ignored." msgstr "" -#: cola/widgets/startup.py:74 +#: cola/widgets/startup.py:73 msgid "List" msgstr "" -#: cola/guicmds.py:267 +#: cola/guicmds.py:266 msgid "Load Commit Message" msgstr "自檔案載入修訂版提交訊息" -#: cola/widgets/main.py:339 +#: cola/widgets/main.py:334 msgid "Load Commit Message..." msgstr "自檔案載入修訂版提交訊息……" -#: cola/widgets/commitmsg.py:144 +#: cola/widgets/commitmsg.py:150 msgid "Load Previous Commit Message" msgstr "載入先前的修訂版提交的訊息" -#: cola/widgets/diff.py:264 +#: cola/widgets/diff.py:265 msgid "Loading..." msgstr "正在載入……" -#: cola/widgets/branch.py:169 cola/widgets/branch.py:240 -#: cola/widgets/branch.py:281 cola/widgets/compare.py:38 -#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/branch.py:173 cola/widgets/branch.py:250 +#: cola/widgets/branch.py:290 cola/widgets/compare.py:37 +#: cola/widgets/compare.py:52 cola/widgets/compare.py:57 msgid "Local" msgstr "本地" -#: cola/widgets/cfgactions.py:227 cola/widgets/merge.py:46 -#: cola/widgets/remote.py:138 +#: cola/widgets/cfgactions.py:225 cola/widgets/merge.py:44 +#: cola/widgets/remote.py:136 msgid "Local Branch" msgstr "本地分支" -#: cola/widgets/createbranch.py:114 +#: cola/widgets/createbranch.py:112 msgid "Local branch" msgstr "本地分支" -#: cola/widgets/dag.py:788 cola/widgets/main.py:651 +#: cola/widgets/dag.py:854 cola/widgets/main.py:664 msgid "Lock Layout" msgstr "鎖住版面" -#: cola/widgets/dag.py:750 +#: cola/widgets/dag.py:816 msgid "Log" msgstr "紀錄" -#: cola/widgets/prefs.py:170 +#: cola/widgets/prefs.py:191 msgid "Log Date Format" msgstr "" -#: cola/widgets/about.py:268 +#: cola/themes.py:769 +msgid "MacOS Aqua dark" +msgstr "" + +#: cola/themes.py:765 +msgid "MacOS Aqua light" +msgstr "" + +#: cola/themes.py:781 +msgid "MacOS Vibrant dark" +msgstr "" + +#: cola/themes.py:775 +msgid "MacOS Vibrant light" +msgstr "" + +#: cola/widgets/about.py:251 msgid "Maintainer (since 2007) and developer" msgstr "（自從 2007 年開始）維護者與開發者" -#: cola/widgets/text.py:398 +#: cola/widgets/text.py:395 msgid "Match Case" msgstr "" -#: cola/widgets/merge.py:88 +#: cola/widgets/merge.py:86 msgid "Merge" msgstr "合併" -#: cola/widgets/merge.py:162 +#: cola/widgets/merge.py:160 #, python-format msgid "Merge \"%(revision)s\" into \"%(branch)s\"" msgstr "合併「%(revision)s」修訂版至「%(branch)s」分支中" -#: cola/widgets/prefs.py:257 +#: cola/widgets/prefs.py:278 msgid "Merge Tool" msgstr "合併(merge)工具" -#: cola/widgets/prefs.py:171 +#: cola/widgets/prefs.py:193 msgid "Merge Verbosity" msgstr "合併資訊詳細程度" -#: cola/cmds.py:1829 +#: cola/cmds.py:1780 msgid "Merge failed. Conflict resolution is required." msgstr "合併失敗. 需要解決衝突." -#: cola/widgets/merge.py:167 +#: cola/widgets/merge.py:165 #, python-format msgid "Merge into \"%s\"" msgstr "合併到「%s」分支" -#: cola/widgets/branch.py:231 +#: cola/widgets/branch.py:242 msgid "Merge into current branch" msgstr "合併進當前分支" -#: cola/widgets/main.py:363 +#: cola/widgets/main.py:358 msgid "Merge..." msgstr "分支合併(merge)……" -#: cola/widgets/main.py:1163 +#: cola/widgets/main.py:1176 msgid "Merging" msgstr "正在進行分支合併" -#: cola/models/browse.py:33 cola/widgets/createtag.py:78 +#: cola/models/browse.py:32 cola/widgets/createtag.py:76 msgid "Message" msgstr "訊息" -#: cola/widgets/commitmsg.py:417 +#: cola/widgets/commitmsg.py:425 msgid "Missing Commit Message" msgstr "缺少修訂版提交訊息" -#: cola/widgets/createbranch.py:252 +#: cola/widgets/createbranch.py:250 msgid "Missing Data" msgstr "缺少資料" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Missing Name" msgstr "缺少標籤名稱" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Missing Revision" msgstr "缺少的修訂版" -#: cola/cmds.py:2801 +#: cola/cmds.py:2747 msgid "Missing Tag Message" msgstr "缺少標籤訊息" -#: cola/models/browse.py:332 cola/widgets/status.py:158 -#: cola/widgets/status.py:631 +#: cola/models/browse.py:331 cola/widgets/status.py:158 +#: cola/widgets/status.py:632 msgid "Modified" msgstr "已被修改" -#: cola/widgets/commitmsg.py:506 +#: cola/widgets/commitmsg.py:532 msgid "More..." msgstr "更多……" -#: cola/widgets/standard.py:243 cola/widgets/status.py:233 +#: cola/widgets/standard.py:242 cola/widgets/status.py:234 msgid "Move Down" msgstr "往下移動" -#: cola/widgets/standard.py:235 cola/widgets/status.py:225 +#: cola/widgets/standard.py:234 cola/widgets/status.py:226 msgid "Move Up" msgstr "往上移動" -#: cola/widgets/status.py:300 +#: cola/widgets/status.py:301 msgid "Move files to trash" msgstr "將檔案移動到資源回收筒" -#: cola/models/browse.py:33 cola/widgets/bookmarks.py:467 -#: cola/widgets/createtag.py:61 cola/widgets/editremotes.py:450 -#: cola/widgets/status.py:1452 cola/widgets/toolbar.py:312 +#: cola/models/browse.py:32 cola/widgets/bookmarks.py:466 +#: cola/widgets/createtag.py:59 cola/widgets/editremotes.py:448 +#: cola/widgets/status.py:1453 cola/widgets/toolbar.py:317 msgid "Name" msgstr "名稱" -#: cola/widgets/editremotes.py:434 +#: cola/widgets/editremotes.py:432 msgid "Name for the new remote" msgstr "新遠端版控庫的名稱" -#: cola/guicmds.py:148 cola/widgets/main.py:285 +#: cola/guicmds.py:147 cola/widgets/main.py:280 msgid "New Bare Repository..." msgstr "新的裸裝版控庫(bare repository)……" -#: cola/guicmds.py:87 cola/widgets/main.py:280 +#: cola/guicmds.py:86 cola/widgets/main.py:275 msgid "New Repository..." msgstr "新版控庫……" -#: cola/widgets/main.py:983 +#: cola/widgets/main.py:996 msgid "New Toolbar" msgstr "新增工具列" -#: cola/widgets/startup.py:53 +#: cola/widgets/startup.py:52 msgid "New..." msgstr "新建……" @@ -2363,15 +2441,19 @@ msgstr "新建……" msgid "Next File" msgstr "下個檔案" -#: cola/widgets/createbranch.py:123 cola/widgets/standard.py:1065 +#: cola/widgets/createbranch.py:121 cola/widgets/standard.py:1183 msgid "No" msgstr "不更新" -#: cola/widgets/merge.py:217 cola/widgets/merge.py:227 +#: cola/widgets/merge.py:215 cola/widgets/merge.py:225 msgid "No Revision Specified" msgstr "沒有選取修訂版" -#: cola/widgets/commitmsg.py:427 +#: cola/widgets/stash.py:225 +msgid "No change made" +msgstr "" + +#: cola/widgets/commitmsg.py:435 msgid "" "No changes to commit.\n" "\n" @@ -2381,27 +2463,27 @@ msgstr "" "\n" "提交前你必須至少將至少一個檔案移入新修訂版準備區域。" -#: cola/widgets/selectcommits.py:118 +#: cola/widgets/selectcommits.py:117 msgid "No commits exist in this branch." msgstr "此分支中無任何修訂版提交。" -#: cola/widgets/merge.py:65 +#: cola/widgets/merge.py:63 msgid "No fast forward" msgstr "不進行快速前移式合併" -#: cola/widgets/remote.py:186 +#: cola/widgets/remote.py:190 msgid "No fast-forward" msgstr "不進行快速前移式合併" -#: cola/widgets/remote.py:577 +#: cola/widgets/remote.py:612 msgid "No repository selected." msgstr "沒有選擇版控庫。" -#: cola/widgets/remote.py:615 +#: cola/widgets/remote.py:650 msgid "Non-fast-forward fetch overwrites local history!" msgstr "非快速前移式的撈取(fetch)將會覆寫本地版控庫的變更紀錄！" -#: cola/widgets/remote.py:621 +#: cola/widgets/remote.py:656 msgid "" "Non-fast-forward push overwrites published history!\n" "(Did you pull first?)" @@ -2409,7 +2491,7 @@ msgstr "" "非快速前移式的推送(push)將會覆寫遠端版控庫的變更紀錄！\n" "（您有先 Pull 過了嗎？）" -#: cola/widgets/commitmsg.py:444 +#: cola/widgets/commitmsg.py:452 msgid "Nothing to commit" msgstr "沒有東西可以提交" @@ -2417,80 +2499,80 @@ msgstr "沒有東西可以提交" msgid "Nothing to do" msgstr "沒有事情可做" -#: cola/widgets/prefs.py:172 +#: cola/widgets/prefs.py:194 msgid "Number of Diff Context Lines" msgstr "內容差異上下文行數" -#: cola/widgets/bookmarks.py:79 cola/widgets/bookmarks.py:213 -#: cola/widgets/startup.py:336 +#: cola/widgets/bookmarks.py:78 cola/widgets/bookmarks.py:212 +#: cola/widgets/startup.py:335 msgid "Open" msgstr "開啟" -#: cola/widgets/text.py:230 +#: cola/widgets/text.py:228 #, python-format msgid "Open \"%s\"" msgstr "" -#: cola/cmds.py:1857 +#: cola/cmds.py:1808 msgid "Open Directory" msgstr "" -#: cola/guicmds.py:205 cola/guicmds.py:214 cola/widgets/editremotes.py:473 -#: cola/widgets/startup.py:55 cola/widgets/startup.py:215 +#: cola/guicmds.py:204 cola/guicmds.py:213 cola/widgets/editremotes.py:471 +#: cola/widgets/startup.py:54 cola/widgets/startup.py:214 msgid "Open Git Repository" msgstr "開啟一個 Git 版控庫" -#: cola/widgets/submodules.py:49 +#: cola/widgets/submodules.py:48 #, fuzzy msgid "Open Parent" msgstr "打開最近使用的版控庫" -#: cola/cmds.py:1877 +#: cola/cmds.py:1828 msgid "Open Parent Directory" msgstr "開啟上一層目錄" -#: cola/widgets/main.py:679 +#: cola/widgets/main.py:692 msgid "Open Recent" msgstr "打開最近使用的版控庫" -#: cola/cmds.py:1840 +#: cola/cmds.py:1791 msgid "Open Using Default Application" msgstr "以系統預設的軟體開啟" -#: cola/cmds.py:1890 +#: cola/cmds.py:1841 msgid "Open Worktree" msgstr "" -#: cola/widgets/bookmarks.py:221 cola/widgets/startup.py:344 +#: cola/widgets/bookmarks.py:220 cola/widgets/startup.py:343 msgid "Open in New Window" msgstr "於新 git-cola 視窗中開啟" -#: cola/widgets/main.py:408 +#: cola/widgets/main.py:415 msgid "Open in New Window..." msgstr "於新 git-cola 視窗中開啟版控庫……" -#: cola/widgets/main.py:402 +#: cola/widgets/main.py:409 msgid "Open..." msgstr "打開版控庫……" -#: cola/widgets/branch.py:345 +#: cola/widgets/branch.py:354 msgid "Other branches" msgstr "其他分支" -#: cola/widgets/archive.py:210 +#: cola/widgets/archive.py:208 msgid "Overwrite" msgstr "覆寫" -#: cola/widgets/archive.py:209 +#: cola/widgets/archive.py:207 #, python-format msgid "Overwrite \"%s\"?" msgstr "要覆寫「%s」嗎？" -#: cola/widgets/archive.py:207 +#: cola/widgets/archive.py:205 msgid "Overwrite File?" msgstr "要覆寫檔案嗎？" -#: cola/widgets/grep.py:144 +#: cola/widgets/grep.py:142 msgid "" "Parse arguments using a shell.\n" "Queries with spaces will require \"double quotes\"." @@ -2498,63 +2580,67 @@ msgstr "" "使用殼程式(shell)來解析參數。\n" "內含空白字元的查詢需使用 \"雙引號\" 括住。" -#: cola/models/browse.py:330 +#: cola/models/browse.py:329 msgid "Partially Staged" msgstr "部份內容變更被移入新修訂版準備區域" -#: cola/widgets/main.py:744 +#: cola/widgets/main.py:757 msgid "Paste" msgstr "粘貼" -#: cola/cmds.py:363 +#: cola/cmds.py:364 msgid "Patch failed to apply" msgstr "" -#: cola/cmds.py:375 +#: cola/cmds.py:376 msgid "Patch(es) Applied" msgstr "已套用所有修正" -#: cola/widgets/diff.py:1219 cola/widgets/main.py:695 +#: cola/widgets/diff.py:1293 cola/widgets/main.py:708 msgid "Patches" msgstr "" -#: cola/widgets/prefs.py:173 +#: cola/widgets/prefs.py:195 msgid "Patches Directory" msgstr "" -#: cola/widgets/bookmarks.py:468 cola/widgets/submodules.py:118 +#: cola/widgets/bookmarks.py:467 cola/widgets/submodules.py:117 msgid "Path" msgstr "所在路徑" -#: cola/widgets/clone.py:112 +#: cola/widgets/clone.py:110 msgid "Path or URL to clone (Env. $VARS okay)" msgstr "要克隆的路徑或 URL（可使用環境 $變數 ）" -#: cola/sequenceeditor.py:346 +#: cola/sequenceeditor.py:342 msgid "Pick" msgstr "" -#: cola/widgets/diff.py:781 +#: cola/widgets/dag.py:490 +msgid "Pickaxe search for changes containing text" +msgstr "" + +#: cola/widgets/diff.py:809 msgid "Pixel XOR" msgstr "像素互斥或(XOR)" -#: cola/widgets/createbranch.py:253 +#: cola/widgets/createbranch.py:251 msgid "Please provide both a branch name and revision expression." msgstr "請填寫分支名稱與修訂版表達式。" -#: cola/cmds.py:2348 +#: cola/cmds.py:2299 msgid "Please select a file" msgstr "請選擇一個檔案" -#: cola/cmds.py:2797 +#: cola/cmds.py:2743 msgid "Please specify a name for the new tag." msgstr "請指定新標籤的名稱。" -#: cola/cmds.py:2791 +#: cola/cmds.py:2737 msgid "Please specify a revision to tag." msgstr "請指定一個修訂版來套用標籤。" -#: cola/widgets/commitmsg.py:410 +#: cola/widgets/commitmsg.py:418 msgid "" "Please supply a commit message.\n" "\n" @@ -2572,31 +2658,31 @@ msgstr "" "- 第二行: 空行\n" "- 剩餘行: 描述為什麼您所做的變更是好的。\n" -#: cola/cmds.py:653 +#: cola/cmds.py:655 msgid "Point the current branch head to a new commit?" msgstr "將當前分支的 head 指向一個新的修訂版提交？" -#: cola/widgets/about.py:416 +#: cola/widgets/about.py:399 msgid "Polish translation" msgstr "波蘭語翻譯" -#: cola/widgets/stash.py:63 cola/widgets/stash.py:111 cola/widgets/stash.py:115 +#: cola/widgets/stash.py:65 cola/widgets/stash.py:114 cola/widgets/stash.py:118 msgid "Pop" msgstr "POP" -#: cola/widgets/main.py:293 cola/widgets/prefs.py:395 +#: cola/widgets/main.py:288 cola/widgets/prefs.py:433 msgid "Preferences" msgstr "偏好設定" -#: cola/widgets/archive.py:129 +#: cola/widgets/archive.py:127 msgid "Prefix" msgstr "前綴路徑" -#: cola/widgets/main.py:345 +#: cola/widgets/main.py:340 msgid "Prepare Commit Message" msgstr "準備修訂版提交訊息" -#: cola/widgets/prefs.py:157 +#: cola/widgets/prefs.py:180 msgid "Prevent \"Stage\" from staging all files when nothing is selected" msgstr "避免 Stage 快捷鍵在沒有選取任何項目時將所有檔案移至修訂版提交準備區域" @@ -2604,216 +2690,228 @@ msgstr "避免 Stage 快捷鍵在沒有選取任何項目時將所有檔案移 msgid "Previous File" msgstr "上個檔案" -#: cola/widgets/remote.py:171 +#: cola/widgets/remote.py:169 msgid "Prompt on creation" msgstr "建新分支時提示" -#: cola/widgets/remote.py:172 +#: cola/widgets/remote.py:170 msgid "Prompt when pushing creates new remote branches" msgstr "在建立新的遠端分支時提示使用者" -#: cola/widgets/remote.py:208 +#: cola/widgets/remote.py:212 msgid "Prune " msgstr "清除(prune) " -#: cola/widgets/bookmarks.py:255 cola/widgets/startup.py:376 +#: cola/widgets/bookmarks.py:254 cola/widgets/startup.py:375 msgid "Prune Missing Entries" msgstr "" -#: cola/widgets/branch.py:247 cola/widgets/remote.py:728 +#: cola/widgets/branch.py:256 cola/widgets/remote.py:783 msgid "Pull" msgstr "自遠端分支撈取並合併(pull)" -#: cola/widgets/action.py:65 cola/widgets/main.py:397 +#: cola/widgets/action.py:73 cola/widgets/main.py:401 msgid "Pull..." msgstr "自遠端分支撈取並合併(pull)……" -#: cola/widgets/branch.py:253 cola/widgets/remote.py:593 -#: cola/widgets/remote.py:698 +#: cola/widgets/branch.py:262 cola/widgets/remote.py:628 +#: cola/widgets/remote.py:758 msgid "Push" msgstr "推送至遠端版控庫" -#: cola/widgets/action.py:64 cola/widgets/main.py:392 +#: cola/widgets/action.py:70 cola/widgets/main.py:393 +msgid "Push to one or more remotes using \"git push\"" +msgstr "" + +#: cola/widgets/action.py:70 cola/widgets/main.py:392 msgid "Push..." msgstr "推送至遠端版控庫(push)……" -#: cola/guicmds.py:252 +#: cola/guicmds.py:251 msgid "Quick Open Repository" msgstr "" -#: cola/widgets/main.py:660 +#: cola/widgets/main.py:673 msgid "Quick Open..." msgstr "" -#: cola/widgets/main.py:355 +#: cola/widgets/main.py:350 msgid "Quit" msgstr "結束" -#: cola/cmds.py:2144 cola/cmds.py:2180 cola/cmds.py:2181 cola/cmds.py:2194 -#: cola/cmds.py:2195 cola/sequenceeditor.py:158 cola/sequenceeditor.py:199 -#: cola/widgets/main.py:822 cola/widgets/remote.py:211 +#: cola/cmds.py:2095 cola/cmds.py:2131 cola/cmds.py:2132 cola/cmds.py:2145 +#: cola/cmds.py:2146 cola/sequenceeditor.py:156 cola/sequenceeditor.py:197 +#: cola/widgets/main.py:835 cola/widgets/remote.py:215 msgid "Rebase" msgstr "變更基底" -#: cola/cmds.py:2143 +#: cola/cmds.py:2094 #, python-format msgid "Rebase onto %s" msgstr "變更基底至 %s" -#: cola/cmds.py:2156 +#: cola/cmds.py:2107 msgid "Rebase stopped" msgstr "變更基底已停止" -#: cola/widgets/remote.py:210 +#: cola/widgets/remote.py:214 msgid "Rebase the current branch instead of merging" msgstr "不合併分支，而是將遠端分支變更基底到當前分支" -#: cola/widgets/dag.py:419 +#: cola/widgets/dag.py:418 msgid "Rebase to this commit" msgstr "" -#: cola/widgets/main.py:1165 +#: cola/widgets/main.py:1178 msgid "Rebasing" msgstr "正在進行變更基底程序" -#: cola/widgets/main.py:120 +#: cola/widgets/main.py:118 msgid "Recent" msgstr "最近使用的版控庫" -#: cola/widgets/bookmarks.py:93 +#: cola/widgets/bookmarks.py:92 msgid "Recent repositories" msgstr "最近使用的版控庫" -#: cola/widgets/prefs.py:258 +#: cola/widgets/prefs.py:279 msgid "Recent repository count" msgstr "最近使用的版控庫數量" -#: cola/widgets/recent.py:46 +#: cola/widgets/recent.py:44 msgid "Recently Modified Files" msgstr "最近修改過的檔案" -#: cola/widgets/main.py:320 +#: cola/widgets/main.py:315 msgid "Recently Modified Files..." msgstr "最近修改過的檔案……" -#: cola/widgets/stash.py:256 +#: cola/widgets/stash.py:274 msgid "Recovering a dropped stash is not possible." msgstr "要救回一個丟棄的珍藏項目是不可能的。" -#: cola/widgets/createbranch.py:283 +#: cola/widgets/createbranch.py:281 msgid "Recovering lost commits may not be easy." msgstr "恢復丟失的提交是比較困難的." -#: cola/widgets/main.py:737 +#: cola/widgets/main.py:750 msgid "Redo" msgstr "重做" -#: cola/widgets/clone.py:121 +#: cola/widgets/clone.py:119 msgid "Reduce commit history to minimum" msgstr "將版本提交歷史量降到最低" -#: cola/widgets/submodules.py:121 +#: cola/widgets/submodules.py:120 msgid "Reference Repository" msgstr "" -#: cola/widgets/submodules.py:105 +#: cola/widgets/submodules.py:104 msgid "Reference URL" msgstr "" -#: cola/widgets/submodules.py:106 +#: cola/widgets/submodules.py:105 msgid "Reference repository to use when cloning (optional)" msgstr "" -#: cola/cmds.py:2222 cola/qtutils.py:770 cola/widgets/action.py:62 -#: cola/widgets/dag.py:792 cola/widgets/editremotes.py:85 -#: cola/widgets/grep.py:105 cola/widgets/recent.py:116 -#: cola/widgets/submodules.py:45 +#: cola/cmds.py:2173 cola/qtutils.py:801 cola/widgets/action.py:63 +#: cola/widgets/dag.py:858 cola/widgets/editremotes.py:84 +#: cola/widgets/grep.py:103 cola/widgets/recent.py:114 +#: cola/widgets/submodules.py:44 msgid "Refresh" msgstr "重新整理" -#: cola/widgets/remote.py:179 +#: cola/widgets/remote.py:183 msgid "Refuse to merge unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward" msgstr "除非當前 HEAD 指標早就是最新版本或是分支合併能以快速前移式處理否則拒絕合併分支" -#: cola/widgets/branch.py:173 cola/widgets/branch.py:225 -#: cola/widgets/branch.py:269 cola/widgets/branch.py:470 -#: cola/widgets/compare.py:54 cola/widgets/compare.py:59 -#: cola/widgets/remote.py:147 +#: cola/widgets/branch.py:177 cola/widgets/branch.py:236 +#: cola/widgets/branch.py:278 cola/widgets/branch.py:513 +#: cola/widgets/compare.py:53 cola/widgets/compare.py:58 +#: cola/widgets/remote.py:145 msgid "Remote" msgstr "遠端" -#: cola/widgets/remote.py:162 +#: cola/widgets/remote.py:160 msgid "Remote Branch" msgstr "遠端分支名" -#: cola/cmds.py:1196 +#: cola/cmds.py:1197 msgid "Remote Branch Deleted" msgstr "已移除遠端分支" -#: cola/widgets/editremotes.py:49 +#: cola/widgets/log.py:99 +msgid "Remote Messages" +msgstr "" + +#: cola/widgets/editremotes.py:48 msgid "Remote git repositories - double-click to rename" msgstr "遠端 Git 版控庫 - 連續點兩下以重新命名" -#: cola/cmds.py:1029 cola/widgets/patch.py:107 cola/widgets/patch.py:122 -#: cola/widgets/startup.py:265 cola/widgets/status.py:1382 +#: cola/cmds.py:1030 cola/widgets/diff.py:1701 cola/widgets/diff.py:1716 +#: cola/widgets/startup.py:264 cola/widgets/status.py:1383 msgid "Remove" msgstr "移除" -#: cola/cmds.py:1027 +#: cola/cmds.py:1028 #, python-format msgid "Remove %s from the recent list?" msgstr "要將「%s」版控庫從最近使用的版控庫清單中移除嗎？" -#: cola/widgets/toolbar.py:316 +#: cola/widgets/toolbar.py:321 msgid "Remove Element" msgstr "移除元素" -#: cola/widgets/remote.py:206 +#: cola/widgets/remote.py:210 msgid "Remove remote-tracking branches that no longer exist on the remote" msgstr "移除不再存在於遠端板控庫上的遠端追蹤分支" -#: cola/widgets/patch.py:109 +#: cola/widgets/diff.py:1703 msgid "Remove selected (Delete)" msgstr "移除被選取的項目（刪除）" -#: cola/widgets/bookmarks.py:258 cola/widgets/startup.py:379 +#: cola/widgets/bookmarks.py:257 cola/widgets/startup.py:378 msgid "Remove stale entries for repositories that no longer exist" msgstr "" -#: cola/guicmds.py:333 cola/widgets/browse.py:159 +#: cola/guicmds.py:332 cola/widgets/browse.py:159 cola/widgets/stash.py:44 msgid "Rename" msgstr "重新命名" -#: cola/cmds.py:1153 +#: cola/cmds.py:1154 #, python-format msgid "Rename \"%s\"" msgstr "重新命名「%s」" -#: cola/widgets/branch.py:259 +#: cola/widgets/branch.py:268 msgid "Rename Branch" msgstr "重新命名分支" -#: cola/widgets/main.py:570 +#: cola/widgets/main.py:583 msgid "Rename Branch..." msgstr "重新命名分支……" -#: cola/guicmds.py:330 +#: cola/guicmds.py:329 msgid "Rename Existing Branch" msgstr "重新命名已存在的分支" -#: cola/cmds.py:944 +#: cola/cmds.py:942 msgid "Rename Remote" msgstr "重新命名遠端版控庫" -#: cola/widgets/bookmarks.py:233 cola/widgets/startup.py:356 +#: cola/widgets/bookmarks.py:232 cola/widgets/startup.py:355 msgid "Rename Repository" msgstr "更名版控庫" -#: cola/widgets/branch.py:445 +#: cola/widgets/stash.py:218 +msgid "Rename Stash" +msgstr "" + +#: cola/widgets/branch.py:478 msgid "Rename branch" msgstr "重新命名分支" -#: cola/cmds.py:945 +#: cola/cmds.py:943 #, python-format msgid "Rename remote \"%(current)s\" to \"%(new)s\"?" msgstr "要將「%(current)s」遠端版控庫改名為「%(new)s」嗎？" @@ -2822,179 +2920,183 @@ msgstr "要將「%(current)s」遠端版控庫改名為「%(new)s」嗎？" msgid "Rename selected paths" msgstr "重新命名選取的路徑" -#: cola/app.py:497 cola/widgets/startup.py:262 +#: cola/widgets/stash.py:45 +msgid "Rename the selected stash" +msgstr "" + +#: cola/app.py:500 cola/widgets/startup.py:261 msgid "Repository Not Found" msgstr "" -#: cola/widgets/browse.py:87 cola/widgets/main.py:1095 +#: cola/widgets/browse.py:87 cola/widgets/main.py:1108 #, python-format msgid "Repository: %s" msgstr "版控庫：%s" -#: cola/guicmds.py:351 cola/widgets/createbranch.py:125 cola/widgets/dag.py:331 -#: cola/widgets/editremotes.py:58 cola/widgets/main.py:832 +#: cola/guicmds.py:350 cola/widgets/createbranch.py:123 cola/widgets/dag.py:330 +#: cola/widgets/editremotes.py:57 cola/widgets/main.py:845 msgid "Reset" msgstr "重設" -#: cola/widgets/createbranch.py:286 +#: cola/widgets/createbranch.py:284 #, python-format msgid "Reset \"%(branch)s\" to \"%(revision)s\"?" msgstr "要重設「%(branch)s」分支到 「%(revision)s」修訂版嗎？" -#: cola/guicmds.py:359 +#: cola/guicmds.py:358 msgid "Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/cmds.py:655 cola/cmds.py:706 cola/guicmds.py:342 -#: cola/widgets/createbranch.py:295 +#: cola/cmds.py:657 cola/cmds.py:708 cola/guicmds.py:341 +#: cola/widgets/createbranch.py:293 msgid "Reset Branch" msgstr "重設分支" -#: cola/cmds.py:703 cola/guicmds.py:341 cola/widgets/dag.py:425 -#: cola/widgets/main.py:419 +#: cola/cmds.py:705 cola/guicmds.py:340 cola/widgets/dag.py:424 +#: cola/widgets/main.py:431 msgid "Reset Branch (Soft)" msgstr "" -#: cola/cmds.py:652 cola/guicmds.py:350 cola/widgets/dag.py:431 -#: cola/widgets/main.py:426 +#: cola/cmds.py:654 cola/guicmds.py:349 cola/widgets/dag.py:430 +#: cola/widgets/main.py:439 msgid "Reset Branch and Stage (Mixed)" msgstr "" -#: cola/widgets/createbranch.py:292 +#: cola/widgets/createbranch.py:290 msgid "Reset Branch?" msgstr "要重設分支嗎？" -#: cola/widgets/main.py:655 +#: cola/widgets/main.py:668 msgid "Reset Layout" msgstr "" -#: cola/cmds.py:687 +#: cola/cmds.py:689 msgid "Reset Worktree and Reset All?" msgstr "" -#: cola/cmds.py:672 cola/cmds.py:689 cola/cmds.py:723 cola/guicmds.py:360 -#: cola/guicmds.py:373 cola/guicmds.py:382 +#: cola/cmds.py:674 cola/cmds.py:691 cola/cmds.py:725 cola/guicmds.py:359 +#: cola/guicmds.py:372 cola/guicmds.py:381 msgid "Reset and Restore" msgstr "" -#: cola/cmds.py:704 +#: cola/cmds.py:706 msgid "Reset branch?" msgstr "" -#: cola/widgets/createbranch.py:266 +#: cola/widgets/createbranch.py:264 #, python-format msgid "Resetting \"%(branch)s\" to \"%(revision)s\" will lose commits." msgstr "重置「%(branch)s」分支到「%(revision)s」修訂版將導致修訂版提交的丟失。" -#: cola/widgets/prefs.py:264 +#: cola/widgets/prefs.py:285 msgid "Resize File Browser columns" msgstr "" -#: cola/widgets/prefs.py:374 +#: cola/widgets/prefs.py:412 msgid "Restart the application after changing appearance settings." msgstr "" -#: cola/cmds.py:757 cola/cmds.py:760 cola/guicmds.py:390 cola/guicmds.py:391 -#: cola/widgets/dag.py:461 cola/widgets/main.py:457 +#: cola/cmds.py:759 cola/cmds.py:762 cola/guicmds.py:389 cola/guicmds.py:390 +#: cola/widgets/dag.py:460 cola/widgets/main.py:471 msgid "Restore Worktree" msgstr "" -#: cola/cmds.py:720 cola/guicmds.py:381 cola/widgets/dag.py:454 -#: cola/widgets/main.py:450 +#: cola/cmds.py:722 cola/guicmds.py:380 cola/widgets/dag.py:453 +#: cola/widgets/main.py:463 msgid "Restore Worktree and Reset All (Hard)" msgstr "" -#: cola/cmds.py:669 cola/widgets/main.py:434 +#: cola/cmds.py:671 cola/widgets/main.py:447 msgid "Restore Worktree and Reset All (Keep Unstaged Changes)" msgstr "" -#: cola/widgets/dag.py:438 +#: cola/widgets/dag.py:437 msgid "Restore Worktree and Reset All (Keep Unstaged Edits)" msgstr "" -#: cola/cmds.py:686 cola/guicmds.py:372 cola/widgets/dag.py:446 -#: cola/widgets/main.py:442 +#: cola/cmds.py:688 cola/guicmds.py:371 cola/widgets/dag.py:445 +#: cola/widgets/main.py:455 msgid "Restore Worktree and Reset All (Merge)" msgstr "" -#: cola/cmds.py:721 +#: cola/cmds.py:723 msgid "Restore Worktree and Reset All?" msgstr "" -#: cola/cmds.py:758 +#: cola/cmds.py:760 #, python-format msgid "Restore Worktree to %s?" msgstr "" -#: cola/cmds.py:670 +#: cola/cmds.py:672 msgid "Restore worktree, reset, and preserve unstaged edits?" msgstr "" -#: cola/widgets/dag.py:390 +#: cola/widgets/dag.py:389 msgid "Revert" msgstr "撤銷修訂版提交" -#: cola/widgets/diff.py:1153 +#: cola/widgets/diff.py:1227 msgid "Revert Diff Hunk" msgstr "撤銷選取內容差異區塊的內容變更" -#: cola/widgets/diff.py:1018 +#: cola/widgets/diff.py:1057 msgid "Revert Diff Hunk..." msgstr "撤銷此內容差異區塊的內容變更……" -#: cola/widgets/diff.py:1152 +#: cola/widgets/diff.py:1226 msgid "Revert Diff Hunk?" msgstr "要撤銷選取內容差異區塊的內容變更嗎？" -#: cola/widgets/diff.py:1150 +#: cola/widgets/diff.py:1224 msgid "Revert Selected Lines" msgstr "撤銷選取行的內容變更" -#: cola/widgets/diff.py:1013 +#: cola/widgets/diff.py:1052 msgid "Revert Selected Lines..." msgstr "撤銷選取行的內容變更……" -#: cola/widgets/diff.py:1149 +#: cola/widgets/diff.py:1223 msgid "Revert Selected Lines?" msgstr "要撤銷選取行的內容變更嗎？" -#: cola/cmds.py:2311 +#: cola/cmds.py:2262 msgid "Revert Uncommitted Changes" msgstr "撤銷尚未提交至版控庫的內容變更" -#: cola/cmds.py:2305 +#: cola/cmds.py:2256 msgid "Revert Uncommitted Changes?" msgstr "要撤銷尚未提交至版控庫的內容變更嗎？" -#: cola/cmds.py:2298 +#: cola/cmds.py:2249 msgid "Revert Uncommitted Edits..." msgstr "撤銷尚未提交到版控庫的內容變更……" -#: cola/cmds.py:2289 +#: cola/cmds.py:2240 msgid "Revert Unstaged Changes" msgstr "撤銷尚未移入新修訂版準備區域的內容變動" -#: cola/cmds.py:2283 +#: cola/cmds.py:2234 msgid "Revert Unstaged Changes?" msgstr "要撤銷尚未移入新修訂版準備區域的內容變動嗎？" -#: cola/cmds.py:2275 +#: cola/cmds.py:2226 msgid "Revert Unstaged Edits..." msgstr "撤銷尚未移入新修訂版準備區域的內容修改……" -#: cola/cmds.py:598 +#: cola/cmds.py:599 msgid "Revert failed" msgstr "" -#: cola/cmds.py:2310 cola/widgets/diff.py:1161 +#: cola/cmds.py:2261 cola/widgets/diff.py:1235 msgid "Revert the uncommitted changes?" msgstr "要撤銷尚未提交至版控庫的內容變更嗎？" -#: cola/cmds.py:2288 +#: cola/cmds.py:2239 msgid "Revert the unstaged changes?" msgstr "要撤銷尚未移入新修訂版準備區域的內容變動嗎？" -#: cola/widgets/browse.py:189 +#: cola/widgets/browse.py:190 msgid "Revert uncommitted changes to selected paths" msgstr "在被選取的路徑中撤銷尚未提交進版控的內容變更" @@ -3002,294 +3104,302 @@ msgstr "在被選取的路徑中撤銷尚未提交進版控的內容變更" msgid "Revert unstaged changes to selected paths" msgstr "在被選取的路徑中撤銷尚未移入新修訂版準備區域的內容變更" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Review" msgstr "審視(review)" -#: cola/widgets/main.py:583 +#: cola/widgets/main.py:596 msgid "Review..." msgstr "審視(review)……" -#: cola/widgets/cfgactions.py:233 cola/widgets/createtag.py:84 +#: cola/widgets/cfgactions.py:231 cola/widgets/createtag.py:82 msgid "Revision" msgstr "修訂版" -#: cola/widgets/selectcommits.py:62 +#: cola/widgets/selectcommits.py:61 msgid "Revision Expression:" msgstr "修訂版表達式：" -#: cola/widgets/merge.py:39 cola/widgets/merge.py:42 +#: cola/widgets/merge.py:37 cola/widgets/merge.py:40 msgid "Revision to Merge" msgstr "要合併的修訂版" -#: cola/sequenceeditor.py:351 +#: cola/sequenceeditor.py:347 msgid "Reword" msgstr "重新敘述" -#: cola/cmds.py:776 cola/widgets/commitmsg.py:456 +#: cola/cmds.py:778 cola/widgets/commitmsg.py:464 msgid "Rewrite Published Commit?" msgstr "要重寫已推送出去的修訂版提交嗎？" -#: cola/widgets/log.py:31 +#: cola/widgets/log.py:31 cola/widgets/log.py:133 msgid "Right-click links to open:" msgstr "" -#: cola/interaction.py:127 cola/widgets/cfgactions.py:245 +#: cola/interaction.py:125 cola/widgets/cfgactions.py:243 msgid "Run" msgstr "執行" -#: cola/cmds.py:2341 +#: cola/cmds.py:2292 #, python-format msgid "Run \"%s\"?" msgstr "要執行「%s」操作嗎？" -#: cola/interaction.py:124 +#: cola/interaction.py:122 #, python-format msgid "Run %s?" msgstr "執行 %s？" -#: cola/interaction.py:125 +#: cola/interaction.py:123 #, python-format msgid "Run the \"%s\" command?" msgstr "要執行「%s」命令嗎？" -#: cola/cmds.py:2380 +#: cola/cmds.py:2331 #, python-format msgid "Running command: %s" msgstr "執行命令：%s" -#: cola/widgets/about.py:422 +#: cola/widgets/about.py:405 msgid "Russian translation" msgstr "俄羅斯語翻譯" -#: cola/sequenceeditor.py:324 +#: cola/sequenceeditor.py:321 msgid "SHA-1" msgstr "SHA-1 雜湊" -#: cola/widgets/prefs.py:183 +#: cola/widgets/prefs.py:205 msgid "Safe Mode" msgstr "安全模式" -#: cola/cmds.py:2167 cola/widgets/archive.py:126 cola/widgets/browse.py:609 -#: cola/widgets/editremotes.py:54 cola/widgets/stash.py:52 -#: cola/widgets/status.py:1388 +#: cola/cmds.py:2118 cola/widgets/archive.py:124 cola/widgets/browse.py:610 +#: cola/widgets/editremotes.py:53 cola/widgets/stash.py:54 +#: cola/widgets/status.py:1389 msgid "Save" msgstr "保存" -#: cola/widgets/archive.py:113 +#: cola/widgets/archive.py:111 msgid "Save Archive" msgstr "保存封存檔" -#: cola/widgets/dag.py:382 cola/widgets/main.py:351 +#: cola/widgets/dag.py:381 cola/widgets/main.py:346 msgid "Save As Tarball/Zip..." msgstr "保存為 Tarball/Zip 封存檔…" -#: cola/widgets/prefs.py:263 +#: cola/widgets/prefs.py:284 msgid "Save GUI Settings" msgstr "保存圖形介面設定" -#: cola/widgets/stash.py:227 +#: cola/widgets/stash.py:253 msgid "Save Stash" msgstr "保存珍藏項目" -#: cola/widgets/stash.py:53 +#: cola/widgets/stash.py:55 msgid "Save modified state to new stash" msgstr "將被修改的狀態保存為一個新的珍藏項目" -#: cola/widgets/browse.py:570 +#: cola/widgets/browse.py:571 #, python-format msgid "Saved \"%(filename)s\" from \"%(ref)s\" to \"%(destination)s\"" msgstr "已將「%(filename)s」檔案自「%(ref)s」修訂版保存至「%(destination)s」目錄" -#: cola/widgets/bookmarks.py:83 cola/widgets/grep.py:98 -#: cola/widgets/search.py:42 cola/widgets/search.py:62 +#: cola/widgets/bookmarks.py:82 cola/widgets/grep.py:96 +#: cola/widgets/search.py:41 cola/widgets/search.py:61 msgid "Search" msgstr "搜尋" -#: cola/widgets/search.py:226 +#: cola/widgets/search.py:225 msgid "Search Authors" msgstr "搜尋作者名" -#: cola/widgets/search.py:224 +#: cola/widgets/search.py:223 msgid "Search Commit Messages" msgstr "搜尋修訂版提交訊息" -#: cola/widgets/search.py:227 +#: cola/widgets/search.py:226 msgid "Search Committers" msgstr "搜尋提交者名" -#: cola/widgets/search.py:228 +#: cola/widgets/search.py:227 msgid "Search Date Range" msgstr "搜尋日期範圍" -#: cola/widgets/search.py:225 +#: cola/widgets/search.py:224 msgid "Search Diffs" msgstr "搜尋內容變更" -#: cola/widgets/search.py:222 +#: cola/widgets/search.py:221 msgid "Search by Expression" msgstr "以表達式搜尋" -#: cola/widgets/search.py:223 +#: cola/widgets/search.py:222 msgid "Search by Path" msgstr "以路徑搜尋" -#: cola/widgets/grep.py:124 +#: cola/widgets/dag.py:494 +msgid "Search commit messages" +msgstr "" + +#: cola/widgets/grep.py:122 msgid "Search for a fixed string" msgstr "搜尋一個固定內容字串" -#: cola/widgets/diff.py:519 cola/widgets/diff.py:1514 +#: cola/widgets/diff.py:526 cola/widgets/diff.py:1576 msgid "Search in Diff" msgstr "" -#: cola/guicmds.py:253 cola/widgets/bookmarks.py:62 +#: cola/guicmds.py:252 cola/widgets/bookmarks.py:61 msgid "Search repositories by name..." msgstr "" -#: cola/widgets/grep.py:122 +#: cola/widgets/grep.py:120 msgid "Search using a POSIX basic regular expression" msgstr "使用 POSIX 基本正規表達式來搜尋" -#: cola/widgets/grep.py:123 +#: cola/widgets/grep.py:121 msgid "Search using a POSIX extended regular expression" msgstr "使用 POSIX 延伸正規表達式來搜尋" -#: cola/widgets/main.py:493 +#: cola/widgets/main.py:506 msgid "Search..." msgstr "尋找……" -#: cola/widgets/selectcommits.py:67 +#: cola/widgets/selectcommits.py:66 msgid "Search:" msgstr "" -#: cola/guicmds.py:330 cola/widgets/selectcommits.py:74 +#: cola/guicmds.py:329 cola/widgets/selectcommits.py:73 msgid "Select" msgstr "選擇" -#: cola/widgets/main.py:750 +#: cola/widgets/main.py:763 msgid "Select All" msgstr "全選" -#: cola/guicmds.py:321 +#: cola/guicmds.py:320 msgid "Select Branch to Review" msgstr "選擇要審視(review)的分支" -#: cola/widgets/dag.py:1610 +#: cola/widgets/dag.py:1667 msgid "Select Child" msgstr "選擇子節點" -#: cola/widgets/commitmsg.py:512 +#: cola/widgets/commitmsg.py:538 msgid "Select Commit" msgstr "選取修訂版提交" -#: cola/guicmds.py:137 +#: cola/guicmds.py:136 msgid "Select Directory..." msgstr "選擇目錄……" -#: cola/cmds.py:2129 +#: cola/cmds.py:2080 msgid "Select New Upstream" msgstr "選擇新的上游版本" -#: cola/widgets/dag.py:1614 +#: cola/widgets/dag.py:1671 msgid "Select Newest Child" msgstr "選取最新的子節點" -#: cola/widgets/dag.py:1604 +#: cola/widgets/dag.py:1661 msgid "Select Oldest Parent" msgstr "選取最舊的母節點" -#: cola/widgets/dag.py:1599 +#: cola/widgets/dag.py:1656 msgid "Select Parent" msgstr "選取" -#: cola/widgets/browse.py:525 +#: cola/widgets/browse.py:526 msgid "Select Previous Version" msgstr "選擇先前版本" -#: cola/widgets/clone.py:197 +#: cola/widgets/clone.py:195 msgid "Select a parent directory for the new clone" msgstr "選取新克隆的 Git 版控庫要放置的目錄" -#: cola/widgets/standard.py:756 cola/widgets/standard.py:779 +#: cola/widgets/standard.py:826 cola/widgets/standard.py:848 msgid "Select directory" msgstr "" -#: cola/widgets/selectcommits.py:162 +#: cola/widgets/selectcommits.py:161 msgid "Select output dir" msgstr "選取輸出目錄" -#: cola/widgets/selectcommits.py:183 +#: cola/widgets/selectcommits.py:182 msgid "Select output directory" msgstr "選擇要輸出的目錄" -#: cola/widgets/patch.py:175 +#: cola/widgets/diff.py:1769 msgid "Select patch file(s)..." msgstr "選擇修正檔……" -#: cola/widgets/editremotes.py:437 +#: cola/widgets/editremotes.py:435 msgid "Select repository" msgstr "選擇版控庫" -#: cola/widgets/bookmarks.py:225 cola/widgets/startup.py:348 +#: cola/widgets/bookmarks.py:224 cola/widgets/startup.py:347 msgid "Set Default Repository" msgstr "設定預設版控庫" -#: cola/widgets/branch.py:282 +#: cola/widgets/branch.py:291 msgid "Set Upstream Branch" msgstr "設為上游追蹤分支" -#: cola/widgets/branch.py:72 +#: cola/widgets/branch.py:74 msgid "" "Set the sort order for branches and tags.\n" "Toggle between date-based and version-name-based sorting." msgstr "" -#: cola/widgets/remote.py:213 +#: cola/widgets/remote.py:217 msgid "Set upstream" msgstr "設為上游追蹤分支" -#: cola/widgets/prefs.py:405 +#: cola/widgets/prefs.py:443 msgid "Settings" msgstr "設定值" -#: cola/widgets/grep.py:142 +#: cola/widgets/grep.py:140 msgid "Shell arguments" msgstr "殼程式參數" -#: cola/sequenceeditor.py:375 +#: cola/sequenceeditor.py:371 msgid "Shift Down" msgstr "往下平移" -#: cola/sequenceeditor.py:379 +#: cola/sequenceeditor.py:375 msgid "Shift Up" msgstr "往上平移" -#: cola/widgets/about.py:499 +#: cola/widgets/about.py:482 msgid "Shortcuts" msgstr "鍵盤快捷鍵" -#: cola/widgets/prefs.py:179 +#: cola/widgets/prefs.py:201 msgid "Show Diffstat After Merge" msgstr "在合併後顯示內容差異" -#: cola/widgets/prefs.py:178 +#: cola/widgets/prefs.py:200 msgid "Show Full Paths in the Window Title" msgstr "在視窗標題列中顯示版控庫的完整路徑" -#: cola/sequenceeditor.py:106 cola/widgets/finder.py:187 -#: cola/widgets/status.py:1384 +#: cola/sequenceeditor.py:104 cola/widgets/finder.py:186 +#: cola/widgets/status.py:1385 msgid "Show Help" msgstr "顯示幫助訊息" -#: cola/widgets/filelist.py:30 +#: cola/widgets/filelist.py:27 msgid "Show History" msgstr "檢視變更紀錄" -#: cola/widgets/prefs.py:348 +#: cola/widgets/prefs.py:368 msgid "Show file counts in Status titles" msgstr "" -#: cola/sequenceeditor.py:171 cola/widgets/finder.py:138 +#: cola/widgets/diff.py:794 +msgid "Show filenames" +msgstr "" + +#: cola/sequenceeditor.py:169 cola/widgets/finder.py:137 msgid "" "Show help\n" "Shortcut: ?" @@ -3297,137 +3407,145 @@ msgstr "" "顯示幫助訊息\n" "鍵盤快捷鍵：?" -#: cola/widgets/diff.py:765 +#: cola/widgets/diff.py:792 msgid "Show line numbers" msgstr "顯示行號" -#: cola/widgets/diff.py:761 +#: cola/widgets/remote.py:175 +msgid "Show remote messages" +msgstr "" + +#: cola/widgets/diff.py:789 msgid "Show whole surrounding functions of changes" msgstr "秀出整個包含變更的函式內容" -#: cola/widgets/recent.py:58 +#: cola/widgets/recent.py:56 msgid "Showing changes since" msgstr "顯示變更自前" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "Side by side" msgstr "並列檢視" -#: cola/cmds.py:2512 +#: cola/cmds.py:2463 msgid "Sign Off" msgstr "署名(Sign Off)" -#: cola/widgets/createtag.py:71 +#: cola/widgets/createtag.py:69 msgid "Sign Tag" msgstr "為標籤簽名" -#: cola/widgets/commitmsg.py:55 +#: cola/widgets/commitmsg.py:56 msgid "Sign off on this commit" msgstr "於此修訂版提交上簽名" -#: cola/widgets/about.py:412 cola/widgets/about.py:425 +#: cola/widgets/about.py:395 cola/widgets/about.py:408 msgid "Simplified Chinese translation" msgstr "簡體中文翻譯" -#: cola/cmds.py:2587 +#: cola/cmds.py:2529 msgid "Skip" msgstr "跳過" -#: cola/widgets/main.py:264 cola/widgets/main.py:617 +#: cola/widgets/main.py:260 cola/widgets/main.py:630 msgid "Skip Current Patch" msgstr "跳過目前的修正" -#: cola/widgets/main.py:267 +#: cola/widgets/main.py:261 msgid "Skip applying the current patch and continue applying patches" msgstr "" -#: cola/widgets/prefs.py:261 +#: cola/widgets/prefs.py:282 msgid "Sort bookmarks alphabetically" msgstr "以字母順序排序書籤" -#: cola/widgets/about.py:413 cola/widgets/about.py:436 -#: cola/widgets/about.py:440 +#: cola/widgets/about.py:396 cola/widgets/about.py:419 +#: cola/widgets/about.py:423 msgid "Spanish translation" msgstr "西班牙語翻譯" -#: cola/widgets/createtag.py:88 +#: cola/widgets/createtag.py:86 msgid "Specifies the SHA-1 to tag" msgstr "指定 SHA-1 雜湊給標籤" -#: cola/widgets/createtag.py:81 +#: cola/widgets/createtag.py:79 msgid "Specifies the tag message" msgstr "指定標籤訊息" -#: cola/widgets/createtag.py:65 +#: cola/widgets/createtag.py:63 msgid "Specifies the tag name" msgstr "指定標籤的名稱" -#: cola/widgets/spellcheck.py:46 +#: cola/widgets/spellcheck.py:45 msgid "Spelling Suggestions" msgstr "拼字建議" -#: cola/sequenceeditor.py:369 cola/widgets/merge.py:58 +#: cola/sequenceeditor.py:365 cola/widgets/merge.py:56 msgid "Squash" msgstr "壓為單一修訂版提交" -#: cola/widgets/merge.py:57 +#: cola/widgets/merge.py:55 msgid "Squash the merged commits into a single commit" msgstr "將合併之修訂版提交（們）壓為單一修訂版提交" -#: cola/cmds.py:2598 cola/widgets/action.py:60 cola/widgets/diff.py:982 +#: cola/cmds.py:2540 cola/widgets/action.py:58 cola/widgets/diff.py:1168 msgid "Stage" msgstr "移動到新修訂版準備區域" -#: cola/cmds.py:2753 +#: cola/cmds.py:2699 msgid "Stage / Unstage" msgstr "移入／移出新修訂版準備區域" -#: cola/cmds.py:2735 +#: cola/cmds.py:2681 msgid "Stage / Unstage All" msgstr "" -#: cola/widgets/diff.py:1016 +#: cola/widgets/diff.py:1055 msgid "Stage Diff Hunk" msgstr "將此內容差異區塊移入新修訂版準備區域" -#: cola/cmds.py:2691 +#: cola/cmds.py:2633 msgid "Stage Modified" msgstr "將已變更的項目移入新修訂版準備區域" -#: cola/cmds.py:2724 +#: cola/cmds.py:2670 msgid "Stage Modified and Untracked" msgstr "" -#: cola/widgets/status.py:872 cola/widgets/status.py:894 -#: cola/widgets/status.py:962 +#: cola/widgets/status.py:873 cola/widgets/status.py:895 +#: cola/widgets/status.py:963 msgid "Stage Selected" msgstr "將被選取的項目移入新修訂版準備區域" -#: cola/widgets/diff.py:1011 +#: cola/widgets/diff.py:1050 msgid "Stage Selected Lines" msgstr "將選取的行移入新修訂版準備區域(&S)" -#: cola/cmds.py:2702 +#: cola/cmds.py:2644 msgid "Stage Unmerged" msgstr "將尚未合併的檔案移動到新修訂版準備區域" -#: cola/cmds.py:2713 +#: cola/cmds.py:2655 msgid "Stage Untracked" msgstr "將尚未追蹤其版本的項目移動到新修訂版準備區域" -#: cola/widgets/commitmsg.py:438 +#: cola/widgets/commitmsg.py:446 msgid "Stage and Commit" msgstr "移入新修訂版準備區域並提交出去" -#: cola/widgets/commitmsg.py:435 +#: cola/widgets/commitmsg.py:443 msgid "Stage and commit?" msgstr "要移入新修訂版準備區域並提交出去嗎？" -#: cola/cmds.py:2586 +#: cola/widgets/action.py:58 +msgid "Stage changes using \"git add\"" +msgstr "" + +#: cola/cmds.py:2528 msgid "Stage conflicts" msgstr "將合併衝突移入新修訂版準備區域" -#: cola/cmds.py:2577 +#: cola/cmds.py:2519 msgid "Stage conflicts?" msgstr "要將合併衝突移入新修訂版準備區域嗎？" @@ -3435,45 +3553,45 @@ msgstr "要將合併衝突移入新修訂版準備區域嗎？" msgid "Stage/unstage selected paths for commit" msgstr "將被選取的路徑移進／移出新修訂版準備區域" -#: cola/models/browse.py:334 cola/widgets/status.py:156 -#: cola/widgets/status.py:620 +#: cola/models/browse.py:333 cola/widgets/status.py:156 +#: cola/widgets/status.py:621 msgid "Staged" msgstr "已被移入新修訂版準備區域" -#: cola/cmds.py:2605 +#: cola/cmds.py:2547 #, python-format msgid "Staging: %s" msgstr "正在移動到新修訂版準備區域：%s" -#: cola/widgets/main.py:597 +#: cola/widgets/main.py:610 msgid "Start Interactive Rebase..." msgstr "開始互動式變更基底……" -#: cola/widgets/createbranch.py:107 +#: cola/widgets/createbranch.py:105 msgid "Starting Revision" msgstr "起始修訂版" -#: cola/widgets/stash.py:40 +#: cola/widgets/stash.py:36 msgid "Stash" msgstr "珍藏項目" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash Index" msgstr "將修訂版提交準備區域中的變更存為珍藏項目" -#: cola/widgets/stash.py:77 +#: cola/widgets/stash.py:79 msgid "Stash staged changes only" msgstr "只將移入新修訂版提交準備區域中的變更存為珍藏項目" -#: cola/widgets/stash.py:73 +#: cola/widgets/stash.py:75 msgid "Stash unstaged changes only, keeping staged changes" msgstr "只將尚未移入新修訂版提交準備區域的變更存入珍藏項目，保留移入新修訂版提交準備區域的變更" -#: cola/widgets/action.py:66 cola/widgets/main.py:414 +#: cola/widgets/action.py:76 cola/widgets/main.py:422 msgid "Stash..." msgstr "珍藏項目(STASH)..." -#: cola/models/browse.py:33 cola/widgets/main.py:102 +#: cola/models/browse.py:32 cola/widgets/main.py:100 msgid "Status" msgstr "狀態" @@ -3481,151 +3599,159 @@ msgstr "狀態" msgid "Stop tracking paths" msgstr "停止追蹤路徑" -#: cola/widgets/submodules.py:82 +#: cola/widgets/submodules.py:81 msgid "Submodule URL (can be relative, ex: ../repo.git)" msgstr "" -#: cola/widgets/submodules.py:90 +#: cola/widgets/submodules.py:89 msgid "Submodule branch to track (optional)" msgstr "" -#: cola/widgets/submodules.py:86 +#: cola/widgets/submodules.py:85 msgid "Submodule path within the current repository (optional)" msgstr "" -#: cola/widgets/main.py:143 cola/widgets/submodules.py:32 +#: cola/widgets/main.py:141 cola/widgets/submodules.py:31 msgid "Submodules" msgstr "" -#: cola/widgets/prefs.py:174 +#: cola/widgets/prefs.py:196 msgid "Summarize Merge Commits" msgstr "概述合併進來的內容提交(commit)" -#: cola/sequenceeditor.py:325 cola/widgets/dag.py:506 +#: cola/sequenceeditor.py:322 cola/widgets/dag.py:572 msgid "Summary" msgstr "總結" -#: cola/widgets/prefs.py:168 +#: cola/widgets/prefs.py:273 msgid "Tab Width" msgstr "Tab 字元的顯示寬度" -#: cola/widgets/cfgactions.py:229 cola/widgets/createbranch.py:116 -#: cola/widgets/merge.py:48 +#: cola/widgets/cfgactions.py:227 cola/widgets/createbranch.py:114 +#: cola/widgets/merge.py:46 msgid "Tag" msgstr "標籤" -#: cola/cmds.py:2842 +#: cola/cmds.py:2788 msgid "Tag Created" msgstr "標籤已建立" -#: cola/widgets/createtag.py:80 +#: cola/widgets/createtag.py:78 msgid "Tag message..." msgstr "標籤訊息……" -#: cola/cmds.py:2802 +#: cola/cmds.py:2748 msgid "Tag-signing was requested but the tag message is empty." msgstr "被要求要有標籤簽名但是標籤訊息是空的。" -#: cola/widgets/branch.py:179 cola/widgets/branch.py:238 +#: cola/widgets/branch.py:183 cola/widgets/branch.py:248 msgid "Tags" msgstr "標籤" -#: cola/widgets/toolbar.py:180 +#: cola/widgets/action.py:78 cola/widgets/main.py:423 +msgid "Temporarily stash away uncommitted changes using \"git stash\"" +msgstr "" + +#: cola/widgets/toolbar.py:184 msgid "Text Beside Icon" msgstr "" -#: cola/widgets/toolbar.py:179 +#: cola/widgets/toolbar.py:183 msgid "Text Only" msgstr "" -#: cola/widgets/toolbar.py:181 +#: cola/widgets/toolbar.py:185 msgid "Text Under Icon" msgstr "" -#: cola/widgets/prefs.py:169 +#: cola/widgets/prefs.py:272 msgid "Text Width" msgstr "單行文字寬度限制" -#: cola/cmds.py:1116 +#: cola/cmds.py:1117 msgid "The branch will be no longer available." msgstr "此分支將不再存在。" -#: cola/cmds.py:648 +#: cola/cmds.py:650 #, python-format msgid "The branch will be reset using \"git reset --mixed %s\"" msgstr "這個分支將會被用「git reset --mixed %s」命令重設" -#: cola/cmds.py:699 cola/cmds.py:790 +#: cola/cmds.py:701 cola/cmds.py:792 #, python-format msgid "The branch will be reset using \"git reset --soft %s\"" msgstr "這個分支將會被用「git reset --soft %s」命令重設" -#: cola/widgets/commitmsg.py:303 +#: cola/widgets/commitmsg.py:311 msgid "The commit message will be cleared." msgstr "修訂版提交訊息將會被移除。" -#: cola/widgets/prefs.py:146 +#: cola/widgets/prefs.py:169 msgid "" "The date-time format used when displaying dates in Git DAG.\n" "This value is passed to git log --date=" msgstr "" -#: cola/widgets/archive.py:208 +#: cola/widgets/archive.py:206 #, python-format msgid "The file \"%s\" exists and will be overwritten." msgstr "檔案「%s」已存在且將會被覆寫。" -#: cola/cmds.py:1086 +#: cola/cmds.py:1087 msgid "The following files will be deleted:" msgstr "下列檔案將會被移除：" -#: cola/widgets/status.py:1646 +#: cola/widgets/status.py:1647 msgid "The number of leading paths to strip" msgstr "" -#: cola/cmds.py:716 +#: cola/cmds.py:718 #, python-format msgid "The repository will be reset using \"git reset --hard %s\"" msgstr "" -#: cola/cmds.py:665 +#: cola/cmds.py:667 #, python-format msgid "The repository will be reset using \"git reset --keep %s\"" msgstr "" -#: cola/cmds.py:682 +#: cola/cmds.py:684 #, python-format msgid "The repository will be reset using \"git reset --merge %s\"" msgstr "" -#: cola/cmds.py:2365 +#: cola/cmds.py:2316 msgid "The revision expression cannot be empty." msgstr "修訂版表達式不可以是空的。" -#: cola/cmds.py:3029 +#: cola/widgets/stash.py:225 +msgid "The stash has not been renamed" +msgstr "" + +#: cola/cmds.py:2975 #, python-format msgid "" "The submodule will be added using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:3074 +#: cola/cmds.py:3020 #, python-format msgid "" "The submodule will be updated using\n" "\"%s\"" msgstr "" -#: cola/cmds.py:736 +#: cola/cmds.py:738 #, python-format msgid "The worktree will be restored using \"git read-tree --reset -u %s\"" msgstr "" -#: cola/widgets/commitmsg.py:304 +#: cola/widgets/commitmsg.py:312 msgid "This cannot be undone. Clear commit message?" msgstr "此操作將無法復原。要清除提交訊息嗎？" -#: cola/cmds.py:778 cola/widgets/commitmsg.py:458 +#: cola/cmds.py:780 cola/widgets/commitmsg.py:466 msgid "" "This commit has already been published.\n" "This operation will rewrite published history.\n" @@ -3635,7 +3761,7 @@ msgstr "" "此操作將會重寫已推送出去的變更紀錄。\n" "您可能不想要做此操作。" -#: cola/widgets/diff.py:1158 +#: cola/widgets/diff.py:1232 msgid "" "This operation drops uncommitted changes.\n" "These changes cannot be recovered." @@ -3643,7 +3769,7 @@ msgstr "" "此操作將會丟棄尚未提交進版控庫的內容變更。\n" "這些內容變更將無法被救回。" -#: cola/cmds.py:2307 +#: cola/cmds.py:2258 msgid "" "This operation removes uncommitted edits from selected files.\n" "These changes cannot be recovered." @@ -3651,7 +3777,7 @@ msgstr "" "此操作將會丟棄尚未提交至版控庫的內容變更。\n" "這些內容變更將無法被救回。" -#: cola/cmds.py:2285 +#: cola/cmds.py:2236 msgid "" "This operation removes unstaged edits from selected files.\n" "These changes cannot be recovered." @@ -3659,27 +3785,27 @@ msgstr "" "此操作將丟棄尚未移入新修訂版準備區域的內容變動。\n" "這些內容變動將無法被還原。" -#: cola/cmds.py:475 +#: cola/cmds.py:476 msgid "" "This operation will replace the selected unmerged files with content from the branch being merged using \"git checkout --theirs\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/cmds.py:513 +#: cola/cmds.py:514 msgid "" "This operation will replace the selected unmerged files with content from your current branch using \"git checkout --ours\".\n" "*ALL* uncommitted changes will be lost.\n" "Recovering uncommitted changes is not possible." msgstr "" -#: cola/widgets/main.py:1109 +#: cola/widgets/main.py:1122 msgid "" "This repository has unresolved conflicts after applying a patch.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1102 +#: cola/widgets/main.py:1115 msgid "" "This repository is currently being rebased.\n" "Resolve conflicts, commit changes, and run:\n" @@ -3689,13 +3815,13 @@ msgstr "" "解決所有的變更基底衝突，提交變更，然後執行：\n" " 變更基底 > 繼續" -#: cola/widgets/main.py:1115 +#: cola/widgets/main.py:1128 msgid "" "This repository is in the middle of a cherry-pick.\n" "Resolve conflicts and commit changes." msgstr "" -#: cola/widgets/main.py:1121 +#: cola/widgets/main.py:1134 msgid "" "This repository is in the middle of a merge.\n" "Resolve conflicts and commit changes." @@ -3715,15 +3841,15 @@ msgstr "" msgid "To avoid applying removal lines ('-'), change them to context lines (' ')." msgstr "" -#: cola/sequenceeditor.py:342 +#: cola/sequenceeditor.py:338 msgid "Toggle Enabled" msgstr "切換為啟用" -#: cola/widgets/diff.py:776 +#: cola/widgets/diff.py:804 msgid "Toggle image diff" msgstr "" -#: cola/widgets/branch.py:63 +#: cola/widgets/branch.py:65 msgid "Toggle the branches filter" msgstr "切換分支過濾器開關" @@ -3731,51 +3857,51 @@ msgstr "切換分支過濾器開關" msgid "Toggle the paths filter" msgstr "切換路徑過濾器開關" -#: cola/widgets/toolbar.py:317 +#: cola/widgets/toolbar.py:322 msgid "Toolbar Style:" msgstr "" -#: cola/widgets/cfgactions.py:228 cola/widgets/merge.py:47 +#: cola/widgets/cfgactions.py:226 cola/widgets/merge.py:45 msgid "Tracking Branch" msgstr "跟蹤分支" -#: cola/widgets/createbranch.py:115 +#: cola/widgets/createbranch.py:113 msgid "Tracking branch" msgstr "追蹤分支" -#: cola/widgets/about.py:408 cola/widgets/about.py:434 -#: cola/widgets/about.py:445 +#: cola/widgets/about.py:391 cola/widgets/about.py:417 +#: cola/widgets/about.py:428 msgid "Traditional Chinese (Taiwan) translation" msgstr "傳統中文（台灣）翻譯" -#: cola/widgets/about.py:439 +#: cola/widgets/about.py:422 msgid "Translation" msgstr "" -#: cola/widgets/about.py:94 +#: cola/widgets/about.py:92 msgid "Translators" msgstr "翻譯者群" -#: cola/widgets/about.py:418 cola/widgets/about.py:423 -#: cola/widgets/about.py:438 +#: cola/widgets/about.py:401 cola/widgets/about.py:406 +#: cola/widgets/about.py:421 msgid "Turkish translation" msgstr "土耳其語翻譯" -#: cola/widgets/clone.py:109 cola/widgets/editremotes.py:451 -#: cola/widgets/submodules.py:117 +#: cola/widgets/clone.py:107 cola/widgets/editremotes.py:449 +#: cola/widgets/submodules.py:116 msgid "URL" msgstr "URL" -#: cola/widgets/remote.py:463 +#: cola/widgets/remote.py:497 #, python-format msgid "URL: %s" msgstr "URL: %s" -#: cola/widgets/about.py:415 +#: cola/widgets/about.py:398 msgid "Ukranian translation" msgstr "烏克蘭語翻譯" -#: cola/cmds.py:2122 +#: cola/cmds.py:2073 msgid "Unable to rebase" msgstr "無法變更基底" @@ -3784,53 +3910,58 @@ msgstr "無法變更基底" msgid "Unable to set URL for \"%(name)s\" to \"%(url)s\"" msgstr "無法將「%(name)s」的 URL 設定為 %(url)s" -#: cola/widgets/diff.py:1327 +#: cola/widgets/diff.py:1401 #, python-format msgid "Unable to write patch to \"%s\". Check permissions?" msgstr "" -#: cola/widgets/main.py:735 +#: cola/widgets/main.py:748 msgid "Undo" msgstr "撤銷" -#: cola/cmds.py:783 cola/cmds.py:788 cola/cmds.py:791 cola/widgets/main.py:208 +#: cola/cmds.py:785 cola/cmds.py:790 cola/cmds.py:793 cola/widgets/main.py:207 msgid "Undo Last Commit" msgstr "" -#: cola/cmds.py:789 +#: cola/cmds.py:791 msgid "Undo last commit?" msgstr "" -#: cola/cmds.py:782 +#: cola/cmds.py:784 msgid "Undo the published commit?" msgstr "" -#: cola/models/browse.py:328 cola/widgets/status.py:157 -#: cola/widgets/status.py:640 +#: cola/models/browse.py:327 cola/widgets/status.py:157 +#: cola/widgets/status.py:641 msgid "Unmerged" msgstr "尚未合併" -#: cola/cmds.py:2855 cola/widgets/action.py:61 cola/widgets/diff.py:985 +#: cola/cmds.py:2801 cola/widgets/action.py:61 cola/widgets/diff.py:1165 +#: cola/widgets/main.py:212 msgid "Unstage" msgstr "移出新修訂版準備區域" -#: cola/widgets/main.py:203 cola/widgets/status.py:790 +#: cola/widgets/main.py:202 cola/widgets/status.py:791 msgid "Unstage All" msgstr "將所有項目移出新修訂版準備區域" -#: cola/widgets/diff.py:1061 +#: cola/widgets/diff.py:1017 msgid "Unstage Diff Hunk" msgstr "將此內容差異區塊移出新修訂版準備區域" -#: cola/widgets/status.py:823 cola/widgets/status.py:858 +#: cola/widgets/status.py:824 cola/widgets/status.py:859 msgid "Unstage Selected" msgstr "將被選取的項目移出新修訂版準備區域" -#: cola/widgets/diff.py:1058 +#: cola/widgets/diff.py:1015 msgid "Unstage Selected Lines" msgstr "將被選取的行移出新修訂版準備區域" -#: cola/cmds.py:2867 +#: cola/widgets/action.py:61 +msgid "Unstage changes using \"git reset\"" +msgstr "" + +#: cola/cmds.py:2813 #, python-format msgid "Unstaging: %s" msgstr "正在將「%s」移出新修訂版準備區域" @@ -3839,90 +3970,89 @@ msgstr "正在將「%s」移出新修訂版準備區域" msgid "Untrack Selected" msgstr "將被選取的項目移出新修訂版準備區域" -#: cola/widgets/status.py:159 cola/widgets/status.py:646 +#: cola/widgets/status.py:159 cola/widgets/status.py:647 msgid "Untracked" msgstr "未納入版本追蹤" -#: cola/cmds.py:1141 cola/cmds.py:2923 +#: cola/cmds.py:1142 cola/cmds.py:2869 #, python-format msgid "Untracking: %s" msgstr "正在將「%s」移出新修訂版準備區域" -#: cola/widgets/main.py:374 +#: cola/widgets/main.py:369 msgid "Update All Submodules..." msgstr "" -#: cola/widgets/createbranch.py:121 +#: cola/widgets/createbranch.py:119 msgid "Update Existing Branch:" msgstr "是否更新既有分支：" -#: cola/cmds.py:3075 +#: cola/cmds.py:3021 #, fuzzy msgid "Update Submodule" msgstr "已更新" -#: cola/cmds.py:3072 +#: cola/cmds.py:3018 msgid "Update Submodule..." msgstr "" -#: cola/cmds.py:3111 +#: cola/cmds.py:3057 #, fuzzy msgid "Update Submodules" msgstr "初始化子模組" -#: cola/cmds.py:3109 +#: cola/cmds.py:3055 #, fuzzy msgid "Update all submodules?" msgstr "初始化子模組" -#: cola/cmds.py:2093 +#: cola/cmds.py:2044 msgid "Update stacked branches" msgstr "" -#: cola/cmds.py:2085 cola/cmds.py:2092 +#: cola/cmds.py:2036 cola/cmds.py:2043 msgid "Update stacked branches when rebasing?" msgstr "" -#: cola/cmds.py:3108 +#: cola/cmds.py:3054 #, fuzzy msgid "Update submodules..." msgstr "初始化子模組" -#: cola/widgets/status.py:953 +#: cola/widgets/status.py:954 #, fuzzy msgid "Update this submodule" msgstr "初始化子模組" -#: cola/cmds.py:3073 +#: cola/cmds.py:3019 msgid "Update this submodule?" msgstr "" -#: cola/widgets/branch.py:421 cola/widgets/createbranch.py:302 -#: cola/widgets/remote.py:135 +#: cola/widgets/branch.py:433 cola/widgets/createbranch.py:300 msgid "Updating" msgstr "正在更新" -#: cola/widgets/prefs.py:350 +#: cola/widgets/prefs.py:370 msgid "Use a block cursor in diff editors" msgstr "" -#: cola/widgets/prefs.py:154 +#: cola/widgets/prefs.py:177 msgid "Use gravatar.com to lookup icons for author emails" msgstr "" -#: cola/widgets/prefs.py:166 +#: cola/widgets/prefs.py:189 msgid "User Name" msgstr "使用者名稱" -#: cola/widgets/about.py:92 +#: cola/widgets/about.py:90 msgid "Version" msgstr "版本" -#: cola/widgets/dag.py:800 cola/widgets/main.py:845 cola/widgets/main.py:966 +#: cola/widgets/dag.py:866 cola/widgets/main.py:858 cola/widgets/main.py:979 msgid "View" msgstr "檢視" -#: cola/widgets/browse.py:137 cola/widgets/status.py:278 +#: cola/widgets/browse.py:137 cola/widgets/status.py:279 msgid "View History..." msgstr "檢視變更紀錄……" @@ -3930,39 +4060,39 @@ msgstr "檢視變更紀錄……" msgid "View history for selected paths" msgstr "檢視被選取的路徑（們）的變更紀錄" -#: cola/widgets/merge.py:54 +#: cola/widgets/branch.py:224 cola/widgets/merge.py:52 msgid "Visualize" msgstr "視覺化顯示" -#: cola/widgets/main.py:488 +#: cola/widgets/main.py:501 msgid "Visualize All Branches..." msgstr "視覺化顯示所有分支……" -#: cola/widgets/main.py:482 +#: cola/widgets/main.py:495 msgid "Visualize Current Branch..." msgstr "視覺化顯示當前分支……" -#: cola/widgets/createtag.py:73 +#: cola/widgets/createtag.py:71 msgid "Whether to sign the tag (git tag -s)" msgstr "是否簽名此標籤 (git tag -s)" -#: cola/widgets/text.py:399 +#: cola/widgets/text.py:396 msgid "Whole Words" msgstr "" -#: cola/widgets/commitmsg.py:432 +#: cola/widgets/commitmsg.py:440 msgid "Would you like to stage and commit all modified files?" msgstr "您要將所有被修改的檔案移入新修訂版準備區域並提交出去嗎？" -#: cola/widgets/diff.py:781 +#: cola/widgets/diff.py:809 msgid "XOR" msgstr "互斥或(XOR)" -#: cola/widgets/standard.py:1064 +#: cola/widgets/standard.py:1182 msgid "Yes" msgstr "是" -#: cola/cmds.py:256 +#: cola/cmds.py:255 msgid "" "You are in the middle of a merge.\n" "Cannot amend while merging." @@ -3970,36 +4100,36 @@ msgstr "" "您現在正在進行分支合併。\n" "您不能在進行分支合併時修正前一次的修訂版提交。" -#: cola/cmds.py:2123 +#: cola/cmds.py:2074 msgid "You cannot rebase with uncommitted changes." msgstr "您不能在還有尚未提交至版控庫的內容變更的時候進行變更基底。" -#: cola/widgets/merge.py:227 +#: cola/widgets/merge.py:225 msgid "You must specify a revision to merge." msgstr "您必須要選擇一個修訂版來合併。" -#: cola/widgets/merge.py:217 +#: cola/widgets/merge.py:215 msgid "You must specify a revision to view." msgstr "您必須要選擇一個修訂版來檢視。" -#: cola/widgets/dag.py:710 cola/widgets/dag.py:1588 +#: cola/widgets/dag.py:776 cola/widgets/dag.py:1645 msgid "Zoom In" msgstr "放大" -#: cola/widgets/dag.py:706 cola/widgets/dag.py:1594 +#: cola/widgets/dag.py:772 cola/widgets/dag.py:1651 msgid "Zoom Out" msgstr "縮小" -#: cola/widgets/dag.py:524 cola/widgets/dag.py:714 cola/widgets/dag.py:1596 -#: cola/widgets/diff.py:785 +#: cola/widgets/dag.py:590 cola/widgets/dag.py:780 cola/widgets/dag.py:1653 +#: cola/widgets/diff.py:813 msgid "Zoom to Fit" msgstr "縮放以符合視窗大小" -#: cola/widgets/grep.py:112 +#: cola/widgets/grep.py:110 msgid "command-line arguments" msgstr "命令列參數" -#: cola/widgets/main.py:932 cola/widgets/main.py:938 +#: cola/widgets/main.py:945 cola/widgets/main.py:951 msgid "error: unable to execute git" msgstr "錯誤：無法執行 git" @@ -4008,45 +4138,41 @@ msgstr "錯誤：無法執行 git" msgid "exit code %s" msgstr "程式以 %s 狀態碼結束" -#: cola/app.py:301 +#: cola/app.py:304 #, python-format msgid "fatal: \"%s\" is not a directory. Please specify a correct --repo ." msgstr "致命錯誤：「%s」並不是個目錄。請指定一個正確的 --repo 〈路徑〉。" -#: cola/widgets/main.py:928 +#: cola/widgets/main.py:941 #, python-format msgid "git cola version %s" msgstr "git cola 第 %s 版" -#: cola/widgets/startup.py:35 +#: cola/widgets/startup.py:34 msgid "git-cola" msgstr "git-cola" -#: cola/difftool.py:63 +#: cola/difftool.py:82 msgid "git-cola diff" msgstr "git-cola diff" -#: cola/widgets/submodules.py:81 +#: cola/widgets/submodules.py:80 msgid "git://git.example.com/repo.git" msgstr "" -#: cola/widgets/grep.py:132 +#: cola/widgets/grep.py:130 msgid "grep result..." msgstr "搜尋結果……" -#: cola/widgets/about.py:486 +#: cola/widgets/about.py:469 msgid "hotkeys.html" msgstr "hotkeys_zh_TW.html" -#: cola/widgets/submodules.py:85 +#: cola/widgets/submodules.py:84 msgid "path/to/submodule" msgstr "" -#: cola/cmds.py:2537 -msgid "unknown" -msgstr "未知使用者" - -#: cola/widgets/createtag.py:63 +#: cola/widgets/createtag.py:61 msgid "vX.Y.Z" msgstr "X.Y.Z版本" @@ -4055,14 +4181,18 @@ msgid "x 1" msgstr "" #: cola/hidpi.py:44 -msgid "x 1.5" +msgid "x 1.25" msgstr "" #: cola/hidpi.py:45 +msgid "x 1.5" +msgstr "" + +#: cola/hidpi.py:46 msgid "x 2" msgstr "" -#: cola/widgets/search.py:53 cola/widgets/search.py:58 +#: cola/widgets/search.py:52 cola/widgets/search.py:57 msgid "yyyy-MM-dd" msgstr "yyyy-MM-dd" @@ -4180,6 +4310,10 @@ msgstr "yyyy-MM-dd" #~ msgid "A branch is required for 'Merged Into'." #~ msgstr "'合併到' 需要指定某個分支" +#, python-format +#~ msgid "A stash named \"%s\" already exists" +#~ msgstr "名為「%s」的珍藏項目已經存在" + #~ msgid "Abort completed. Ready." #~ msgstr "中止完成. 就緒." @@ -4413,6 +4547,9 @@ msgstr "yyyy-MM-dd" #~ msgid "Error: Command Failed" #~ msgstr "錯誤: 命令失敗" +#~ msgid "Error: Stash exists" +#~ msgstr "錯誤：珍藏項目已存在" + #~ msgid "Errors: %s" #~ msgstr "錯誤：%s" @@ -5200,6 +5337,9 @@ msgstr "yyyy-MM-dd" #~ msgid "remote prune %s" #~ msgstr "清除遠端 %s" +#~ msgid "unknown" +#~ msgstr "未知使用者" + #~ msgid "update-ref failed:" #~ msgstr "update-ref 失敗:" -- 2.11.4.GIT