Mercurial Repositories > eric / changeset
changeset
Updated translations.
Mon, 09 Mar 2020 19:51:19 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 09 Mar 2020 19:51:19 +0100
- changeset 7447
- ba6171edd33d
- parent 7446
- 67b21645ffec
- child 7448
- 29b54296cf8c
Updated translations.
--- a/eric6/i18n/eric6_cs.ts Mon Mar 09 19:51:02 2020 +0100 +++ b/eric6/i18n/eric6_cs.ts Mon Mar 09 19:51:19 2020 +0100 @@ -30182,7 +30182,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> @@ -30192,7 +30192,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -30312,62 +30312,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -31313,42 +31313,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="91"/> <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> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> - <source>Received data on unexpected channel.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="152"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="160"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="165"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="383"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -31744,7 +31744,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> <source>Input</source> - <translation type="obsolete">Vstup</translation> + <translation type="unfinished">Vstup</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> @@ -31754,7 +31754,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> <source>&Send</source> - <translation type="obsolete">Ode&slat</translation> + <translation type="unfinished">Ode&slat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> @@ -31764,12 +31764,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> <source>Select to switch the input field to password mode</source> - <translation type="obsolete">Vybrat pro přepnutí vstupního pole do režimu hesla</translation> + <translation type="unfinished">Vybrat pro přepnutí vstupního pole do režimu hesla</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> <source>&Password Mode</source> - <translation type="obsolete">Ty&p heslo</translation> + <translation type="unfinished">Ty&p heslo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> @@ -31781,6 +31781,36 @@ <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="obsolete">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the subversion process</source> + <translation type="obsolete">Stisknout pro odeslání vstupu do procesu subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="obsolete">Zadejte data, která mají být do procesu subversion odeslána</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDiffDialog</name> @@ -52034,17 +52064,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1621"/> + <location filename="../Preferences/__init__.py" line="1622"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -61218,27 +61248,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="242"/> <source>pyuic / pyside-uic Options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="248"/> + <source>Indent Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Select the indent width (default: 4)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="287"/> + <source>Generate imports relative to '.'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> - <source>Indent Width:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Select the indent width (default: 4)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> - <source>Generate imports relative to '.'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> @@ -61258,10 +61288,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.py" line="67"/> + <location filename="../Preferences/ConfigurationPages/QtPage.py" line="72"/> <source>Sample: {0}designer{1}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <source>PySide2 Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="232"/> + <source>Enter the path of the PySide2 tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -85359,12 +85399,12 @@ <translation type="obsolete">Zadejte jméno souboru se styly</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="36"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="37"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation type="unfinished">Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;Všechny soubory (*)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="62"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="63"/> <source>System</source> <translation type="unfinished">Systém</translation> </message>
--- a/eric6/i18n/eric6_de.ts Mon Mar 09 19:51:02 2020 +0100 +++ b/eric6/i18n/eric6_de.ts Mon Mar 09 19:51:19 2020 +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> @@ -2033,8 +2032,8 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="171"/> - <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="175"/> @@ -2102,8 +2101,8 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="91"/> - <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="95"/> @@ -27961,7 +27960,7 @@ <translation>Pflege Änderungen in das Mercurial-Repository ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> @@ -27971,7 +27970,7 @@ <translation><p>Der Mercurial-Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> @@ -28086,62 +28085,62 @@ <translation>Spitze des aktuellen Zweigs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> <source>Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Select the bookmark to be deleted:</source> <translation>Wähle das zu löschende Lesezeichen aus:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Select the bookmark to be pulled:</source> <translation>Wähle das herunterzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Lade Lesezeichen von einem entfernten Mercurial-Repository herunter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Select the bookmark to be push:</source> <translation>Wähle das hochzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation> </message> @@ -28990,42 +28989,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="91"/> <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> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> - <source>Did not receive the 'hello' message.</source> - <translation>„Hallo“-Nachricht konnte nicht empfangen werden.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> - <source>Received data on unexpected channel.</source> - <translation>Daten auf unerwartetem Kanal empfangen.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>Did not receive the 'hello' message.</source> + <translation>„Hallo“-Nachricht konnte nicht empfangen werden.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> + <source>Received data on unexpected channel.</source> + <translation>Daten auf unerwartetem Kanal empfangen.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation>Ungültige „Hallo“-Nachricht; Erwartete „capabilities: “, empfing jedoch „{0}“.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="152"/> <source>'capabilities' message did not contain any capability.</source> <translation>„capabilities“-Nachricht enthielt keine Fähigkeiten.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="160"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation>Ungültige „Hallo“-Nachricht; Erwartete „encoding: “, empfing jedoch „{0}“.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="165"/> <source>'encoding' message did not contain any encoding.</source> <translation>„encoding“-Nachricht enthielt keine Kodierung.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="383"/> <source>For message see output dialog.</source> <translation>Nachricht siehe Ausgabedialog.</translation> </message> @@ -29394,6 +29393,46 @@ <source>Errors</source> <translation>Fehler</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> + <source>Input</source> + <translation>Eingabe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> + <source>Alt+S</source> + <translation>Alt+D</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> + <source>Select to switch the input field to password mode</source> + <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> + <source>&Password Mode</source> + <translation>&Kennwortmodus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> + <source>Alt+P</source> + <translation>Alt+K</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the Mercurial process</source> + <translation>Drücken um die Eingabe an den Mercurial-Prozess zu senden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the Mercurial process</source> + <translation>Gib die Daten ein, die an den Mercurial-Prozess geschickt werden sollen</translation> + </message> </context> <context> <name>HgDiffDialog</name> @@ -43936,12 +43975,12 @@ </message> <message> <location filename="../MicroPython/MicroPythonWidget.py" line="978"/> - <source>µPy Chart</source> + <source>µPy Chart</source> <translation>µPy Chart</translation> </message> <message> <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/> - <source>µPy Files</source> + <source>µPy Files</source> <translation>µPy Dateien</translation> </message> <message> @@ -49226,17 +49265,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1621"/> + <location filename="../Preferences/__init__.py" line="1622"/> <source>Export Preferences</source> <translation>Einstellungen exportieren</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Import Preferences</source> <translation>Einstellungen importieren</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation> </message> @@ -58422,27 +58461,27 @@ <translation>Gib das Anhängsel für den Qt-Werkzeugnamen ein</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="242"/> <source>pyuic / pyside-uic Options</source> <translation>pyuic / pyside-uic Optionen</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="248"/> + <source>Indent Width:</source> + <translation>Einrückungstiefe:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Select the indent width (default: 4)</source> + <translation>Wähle die Einrücktiefe (Standard: 4)</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="287"/> + <source>Generate imports relative to '.'</source> + <translation>Erzeuge Imports relativ zu '.'</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> - <source>Indent Width:</source> - <translation>Einrückungstiefe:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Select the indent width (default: 4)</source> - <translation>Wähle die Einrücktiefe (Standard: 4)</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> - <source>Generate imports relative to '.'</source> - <translation>Erzeuge Imports relativ zu '.'</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> <source>Tools Directory:</source> <translation>Verzeichnis:</translation> </message> @@ -58462,10 +58501,20 @@ <translation>Gib den Pfad des Verzeichnisses mit den PyQt-Werkzeugen ein, falls sie nicht automatisch gefunden werden.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.py" line="67"/> + <location filename="../Preferences/ConfigurationPages/QtPage.py" line="72"/> <source>Sample: {0}designer{1}</source> <translation>Beispiel: {0}designer{1}</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <source>PySide2 Tools</source> + <translation>PySide2-Werkzeuge</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="232"/> + <source>Enter the path of the PySide2 tools directory, if they are not found.</source> + <translation>Gib den Pfad des Verzeichnisses mit den PySide2-Werkzeugen ein, falls sie nicht automatisch gefunden werden.</translation> + </message> </context> <context> <name>Queues</name> @@ -82536,12 +82585,12 @@ <translation>Stildatei:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="36"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="37"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation>Qt-Stylesheets (*.qss);;Cascading Style Sheets (*.css);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="62"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="63"/> <source>System</source> <translation>System</translation> </message> @@ -83697,8 +83746,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="673"/> - <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="679"/>
--- a/eric6/i18n/eric6_empty.ts Mon Mar 09 19:51:02 2020 +0100 +++ b/eric6/i18n/eric6_empty.ts Mon Mar 09 19:51:19 2020 +0100 @@ -27934,7 +27934,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> @@ -27944,67 +27944,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -28820,42 +28820,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="91"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> - <source>Received data on unexpected channel.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="152"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="160"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="165"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="383"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -29217,6 +29217,46 @@ <source>Errors</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDiffDialog</name> @@ -48975,17 +49015,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1621"/> + <location filename="../Preferences/__init__.py" line="1622"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> @@ -57940,7 +57980,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> @@ -57985,22 +58025,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="242"/> <source>pyuic / pyside-uic Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="248"/> <source>Indent Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Select the indent width (default: 4)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Select the indent width (default: 4)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="287"/> <source>Generate imports relative to '.'</source> <translation type="unfinished"></translation> </message> @@ -58015,10 +58055,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.py" line="67"/> + <location filename="../Preferences/ConfigurationPages/QtPage.py" line="72"/> <source>Sample: {0}designer{1}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <source>PySide2 Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="232"/> + <source>Enter the path of the PySide2 tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -81863,12 +81913,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="36"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="37"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="62"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="63"/> <source>System</source> <translation type="unfinished"></translation> </message>
--- a/eric6/i18n/eric6_en.ts Mon Mar 09 19:51:02 2020 +0100 +++ b/eric6/i18n/eric6_en.ts Mon Mar 09 19:51:19 2020 +0100 @@ -27815,7 +27815,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> @@ -27825,7 +27825,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -27940,62 +27940,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -28841,42 +28841,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="91"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> - <source>Received data on unexpected channel.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="152"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="160"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="165"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="383"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -29238,6 +29238,46 @@ <source>Errors</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> + <source>&Password Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDiffDialog</name> @@ -49016,17 +49056,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1621"/> + <location filename="../Preferences/__init__.py" line="1622"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -58018,27 +58058,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="242"/> <source>pyuic / pyside-uic Options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="248"/> + <source>Indent Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Select the indent width (default: 4)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="287"/> + <source>Generate imports relative to '.'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> - <source>Indent Width:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Select the indent width (default: 4)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> - <source>Generate imports relative to '.'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> @@ -58058,10 +58098,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.py" line="67"/> + <location filename="../Preferences/ConfigurationPages/QtPage.py" line="72"/> <source>Sample: {0}designer{1}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <source>PySide2 Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="232"/> + <source>Enter the path of the PySide2 tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -81909,12 +81959,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="36"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="37"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="62"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="63"/> <source>System</source> <translation type="unfinished"></translation> </message>
--- a/eric6/i18n/eric6_es.ts Mon Mar 09 19:51:02 2020 +0100 +++ b/eric6/i18n/eric6_es.ts Mon Mar 09 19:51:19 2020 +0100 @@ -27962,7 +27962,7 @@ <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> @@ -27972,7 +27972,7 @@ <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation> </message> @@ -28087,62 +28087,62 @@ <translation>Tip branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Delete Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Select the bookmark to be deleted:</source> <translation>Seleccionar el marcador a borrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> <source>Delete Mercurial Bookmark</source> <translation>Borrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> <source>Rename Mercurial Bookmark</source> <translation>Renombrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> <source>Move Mercurial Bookmark</source> <translation>Mover Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Pull Bookmark</source> <translation>Pull de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Select the bookmark to be pulled:</source> <translation>Seleccinar el marcador sobre el que hacer pull:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Haciendo pull de marcador desde un repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Push Bookmark</source> <translation>Push de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Select the bookmark to be push:</source> <translation>Seleccinar el marcador sobre el que hacer push:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation> </message> @@ -28991,42 +28991,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="91"/> <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> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> - <source>Did not receive the 'hello' message.</source> - <translation>No se ha recibido el mensaje 'hello'.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> - <source>Received data on unexpected channel.</source> - <translation>Datos recibidos en canal no esperado.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>Did not receive the 'hello' message.</source> + <translation>No se ha recibido el mensaje 'hello'.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> + <source>Received data on unexpected channel.</source> + <translation>Datos recibidos en canal no esperado.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation>Mensaje 'hello' erróneo, se esperaba 'capabilities' pero se obtuvo '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="152"/> <source>'capabilities' message did not contain any capability.</source> <translation>El mensaje 'capabilities' no contiene ninguna capacidad.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="160"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation>Mensaje 'hello' erróneo, se esperaba 'encoding' pero se obtuvo '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="165"/> <source>'encoding' message did not contain any encoding.</source> <translation>El mensaje 'encoding' no contiene ninguna codificación.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="383"/> <source>For message see output dialog.</source> <translation>Para mensaje ver el diálogo de output.</translation> </message> @@ -29395,6 +29395,51 @@ <source>Errors</source> <translation>Errores</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the subversion process</source> + <translation type="obsolete">Pulsar para enviar el input al proceso de subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> + <source>&Send</source> + <translation type="unfinished">&Enviar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">Seleccionar para cambiar el campo de input a modo contraseña</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> + <source>&Password Mode</source> + <translation type="unfinished">&Modo de contraseña</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDiffDialog</name> @@ -49227,17 +49272,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1621"/> + <location filename="../Preferences/__init__.py" line="1622"/> <source>Export Preferences</source> <translation>Exportar Preferencias</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Import Preferences</source> <translation>Importar Preferencias</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation> </message> @@ -58387,27 +58432,27 @@ <translation>Introducir el postfijo para nombre de las herramientas Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="242"/> <source>pyuic / pyside-uic Options</source> <translation>Opciones de pyuic / pyside-uic</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="248"/> + <source>Indent Width:</source> + <translation>Ancho de indentación:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Select the indent width (default: 4)</source> + <translation>Seleccionar el ancho de indentación (valor por defecto: 4)</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="287"/> + <source>Generate imports relative to '.'</source> + <translation>Generar imports relativos a '.'</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> - <source>Indent Width:</source> - <translation>Ancho de indentación:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Select the indent width (default: 4)</source> - <translation>Seleccionar el ancho de indentación (valor por defecto: 4)</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> - <source>Generate imports relative to '.'</source> - <translation>Generar imports relativos a '.'</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> <source>Tools Directory:</source> <translation>Directorio de las Herramientas:</translation> </message> @@ -58427,10 +58472,20 @@ <translation>Introducir la ruta del directorio de las herramientas PyQt, si no se encuentran automáticamente.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.py" line="67"/> + <location filename="../Preferences/ConfigurationPages/QtPage.py" line="72"/> <source>Sample: {0}designer{1}</source> <translation>Muestra: {0}designer{1}</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <source>PySide2 Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="232"/> + <source>Enter the path of the PySide2 tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name>
--- a/eric6/i18n/eric6_fr.ts Mon Mar 09 19:51:02 2020 +0100 +++ b/eric6/i18n/eric6_fr.ts Mon Mar 09 19:51:19 2020 +0100 @@ -29422,7 +29422,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> @@ -29432,7 +29432,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -29552,62 +29552,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Delete Bookmark</source> <translation type="unfinished">Supprimer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished">Selectionner le signet à supprimer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Supprimer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Renommer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Déplacer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Pull Bookmark</source> <translation type="unfinished">Récuperer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished">Sélectionner le signet à récuperer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished">Récupérant le signet d'un dépôt Mercurial distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Push Bookmark</source> <translation type="unfinished">Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Select the bookmark to be push:</source> <translation type="unfinished">Sélectionner le signet à envoyer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">À envoyer le signet à un dépôt Mercurial distant</translation> </message> @@ -30558,42 +30558,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="91"/> <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'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> - <source>Received data on unexpected channel.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="152"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="160"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="165"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="383"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -30995,27 +30995,27 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> <source>Input</source> - <translation type="obsolete">Entrée</translation> + <translation type="unfinished">Entrée</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> <source>&Send</source> - <translation type="obsolete">&Envoyer</translation> + <translation type="unfinished">&Envoyer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> <source>Select to switch the input field to password mode</source> - <translation type="obsolete">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> + <translation type="unfinished">Cocher pour basculer le champ d'entrée en mode Mot de Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> <source>&Password Mode</source> - <translation type="obsolete">Mode Mot de &Passe</translation> + <translation type="unfinished">Mode Mot de &Passe</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> <source>Alt+P</source> - <translation type="obsolete">Alt+P</translation> + <translation type="unfinished">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> @@ -31027,6 +31027,31 @@ <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="obsolete">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the subversion process</source> + <translation type="obsolete">Cliquer pour envoyer l'entrée saisie au processus Subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="obsolete">Entrer les données à envoyer au processus Subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDiffDialog</name> @@ -51207,17 +51232,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1621"/> + <location filename="../Preferences/__init__.py" line="1622"/> <source>Export Preferences</source> <translation>Export des préférences</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Import Preferences</source> <translation>Import des préférences</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -60386,27 +60411,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="242"/> <source>pyuic / pyside-uic Options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="248"/> + <source>Indent Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Select the indent width (default: 4)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="287"/> + <source>Generate imports relative to '.'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> - <source>Indent Width:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Select the indent width (default: 4)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> - <source>Generate imports relative to '.'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> @@ -60426,10 +60451,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.py" line="67"/> + <location filename="../Preferences/ConfigurationPages/QtPage.py" line="72"/> <source>Sample: {0}designer{1}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <source>PySide2 Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="232"/> + <source>Enter the path of the PySide2 tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -84513,12 +84548,12 @@ <translation type="obsolete">Entrer le nom d'une feuille de style</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="36"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="37"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation type="unfinished">Feuilles Qt Style (*.qss);;Feuilles CSS (*.css);;Tous les fichiers (*)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="62"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="63"/> <source>System</source> <translation type="unfinished">Système</translation> </message>
--- a/eric6/i18n/eric6_it.ts Mon Mar 09 19:51:02 2020 +0100 +++ b/eric6/i18n/eric6_it.ts Mon Mar 09 19:51:19 2020 +0100 @@ -31446,7 +31446,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> @@ -31456,7 +31456,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -31576,62 +31576,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Delete Bookmark</source> <translation type="unfinished">Cancella segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished">Seleziona il segnalibro da cancellare:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Cancella Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Rinomina Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Sposta Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Pull Bookmark</source> <translation type="unfinished">Estrai Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished">Seleziona il segnalibro da estrarre:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished">Etrae segnalibro da un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Push Bookmark</source> <translation type="unfinished">Inserisce Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Select the bookmark to be push:</source> <translation type="unfinished">Seleziona il segnalibro da inserire:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">Inserisce segnalibro in un repository Mercurial remoto</translation> </message> @@ -32627,42 +32627,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="91"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> - <source>Received data on unexpected channel.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="152"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="160"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="165"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="383"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -33077,7 +33077,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> <source>Input</source> - <translation type="obsolete">Input</translation> + <translation type="unfinished">Input</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> @@ -33087,12 +33087,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> <source>&Send</source> - <translation type="obsolete">&Spedisci</translation> + <translation type="unfinished">&Spedisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> <source>Alt+S</source> - <translation type="obsolete">Alt+S</translation> + <translation type="unfinished">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> @@ -33102,17 +33102,17 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> <source>Select to switch the input field to password mode</source> - <translation type="obsolete">Seleziona per impostare il campo di input in modalità password</translation> + <translation type="unfinished">Seleziona per impostare il campo di input in modalità password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> <source>&Password Mode</source> - <translation type="obsolete">Modo &Password</translation> + <translation type="unfinished">Modo &Password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> <source>Alt+P</source> - <translation type="obsolete">Alt+P</translation> + <translation type="unfinished">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> @@ -33124,6 +33124,26 @@ <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="obsolete">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the subversion process</source> + <translation type="obsolete">Premi per mandare l'input al processo subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="obsolete">Inserisci i dati da mandare al processo subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDiffDialog</name> @@ -53597,17 +53617,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1621"/> + <location filename="../Preferences/__init__.py" line="1622"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>File proprietà (*.ini);;Tutti i file(*)</translation> </message> @@ -62813,27 +62833,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="242"/> <source>pyuic / pyside-uic Options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="248"/> + <source>Indent Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Select the indent width (default: 4)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="287"/> + <source>Generate imports relative to '.'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> - <source>Indent Width:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Select the indent width (default: 4)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> - <source>Generate imports relative to '.'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> @@ -62853,10 +62873,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.py" line="67"/> + <location filename="../Preferences/ConfigurationPages/QtPage.py" line="72"/> <source>Sample: {0}designer{1}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <source>PySide2 Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="232"/> + <source>Enter the path of the PySide2 tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -87013,12 +87043,12 @@ <translation type="obsolete">Inserisci il nome del foglio di stile</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="36"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="37"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="62"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="63"/> <source>System</source> <translation type="unfinished">Sistema</translation> </message>
--- a/eric6/i18n/eric6_pt.ts Mon Mar 09 19:51:02 2020 +0100 +++ b/eric6/i18n/eric6_pt.ts Mon Mar 09 19:51:19 2020 +0100 @@ -31016,7 +31016,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> @@ -31026,7 +31026,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -31176,62 +31176,62 @@ <translation>Criado o novo ramo <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Delete Bookmark</source> <translation>Apagar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Select the bookmark to be deleted:</source> <translation>Selecionar o marcador a apagar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> <source>Delete Mercurial Bookmark</source> <translation>Apagar o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> <source>Rename Mercurial Bookmark</source> <translation>Renomear o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> <source>Move Mercurial Bookmark</source> <translation>Mover o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Pull Bookmark</source> <translation>Puxar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Select the bookmark to be pulled:</source> <translation>Selecionar o marcador a puxar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>A puxar marcador desde o repositório remoto de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Push Bookmark</source> <translation>Empurrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Select the bookmark to be push:</source> <translation>Selecione o marcador a empurrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>A empurrar marcador a um repositório remoto de Mercurial</translation> </message> @@ -32200,42 +32200,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="91"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> - <source>Did not receive the 'hello' message.</source> - <translation>Não recebeu a mensagem 'hello'.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> - <source>Received data on unexpected channel.</source> - <translation>Dados recebidos num canal imprevisto.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>Did not receive the 'hello' message.</source> + <translation>Não recebeu a mensagem 'hello'.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> + <source>Received data on unexpected channel.</source> + <translation>Dados recebidos num canal imprevisto.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation>Mensagem 'hello' má, esperava-se 'capabilities: ' mas teve '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="152"/> <source>'capabilities' message did not contain any capability.</source> <translation>Mensagem 'capabilities' não tinha nenhuma capacidade.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="160"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation>Mensagem 'hello' má, esperava-se 'encoding: ' mas teve '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="165"/> <source>'encoding' message did not contain any encoding.</source> <translation>Mensagem 'encoding' não tinha nenhuma codificação.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="383"/> <source>For message see output dialog.</source> <translation>Para a mensagem ver a caixa de diálogo da saída de comandos.</translation> </message> @@ -32656,7 +32656,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> <source>Input</source> - <translation type="obsolete">Entrada</translation> + <translation type="unfinished">Entrada</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> @@ -32666,12 +32666,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> <source>&Send</source> - <translation type="obsolete">&Enviar</translation> + <translation type="unfinished">&Enviar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> <source>Alt+S</source> - <translation type="obsolete">Alt+S</translation> + <translation type="unfinished">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> @@ -32681,17 +32681,17 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> <source>Select to switch the input field to password mode</source> - <translation type="obsolete">Selecionar para mudar o campo de entrada ao modo senha</translation> + <translation type="unfinished">Selecionar para mudar o campo de entrada ao modo senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> <source>&Password Mode</source> - <translation type="obsolete">Modo &Senha</translation> + <translation type="unfinished">Modo &Senha</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> <source>Alt+P</source> - <translation type="obsolete">Alt+P</translation> + <translation type="unfinished">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> @@ -32703,6 +32703,26 @@ <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="obsolete">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the subversion process</source> + <translation type="obsolete">Pressionar para enviar a entrada ao processo de subversão</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="obsolete">Introduzir dados para enviar ao processo de subversão</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDiffDialog</name> @@ -53023,17 +53043,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1621"/> + <location filename="../Preferences/__init__.py" line="1622"/> <source>Export Preferences</source> <translation>Exportar Preferências</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Import Preferences</source> <translation>Importar Preferências</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation> </message> @@ -62106,27 +62126,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="242"/> <source>pyuic / pyside-uic Options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="248"/> + <source>Indent Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Select the indent width (default: 4)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="287"/> + <source>Generate imports relative to '.'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> - <source>Indent Width:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Select the indent width (default: 4)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> - <source>Generate imports relative to '.'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> @@ -62146,10 +62166,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.py" line="67"/> + <location filename="../Preferences/ConfigurationPages/QtPage.py" line="72"/> <source>Sample: {0}designer{1}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <source>PySide2 Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="232"/> + <source>Enter the path of the PySide2 tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -86182,12 +86212,12 @@ <translation type="obsolete">Introduzir o nome do ficheiro da folha de estilos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="36"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="37"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation type="unfinished">Folha de Estilos Qt (*.qss);;Folha de Estilos de Cascata (*.css);;Ficheiros Todos (*)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="62"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="63"/> <source>System</source> <translation type="unfinished">Sistema</translation> </message>
--- a/eric6/i18n/eric6_ru.ts Mon Mar 09 19:51:02 2020 +0100 +++ b/eric6/i18n/eric6_ru.ts Mon Mar 09 19:51:19 2020 +0100 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1" language="ru_RU"> +<!DOCTYPE TS><TS version="2.0" language="ru_RU" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -2031,7 +2030,7 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="171"/> - <source>Open in New Tab Ctrl+LMB</source> + <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Открыть в новой вкладке\tCtrl+LMB</translation> </message> <message> @@ -2100,7 +2099,7 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="91"/> - <source>Open in New Tab Ctrl+LMB</source> + <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Открыть в новой вкладке\tCtrl+LMB</translation> </message> <message> @@ -28009,7 +28008,7 @@ <translation>Mercurial: Фиксация изменений в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source>Mercurial Command Server</source> <translation>Mercurial: Сервер команд</translation> </message> @@ -28019,7 +28018,7 @@ <translation><p>Mercurial: Невозможно перезапустить сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно запустить сервер.<br>Причина: {0}.</p></translation> </message> @@ -28134,62 +28133,62 @@ <translation>Конечная ревизия текущей ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> <source>Mercurial Bookmark</source> <translation>Mercurial: Закладка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Delete Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Select the bookmark to be deleted:</source> <translation>Выберите закладку для удаления:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial: Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial: Переименовать закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial: Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Pull Bookmark</source> <translation>Затянуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Select the bookmark to be pulled:</source> <translation>Выберите закладку для затягивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Затянуть закладку из удалённого Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Push Bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Select the bookmark to be push:</source> <translation>Выберите закладку для проталкивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Mercurial: Проталкивание закладки в удалённый репозиторий</translation> </message> @@ -29037,42 +29036,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="91"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> - <source>Did not receive the 'hello' message.</source> - <translation>Сообщение 'hello' не получено.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> - <source>Received data on unexpected channel.</source> - <translation>Получены данные по неожиданному каналу.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>Did not receive the 'hello' message.</source> + <translation>Сообщение 'hello' не получено.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> + <source>Received data on unexpected channel.</source> + <translation>Получены данные по неожиданному каналу.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation>Неправильное 'hello' сообщение, ожидалось 'capabilities: ', а получено '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="152"/> <source>'capabilities' message did not contain any capability.</source> <translation>Сообщение 'capabilities' пусто.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="160"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation>Неправильное 'hello' сообщение, ожидалось 'encoding: ', а получено '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="165"/> <source>'encoding' message did not contain any encoding.</source> <translation>Сообщение 'encoding' пусто.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="383"/> <source>For message see output dialog.</source> <translation>Сообщение можно увидеть в окне вывода.</translation> </message> @@ -29440,6 +29439,56 @@ <source>Errors</source> <translation>Ошибки</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> + <source>Input</source> + <translation type="unfinished">Ввод</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the subversion process</source> + <translation type="obsolete">Отправить данные процессу subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> + <source>&Send</source> + <translation type="unfinished">&Отправить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="obsolete">Введите данные для отправки процессу subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> + <source>&Password Mode</source> + <translation type="unfinished">&Парольный режим</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDiffDialog</name> @@ -43815,7 +43864,7 @@ <message> <location filename="../MicroPython/MicroPythonWidget.py" line="889"/> <source>The current editor does not contain a script. Abort...</source> - <translation>Текущий редактор не содержит скрипт. Прервать...</translation> + <translation>Текущий редактор не содержит скрипт. Прервать...</translation> </message> <message> <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> @@ -44004,12 +44053,12 @@ </message> <message> <location filename="../MicroPython/MicroPythonWidget.py" line="978"/> - <source>µPy Chart</source> + <source>µPy Chart</source> <translation>µPy диаграммы</translation> </message> <message> <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/> - <source>µPy Files</source> + <source>µPy Files</source> <translation>µPy файлы</translation> </message> <message> @@ -49307,17 +49356,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1621"/> + <location filename="../Preferences/__init__.py" line="1622"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Файлы предпочтений (*.ini);;Все файлы (*)</translation> </message> @@ -58556,27 +58605,27 @@ <translation>Задайте постфикс для инструментов Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="242"/> <source>pyuic / pyside-uic Options</source> <translation>Параметры pyuic / pyside-uic</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="248"/> + <source>Indent Width:</source> + <translation>Ширина отступа:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Select the indent width (default: 4)</source> + <translation>Задайте ширину отступа (по умолчанию: 4)</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="287"/> + <source>Generate imports relative to '.'</source> + <translation>Генерировать импорт относительно '.'</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> - <source>Indent Width:</source> - <translation>Ширина отступа:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Select the indent width (default: 4)</source> - <translation>Задайте ширину отступа (по умолчанию: 4)</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> - <source>Generate imports relative to '.'</source> - <translation>Генерировать импорт относительно '.'</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> <source>Tools Directory:</source> <translation>Директория инструментов:</translation> </message> @@ -58596,10 +58645,20 @@ <translation>Задайте путь к директории инструментов PyQT, если они не найдены.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.py" line="67"/> + <location filename="../Preferences/ConfigurationPages/QtPage.py" line="72"/> <source>Sample: {0}designer{1}</source> <translation>Например: {0}designer{1}</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <source>PySide2 Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="232"/> + <source>Enter the path of the PySide2 tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -82737,12 +82796,12 @@ <translation>Таблица стилей:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="36"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="37"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation>Таблицы стилей Qt (*.qss);;Каскадные таблицы стилей (*.css);;Все файлы (*)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="62"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="63"/> <source>System</source> <translation>Система</translation> </message> @@ -83900,8 +83959,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="673"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Открыть ссылку в новой вкладке Ctrl+LMB</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Открыть ссылку в новой вкладке<byte value="x9"/>Ctrl+LMB</translation> </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="679"/>
--- a/eric6/i18n/eric6_tr.ts Mon Mar 09 19:51:02 2020 +0100 +++ b/eric6/i18n/eric6_tr.ts Mon Mar 09 19:51:19 2020 +0100 @@ -30288,7 +30288,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> @@ -30298,7 +30298,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -30418,62 +30418,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -31469,42 +31469,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="91"/> <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> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> - <source>Received data on unexpected channel.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="152"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="160"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="165"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="383"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -31921,7 +31921,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> <source>Input</source> - <translation type="obsolete">Girdi</translation> + <translation type="unfinished">Girdi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> @@ -31931,12 +31931,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> <source>&Send</source> - <translation type="obsolete">&Gönder</translation> + <translation type="unfinished">&Gönder</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> <source>Alt+S</source> - <translation type="obsolete">Alt+S</translation> + <translation type="unfinished">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> @@ -31946,17 +31946,17 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> <source>Select to switch the input field to password mode</source> - <translation type="obsolete">Giriş alanını parola moduna çevirmek için seçiniz</translation> + <translation type="unfinished">Giriş alanını parola moduna çevirmek için seçiniz</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> <source>&Password Mode</source> - <translation type="obsolete">&Parola Modu</translation> + <translation type="unfinished">&Parola Modu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> <source>Alt+P</source> - <translation type="obsolete">Alt+P</translation> + <translation type="unfinished">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> @@ -31968,6 +31968,26 @@ <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="obsolete">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the subversion process</source> + <translation type="obsolete">Girdiyi altsürüm sürecine göndermek için basınız</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="obsolete">Altsürüm işlemleri için gönderilecek verileri gir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDiffDialog</name> @@ -52300,17 +52320,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1621"/> + <location filename="../Preferences/__init__.py" line="1622"/> <source>Export Preferences</source> <translation>Seçenekleri Dışa Aktar</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Import Preferences</source> <translation>Seçenekleri İçe Aktar</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -61397,27 +61417,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="242"/> <source>pyuic / pyside-uic Options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="248"/> + <source>Indent Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Select the indent width (default: 4)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="287"/> + <source>Generate imports relative to '.'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> - <source>Indent Width:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Select the indent width (default: 4)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> - <source>Generate imports relative to '.'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> @@ -61437,10 +61457,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.py" line="67"/> + <location filename="../Preferences/ConfigurationPages/QtPage.py" line="72"/> <source>Sample: {0}designer{1}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <source>PySide2 Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="232"/> + <source>Enter the path of the PySide2 tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -85472,12 +85502,12 @@ <translation type="obsolete">Sayfa stili dosyasının adını giriniz</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="36"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="37"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation type="unfinished">Qt Sayfa stili (*.qss);;Üstüste Sayfa Stili (*.css);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="62"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="63"/> <source>System</source> <translation type="unfinished">Sistem</translation> </message>
--- a/eric6/i18n/eric6_zh_CN.ts Mon Mar 09 19:51:02 2020 +0100 +++ b/eric6/i18n/eric6_zh_CN.ts Mon Mar 09 19:51:19 2020 +0100 @@ -30816,7 +30816,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> @@ -30826,7 +30826,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -30946,62 +30946,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Delete Bookmark</source> <translation type="unfinished">删除书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -31967,42 +31967,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="91"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> - <source>Received data on unexpected channel.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="152"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="160"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="165"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="383"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -32409,32 +32409,32 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> <source>Input</source> - <translation type="obsolete">输入</translation> + <translation type="unfinished">输入</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> <source>&Send</source> - <translation type="obsolete">发送(&S)</translation> + <translation type="unfinished">发送(&S)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> <source>Alt+S</source> - <translation type="obsolete">Alt+S</translation> + <translation type="unfinished">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> <source>Select to switch the input field to password mode</source> - <translation type="obsolete">选择将输入区域转换成密码模式</translation> + <translation type="unfinished">选择将输入区域转换成密码模式</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> <source>&Password Mode</source> - <translation type="obsolete">密码模式(&P)</translation> + <translation type="unfinished">密码模式(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> <source>Alt+P</source> - <translation type="obsolete">Alt+P</translation> + <translation type="unfinished">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> @@ -32446,6 +32446,26 @@ <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the subversion process</source> + <translation type="obsolete">点击将输入发送到 subversion 进程</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="obsolete">输入要发送到 subversion 进程的数据</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDiffDialog</name> @@ -52816,17 +52836,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1621"/> + <location filename="../Preferences/__init__.py" line="1622"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>属性文件 (*.ini);;所有文件 (*)</translation> </message> @@ -62007,27 +62027,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="242"/> <source>pyuic / pyside-uic Options</source> <translation>pyuic / pyside-uic 选项</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="248"/> + <source>Indent Width:</source> + <translation>缩进宽度：</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Select the indent width (default: 4)</source> + <translation>缩进宽度（默认值：4）</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="287"/> + <source>Generate imports relative to '.'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> - <source>Indent Width:</source> - <translation>缩进宽度：</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Select the indent width (default: 4)</source> - <translation>缩进宽度（默认值：4）</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> - <source>Generate imports relative to '.'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> @@ -62047,10 +62067,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.py" line="67"/> + <location filename="../Preferences/ConfigurationPages/QtPage.py" line="72"/> <source>Sample: {0}designer{1}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <source>PySide2 Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="232"/> + <source>Enter the path of the PySide2 tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -86226,12 +86256,12 @@ <translation type="obsolete">输入样式表文件的名称</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="36"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="37"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="62"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="63"/> <source>System</source> <translation type="unfinished"></translation> </message>
