Mercurial Repositories > eric / changeset

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.GitUtilities.html	Sun Jan 07 17:22:37 2018 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.GitUtilities.html	Mon Jan 08 19:46:53 2018 +0100
@@ -66,7 +66,7 @@
 </p><dl>
 <dt><i>proc</i></dt>
 <dd>
-reference to the proces to be prepared (QProcess)
+reference to the process to be prepared (QProcess)
 </dd><dt><i>language</i></dt>
 <dd>
 language to be set (string)

--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html	Sun Jan 07 17:22:37 2018 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html	Mon Jan 08 19:46:53 2018 +0100
@@ -90,7 +90,7 @@
 </p><dl>
 <dt><i>proc</i></dt>
 <dd>
-reference to the proces to be prepared (QProcess)
+reference to the process to be prepared (QProcess)
 </dd><dt><i>encoding</i></dt>
 <dd>
 encoding to be used by the process (string)

--- a/Plugins/VcsPlugins/vcsGit/GitBranchDialog.py	Sun Jan 07 17:22:37 2018 +0100
+++ b/Plugins/VcsPlugins/vcsGit/GitBranchDialog.py	Mon Jan 08 19:46:53 2018 +0100
@@ -44,8 +44,10 @@
         self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
         self.okButton.setEnabled(False)
         
-        self.__remoteBranches = [b for b in branchlist if "/" in b]
-        self.__lokalBranches = [b for b in branchlist if "/" not in b]
+        self.__remoteBranches = [b for b in branchlist
+                                 if b.startswith("remotes/")]
+        self.__lokalBranches = [b for b in branchlist
+                                if not b.startswith("remotes/")]
         
         self.branchCombo.clear()
         self.branchCombo.addItem("")

