Mercurial Repositories > eric / changeset
changeset
Fixed an issue in the Mercurial project browser helper.
Mon, 22 Sep 2014 19:52:35 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 22 Sep 2014 19:52:35 +0200
- changeset 3811
- 7b2f618617ac
- parent 3809
- 3d71f2e733b2
- child 3812
- 9643514994be
Fixed an issue in the Mercurial project browser helper.
--- a/Documentation/Help/source.qhp Sun Sep 21 17:43:13 2014 +0200 +++ b/Documentation/Help/source.qhp Mon Sep 22 19:52:35 2014 +0200 @@ -6145,6 +6145,7 @@ <keyword name="HgProjectBrowserHelper" id="HgProjectBrowserHelper" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper" /> <keyword name="HgProjectBrowserHelper (Constructor)" id="HgProjectBrowserHelper (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__init__" /> <keyword name="HgProjectBrowserHelper.__HgAnnotate" id="HgProjectBrowserHelper.__HgAnnotate" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgAnnotate" /> + <keyword name="HgProjectBrowserHelper.__HgConfigure" id="HgProjectBrowserHelper.__HgConfigure" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgConfigure" /> <keyword name="HgProjectBrowserHelper.__HgCopy" id="HgProjectBrowserHelper.__HgCopy" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgCopy" /> <keyword name="HgProjectBrowserHelper.__HgExtendedDiff" id="HgProjectBrowserHelper.__HgExtendedDiff" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgExtendedDiff" /> <keyword name="HgProjectBrowserHelper.__HgForget" id="HgProjectBrowserHelper.__HgForget" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgForget" />
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html Sun Sep 21 17:43:13 2014 +0200 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html Mon Sep 22 19:52:35 2014 +0200 @@ -63,6 +63,9 @@ <td><a href="#HgProjectBrowserHelper.__HgAnnotate">__HgAnnotate</a></td> <td>Private slot called by the context menu to show the annotations of a file.</td> </tr><tr> +<td><a href="#HgProjectBrowserHelper.__HgConfigure">__HgConfigure</a></td> +<td>Private method to open the configuration dialog.</td> +</tr><tr> <td><a href="#HgProjectBrowserHelper.__HgCopy">__HgCopy</a></td> <td>Private slot called by the context menu to copy the selected file.</td> </tr><tr> @@ -163,6 +166,11 @@ <p> Private slot called by the context menu to show the annotations of a file. +</p><a NAME="HgProjectBrowserHelper.__HgConfigure" ID="HgProjectBrowserHelper.__HgConfigure"></a> +<h4>HgProjectBrowserHelper.__HgConfigure</h4> +<b>__HgConfigure</b>(<i></i>) +<p> + Private method to open the configuration dialog. </p><a NAME="HgProjectBrowserHelper.__HgCopy" ID="HgProjectBrowserHelper.__HgCopy"></a> <h4>HgProjectBrowserHelper.__HgCopy</h4> <b>__HgCopy</b>(<i></i>)
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sun Sep 21 17:43:13 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Mon Sep 22 19:52:35 2014 +0200 @@ -13,6 +13,8 @@ from PyQt5.QtWidgets import QMenu, QDialog +from E5Gui.E5Application import e5App + from Project.ProjectBrowserModel import ProjectBrowserFileItem from VCS.ProjectBrowserHelper import VcsProjectBrowserHelper @@ -370,7 +372,7 @@ menu.addAction(self.tr('Select all versioned directory entries'), self.browser.selectVCSDirEntries) menu.addSeparator() - # TODO: add entry for configure + menu.addAction(self.tr("Configure..."), self.__HgConfigure) mainMenu.addSeparator() mainMenu.addMenu(menu) @@ -458,7 +460,7 @@ menu.addAction(self.tr('Select all versioned directory entries'), self.browser.selectVCSDirEntries) menu.addSeparator() - # TODO: add entry for configure + menu.addAction(self.tr("Configure..."), self.__HgConfigure) mainMenu.addSeparator() mainMenu.addMenu(menu) @@ -491,7 +493,7 @@ menu.addAction(self.tr('Select all versioned directory entries'), self.browser.selectVCSDirEntries) menu.addSeparator() - # TODO: add entry for configure + menu.addAction(self.tr("Configure..."), self.__HgConfigure) mainMenu.addSeparator() mainMenu.addMenu(menu) @@ -590,7 +592,7 @@ menu.addAction(self.tr('Select all versioned directory entries'), self.browser.selectVCSDirEntries) menu.addSeparator() - # TODO: add entry for configure + menu.addAction(self.tr("Configure..."), self.__HgConfigure) mainMenu.addSeparator() mainMenu.addMenu(menu) @@ -675,7 +677,7 @@ menu.addAction(self.tr('Select all versioned directory entries'), self.browser.selectVCSDirEntries) menu.addSeparator() - # TODO: add entry for configure + menu.addAction(self.tr("Configure..."), self.__HgConfigure) mainMenu.addSeparator() mainMenu.addMenu(menu) @@ -846,3 +848,10 @@ for fn in names: self._updateVCSStatus(fn) + + def __HgConfigure(self): + """ + Private method to open the configuration dialog. + """ + e5App().getObject("UserInterface")\ + .showPreferences("zzz_mercurialPage")
--- a/i18n/eric6_cs.ts Sun Sep 21 17:43:13 2014 +0200 +++ b/i18n/eric6_cs.ts Mon Sep 22 19:52:35 2014 +0200 @@ -15609,7 +15609,7 @@ <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="2083"/> <source>bytes</source> - <translation type="unfinished"></translation> + <translation type="unfinished">bajty</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="2086"/> @@ -22209,130 +22209,135 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> <source>Version Control</source> <translation>Kontrola verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Commit changes to repository...</source> <translation>Zapsat změny do repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> <source>Add to repository</source> <translation>Přidat do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> <source>Remove from repository (and disk)</source> <translation>Odebrat z repozitáře (a z disku)</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> + <source>Show log</source> + <translation>Zobrazit log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <source>Show log browser</source> + <translation>Zobrazit log prohlížeč</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <source>Show status</source> + <translation>Zobrazit status</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <source>Show annotated file</source> + <translation>Zobrazit komentované soubory</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <source>Revert changes</source> + <translation>Vrátit změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <source>Select all local file entries</source> + <translation>Vybrat všechny lokální soubory</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <source>Select all versioned file entries</source> + <translation>Vybrat všechny soubory ve správě verzí</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <source>Select all local directory entries</source> + <translation>Vybrat všechny lokální adresáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <source>Select all versioned directory entries</source> + <translation>Vybrat všechny adresáře ve správě verzí</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <source>Remove from repository only</source> + <translation>Odebrat jen z repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <source>Do you really want to remove these files from the repository?</source> + <translation>Opravdu chcete odebrat tyto soubory z repozitáře?</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> - <source>Show log</source> - <translation>Zobrazit log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="547"/> - <source>Show log browser</source> - <translation>Zobrazit log prohlížeč</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> - <source>Show status</source> - <translation>Zobrazit status</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="345"/> - <source>Show annotated file</source> - <translation>Zobrazit komentované soubory</translation> + <source>Copy</source> + <translation type="unfinished">Kopírovat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="249"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> - <source>Revert changes</source> - <translation>Vrátit změny</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> - <source>Select all local file entries</source> - <translation>Vybrat všechny lokální soubory</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> - <source>Select all versioned file entries</source> - <translation>Vybrat všechny soubory ve správě verzí</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> - <source>Select all local directory entries</source> - <translation>Vybrat všechny lokální adresáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> - <source>Select all versioned directory entries</source> - <translation>Vybrat všechny adresáře ve správě verzí</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> - <source>Remove from repository only</source> - <translation>Odebrat jen z repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> - <source>Do you really want to remove these files from the repository?</source> - <translation>Opravdu chcete odebrat tyto soubory z repozitáře?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="538"/> - <source>Copy</source> - <translation type="unfinished">Kopírovat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540"/> - <source>Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="247"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641"/> - <source>Show differences</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="331"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="645"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="655"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="658"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <source>Configure...</source> + <translation type="unfinished">Konfigurovat...</translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -24468,7 +24473,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="23"/> <source>Default</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Výchozí</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="93"/> @@ -40760,7 +40765,8 @@ <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="393"/> <source><b>Any character: '.'</b> <p>Select to insert a dot (.) in your regexp.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Nějaký znak: '.'</b> +<p>Vybrat pro vložení tečky (.) ve vašem regexp.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="397"/> @@ -40768,19 +40774,23 @@ <p>Select to insert a dot (.) in your regexp. The dot matches a single character, except line break characters (by default). E.g. 'gr.y' matches 'gray', 'grey', 'gr%y', etc. Use the dot sparingly. Often, a character class or negated character class is faster and more precise.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Nějaký znak: '.'</b> +<p>Vybrat pro vložení tečky (.) ve vašem regexp. Tečka porovnává (defaultně) jeden znak, kromě znaků konce řádky. +Např. 'gr.y' vyhodnotí výrazy 'gray', 'grey', 'gr%y', atd. Používejte tečku střídmě. Často bývá třída znaku nebo negace třídy znaku rychlejší a přesnější.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="411"/> <source><b>Repeat contents</b> <p>Select a repetition condition via a specific dialog. This dialog will help to specify the allowed range for repetitions.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Opakovat obsah</b> +<p>Vybrat podmínku opakování přes konkrétní dialog. Tento dialog pomůže specifikovat povolený rozsah pro opakování.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="159"/> <source><b>Non capturing parentheses: (?:)</b> <p>Select to insert some non capturing brackets.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Nezachycované závorky (?:)</b> +<p>Výběr pro vložení závorek, ve kterých jejich obsah nevytváří skupinu (group).</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="163"/> @@ -40788,13 +40798,15 @@ <p>Select to insert some non capturing brackets. It can be used to apply a regexp quantifier (eg. '?' or '+') to the entire group of characters inside the brakets. E.g. the regex 'Set(?:Value)?' matches 'Set' or 'SetValue'. The '?:' inside the brakets means that the content of the match (called the backreference) is not stored for further use.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Nezachycované závorky (?:)</b> +<p>Výběr pro vložení závorek, ve kterých obsah nevytváří skupinu. Může být použit i s regexp kvantifikátorem (např. '?' nebo '+') pro celou skupinu uvnitř závorek. Např. regexp 'Set(?:Value)?' nalezne 'Set' nebo 'SetValue'. Výraz '?:' za levou závorkou znamená, že obsah v závorkách (nazývaný zpětná reference) nebude uložen pro další použití.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="419"/> <source><b>Group: ()</b> <p>Select to insert some capturing brackets.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Skupina ()</b> +<p>Vybrat pro vložení závorek, které mají zachytit nějaký obsah.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="177"/> @@ -40804,13 +40816,17 @@ the backreference matched inside the brakets is stored for further use (i.e. 'Value' in the second example above). One can access the backereference with the '\1' expression. </p> <p>E.g. '([a-c])x\1x\1' will match 'axaxa', 'bxbxb' and 'cxcxc'.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Skupina: ()</b> +<p>Vybrat pro vložení závorek, které mají zachytit nějaký obsah. Může být použit i s regexp kvantifikátorem (např. '?' nebo '+') pro celou skupinu uvnitř závorek. Např. regexp 'Set(Value)?' nalezne 'Set' nebo 'SetValue'. Opačně oproti závorkám, které obsah nezachycují, je obsah uvnitř závorek uložen pro další použití (např. 'Value' ve druhém příkladu dole). +Jednička v následujícím pžíkladu umožňuje použít výraz nalezený v závorkách.</p> +<p>Příklad: '([a-c])x\1x\1' vyhledá 'axaxa', 'bxbxb' and 'cxcxc'.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="432"/> <source><b>Alternatives: '|'</b> <p>Select to insert the alternation symbol '|'. </p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Alternativy: '|'</b> +<p>Vybrat pro vložení symbol alternativy '|'.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="193"/> @@ -40819,64 +40835,75 @@ several possible regular expressions. E.g. 'cat|dog|mouse|fish' matches words containing the word 'cat', 'dog','mouse' or 'fish'. Be aware that in the above example, the alternatives refer to whole or part of words. If you want to match exactly the words 'cat', 'dog', ... you should express the fact that you only want to match complete words: '\b(cat|dog|mouse|fish)\b'</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Alternativy: '|'</b> +<p>Vybrat pro vložení symbol alternativy '|'. Alternace se používá pro vyhledávání více možností vhledaném výrazu. Např. 'kočka|pes|myš|ryba' nalezne slova 'kočka', 'pes', 'myš' a 'ryba'. Je nutné si uvědomit, že předchozí příklad nalezne tyto výrazy i uvnitř jiných slov. Pokud chcete získat pouze slova 'kočka', 'pes', ... musíte výraz zapsat takto: '\b(kočka|pes|myš|ryba)\b'. Pozor na české znaky! Kódování vzorku musí souhlasit s prohledávaným textem. V případě kódování UTF pak musí být vše převedeno na unicode:<br> +# -*- coding: UTF-8 -*-<br>import re<br>print '\n'.join(re.findall(ur'\b(pes|kočka|myš|ryba)\b', u'pes, kočka, myš, ryba', re.U))</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="204"/> <source><b>Begin of line: '^'</b> <p>Select to insert the start line character (^).</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Začátek řádky: '^'</b> +<p>Vybrat pro vložení znaku začátku řádku (^).</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="208"/> <source><b>Begin of line: '^'</b> <p>Select to insert the start line character (^). It is used to find some expressions at the begining of lines. E.g. '^[A-Z]' match lines starting with a capitalized character. </p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Začátek řádky: '^'</b> +<p>Vybrat pro vložení znaku začátku řádku (^). Používá se na vyhledání výrazů na začátku řádků. Např: '^[A-Z]' nalezne řádky začínající velkými znaky. Pozor! Diakritika do toho nepatří. V takovém případě zadejte např: '[A-ZŽŠČŘĎŤŇ]'</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="217"/> <source><b>End of line: '$'</b> <p>Select to insert the end of line character ($).</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Konec řádky: '$'</b> +<p>Vybrat pro vložení znaku konce řádku ($).</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="221"/> <source><b>End of line: '$'</b> <p>Select to insert the end of line character ($). It is used to find some expressions at the end of lines.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Konec řádku: '$'</b> +<p>Vybrat pro vložení znaku konce řádku ($). Používá se pro vyhledání výrazů na konci řádků.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="229"/> <source><b>Word boundary</b> <p>Select to insert the word boudary character (\b).</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Okraj slova</b> +<p>Vybrat pro vložení znaku okraje slova (\b).</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="233"/> <source><b>Word boundary</b> <p>Select to insert the word boudary character (\b). This character is used to express the fact that word must begin or end at this position. E.g. '\bcat\b' matches exactly the word 'cat' while 'concatenation' is ignored.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Okraj slova</b> +<p>Vybrat pro vložení znaku okraje slova (\b). Využívá se k nalezení celých slov. Například '\bmyš\b' nalezne pouze slovo 'myš' ale slovo 'zamyšlený' již nalezeno není.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="242"/> <source><b>Non word boundary</b> <p>Select to insert the word boudary character (\B). \B is the negated version of \b.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Ne okraj slova</b> +<p>Vybrat pro vložení znaku \B, který je negací znaku \b a vyhledává výrazy, které nejsou okraji slova.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="246"/> <source><b>Non word boundary</b> <p>Select to insert the word boudary character (\B). \B is the negated version of \b. \B matches at every position where \b does not. Effectively, \B matches at any position between two word characters as well as at any position between two non-word characters.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Ne okraj slova</b> +<p>Vybrat pro vložení znaku \B znamenající ne okraj slova. Je to přesný opak znaku \b. Znak \B nalezne kažodu pozici kde \b není. Výraz \B nalezne účinně každou pozici mezi dvěma znaky slov stejně jako mezi dvěma znaky znamenající ne-slovo.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="255"/> <source><b>Positive lookahead: (?=<i>regexpr</i>)</b> <p>Select to insert the positive lookhead brackets.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Pozitivní vyhlížení: (?=<i>regexpr</i>)</b> +<p>Vybrat pro vložení závorek pro pozitivní vyhlížení.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="259"/> @@ -40884,13 +40911,16 @@ <p>Select to insert the positive lookhead brackets. Basically, positive lookhead is used to match a character only if followed by another one. Writting 'q(?=u)' means that you want to match the 'q' character only if it is followed by 'u'. In this statement 'u' is a trivial regexp which may be replaced by a more complex expression; q(?=[abc])' will match a 'q' if followed by either 'a', 'b' or 'c'.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Pozitivní vyhlížení: (?=<i>regexpr</i>)</b> +<p>Vybrat pro vložení závorek pro pozitivní vyhlížení. Pozitivní vyhlížení se používá pro vyhledání znaků, které vyhovují následujícímu výrazu. +Zápis 'q(?=u)' znamená, že chcete vyhledat znak 'q' pouze v případě, že za ním následuje znak 'u'. To je jednoduchý příklad, ale je možné zadat mnohem složitější výraz, například 'q(?=[abc])', který vyhledá znak 'q' pokud za ním následují znaky 'a', 'b' nebo 'c'.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="269"/> <source><b>Negative lookahead: (?!<i>regexpr</i>)</b> <p>Select to insert the negative lookhead brackets.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Negativní vyhlížení: (?!<i>regexpr</i>)</b> +<p>Vybrat pro zadání závorek negativního vyhlížení.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="273"/> @@ -40898,7 +40928,9 @@ <p>Select to insert the negative lookhead brackets. Basically, negative lookhead is used to match a character only if it is not followed by a another one. Writting 'q(?!u)' means that you want to match 'q' only if it is not followed by 'u'. In this statement, 'u' is a trivial regexp which may be replaced by a more complex expression; 'q(?![abc])' will match a 'q' if it is followed by anything else than 'a', 'b' or 'c'.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Negativní vyhlížení: (?!<i>regexpr</i>)</b> +<p>Vybrat pro zadání závorek negativního vyhlížení. Negativní vyhlížení se používá pro vyhledání znaků, které nevyhovují následujícímu výrazu. +Zápis 'q(?!u)' znamená, že chcete vyhledat znak 'q' pouze v případě, že za ním nenásleduje znak 'u'. To je jednoduchý příklad, ale je možné zadat mnohem složitější výraz, například 'q(?![abc])', který vyhledá znak 'q' jen pokud za ním nenásledují znaky 'a', 'b' nebo 'c'.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="327"/> @@ -42019,7 +42051,8 @@ <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="76"/> <source><b>Any character: '.'</b> <p>Select to insert a dot (.) in your regexp.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Nějaký znak: '.'</b> +<p>Vybrat pro vložení tečky (.) ve vašem regexp.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="80"/> @@ -42027,19 +42060,23 @@ <p>Select to insert a dot (.) in your regexp. The dot matches a single character, except line break characters (by default). E.g. 'gr.y' matches 'gray', 'grey', 'gr%y', etc. Use the dot sparingly. Often, a character class or negated character class is faster and more precise.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Nějaký znak: '.'</b> +<p>Vybrat pro vložení tečky (.) ve vašem regexp. Tečka porovnává (defaultně) jeden znak, kromě znaků konce řádky. +Např. 'gr.y' vyhodnotí výrazy 'gray', 'grey', 'gr%y', atd. Používejte tečku střídmě. Často bývá třída znaku nebo negace třídy znaku rychlejší a přesnější.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="94"/> <source><b>Repeat contents</b> <p>Select a repetition condition via a specific dialog. This dialog will help to specify the allowed range for repetitions.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Opakovat obsah</b> +<p>Vybrat podmínku opakování přes konkrétní dialog. Tento dialog pomůže specifikovat povolený rozsah pro opakování.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="102"/> <source><b>Non capturing parentheses: (?:)</b> <p>Select to insert some non capturing brackets.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Nezachycované závorky (?:)</b> +<p>Výběr pro vložení závorek, ve kterých jejich obsah nevytváří skupinu (group).</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="106"/> @@ -42047,7 +42084,8 @@ <p>Select to insert some non capturing brackets. It can be used to apply a regexp quantifier (eg. '?' or '+') to the entire group of characters inside the brakets. E.g. the regex 'Set(?:Value)?' matches 'Set' or 'SetValue'. The '?:' inside the brakets means that the content of the match (called the backreference) is not stored for further use.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Nezachycované závorky (?:)</b> +<p>Výběr pro vložení závorek, ve kterých obsah nevytváří skupinu. Může být použit i s regexp kvantifikátorem (např. '?' nebo '+') pro celou skupinu uvnitř závorek. Např. regexp 'Set(?:Value)?' nalezne 'Set' nebo 'SetValue'. Výraz '?:' za levou závorkou znamená, že obsah v závorkách (nazývaný zpětná reference) nebude uložen pro další použití.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="116"/> @@ -42067,7 +42105,8 @@ <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="130"/> <source><b>Group: ()</b> <p>Select to insert some capturing brackets.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Skupina ()</b> +<p>Vybrat pro vložení závorek, které mají zachytit nějaký obsah.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="134"/> @@ -42077,7 +42116,10 @@ the backreference matched inside the brakets is stored for further use (i.e. 'Value' in the second example above). One can access the backereference with the '\1' expression. </p> <p>E.g. '([a-c])x\1x\1' will match 'axaxa', 'bxbxb' and 'cxcxc'.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Skupina: ()</b> +<p>Vybrat pro vložení závorek, které mají zachytit nějaký obsah. Může být použit i s regexp kvantifikátorem (např. '?' nebo '+') pro celou skupinu uvnitř závorek. Např. regexp 'Set(Value)?' nalezne 'Set' nebo 'SetValue'. Opačně oproti závorkám, které obsah nezachycují, je obsah uvnitř závorek uložen pro další použití (např. 'Value' ve druhém příkladu dole). +Jednička v následujícím pžíkladu umožňuje použít výraz nalezený v závorkách.</p> +<p>Příklad: '([a-c])x\1x\1' vyhledá 'axaxa', 'bxbxb' and 'cxcxc'.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="146"/> @@ -42118,7 +42160,8 @@ <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="175"/> <source><b>Alternatives: '|'</b> <p>Select to insert the alternation symbol '|'. </p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Alternativy: '|'</b> +<p>Vybrat pro vložení symbol alternativy '|'.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="179"/> @@ -42127,64 +42170,75 @@ several possible regular expressions. E.g. 'cat|dog|mouse|fish' matches words containing the word 'cat', 'dog','mouse' or 'fish'. Be aware that in the above example, the alternatives refer to whole or part of words. If you want to match exactly the words 'cat', 'dog', ... you should express the fact that you only want to match complete words: '\b(cat|dog|mouse|fish)\b'</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Alternativy: '|'</b> +<p>Vybrat pro vložení symbol alternativy '|'. Alternace se používá pro vyhledávání více možností vhledaném výrazu. Např. 'kočka|pes|myš|ryba' nalezne slova 'kočka', 'pes', 'myš' a 'ryba'. Je nutné si uvědomit, že předchozí příklad nalezne tyto výrazy i uvnitř jiných slov. Pokud chcete získat pouze slova 'kočka', 'pes', ... musíte výraz zapsat takto: '\b(kočka|pes|myš|ryba)\b'. Pozor na české znaky! Kódování vzorku musí souhlasit s prohledávaným textem. V případě kódování UTF pak musí být vše převedeno na unicode:<br> +# -*- coding: UTF-8 -*-<br>import re<br>print '\n'.join(re.findall(ur'\b(pes|kočka|myš|ryba)\b', u'pes, kočka, myš, ryba', re.U))</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="190"/> <source><b>Begin of line: '^'</b> <p>Select to insert the start line character (^).</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Začátek řádky: '^'</b> +<p>Vybrat pro vložení znaku začátku řádku (^).</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="194"/> <source><b>Begin of line: '^'</b> <p>Select to insert the start line character (^). It is used to find some expressions at the begining of lines. E.g. '^[A-Z]' match lines starting with a capitalized character. </p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Začátek řádky: '^'</b> +<p>Vybrat pro vložení znaku začátku řádku (^). Používá se na vyhledání výrazů na začátku řádků. Např: '^[A-Z]' nalezne řádky začínající velkými znaky. Pozor! Diakritika do toho nepatří. V takovém případě zadejte např: '[A-ZŽŠČŘĎŤŇ]'</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="203"/> <source><b>End of line: '$'</b> <p>Select to insert the end of line character ($).</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Konec řádky: '$'</b> +<p>Vybrat pro vložení znaku konce řádku ($).</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="207"/> <source><b>End of line: '$'</b> <p>Select to insert the end of line character ($). It is used to find some expressions at the end of lines.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Konec řádku: '$'</b> +<p>Vybrat pro vložení znaku konce řádku ($). Používá se pro vyhledání výrazů na konci řádků.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="215"/> <source><b>Word boundary</b> <p>Select to insert the word boudary character (\b).</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Okraj slova</b> +<p>Vybrat pro vložení znaku okraje slova (\b).</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="219"/> <source><b>Word boundary</b> <p>Select to insert the word boudary character (\b). This character is used to express the fact that word must begin or end at this position. E.g. '\bcat\b' matches exactly the word 'cat' while 'concatenation' is ignored.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Okraj slova</b> +<p>Vybrat pro vložení znaku okraje slova (\b). Využívá se k nalezení celých slov. Například '\bmyš\b' nalezne pouze slovo 'myš' ale slovo 'zamyšlený' již nalezeno není.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="228"/> <source><b>Non word boundary</b> <p>Select to insert the word boudary character (\B). \B is the negated version of \b.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Ne okraj slova</b> +<p>Vybrat pro vložení znaku \B, který je negací znaku \b a vyhledává výrazy, které nejsou okraji slova.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="232"/> <source><b>Non word boundary</b> <p>Select to insert the word boudary character (\B). \B is the negated version of \b. \B matches at every position where \b does not. Effectively, \B matches at any position between two word characters as well as at any position between two non-word characters.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Ne okraj slova</b> +<p>Vybrat pro vložení znaku \B znamenající ne okraj slova. Je to přesný opak znaku \b. Znak \B nalezne kažodu pozici kde \b není. Výraz \B nalezne účinně každou pozici mezi dvěma znaky slov stejně jako mezi dvěma znaky znamenající ne-slovo.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="241"/> <source><b>Positive lookahead: (?=<i>regexpr</i>)</b> <p>Select to insert the positive lookhead brackets.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Pozitivní vyhlížení: (?=<i>regexpr</i>)</b> +<p>Vybrat pro vložení závorek pro pozitivní vyhlížení.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="245"/> @@ -42192,13 +42246,16 @@ <p>Select to insert the positive lookhead brackets. Basically, positive lookhead is used to match a character only if followed by another one. Writting 'q(?=u)' means that you want to match the 'q' character only if it is followed by 'u'. In this statement 'u' is a trivial regexp which may be replaced by a more complex expression; q(?=[abc])' will match a 'q' if followed by either 'a', 'b' or 'c'.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Pozitivní vyhlížení: (?=<i>regexpr</i>)</b> +<p>Vybrat pro vložení závorek pro pozitivní vyhlížení. Pozitivní vyhlížení se používá pro vyhledání znaků, které vyhovují následujícímu výrazu. +Zápis 'q(?=u)' znamená, že chcete vyhledat znak 'q' pouze v případě, že za ním následuje znak 'u'. To je jednoduchý příklad, ale je možné zadat mnohem složitější výraz, například 'q(?=[abc])', který vyhledá znak 'q' pokud za ním následují znaky 'a', 'b' nebo 'c'.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="255"/> <source><b>Negative lookahead: (?!<i>regexpr</i>)</b> <p>Select to insert the negative lookhead brackets.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Negativní vyhlížení: (?!<i>regexpr</i>)</b> +<p>Vybrat pro zadání závorek negativního vyhlížení.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="259"/> @@ -42206,7 +42263,9 @@ <p>Select to insert the negative lookhead brackets. Basically, negative lookhead is used to match a character only if it is not followed by a another one. Writting 'q(?!u)' means that you want to match 'q' only if it is not followed by 'u'. In this statement, 'u' is a trivial regexp which may be replaced by a more complex expression; 'q(?![abc])' will match a 'q' if it is followed by anything else than 'a', 'b' or 'c'.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Negativní vyhlížení: (?!<i>regexpr</i>)</b> +<p>Vybrat pro zadání závorek negativního vyhlížení. Negativní vyhlížení se používá pro vyhledání znaků, které nevyhovují následujícímu výrazu. +Zápis 'q(?!u)' znamená, že chcete vyhledat znak 'q' pouze v případě, že za ním nenásleduje znak 'u'. To je jednoduchý příklad, ale je možné zadat mnohem složitější výraz, například 'q(?![abc])', který vyhledá znak 'q' jen pokud za ním nenásledují znaky 'a', 'b' nebo 'c'.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="269"/> @@ -62338,7 +62397,7 @@ <message> <location filename="../Helpviewer/OfflineStorage/WebDatabasesModel.py" line="210"/> <source>bytes</source> - <translation type="unfinished"></translation> + <translation type="unfinished">bajty</translation> </message> <message> <location filename="../Helpviewer/OfflineStorage/WebDatabasesModel.py" line="213"/>
--- a/i18n/eric6_de.ts Sun Sep 21 17:43:13 2014 +0200 +++ b/i18n/eric6_de.ts Mon Sep 22 19:52:35 2014 +0200 @@ -22296,130 +22296,135 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> <source>Version Control</source> <translation>Versionskontrolle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Commit changes to repository...</source> <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> <source>Add to repository</source> <translation>Zum Repository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="630"/> - <source>Remove from repository (and disk)</source> - <translation>Vom Repository (und der Platte) löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> - <source>Show log</source> - <translation>Beschreibungen anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="547"/> - <source>Show log browser</source> - <translation>Zeige Log Browser</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <source>Remove from repository (and disk)</source> + <translation>Vom Repository (und der Platte) löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> + <source>Show log</source> + <translation>Beschreibungen anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <source>Show log browser</source> + <translation>Zeige Log Browser</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> <source>Show annotated file</source> <translation>Zeige kommentierte Datei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> - <source>Select all local file entries</source> - <translation>Alle lokalen Dateieinträge auswählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> - <source>Select all versioned file entries</source> - <translation>Alle versionierten Dateieinträge auswählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> - <source>Select all local directory entries</source> - <translation>Alle lokalen Verzeichniseinträge auswählen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <source>Select all local file entries</source> + <translation>Alle lokalen Dateieinträge auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <source>Select all versioned file entries</source> + <translation>Alle versionierten Dateieinträge auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <source>Select all local directory entries</source> + <translation>Alle lokalen Verzeichniseinträge auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> <source>Select all versioned directory entries</source> <translation>Alle versionierten Verzeichniseinträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> <source>Remove from repository only</source> <translation>Nur vom Repository löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> <source>Do you really want to remove these files from the repository?</source> <translation>Wollen Sie wirklich diese Dateien vom Repository löschen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="538"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> <source>Copy</source> <translation>Kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> <source>Move</source> <translation>Verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="249"/> <source>Extensions</source> <translation>Erweiterungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> <source>Show differences</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> <source>Show differences side-by-side</source> <translation>Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> <source>Show differences (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> <source>Show differences side-by-side (extended)</source> <translation>Unterschiede nebeneinander anzeigen (erweitert)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="655"/> - <source>Conflicts resolved</source> - <translation>Konflikte gelöst</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="658"/> - <source>Conflicts unresolved</source> - <translation>Konflikte ungelöst</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <source>Conflicts resolved</source> + <translation>Konflikte gelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <source>Conflicts unresolved</source> + <translation>Konflikte ungelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Re-Merge</source> <translation>Neu zusammenführen</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <source>Configure...</source> + <translation>Einstellungen...</translation> + </message> </context> <context> <name>HgProjectHelper</name>
--- a/i18n/eric6_en.ts Sun Sep 21 17:43:13 2014 +0200 +++ b/i18n/eric6_en.ts Mon Sep 22 19:52:35 2014 +0200 @@ -22148,130 +22148,135 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> <source>Version Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> <source>Remove from repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> + <source>Show log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <source>Show log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <source>Show status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <source>Show annotated file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <source>Select all local file entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <source>Select all versioned file entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <source>Select all local directory entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <source>Select all versioned directory entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> - <source>Show log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="547"/> - <source>Show log browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> - <source>Show status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="345"/> - <source>Show annotated file</source> + <source>Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="249"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> - <source>Revert changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> - <source>Select all local file entries</source> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> - <source>Select all versioned file entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> - <source>Select all local directory entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> - <source>Select all versioned directory entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> - <source>Do you really want to remove these files from the repository?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="538"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540"/> - <source>Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="247"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641"/> - <source>Show differences</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="331"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="645"/> - <source>Show differences (extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="340"/> - <source>Show differences side-by-side (extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="655"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="658"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <source>Configure...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name>
--- a/i18n/eric6_es.ts Sun Sep 21 17:43:13 2014 +0200 +++ b/i18n/eric6_es.ts Mon Sep 22 19:52:35 2014 +0200 @@ -22297,130 +22297,135 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> <source>Version Control</source> <translation>Control de Versiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Commit changes to repository...</source> <translation>Hacer commit de los cambios al repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> <source>Add to repository</source> <translation>Añadir al repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> <source>Remove from repository (and disk)</source> <translation>Eliminar del repositorio (y del disco)</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> + <source>Show log</source> + <translation>Mostrar log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <source>Show log browser</source> + <translation>Mostrar navegador de log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <source>Select all local file entries</source> + <translation>Seleccionar todas las entradas de archivo locales</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <source>Select all versioned file entries</source> + <translation>Seleccionar todas las entradas de archivo versionadas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <source>Select all local directory entries</source> + <translation>Seleccionar todas las entradas de directorio locales</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <source>Select all versioned directory entries</source> + <translation>Seleccionar todas las entradas de directorio versionadas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <source>Show status</source> + <translation>Mostrar estado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <source>Show annotated file</source> + <translation>Mostrar archivo anotado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <source>Revert changes</source> + <translation>Revertir cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <source>Remove from repository only</source> + <translation>Eliminar solamente del repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <source>Do you really want to remove these files from the repository?</source> + <translation>¿Realmente quiere eliminar estos archivos del repositorio?</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> - <source>Show log</source> - <translation>Mostrar log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="547"/> - <source>Show log browser</source> - <translation>Mostrar navegador de log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> - <source>Select all local file entries</source> - <translation>Seleccionar todas las entradas de archivo locales</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> - <source>Select all versioned file entries</source> - <translation>Seleccionar todas las entradas de archivo versionadas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> - <source>Select all local directory entries</source> - <translation>Seleccionar todas las entradas de directorio locales</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> - <source>Select all versioned directory entries</source> - <translation>Seleccionar todas las entradas de directorio versionadas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> - <source>Show status</source> - <translation>Mostrar estado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="345"/> - <source>Show annotated file</source> - <translation>Mostrar archivo anotado</translation> + <source>Copy</source> + <translation>Copiar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <source>Move</source> + <translation>Mover</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="249"/> + <source>Extensions</source> + <translation>Extensiones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <source>Show differences</source> + <translation>Mostrar diferencias</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <source>Show differences side-by-side</source> + <translation>Mostrar diferencias lado a lado</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> - <source>Revert changes</source> - <translation>Revertir cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> - <source>Remove from repository only</source> - <translation>Eliminar solamente del repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> - <source>Do you really want to remove these files from the repository?</source> - <translation>¿Realmente quiere eliminar estos archivos del repositorio?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="538"/> - <source>Copy</source> - <translation>Copiar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540"/> - <source>Move</source> - <translation>Mover</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="247"/> - <source>Extensions</source> - <translation>Extensiones</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641"/> - <source>Show differences</source> - <translation>Mostrar diferencias</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="331"/> - <source>Show differences side-by-side</source> - <translation>Mostrar diferencias lado a lado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="645"/> <source>Show differences (extended)</source> <translation>Mostrar diferencias (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> <source>Show differences side-by-side (extended)</source> <translation>Mostrar diferencias lado a lado (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="655"/> - <source>Conflicts resolved</source> - <translation>Conflictos resueltos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="658"/> - <source>Conflicts unresolved</source> - <translation>Conflictos sin resolver</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <source>Conflicts resolved</source> + <translation>Conflictos resueltos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <source>Conflicts unresolved</source> + <translation>Conflictos sin resolver</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Re-Merge</source> <translation>Re-Merge</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <source>Configure...</source> + <translation type="unfinished">Configurar...</translation> + </message> </context> <context> <name>HgProjectHelper</name>
--- a/i18n/eric6_fr.ts Sun Sep 21 17:43:13 2014 +0200 +++ b/i18n/eric6_fr.ts Mon Sep 22 19:52:35 2014 +0200 @@ -8203,7 +8203,7 @@ <message> <location filename="../E5Gui/E5ToolBarDialog.ui" line="51"/> <source>&New</source> - <translation type="unfinished"></translation> + <translation type="unfinished">&Nouveau</translation> </message> <message> <location filename="../E5Gui/E5ToolBarDialog.ui" line="58"/> @@ -8331,7 +8331,7 @@ <message> <location filename="../E5Gui/E5ZoomWidget.ui" line="165"/> <source>Zoom reset</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Annulation du zoom</translation> </message> </context> <context> @@ -18144,7 +18144,7 @@ <message> <location filename="../Helpviewer/HelpWindow.py" line="985"/> <source>Zoom reset</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Annulation du zoom</translation> </message> <message> <location filename="../Helpviewer/HelpWindow.py" line="985"/> @@ -18333,7 +18333,7 @@ <message> <location filename="../Helpviewer/HelpWindow.py" line="764"/> <source>Stop</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Arrêt</translation> </message> <message> <location filename="../Helpviewer/HelpWindow.py" line="764"/> @@ -22236,130 +22236,135 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> <source>Version Control</source> <translation type="unfinished">Contrôle de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> <source>Remove from repository (and disk)</source> <translation type="unfinished">Supprimer du référentiel (et du disque)</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> + <source>Show log</source> + <translation type="unfinished">Afficher le log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <source>Show log browser</source> + <translation type="unfinished">Afficher le navigateur de logs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <source>Show status</source> + <translation type="unfinished">Afficher l'état (status)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <source>Show annotated file</source> + <translation type="unfinished">Afficher les fichiers annotés</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <source>Revert changes</source> + <translation type="unfinished">Revenir avant les modifications</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <source>Select all local file entries</source> + <translation type="unfinished">Sélectionner tous les fichiers locaux</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <source>Select all versioned file entries</source> + <translation type="unfinished">Sélectionner tous les fichiers ayant une version</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <source>Select all local directory entries</source> + <translation type="unfinished">Sélectionner tous les répertoires locaux</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <source>Select all versioned directory entries</source> + <translation type="unfinished">Sélectionner tous les répertoires ayant une version</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <source>Remove from repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> - <source>Show log</source> - <translation type="unfinished">Afficher le log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="547"/> - <source>Show log browser</source> - <translation type="unfinished">Afficher le navigateur de logs</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> - <source>Show status</source> - <translation type="unfinished">Afficher l'état (status)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="345"/> - <source>Show annotated file</source> - <translation type="unfinished">Afficher les fichiers annotés</translation> + <source>Copy</source> + <translation type="unfinished">Copier</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="249"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> - <source>Revert changes</source> - <translation type="unfinished">Revenir avant les modifications</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> - <source>Select all local file entries</source> - <translation type="unfinished">Sélectionner tous les fichiers locaux</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> - <source>Select all versioned file entries</source> - <translation type="unfinished">Sélectionner tous les fichiers ayant une version</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> - <source>Select all local directory entries</source> - <translation type="unfinished">Sélectionner tous les répertoires locaux</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> - <source>Select all versioned directory entries</source> - <translation type="unfinished">Sélectionner tous les répertoires ayant une version</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> - <source>Remove from repository only</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> - <source>Do you really want to remove these files from the repository?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="538"/> - <source>Copy</source> - <translation type="unfinished">Copier</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540"/> - <source>Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="247"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641"/> - <source>Show differences</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="331"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="645"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="655"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="658"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <source>Configure...</source> + <translation type="unfinished">Configuration...</translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -26538,7 +26543,7 @@ <message> <location filename="../IconEditor/IconEditorWindow.py" line="190"/> <source>&New</source> - <translation type="unfinished"></translation> + <translation type="unfinished">&Nouveau</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="190"/> @@ -27047,7 +27052,7 @@ <message> <location filename="../IconEditor/IconEditorWindow.py" line="506"/> <source>Zoom reset</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Annulation du zoom</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="506"/> @@ -40746,7 +40751,7 @@ <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="14"/> <source>QRegExp Wizard</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Assistant QRegExp </translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="25"/>
--- a/i18n/eric6_it.ts Sun Sep 21 17:43:13 2014 +0200 +++ b/i18n/eric6_it.ts Mon Sep 22 19:52:35 2014 +0200 @@ -22273,130 +22273,135 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> <source>Version Control</source> <translation>Controllo di Versione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Commit changes to repository...</source> <translation>Committa le modifica nel repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> <source>Add to repository</source> <translation>Aggiungi al repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> <source>Remove from repository (and disk)</source> <translation>Rimuovi dal repository (e dal disco)</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> + <source>Show log</source> + <translation>Mostra log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <source>Show log browser</source> + <translation>Mostra il browser dei log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <source>Show status</source> + <translation>Mostra stato</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <source>Show annotated file</source> + <translation>Mostra file appuntati</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <source>Revert changes</source> + <translation>Annulla modifiche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <source>Select all local file entries</source> + <translation>Seleziona tutt i file locali</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <source>Select all versioned file entries</source> + <translation>Seleziona tutti i file controllati</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <source>Select all local directory entries</source> + <translation>Seleziona tutte le directory locali</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <source>Select all versioned directory entries</source> + <translation>Seleziona tutte le directory controllate</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <source>Remove from repository only</source> + <translation>Rimuovi solo dal repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <source>Do you really want to remove these files from the repository?</source> + <translation>Vuoi veramente rimuovere questi file dal repository ?</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> - <source>Show log</source> - <translation>Mostra log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="547"/> - <source>Show log browser</source> - <translation>Mostra il browser dei log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> - <source>Show status</source> - <translation>Mostra stato</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="345"/> - <source>Show annotated file</source> - <translation>Mostra file appuntati</translation> + <source>Copy</source> + <translation>Copia</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <source>Move</source> + <translation>Sposta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="249"/> + <source>Extensions</source> + <translation>Estensioni</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> - <source>Revert changes</source> - <translation>Annulla modifiche</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> - <source>Select all local file entries</source> - <translation>Seleziona tutt i file locali</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> - <source>Select all versioned file entries</source> - <translation>Seleziona tutti i file controllati</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> - <source>Select all local directory entries</source> - <translation>Seleziona tutte le directory locali</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> - <source>Select all versioned directory entries</source> - <translation>Seleziona tutte le directory controllate</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> - <source>Remove from repository only</source> - <translation>Rimuovi solo dal repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> - <source>Do you really want to remove these files from the repository?</source> - <translation>Vuoi veramente rimuovere questi file dal repository ?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="538"/> - <source>Copy</source> - <translation>Copia</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540"/> - <source>Move</source> - <translation>Sposta</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="247"/> - <source>Extensions</source> - <translation>Estensioni</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641"/> - <source>Show differences</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="331"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="645"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="655"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="658"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <source>Configure...</source> + <translation type="unfinished">Configura...</translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -40836,7 +40841,8 @@ <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="411"/> <source><b>Repeat contents</b> <p>Select a repetition condition via a specific dialog. This dialog will help to specify the allowed range for repetitions.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Ripeti contenuti</b> +<p>Selezione una condizione di ripetizione con uno specifico dialogo. Il dialogo aiuterà a specificare l'intervallo di ripetizioni consentito.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="159"/> @@ -40882,7 +40888,8 @@ <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="432"/> <source><b>Alternatives: '|'</b> <p>Select to insert the alternation symbol '|'. </p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Alternativa: '|'</b> +<p>Seleziona per inserire il simbolo di alternativa '|'.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="193"/> @@ -42123,7 +42130,8 @@ <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="94"/> <source><b>Repeat contents</b> <p>Select a repetition condition via a specific dialog. This dialog will help to specify the allowed range for repetitions.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Ripeti contenuti</b> +<p>Selezione una condizione di ripetizione con uno specifico dialogo. Il dialogo aiuterà a specificare l'intervallo di ripetizioni consentito.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="102"/> @@ -42218,7 +42226,8 @@ <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="175"/> <source><b>Alternatives: '|'</b> <p>Select to insert the alternation symbol '|'. </p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Alternativa: '|'</b> +<p>Seleziona per inserire il simbolo di alternativa '|'.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="179"/>
--- a/i18n/eric6_pt.ts Sun Sep 21 17:43:13 2014 +0200 +++ b/i18n/eric6_pt.ts Mon Sep 22 19:52:35 2014 +0200 @@ -22225,130 +22225,135 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> <source>Version Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> <source>Remove from repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> <source>Remove from repository only</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> + <source>Show log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <source>Show log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <source>Show status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <source>Show annotated file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <source>Revert changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <source>Select all local file entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <source>Select all versioned file entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <source>Select all local directory entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <source>Select all versioned directory entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> - <source>Show log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="547"/> - <source>Show log browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> - <source>Show status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="345"/> - <source>Show annotated file</source> + <source>Copy</source> + <translation>Copiar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> - <source>Revert changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> - <source>Select all local file entries</source> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="249"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> - <source>Select all versioned file entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> - <source>Select all local directory entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> - <source>Select all versioned directory entries</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> - <source>Do you really want to remove these files from the repository?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="538"/> - <source>Copy</source> - <translation>Copiar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540"/> - <source>Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641"/> - <source>Show differences</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="331"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="645"/> - <source>Show differences (extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="340"/> - <source>Show differences side-by-side (extended)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="247"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="655"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="658"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <source>Configure...</source> + <translation type="unfinished">Configurar...</translation> + </message> </context> <context> <name>HgProjectHelper</name>
--- a/i18n/eric6_ru.ts Sun Sep 21 17:43:13 2014 +0200 +++ b/i18n/eric6_ru.ts Mon Sep 22 19:52:35 2014 +0200 @@ -22314,130 +22314,135 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> <source>Version Control</source> <translation>Контроль версий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Commit changes to repository...</source> <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> <source>Add to repository</source> <translation>Добавить в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="630"/> - <source>Remove from repository (and disk)</source> - <translation>Удаление из репозитория (и с диска)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> - <source>Show log</source> - <translation>Показать журнал</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="547"/> - <source>Show log browser</source> - <translation>Показать проводник журналов</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> - <source>Select all local file entries</source> - <translation>Выделить все локальные файлы</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> - <source>Select all versioned file entries</source> - <translation>Выделить все файлы с версиями (VCS)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> - <source>Select all local directory entries</source> - <translation>Выделить все локальные каталоги</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> - <source>Select all versioned directory entries</source> - <translation>Выделить все каталоги с версиями (VCS)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> + <source>Remove from repository (and disk)</source> + <translation>Удаление из репозитория (и с диска)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> + <source>Show log</source> + <translation>Показать журнал</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <source>Show log browser</source> + <translation>Показать проводник журналов</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <source>Select all local file entries</source> + <translation>Выделить все локальные файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <source>Select all versioned file entries</source> + <translation>Выделить все файлы с версиями (VCS)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <source>Select all local directory entries</source> + <translation>Выделить все локальные каталоги</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <source>Select all versioned directory entries</source> + <translation>Выделить все каталоги с версиями (VCS)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> <source>Show annotated file</source> <translation>Показать файл, снабжённый комментариями</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <source>Revert changes</source> + <translation>Отмена изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <source>Remove from repository only</source> + <translation>Удалить только из репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <source>Do you really want to remove these files from the repository?</source> + <translation>Вы правда хотите удалить эти файлы переводов и из репозитория?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> + <source>Copy</source> + <translation>Копировать</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <source>Move</source> + <translation>Сдвинуть</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="249"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> - <source>Revert changes</source> - <translation>Отмена изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> - <source>Remove from repository only</source> - <translation>Удалить только из репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> - <source>Do you really want to remove these files from the repository?</source> - <translation>Вы правда хотите удалить эти файлы переводов и из репозитория?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="538"/> - <source>Copy</source> - <translation>Копировать</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540"/> - <source>Move</source> - <translation>Сдвинуть</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="247"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641"/> - <source>Show differences</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="331"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="645"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="655"/> - <source>Conflicts resolved</source> - <translation type="unfinished">Конфликт решён</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="658"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <source>Conflicts resolved</source> + <translation type="unfinished">Конфликт решён</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <source>Configure...</source> + <translation type="unfinished">Настроить...</translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -40908,7 +40913,8 @@ <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="383"/> <source><b>Single character of a range (e.g. [abcd])</b><p>Select a single character of a range via a specific dialog.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Один символ из множества (напр. [abcd])</b> +<p>Вставить один символ из множества с помощью специального диалога.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="386"/> @@ -40919,7 +40925,8 @@ <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="393"/> <source><b>Any character: '.'</b> <p>Select to insert a dot (.) in your regexp.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Любой символ: '.'</b> +<p>Вставить точку (.) в регулярное выражение.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="397"/> @@ -40927,19 +40934,23 @@ <p>Select to insert a dot (.) in your regexp. The dot matches a single character, except line break characters (by default). E.g. 'gr.y' matches 'gray', 'grey', 'gr%y', etc. Use the dot sparingly. Often, a character class or negated character class is faster and more precise.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>любой символ: '.'</b> +<p>Вставить точку (.) в регулярное выражение. Точка совпадает с любым символом, кроме символа окончания строки (по умолчанию). +Например, 'gr.y' совпадает с 'gray', 'grey', 'gr%y', и т.д. Используйте точку без фанатизма. Часто использование класса символов или дополнения до класса символов быстрее и более точно.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="411"/> <source><b>Repeat contents</b> <p>Select a repetition condition via a specific dialog. This dialog will help to specify the allowed range for repetitions.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Повторять содержимое</b> +<p>Задайте условия повторения с помощью специального диалога. Этот диалог поможет указать допустимые пределы для повторений.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="159"/> <source><b>Non capturing parentheses: (?:)</b> <p>Select to insert some non capturing brackets.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Скобки без захвата: (?:)</b> +<p>Вставить скобки, которые группируют, но не попадают в выражения захвата.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="163"/> @@ -40947,13 +40958,17 @@ <p>Select to insert some non capturing brackets. It can be used to apply a regexp quantifier (eg. '?' or '+') to the entire group of characters inside the brakets. E.g. the regex 'Set(?:Value)?' matches 'Set' or 'SetValue'. The '?:' inside the brakets means that the content of the match (called the backreference) is not stored for further use.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Скобки без захвата: (?:)</b> +<p>Вставить скобки, которые группируют, но не попадают в выражения захвата. Они могут использоваться для того, чтобы применить квантификаторы ('?', '*', или '+') ко всей +группе символов внутри скобок. Например, регулярное выражение 'Set(?:Value)?' совпадает с 'Set' или 'SetValue'. '?:' внутри скобок +означает, что содержимое скобок (называемое обратной ссылкой) не сохраняется для дальнейшего использования.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="419"/> <source><b>Group: ()</b> <p>Select to insert some capturing brackets.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Группа: ()</b> +<p>Вставить скобки с захватом содержимого.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="177"/> @@ -40963,13 +40978,21 @@ the backreference matched inside the brakets is stored for further use (i.e. 'Value' in the second example above). One can access the backereference with the '\1' expression. </p> <p>E.g. '([a-c])x\1x\1' will match 'axaxa', 'bxbxb' and 'cxcxc'.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Группа: ()</b> +<p>Вставить скобки с захватом содержимого. +Они могут использоваться для того, чтобы применить квантификаторы ('?', '*', или '+') ко всей +группе символов внутри скобок. Например, регулярное выражение 'Set(?:Value)?' совпадает с 'Set' или 'SetValue'. +В отличие от скобок без захвата, +обратная ссылка сохраняется для дальнейшего использования (т.е. 'Value' из примера). +Значение обратной ссылки можно получить с помощью выражения '\1'. </p> +<p>Например, '([a-c])x\1x\1' совпадёт с 'axaxa', 'bxbxb' и 'cxcxc'.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="432"/> <source><b>Alternatives: '|'</b> <p>Select to insert the alternation symbol '|'. </p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Альтернативы: '|'</b> +<p>Вставить символ альтернатив '|'. </p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="193"/> @@ -40978,64 +41001,77 @@ several possible regular expressions. E.g. 'cat|dog|mouse|fish' matches words containing the word 'cat', 'dog','mouse' or 'fish'. Be aware that in the above example, the alternatives refer to whole or part of words. If you want to match exactly the words 'cat', 'dog', ... you should express the fact that you only want to match complete words: '\b(cat|dog|mouse|fish)\b'</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Альтернативы: '|'</b> +<p>Вставить симвот альтернатив '|' в регулярное выражение. Альтернативы используются для совпадения с одним из нескольких возможных регулярных выражений. Например, 'cat|dog|mouse|fish' совпадает со словами, содержащими слово 'cat', 'dog','mouse' или 'fish'. +Обратите внимание, что в приведённом примере альтернативы ссылаются как на целые слова, так и на части слов. Если необходимо совпадение с целыми словами 'cat', 'dog', ... необходимо выразить это следующим образом: '\b(cat|dog|mouse|fish)\b'</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="204"/> <source><b>Begin of line: '^'</b> <p>Select to insert the start line character (^).</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Начало строки: '^'</b> +<p>Вставить символ начала строки (^).</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="208"/> <source><b>Begin of line: '^'</b> <p>Select to insert the start line character (^). It is used to find some expressions at the begining of lines. E.g. '^[A-Z]' match lines starting with a capitalized character. </p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Начало строки: '^'</b> +<p>Вставить символ начала строки (^). Он используется, чтобы найти выражения с начала строк. +Например, '^[A-Z]' совпадает заглавной латинской буквой, стоящей в начале строки. </p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="217"/> <source><b>End of line: '$'</b> <p>Select to insert the end of line character ($).</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Окончание строки: '$'</b> +<p>Вставить символ окончания строки ($).</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="221"/> <source><b>End of line: '$'</b> <p>Select to insert the end of line character ($). It is used to find some expressions at the end of lines.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Конец строки: '$'</b> +<p>Вставить символ конца строки ($). Используется для поиска выражений в конце строк.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="229"/> <source><b>Word boundary</b> <p>Select to insert the word boudary character (\b).</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Граница слова</b> +<p>Вставить символ границы слова (\b).</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="233"/> <source><b>Word boundary</b> <p>Select to insert the word boudary character (\b). This character is used to express the fact that word must begin or end at this position. E.g. '\bcat\b' matches exactly the word 'cat' while 'concatenation' is ignored.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Граница слова</b> +<p>Вставить символ границы слова (\b). Этот символ используется для обозначения того, что на данной позиции должно начинаться или заканчиваться слово. +Например, '\bcat\b' совпадает исключительно со словом 'cat', в то время как слово 'concatenation' будет пропущено.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="242"/> <source><b>Non word boundary</b> <p>Select to insert the word boudary character (\B). \B is the negated version of \b.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Не граница слова</b> +<p>Вставить символ не границы слова (\B). Это выражение, обратное выражению \b.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="246"/> <source><b>Non word boundary</b> <p>Select to insert the word boudary character (\B). \B is the negated version of \b. \B matches at every position where \b does not. Effectively, \B matches at any position between two word characters as well as at any position between two non-word characters.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Не граница слова</b> +<p>Вставить символ не границы слова (\B). Это выражение, обратное выражению \b. \B совпадает с любой позицией, с которой не совпадает \b. Фактически, \B совпадает с любой позицией между символов в слове, и также с любой позицией между символов дополнения до слова</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="255"/> <source><b>Positive lookahead: (?=<i>regexpr</i>)</b> <p>Select to insert the positive lookhead brackets.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Положительная предварительная проверка: (?=<i>regexpr</i>)</b> +<p>Вставить скобки положительной предварительной проверки.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="259"/> @@ -41043,7 +41079,9 @@ <p>Select to insert the positive lookhead brackets. Basically, positive lookhead is used to match a character only if followed by another one. Writting 'q(?=u)' means that you want to match the 'q' character only if it is followed by 'u'. In this statement 'u' is a trivial regexp which may be replaced by a more complex expression; q(?=[abc])' will match a 'q' if followed by either 'a', 'b' or 'c'.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Положительная предварительная проверка: (?=<i>regexpr</i>)</b> +<p>Вставить скобки положительной предварительной проверки. В основном, положительная предварительная проверка используется для совпадения с символом, за которым следует другой символ +Выражение 'q(?=u)' совпадает с символом 'q', только если за ним следует символ 'u'. В этом примере, 'u' — это простейшее регулярное выражение, которое можно заменить на более сложное: q(?=[abc])' совпадает с 'q', если за ним следует 'a', 'b' или 'c'.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="269"/> @@ -42168,18 +42206,21 @@ <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="66"/> <source><b>Single character of a range (e.g. [abcd])</b><p>Select a single character of a range via a specific dialog.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Один символ из множества (напр. [abcd])</b> +<p>Вставить один символ из множества с помощью специального диалога.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="69"/> <source><b>Single character of a range (e.g. [abcd])</b><p>Select a single character of a range via a specific dialog. This dialog will help to edit the range of characters and add some specific conditions.</p>s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Один символ из множества (напр. [abcd])</b> +<p>Выбрать множество символов с помощью специального диалога. Этот диалог поможет выбрать множество символов и задать некоторые специфические ограничения.</p>s</translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="76"/> <source><b>Any character: '.'</b> <p>Select to insert a dot (.) in your regexp.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Любой символ: '.'</b> +<p>Вставить точку (.) в регулярное выражение.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="80"/> @@ -42187,19 +42228,23 @@ <p>Select to insert a dot (.) in your regexp. The dot matches a single character, except line break characters (by default). E.g. 'gr.y' matches 'gray', 'grey', 'gr%y', etc. Use the dot sparingly. Often, a character class or negated character class is faster and more precise.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>любой символ: '.'</b> +<p>Вставить точку (.) в регулярное выражение. Точка совпадает с любым символом, кроме символа окончания строки (по умолчанию). +Например, 'gr.y' совпадает с 'gray', 'grey', 'gr%y', и т.д. Используйте точку без фанатизма. Часто использование класса символов или дополнения до класса символов быстрее и более точно.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="94"/> <source><b>Repeat contents</b> <p>Select a repetition condition via a specific dialog. This dialog will help to specify the allowed range for repetitions.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Повторять содержимое</b> +<p>Задайте условия повторения с помощью специального диалога. Этот диалог поможет указать допустимые пределы для повторений.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="102"/> <source><b>Non capturing parentheses: (?:)</b> <p>Select to insert some non capturing brackets.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Скобки без захвата: (?:)</b> +<p>Вставить скобки, которые группируют, но не попадают в выражения захвата.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="106"/> @@ -42207,7 +42252,10 @@ <p>Select to insert some non capturing brackets. It can be used to apply a regexp quantifier (eg. '?' or '+') to the entire group of characters inside the brakets. E.g. the regex 'Set(?:Value)?' matches 'Set' or 'SetValue'. The '?:' inside the brakets means that the content of the match (called the backreference) is not stored for further use.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Скобки без захвата: (?:)</b> +<p>Вставить скобки, которые группируют, но не попадают в выражения захвата. Они могут использоваться для того, чтобы применить квантификаторы ('?', '*', или '+') ко всей +группе символов внутри скобок. Например, регулярное выражение 'Set(?:Value)?' совпадает с 'Set' или 'SetValue'. '?:' внутри скобок +означает, что содержимое скобок (называемое обратной ссылкой) не сохраняется для дальнейшего использования.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="116"/> @@ -42227,7 +42275,8 @@ <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="130"/> <source><b>Group: ()</b> <p>Select to insert some capturing brackets.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Группа: ()</b> +<p>Вставить скобки с захватом содержимого.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="134"/> @@ -42237,7 +42286,14 @@ the backreference matched inside the brakets is stored for further use (i.e. 'Value' in the second example above). One can access the backereference with the '\1' expression. </p> <p>E.g. '([a-c])x\1x\1' will match 'axaxa', 'bxbxb' and 'cxcxc'.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Группа: ()</b> +<p>Вставить скобки с захватом содержимого. +Они могут использоваться для того, чтобы применить квантификаторы ('?', '*', или '+') ко всей +группе символов внутри скобок. Например, регулярное выражение 'Set(?:Value)?' совпадает с 'Set' или 'SetValue'. +В отличие от скобок без захвата, +обратная ссылка сохраняется для дальнейшего использования (т.е. 'Value' из примера). +Значение обратной ссылки можно получить с помощью выражения '\1'. </p> +<p>Например, '([a-c])x\1x\1' совпадёт с 'axaxa', 'bxbxb' и 'cxcxc'.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="146"/> @@ -42278,7 +42334,8 @@ <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="175"/> <source><b>Alternatives: '|'</b> <p>Select to insert the alternation symbol '|'. </p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Альтернативы: '|'</b> +<p>Вставить символ альтернатив '|'. </p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="179"/> @@ -42287,64 +42344,77 @@ several possible regular expressions. E.g. 'cat|dog|mouse|fish' matches words containing the word 'cat', 'dog','mouse' or 'fish'. Be aware that in the above example, the alternatives refer to whole or part of words. If you want to match exactly the words 'cat', 'dog', ... you should express the fact that you only want to match complete words: '\b(cat|dog|mouse|fish)\b'</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Альтернативы: '|'</b> +<p>Вставить симвот альтернатив '|' в регулярное выражение. Альтернативы используются для совпадения с одним из нескольких возможных регулярных выражений. Например, 'cat|dog|mouse|fish' совпадает со словами, содержащими слово 'cat', 'dog','mouse' или 'fish'. +Обратите внимание, что в приведённом примере альтернативы ссылаются как на целые слова, так и на части слов. Если необходимо совпадение с целыми словами 'cat', 'dog', ... необходимо выразить это следующим образом: '\b(cat|dog|mouse|fish)\b'</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="190"/> <source><b>Begin of line: '^'</b> <p>Select to insert the start line character (^).</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Начало строки: '^'</b> +<p>Вставить символ начала строки (^).</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="194"/> <source><b>Begin of line: '^'</b> <p>Select to insert the start line character (^). It is used to find some expressions at the begining of lines. E.g. '^[A-Z]' match lines starting with a capitalized character. </p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Начало строки: '^'</b> +<p>Вставить символ начала строки (^). Он используется, чтобы найти выражения с начала строк. +Например, '^[A-Z]' совпадает заглавной латинской буквой, стоящей в начале строки. </p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="203"/> <source><b>End of line: '$'</b> <p>Select to insert the end of line character ($).</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Окончание строки: '$'</b> +<p>Вставить символ окончания строки ($).</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="207"/> <source><b>End of line: '$'</b> <p>Select to insert the end of line character ($). It is used to find some expressions at the end of lines.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Конец строки: '$'</b> +<p>Вставить символ конца строки ($). Используется для поиска выражений в конце строк.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="215"/> <source><b>Word boundary</b> <p>Select to insert the word boudary character (\b).</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Граница слова</b> +<p>Вставить символ границы слова (\b).</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="219"/> <source><b>Word boundary</b> <p>Select to insert the word boudary character (\b). This character is used to express the fact that word must begin or end at this position. E.g. '\bcat\b' matches exactly the word 'cat' while 'concatenation' is ignored.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Граница слова</b> +<p>Вставить символ границы слова (\b). Этот символ используется для обозначения того, что на данной позиции должно начинаться или заканчиваться слово. +Например, '\bcat\b' совпадает исключительно со словом 'cat', в то время как слово 'concatenation' будет пропущено.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="228"/> <source><b>Non word boundary</b> <p>Select to insert the word boudary character (\B). \B is the negated version of \b.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Не граница слова</b> +<p>Вставить символ не границы слова (\B). Это выражение, обратное выражению \b.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="232"/> <source><b>Non word boundary</b> <p>Select to insert the word boudary character (\B). \B is the negated version of \b. \B matches at every position where \b does not. Effectively, \B matches at any position between two word characters as well as at any position between two non-word characters.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Не граница слова</b> +<p>Вставить символ не границы слова (\B). Это выражение, обратное выражению \b. \B совпадает с любой позицией, с которой не совпадает \b. Фактически, \B совпадает с любой позицией между символов в слове, и также с любой позицией между символов дополнения до слова</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="241"/> <source><b>Positive lookahead: (?=<i>regexpr</i>)</b> <p>Select to insert the positive lookhead brackets.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Положительная предварительная проверка: (?=<i>regexpr</i>)</b> +<p>Вставить скобки положительной предварительной проверки.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="245"/> @@ -42352,7 +42422,9 @@ <p>Select to insert the positive lookhead brackets. Basically, positive lookhead is used to match a character only if followed by another one. Writting 'q(?=u)' means that you want to match the 'q' character only if it is followed by 'u'. In this statement 'u' is a trivial regexp which may be replaced by a more complex expression; q(?=[abc])' will match a 'q' if followed by either 'a', 'b' or 'c'.</p></source> - <translation type="unfinished"></translation> + <translation type="unfinished"><b>Положительная предварительная проверка: (?=<i>regexpr</i>)</b> +<p>Вставить скобки положительной предварительной проверки. В основном, положительная предварительная проверка используется для совпадения с символом, за которым следует другой символ +Выражение 'q(?=u)' совпадает с символом 'q', только если за ним следует символ 'u'. В этом примере, 'u' — это простейшее регулярное выражение, которое можно заменить на более сложное: q(?=[abc])' совпадает с 'q', если за ним следует 'a', 'b' или 'c'.</p></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="255"/>
--- a/i18n/eric6_tr.ts Sun Sep 21 17:43:13 2014 +0200 +++ b/i18n/eric6_tr.ts Mon Sep 22 19:52:35 2014 +0200 @@ -22203,130 +22203,135 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> <source>Version Control</source> <translation>Sürüm Kontrol</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Commit changes to repository...</source> <translation>Yapılan değişiklekleri kaynak havuzuna teslim et...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> <source>Add to repository</source> <translation>Kaynak havuzuna ekle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> <source>Remove from repository (and disk)</source> <translation>Kaynak havuzundan kaldır (ve diskten)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> <source>Remove from repository only</source> <translation>Yalnızca kaynak havuzundan kaldır</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> + <source>Show log</source> + <translation>Kayıtı göster</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <source>Show log browser</source> + <translation>Kayıt gözatıcısını gösted</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <source>Show status</source> + <translation>Durumu Göster</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <source>Show annotated file</source> + <translation>Açıklama dosyalarını göster</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <source>Revert changes</source> + <translation>Değişiklikleri başa döndür</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <source>Select all local file entries</source> + <translation>tüm yerel dosyalırın girişini seç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <source>Select all versioned file entries</source> + <translation>Giriş yapılan tüm dosyaları seç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <source>Select all local directory entries</source> + <translation>Tüm yerel dizin kalemlerini seç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <source>Select all versioned directory entries</source> + <translation>Giriş yapılan tüm dizinleri seç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <source>Do you really want to remove these files from the repository?</source> + <translation>Bu dosyaları gerçekten kaynak havuzundan kaldırmak istiyor musunuz?</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> - <source>Show log</source> - <translation>Kayıtı göster</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="547"/> - <source>Show log browser</source> - <translation>Kayıt gözatıcısını gösted</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> - <source>Show status</source> - <translation>Durumu Göster</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="345"/> - <source>Show annotated file</source> - <translation>Açıklama dosyalarını göster</translation> + <source>Copy</source> + <translation type="unfinished">Kopyala</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="249"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> - <source>Revert changes</source> - <translation>Değişiklikleri başa döndür</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> - <source>Select all local file entries</source> - <translation>tüm yerel dosyalırın girişini seç</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> - <source>Select all versioned file entries</source> - <translation>Giriş yapılan tüm dosyaları seç</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> - <source>Select all local directory entries</source> - <translation>Tüm yerel dizin kalemlerini seç</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> - <source>Select all versioned directory entries</source> - <translation>Giriş yapılan tüm dizinleri seç</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> - <source>Do you really want to remove these files from the repository?</source> - <translation>Bu dosyaları gerçekten kaynak havuzundan kaldırmak istiyor musunuz?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="538"/> - <source>Copy</source> - <translation type="unfinished">Kopyala</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540"/> - <source>Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="247"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641"/> - <source>Show differences</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="331"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="645"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="655"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="658"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <source>Configure...</source> + <translation type="unfinished">Ayarlanıyor...</translation> + </message> </context> <context> <name>HgProjectHelper</name>
--- a/i18n/eric6_zh_CN.GB2312.ts Sun Sep 21 17:43:13 2014 +0200 +++ b/i18n/eric6_zh_CN.GB2312.ts Mon Sep 22 19:52:35 2014 +0200 @@ -22194,130 +22194,135 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="607"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="613"/> <source>Version Control</source> <translation type="unfinished">版本控制</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="625"/> <source>Commit changes to repository...</source> <translation type="unfinished">将更改提交到储存库中……</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632"/> <source>Add to repository</source> <translation type="unfinished">添加到储存库</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> <source>Remove from repository (and disk)</source> <translation type="unfinished">从储存库（和磁盘）中移除</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="548"/> + <source>Show log</source> + <translation type="unfinished">显示日志</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="552"/> + <source>Show log browser</source> + <translation type="unfinished">显示日志浏览器</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> + <source>Show status</source> + <translation type="unfinished">显示状态</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="347"/> + <source>Show annotated file</source> + <translation type="unfinished">显示有注释的文件</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="657"/> + <source>Revert changes</source> + <translation type="unfinished">还原改变</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> + <source>Select all local file entries</source> + <translation type="unfinished">选择所有本地文件条目</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673"/> + <source>Select all versioned file entries</source> + <translation type="unfinished">选择所有版本化的文件条目</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675"/> + <source>Select all local directory entries</source> + <translation type="unfinished">选择所有本地文件夹条目</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677"/> + <source>Select all versioned directory entries</source> + <translation type="unfinished">选择所有版本化的文件夹条目</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <source>Remove from repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838"/> + <source>Do you really want to remove these files from the repository?</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="543"/> - <source>Show log</source> - <translation type="unfinished">显示日志</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="547"/> - <source>Show log browser</source> - <translation type="unfinished">显示日志浏览器</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636"/> - <source>Show status</source> - <translation type="unfinished">显示状态</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="345"/> - <source>Show annotated file</source> - <translation type="unfinished">显示有注释的文件</translation> + <source>Copy</source> + <translation type="unfinished">复制</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <source>Move</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="249"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="647"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="333"/> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="651"/> - <source>Revert changes</source> - <translation type="unfinished">还原改变</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="665"/> - <source>Select all local file entries</source> - <translation type="unfinished">选择所有本地文件条目</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> - <source>Select all versioned file entries</source> - <translation type="unfinished">选择所有版本化的文件条目</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="669"/> - <source>Select all local directory entries</source> - <translation type="unfinished">选择所有本地文件夹条目</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="671"/> - <source>Select all versioned directory entries</source> - <translation type="unfinished">选择所有版本化的文件夹条目</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> - <source>Remove from repository only</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="831"/> - <source>Do you really want to remove these files from the repository?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="538"/> - <source>Copy</source> - <translation type="unfinished">复制</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540"/> - <source>Move</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="247"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641"/> - <source>Show differences</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="331"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="645"/> <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="340"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="655"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="658"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="661"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="664"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="667"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="680"/> + <source>Configure...</source> + <translation type="unfinished">配置……</translation> + </message> </context> <context> <name>HgProjectHelper</name>