--- a/Plugins/VcsPlugins/vcsGit/GitDialog.py	Sun Jan 07 17:22:37 2018 +0100
+++ b/Plugins/VcsPlugins/vcsGit/GitDialog.py	Mon Jan 08 19:46:53 2018 +0100
@@ -116,7 +116,8 @@
             self.statusLabel.setText(self.tr("Process crashed."))
         else:
             self.statusLabel.setText(
-                self.tr("Proces finished with exit code {0}").format(exitCode))
+                self.tr("Process finished with exit code {0}")
+                .format(exitCode))
         self.__finish()
     
     def startProcess(self, args, workingDir=None, showArgs=True,

--- a/Plugins/VcsPlugins/vcsGit/GitUtilities.py	Sun Jan 07 17:22:37 2018 +0100
+++ b/Plugins/VcsPlugins/vcsGit/GitUtilities.py	Mon Jan 08 19:46:53 2018 +0100
@@ -35,7 +35,7 @@
     """
     Public function to prepare the given process.
     
-    @param proc reference to the proces to be prepared (QProcess)
+    @param proc reference to the process to be prepared (QProcess)
     @param language language to be set (string)
     """
     env = QProcessEnvironment.systemEnvironment()

--- a/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py	Sun Jan 07 17:22:37 2018 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py	Mon Jan 08 19:46:53 2018 +0100
@@ -39,7 +39,7 @@
     """
     Public function to prepare the given process.
     
-    @param proc reference to the proces to be prepared (QProcess)
+    @param proc reference to the process to be prepared (QProcess)
     @param encoding encoding to be used by the process (string)
     @param language language to be set (string)
     """

--- a/i18n/eric6_cs.ts	Sun Jan 07 17:22:37 2018 +0100
+++ b/i18n/eric6_cs.ts	Mon Jan 08 19:46:53 2018 +0100
@@ -19518,16 +19518,16 @@
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/>
-        <source>Proces finished with exit code {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <source>Process finished with exit code {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">Chyba v procesu generování</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation>
     </message>

Binary file i18n/eric6_de.qm has changed

--- a/i18n/eric6_de.ts	Sun Jan 07 17:22:37 2018 +0100
+++ b/i18n/eric6_de.ts	Mon Jan 08 19:46:53 2018 +0100
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="de">
+<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage="">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -1973,8 +1972,8 @@
     </message>
     <message>
         <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="145"/>
-        <source>Open in New &amp;Tab	Ctrl+LMB</source>
-        <translation>In neuem &amp;Register öffnen	Strg+LMK</translation>
+        <source>Open in New &amp;Tab<byte value="x9"/>Ctrl+LMB</source>
+        <translation>In neuem &amp;Register öffnen<byte value="x9"/>Strg+LMK</translation>
     </message>
     <message>
         <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="163"/>
@@ -1983,8 +1982,8 @@
     </message>
     <message>
         <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="166"/>
-        <source>Open in New Tab	Ctrl+LMB</source>
-        <translation>In neuem Register öffnen	Strg+LMK</translation>
+        <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source>
+        <translation>In neuem Register öffnen<byte value="x9"/>Strg+LMK</translation>
     </message>
     <message>
         <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="169"/>
@@ -2072,8 +2071,8 @@
     </message>
     <message>
         <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="93"/>
-        <source>Open in New &amp;Tab	Ctrl+LMB</source>
-        <translation>In neuem &amp;Register öffnen	Strg+LMK</translation>
+        <source>Open in New &amp;Tab<byte value="x9"/>Ctrl+LMB</source>
+        <translation>In neuem &amp;Register öffnen<byte value="x9"/>Strg+LMK</translation>
     </message>
     <message>
         <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="87"/>
@@ -2082,8 +2081,8 @@
     </message>
     <message>
         <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="90"/>
-        <source>Open in New Tab	Ctrl+LMB</source>
-        <translation>In neuem Register öffnen	Strg+LMK</translation>
+        <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source>
+        <translation>In neuem Register öffnen<byte value="x9"/>Strg+LMK</translation>
     </message>
     <message>
         <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="93"/>
@@ -19034,16 +19033,16 @@
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/>
-        <source>Proces finished with exit code {0}</source>
+        <source>Process finished with exit code {0}</source>
         <translation>Prozess endete mit Code {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>Process Generation Error</source>
         <translation>Fehler beim Prozessstart</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation>
     </message>
@@ -24724,8 +24723,8 @@
     </message>
     <message>
         <location filename="../Helpviewer/HelpBrowserWV.py" line="1219"/>
-        <source>Open Link in New Tab	Ctrl+LMB</source>
-        <translation>Link in neuem Fenster öffnen	Strg+LMK</translation>
+        <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source>
+        <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation>
     </message>
     <message>
         <location filename="../Helpviewer/HelpBrowserWV.py" line="1292"/>
@@ -81943,8 +81942,8 @@
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserView.py" line="618"/>
-        <source>Open Link in New Tab	Ctrl+LMB</source>
-        <translation>Link in neuem Fenster öffnen	Strg+LMK</translation>
+        <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source>
+        <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation>
     </message>
     <message>
         <location filename="../WebBrowser/WebBrowserView.py" line="622"/>

--- a/i18n/eric6_empty.ts	Sun Jan 07 17:22:37 2018 +0100
+++ b/i18n/eric6_empty.ts	Mon Jan 08 19:46:53 2018 +0100
@@ -18893,16 +18893,16 @@
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/>
-        <source>Proces finished with exit code {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <source>Process finished with exit code {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>Process Generation Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>

--- a/i18n/eric6_en.ts	Sun Jan 07 17:22:37 2018 +0100
+++ b/i18n/eric6_en.ts	Mon Jan 08 19:46:53 2018 +0100
@@ -18904,16 +18904,16 @@
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/>
-        <source>Proces finished with exit code {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <source>Process finished with exit code {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>Process Generation Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>

--- a/i18n/eric6_es.ts	Sun Jan 07 17:22:37 2018 +0100
+++ b/i18n/eric6_es.ts	Mon Jan 08 19:46:53 2018 +0100
@@ -19034,16 +19034,16 @@
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/>
-        <source>Proces finished with exit code {0}</source>
-        <translation>El proceso ha terminado con código de salida {0}</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <source>Process finished with exit code {0}</source>
+        <translation type="unfinished">El proceso ha terminado con código de salida {0}</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>Process Generation Error</source>
         <translation>Error de Generación de Proceso</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation>
     </message>

--- a/i18n/eric6_fr.ts	Sun Jan 07 17:22:37 2018 +0100
+++ b/i18n/eric6_fr.ts	Mon Jan 08 19:46:53 2018 +0100
@@ -19480,16 +19480,16 @@
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/>
-        <source>Proces finished with exit code {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <source>Process finished with exit code {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">Erreur du processus</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu&apos;il est bien dans le chemin de recherche.</translation>
     </message>

--- a/i18n/eric6_it.ts	Sun Jan 07 17:22:37 2018 +0100
+++ b/i18n/eric6_it.ts	Mon Jan 08 19:46:53 2018 +0100
@@ -19004,16 +19004,16 @@
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/>
-        <source>Proces finished with exit code {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <source>Process finished with exit code {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">Errore Generazione Processo</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>

--- a/i18n/eric6_pt.ts	Sun Jan 07 17:22:37 2018 +0100
+++ b/i18n/eric6_pt.ts	Mon Jan 08 19:46:53 2018 +0100
@@ -19696,16 +19696,16 @@
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/>
-        <source>Proces finished with exit code {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <source>Process finished with exit code {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">Erro na Criação de Processo</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished">Não pôde iniciar {0}.&lt;br&gt;Certifique-se de que está na rota de pesquisa.</translation>
     </message>

--- a/i18n/eric6_ru.ts	Sun Jan 07 17:22:37 2018 +0100
+++ b/i18n/eric6_ru.ts	Mon Jan 08 19:46:53 2018 +0100
@@ -19077,16 +19077,16 @@
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/>
-        <source>Proces finished with exit code {0}</source>
-        <translation>Процесс завершился с кодом выхода {0}</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <source>Process finished with exit code {0}</source>
+        <translation type="unfinished">Процесс завершился с кодом выхода {0}</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>Process Generation Error</source>
         <translation>Ошибка при запуске процесса</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation>
     </message>

--- a/i18n/eric6_tr.ts	Sun Jan 07 17:22:37 2018 +0100
+++ b/i18n/eric6_tr.ts	Mon Jan 08 19:46:53 2018 +0100
@@ -19488,16 +19488,16 @@
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/>
-        <source>Proces finished with exit code {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <source>Process finished with exit code {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">İşlem Üretecinde Hata</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation>
     </message>

--- a/i18n/eric6_zh_CN.ts	Sun Jan 07 17:22:37 2018 +0100
+++ b/i18n/eric6_zh_CN.ts	Mon Jan 08 19:46:53 2018 +0100
@@ -19508,16 +19508,16 @@
     </message>
     <message>
         <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="120"/>
-        <source>Proces finished with exit code {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <source>Process finished with exit code {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">进程生成错误</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="172"/>
+        <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="173"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation>
     </message>