Sat, 29 Sep 2018 19:32:33 +0200
IRC: added support for the /query, /notice, /ping, /ignore, /unignore, /away, /join, /part and /partall commands.
--- a/APIs/Python3/eric6.api Fri Sep 28 20:07:25 2018 +0200 +++ b/APIs/Python3/eric6.api Sat Sep 29 19:32:33 2018 +0200 @@ -3653,11 +3653,15 @@ eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.UrlRe?7 eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.addMessage?4(sender, msg) eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.addUsers?4(users) +eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.awayCommand?7 eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.channelClosed?7 eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.getUsersCount?4() eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.handleMessage?4(line) eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.hideEvent?4(evt) eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.initAutoWho?4() +eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.leaveAllChannels?7 +eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.leaveChannel?4() +eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.leaveChannels?7 eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.name?4() eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.on_editTopicButton_clicked?4() eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.on_messageEdit_returnPressed?4() @@ -3669,6 +3673,7 @@ eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.partMessage?4() eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.requestLeave?4() eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.sendCtcpReply?7 +eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.sendCtcpRequest?7 eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.sendData?7 eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.setMarkerLine?4() eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.setName?4(name) @@ -3692,8 +3697,10 @@ eric6.Network.IRC.IrcChannelWidget.IrcUserItem.canChangeTopic?4() eric6.Network.IRC.IrcChannelWidget.IrcUserItem.changePrivilege?4(privilege) eric6.Network.IRC.IrcChannelWidget.IrcUserItem.clearPrivileges?4() +eric6.Network.IRC.IrcChannelWidget.IrcUserItem.isIgnored?4() eric6.Network.IRC.IrcChannelWidget.IrcUserItem.name?4() eric6.Network.IRC.IrcChannelWidget.IrcUserItem.parseWhoFlags?4(flags) +eric6.Network.IRC.IrcChannelWidget.IrcUserItem.setIgnored?4(ignored) eric6.Network.IRC.IrcChannelWidget.IrcUserItem.setName?4(name) eric6.Network.IRC.IrcChannelWidget.IrcUserItem?1(name, parent=None) eric6.Network.IRC.IrcIdentitiesEditDialog.IrcIdentitiesEditDialog.accept?4() @@ -3837,6 +3844,7 @@ eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.editNetwork?7 eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.getNetworkChannels?4() eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.getNickname?4() +eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.handleAwayCommand?4(awayMessage) eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.initialize?4(manager) eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.isConnected?4() eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.joinChannel?7 @@ -3868,6 +3876,7 @@ eric6.Network.IRC.IrcWidget.IrcWidget.autoConnect?4() eric6.Network.IRC.IrcWidget.IrcWidget.autoConnected?7 eric6.Network.IRC.IrcWidget.IrcWidget.isChannelName?4(name) +eric6.Network.IRC.IrcWidget.IrcWidget.joinChannel?4(name, key="") eric6.Network.IRC.IrcWidget.IrcWidget.on_channelsWidget_tabCloseRequested?4(index) eric6.Network.IRC.IrcWidget.IrcWidget.shutdown?4() eric6.Network.IRC.IrcWidget.IrcWidget?1(parent=None) @@ -12675,6 +12684,7 @@ eric6.install.createMacAppBundle?4(pydir) eric6.install.createPyWrapper?4(pydir, wfile, isGuiScript=True) eric6.install.createWindowsLinks?4() +eric6.install.createWindowsShortcut?4(linkPath, targetPath, iconPath) eric6.install.currDir?7 eric6.install.defaultMacAppBundleName?7 eric6.install.defaultMacAppBundlePath?7 @@ -12685,6 +12695,7 @@ eric6.install.doCompile?7 eric6.install.doDependancyChecks?4() eric6.install.exit?4(rcode=0) +eric6.install.getWinregEntry?4(name, path) eric6.install.includePythonVariant?7 eric6.install.initGlobals?4() eric6.install.installApis?7 @@ -12706,6 +12717,9 @@ eric6.install.shutilCopy?4(src, dst, perm=0o644) eric6.install.sourceDir?7 eric6.install.usage?4(rcode=2) +eric6.install.windowsDesktopEntries?4() +eric6.install.windowsDesktopNames?4() +eric6.install.windowsProgramsEntry?4() eric6.install.wrapperNames?4(dname, wfile) eric6.patch_modpython.initGlobals?4() eric6.patch_modpython.main?4(argv) @@ -12728,6 +12742,7 @@ eric6.uninstall.defaultMacAppBundlePath?7 eric6.uninstall.exit?4(rcode=0) eric6.uninstall.getConfigDir?4() +eric6.uninstall.getWinregEntry?4(name, path) eric6.uninstall.includePythonVariant?7 eric6.uninstall.initGlobals?4() eric6.uninstall.main?4(argv) @@ -12742,5 +12757,8 @@ eric6.uninstall.uninstallEric?4() eric6.uninstall.uninstallLinuxSpecifics?4() eric6.uninstall.uninstallMacAppBundle?4() +eric6.uninstall.uninstallWindowsLinks?4() eric6.uninstall.usage?4(rcode=2) +eric6.uninstall.windowsDesktopNames?4() +eric6.uninstall.windowsProgramsEntry?4() eric6.uninstall.wrapperNames?4(dname, wfile)
--- a/Documentation/Help/source.qhp Fri Sep 28 20:07:25 2018 +0200 +++ b/Documentation/Help/source.qhp Sat Sep 29 19:32:33 2018 +0200 @@ -10147,6 +10147,7 @@ <keyword name="IrcChannelWidget.handleMessage" id="IrcChannelWidget.handleMessage" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.handleMessage" /> <keyword name="IrcChannelWidget.hideEvent" id="IrcChannelWidget.hideEvent" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.hideEvent" /> <keyword name="IrcChannelWidget.initAutoWho" id="IrcChannelWidget.initAutoWho" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.initAutoWho" /> + <keyword name="IrcChannelWidget.leaveChannel" id="IrcChannelWidget.leaveChannel" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.leaveChannel" /> <keyword name="IrcChannelWidget.name" id="IrcChannelWidget.name" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.name" /> <keyword name="IrcChannelWidget.on_editTopicButton_clicked" id="IrcChannelWidget.on_editTopicButton_clicked" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.on_editTopicButton_clicked" /> <keyword name="IrcChannelWidget.on_messageEdit_returnPressed" id="IrcChannelWidget.on_messageEdit_returnPressed" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.on_messageEdit_returnPressed" /> @@ -10314,6 +10315,7 @@ <keyword name="IrcNetworkWidget.autoConnect" id="IrcNetworkWidget.autoConnect" ref="eric6.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.autoConnect" /> <keyword name="IrcNetworkWidget.getNetworkChannels" id="IrcNetworkWidget.getNetworkChannels" ref="eric6.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.getNetworkChannels" /> <keyword name="IrcNetworkWidget.getNickname" id="IrcNetworkWidget.getNickname" ref="eric6.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.getNickname" /> + <keyword name="IrcNetworkWidget.handleAwayCommand" id="IrcNetworkWidget.handleAwayCommand" ref="eric6.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.handleAwayCommand" /> <keyword name="IrcNetworkWidget.initialize" id="IrcNetworkWidget.initialize" ref="eric6.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.initialize" /> <keyword name="IrcNetworkWidget.isConnected" id="IrcNetworkWidget.isConnected" ref="eric6.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.isConnected" /> <keyword name="IrcNetworkWidget.on_awayButton_clicked" id="IrcNetworkWidget.on_awayButton_clicked" ref="eric6.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.on_awayButton_clicked" /> @@ -10355,11 +10357,14 @@ <keyword name="IrcUserItem (Constructor)" id="IrcUserItem (Constructor)" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.__init__" /> <keyword name="IrcUserItem.__awayIcon" id="IrcUserItem.__awayIcon" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.__awayIcon" /> <keyword name="IrcUserItem.__setIcon" id="IrcUserItem.__setIcon" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.__setIcon" /> + <keyword name="IrcUserItem.__setText" id="IrcUserItem.__setText" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.__setText" /> <keyword name="IrcUserItem.canChangeTopic" id="IrcUserItem.canChangeTopic" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.canChangeTopic" /> <keyword name="IrcUserItem.changePrivilege" id="IrcUserItem.changePrivilege" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.changePrivilege" /> <keyword name="IrcUserItem.clearPrivileges" id="IrcUserItem.clearPrivileges" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.clearPrivileges" /> + <keyword name="IrcUserItem.isIgnored" id="IrcUserItem.isIgnored" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.isIgnored" /> <keyword name="IrcUserItem.name" id="IrcUserItem.name" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.name" /> <keyword name="IrcUserItem.parseWhoFlags" id="IrcUserItem.parseWhoFlags" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.parseWhoFlags" /> + <keyword name="IrcUserItem.setIgnored" id="IrcUserItem.setIgnored" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.setIgnored" /> <keyword name="IrcUserItem.setName" id="IrcUserItem.setName" ref="eric6.Network.IRC.IrcChannelWidget.html#IrcUserItem.setName" /> <keyword name="IrcUtilities (Module)" id="IrcUtilities (Module)" ref="eric6.Network.IRC.IrcUtilities.html" /> <keyword name="IrcWidget" id="IrcWidget" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget" /> @@ -10373,6 +10378,7 @@ <keyword name="IrcWidget.__connectNetwork" id="IrcWidget.__connectNetwork" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__connectNetwork" /> <keyword name="IrcWidget.__editNetwork" id="IrcWidget.__editNetwork" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__editNetwork" /> <keyword name="IrcWidget.__handleCtcp" id="IrcWidget.__handleCtcp" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__handleCtcp" /> + <keyword name="IrcWidget.__handleCtcpReply" id="IrcWidget.__handleCtcpReply" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__handleCtcpReply" /> <keyword name="IrcWidget.__handleNamedMessage" id="IrcWidget.__handleNamedMessage" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__handleNamedMessage" /> <keyword name="IrcWidget.__handleNickInUse" id="IrcWidget.__handleNickInUse" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__handleNickInUse" /> <keyword name="IrcWidget.__handleNickInUseLogin" id="IrcWidget.__handleNickInUseLogin" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__handleNickInUseLogin" /> @@ -10382,8 +10388,9 @@ <keyword name="IrcWidget.__hostConnected" id="IrcWidget.__hostConnected" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__hostConnected" /> <keyword name="IrcWidget.__hostDisconnected" id="IrcWidget.__hostDisconnected" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__hostDisconnected" /> <keyword name="IrcWidget.__hostFound" id="IrcWidget.__hostFound" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__hostFound" /> - <keyword name="IrcWidget.__joinChannel" id="IrcWidget.__joinChannel" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__joinChannel" /> + <keyword name="IrcWidget.__leaveAllChannels" id="IrcWidget.__leaveAllChannels" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__leaveAllChannels" /> <keyword name="IrcWidget.__leaveChannel" id="IrcWidget.__leaveChannel" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__leaveChannel" /> + <keyword name="IrcWidget.__leaveChannels" id="IrcWidget.__leaveChannels" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__leaveChannels" /> <keyword name="IrcWidget.__networkDataChanged" id="IrcWidget.__networkDataChanged" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__networkDataChanged" /> <keyword name="IrcWidget.__openPrivate" id="IrcWidget.__openPrivate" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__openPrivate" /> <keyword name="IrcWidget.__ping" id="IrcWidget.__ping" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__ping" /> @@ -10392,6 +10399,7 @@ <keyword name="IrcWidget.__registerWithServices" id="IrcWidget.__registerWithServices" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__registerWithServices" /> <keyword name="IrcWidget.__send" id="IrcWidget.__send" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__send" /> <keyword name="IrcWidget.__sendCtcpReply" id="IrcWidget.__sendCtcpReply" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__sendCtcpReply" /> + <keyword name="IrcWidget.__sendCtcpRequest" id="IrcWidget.__sendCtcpRequest" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__sendCtcpRequest" /> <keyword name="IrcWidget.__setChannelTypePrefixes" id="IrcWidget.__setChannelTypePrefixes" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__setChannelTypePrefixes" /> <keyword name="IrcWidget.__setUserPrivilegePrefix" id="IrcWidget.__setUserPrivilegePrefix" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__setUserPrivilegePrefix" /> <keyword name="IrcWidget.__sslErrors" id="IrcWidget.__sslErrors" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__sslErrors" /> @@ -10399,6 +10407,7 @@ <keyword name="IrcWidget.__updateUsersCount" id="IrcWidget.__updateUsersCount" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.__updateUsersCount" /> <keyword name="IrcWidget.autoConnect" id="IrcWidget.autoConnect" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.autoConnect" /> <keyword name="IrcWidget.isChannelName" id="IrcWidget.isChannelName" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.isChannelName" /> + <keyword name="IrcWidget.joinChannel" id="IrcWidget.joinChannel" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.joinChannel" /> <keyword name="IrcWidget.on_channelsWidget_tabCloseRequested" id="IrcWidget.on_channelsWidget_tabCloseRequested" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.on_channelsWidget_tabCloseRequested" /> <keyword name="IrcWidget.shutdown" id="IrcWidget.shutdown" ref="eric6.Network.IRC.IrcWidget.html#IrcWidget.shutdown" /> <keyword name="JavaScript (Package)" id="JavaScript (Package)" ref="index-eric6.WebBrowser.JavaScript.html" /> @@ -18680,6 +18689,7 @@ <keyword name="createPyWrapper" id="createPyWrapper" ref="eric6.install.html#createPyWrapper" /> <keyword name="createTranslatorPage" id="createTranslatorPage" ref="eric6.Plugins.PluginTranslator.html#createTranslatorPage" /> <keyword name="createWindowsLinks" id="createWindowsLinks" ref="eric6.install.html#createWindowsLinks" /> + <keyword name="createWindowsShortcut" id="createWindowsShortcut" ref="eric6.install.html#createWindowsShortcut" /> <keyword name="critical" id="critical" ref="eric6.E5Gui.E5MessageBox.html#critical" /> <keyword name="crypto (Package)" id="crypto (Package)" ref="index-eric6.Utilities.crypto.html" /> <keyword name="cursors (Package)" id="cursors (Package)" ref="index-eric6.IconEditor.cursors.html" /> @@ -18941,6 +18951,8 @@ <keyword name="getWebBrowser" id="getWebBrowser" ref="eric6.Preferences.__init__.html#getWebBrowser" /> <keyword name="getWebEngineVersions" id="getWebEngineVersions" ref="eric6.WebBrowser.Tools.WebBrowserTools.html#getWebEngineVersions" /> <keyword name="getWindowsExecutablePath" id="getWindowsExecutablePath" ref="eric6.Utilities.__init__.html#getWindowsExecutablePath" /> + <keyword name="getWinregEntry" id="getWinregEntry" ref="eric6.install.html#getWinregEntry" /> + <keyword name="getWinregEntry" id="getWinregEntry" ref="eric6.uninstall.html#getWinregEntry" /> <keyword name="get_checks" id="get_checks" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#get_checks" /> <keyword name="get_class_members" id="get_class_members" ref="eric6.DebugClients.Python.FlexCompleter.html#get_class_members" /> <keyword name="get_coding" id="get_coding" ref="eric6.Utilities.__init__.html#get_coding" /> @@ -19321,6 +19333,7 @@ <keyword name="uninstallEricDebugClients" id="uninstallEricDebugClients" ref="eric6.uninstall-debugclients.html#uninstallEricDebugClients" /> <keyword name="uninstallLinuxSpecifics" id="uninstallLinuxSpecifics" ref="eric6.uninstall.html#uninstallLinuxSpecifics" /> <keyword name="uninstallMacAppBundle" id="uninstallMacAppBundle" ref="eric6.uninstall.html#uninstallMacAppBundle" /> + <keyword name="uninstallWindowsLinks" id="uninstallWindowsLinks" ref="eric6.uninstall.html#uninstallWindowsLinks" /> <keyword name="unregisterLexer" id="unregisterLexer" ref="eric6.QScintilla.Lexers.__init__.html#unregisterLexer" /> <keyword name="unregisterView" id="unregisterView" ref="eric6.WebBrowser.WebInspector.html#unregisterView" /> <keyword name="update_counts" id="update_counts" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#update_counts" /> @@ -19353,6 +19366,11 @@ <keyword name="win32_GetUserName" id="win32_GetUserName" ref="eric6.Utilities.__init__.html#win32_GetUserName" /> <keyword name="win32_Kill" id="win32_Kill" ref="eric6.Utilities.__init__.html#win32_Kill" /> <keyword name="win32_getRealName" id="win32_getRealName" ref="eric6.Utilities.__init__.html#win32_getRealName" /> + <keyword name="windowsDesktopEntries" id="windowsDesktopEntries" ref="eric6.install.html#windowsDesktopEntries" /> + <keyword name="windowsDesktopNames" id="windowsDesktopNames" ref="eric6.install.html#windowsDesktopNames" /> + <keyword name="windowsDesktopNames" id="windowsDesktopNames" ref="eric6.uninstall.html#windowsDesktopNames" /> + <keyword name="windowsProgramsEntry" id="windowsProgramsEntry" ref="eric6.install.html#windowsProgramsEntry" /> + <keyword name="windowsProgramsEntry" id="windowsProgramsEntry" ref="eric6.uninstall.html#windowsProgramsEntry" /> <keyword name="worker" id="worker" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html#worker" /> <keyword name="worker" id="worker" ref="eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.html#worker" /> <keyword name="worker" id="worker" ref="eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.html#worker" />
--- a/Documentation/Source/eric6.Network.IRC.IrcChannelWidget.html Fri Sep 28 20:07:25 2018 +0200 +++ b/Documentation/Source/eric6.Network.IRC.IrcChannelWidget.html Sat Sep 29 19:32:33 2018 +0200 @@ -48,9 +48,19 @@ Class implementing the IRC channel widget. </p><h3>Signals</h3> <dl> -<dt>channelClosed(str)</dt> +<dt>awayCommand(str)</dt> +<dd> +emitted to set the away status via the /away + command +</dd><dt>channelClosed(str)</dt> <dd> emitted after the user has left the channel +</dd><dt>leaveAllChannels()</dt> +<dd> +emitted to leave all channels +</dd><dt>leaveChannels(list)</dt> +<dd> +emitted to leave a list of channels </dd><dt>openPrivateChat(str)</dt> <dd> emitted to open a "channel" for private @@ -58,6 +68,9 @@ </dd><dt>sendCtcpReply(str, str)</dt> <dd> emitted to send a CTCP reply +</dd><dt>sendCtcpRequest(str, str, str)</dt> +<dd> +emitted to send a CTCP request </dd><dt>sendData(str)</dt> <dd> emitted to send a message to the channel @@ -238,6 +251,9 @@ <td><a href="#IrcChannelWidget.initAutoWho">initAutoWho</a></td> <td>Public method to initialize the Auto Who system.</td> </tr><tr> +<td><a href="#IrcChannelWidget.leaveChannel">leaveChannel</a></td> +<td>Public slot to leave the channel.</td> +</tr><tr> <td><a href="#IrcChannelWidget.name">name</a></td> <td>Public method to get the name of the channel.</td> </tr><tr> @@ -966,6 +982,11 @@ <b>initAutoWho</b>(<i></i>) <p> Public method to initialize the Auto Who system. +</p><a NAME="IrcChannelWidget.leaveChannel" ID="IrcChannelWidget.leaveChannel"></a> +<h4>IrcChannelWidget.leaveChannel</h4> +<b>leaveChannel</b>(<i></i>) +<p> + Public slot to leave the channel. </p><a NAME="IrcChannelWidget.name" ID="IrcChannelWidget.name"></a> <h4>IrcChannelWidget.name</h4> <b>name</b>(<i></i>) @@ -1165,6 +1186,9 @@ <td><a href="#IrcUserItem.__setIcon">__setIcon</a></td> <td>Private method to set the icon dependent on user privileges.</td> </tr><tr> +<td><a href="#IrcUserItem.__setText">__setText</a></td> +<td>Private method to set the user item text.</td> +</tr><tr> <td><a href="#IrcUserItem.canChangeTopic">canChangeTopic</a></td> <td>Public method to check, if the user is allowed to change the topic.</td> </tr><tr> @@ -1174,12 +1198,18 @@ <td><a href="#IrcUserItem.clearPrivileges">clearPrivileges</a></td> <td>Public method to clear the user privileges.</td> </tr><tr> +<td><a href="#IrcUserItem.isIgnored">isIgnored</a></td> +<td>Public method to check, if this user is ignored.</td> +</tr><tr> <td><a href="#IrcUserItem.name">name</a></td> <td>Public method to get the user name.</td> </tr><tr> <td><a href="#IrcUserItem.parseWhoFlags">parseWhoFlags</a></td> <td>Public method to parse the user flags reported by a WHO command.</td> </tr><tr> +<td><a href="#IrcUserItem.setIgnored">setIgnored</a></td> +<td>Public method to set the user status to ignored.</td> +</tr><tr> <td><a href="#IrcUserItem.setName">setName</a></td> <td>Public method to set a new nick name.</td> </tr> @@ -1222,6 +1252,11 @@ <b>__setIcon</b>(<i></i>) <p> Private method to set the icon dependent on user privileges. +</p><a NAME="IrcUserItem.__setText" ID="IrcUserItem.__setText"></a> +<h4>IrcUserItem.__setText</h4> +<b>__setText</b>(<i></i>) +<p> + Private method to set the user item text. </p><a NAME="IrcUserItem.canChangeTopic" ID="IrcUserItem.canChangeTopic"></a> <h4>IrcUserItem.canChangeTopic</h4> <b>canChangeTopic</b>(<i></i>) @@ -1247,7 +1282,22 @@ <b>clearPrivileges</b>(<i></i>) <p> Public method to clear the user privileges. -</p><a NAME="IrcUserItem.name" ID="IrcUserItem.name"></a> +</p><a NAME="IrcUserItem.isIgnored" ID="IrcUserItem.isIgnored"></a> +<h4>IrcUserItem.isIgnored</h4> +<b>isIgnored</b>(<i></i>) +<p> + Public method to check, if this user is ignored. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the ignored status +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="IrcUserItem.name" ID="IrcUserItem.name"></a> <h4>IrcUserItem.name</h4> <b>name</b>(<i></i>) <p> @@ -1267,6 +1317,16 @@ <dd> user flags as reported by WHO (string) </dd> +</dl><a NAME="IrcUserItem.setIgnored" ID="IrcUserItem.setIgnored"></a> +<h4>IrcUserItem.setIgnored</h4> +<b>setIgnored</b>(<i>ignored</i>) +<p> + Public method to set the user status to ignored. +</p><dl> +<dt><i>ignored</i> (bool)</dt> +<dd> +flag indicating the new ignored status +</dd> </dl><a NAME="IrcUserItem.setName" ID="IrcUserItem.setName"></a> <h4>IrcUserItem.setName</h4> <b>setName</b>(<i>name</i>)
--- a/Documentation/Source/eric6.Network.IRC.IrcNetworkWidget.html Fri Sep 28 20:07:25 2018 +0200 +++ b/Documentation/Source/eric6.Network.IRC.IrcNetworkWidget.html Sat Sep 29 19:32:33 2018 +0200 @@ -130,6 +130,9 @@ <td><a href="#IrcNetworkWidget.getNickname">getNickname</a></td> <td>Public method to get the currently selected nick name.</td> </tr><tr> +<td><a href="#IrcNetworkWidget.handleAwayCommand">handleAwayCommand</a></td> +<td>Public slot to process an away command.</td> +</tr><tr> <td><a href="#IrcNetworkWidget.initialize">initialize</a></td> <td>Public method to initialize the widget.</td> </tr><tr> @@ -308,6 +311,16 @@ <dd> selected nick name (string) </dd> +</dl><a NAME="IrcNetworkWidget.handleAwayCommand" ID="IrcNetworkWidget.handleAwayCommand"></a> +<h4>IrcNetworkWidget.handleAwayCommand</h4> +<b>handleAwayCommand</b>(<i>awayMessage</i>) +<p> + Public slot to process an away command. +</p><dl> +<dt><i>awayMessage</i> (str)</dt> +<dd> +message to be set for being away +</dd> </dl><a NAME="IrcNetworkWidget.initialize" ID="IrcNetworkWidget.initialize"></a> <h4>IrcNetworkWidget.initialize</h4> <b>initialize</b>(<i>manager</i>)
--- a/Documentation/Source/eric6.Network.IRC.IrcWidget.html Fri Sep 28 20:07:25 2018 +0200 +++ b/Documentation/Source/eric6.Network.IRC.IrcWidget.html Sat Sep 29 19:32:33 2018 +0200 @@ -90,6 +90,9 @@ <td><a href="#IrcWidget.__handleCtcp">__handleCtcp</a></td> <td>Private method to handle a CTCP command.</td> </tr><tr> +<td><a href="#IrcWidget.__handleCtcpReply">__handleCtcpReply</a></td> +<td>Private method to handle a server message containing a CTCP reply.</td> +</tr><tr> <td><a href="#IrcWidget.__handleNamedMessage">__handleNamedMessage</a></td> <td>Private method to handle a server message containing a message name.</td> </tr><tr> @@ -117,12 +120,15 @@ <td><a href="#IrcWidget.__hostFound">__hostFound</a></td> <td>Private slot to indicate the host was found.</td> </tr><tr> -<td><a href="#IrcWidget.__joinChannel">__joinChannel</a></td> -<td>Private slot to join a channel.</td> +<td><a href="#IrcWidget.__leaveAllChannels">__leaveAllChannels</a></td> +<td>Private slot to leave all channels and close their tabs.</td> </tr><tr> <td><a href="#IrcWidget.__leaveChannel">__leaveChannel</a></td> <td>Private slot to leave a channel and close the associated tab.</td> </tr><tr> +<td><a href="#IrcWidget.__leaveChannels">__leaveChannels</a></td> +<td>Private slot to leave a list of channels and close their associated tabs.</td> +</tr><tr> <td><a href="#IrcWidget.__networkDataChanged">__networkDataChanged</a></td> <td>Private slot handling changes of the network and identity definitions.</td> </tr><tr> @@ -147,6 +153,9 @@ <td><a href="#IrcWidget.__sendCtcpReply">__sendCtcpReply</a></td> <td>Private slot to send a CTCP reply.</td> </tr><tr> +<td><a href="#IrcWidget.__sendCtcpRequest">__sendCtcpRequest</a></td> +<td>Private slot to send a CTCP request.</td> +</tr><tr> <td><a href="#IrcWidget.__setChannelTypePrefixes">__setChannelTypePrefixes</a></td> <td>Private method to set the channel type prefixes.</td> </tr><tr> @@ -168,6 +177,9 @@ <td><a href="#IrcWidget.isChannelName">isChannelName</a></td> <td>Public method to check, if the given name is a channel name.</td> </tr><tr> +<td><a href="#IrcWidget.joinChannel">joinChannel</a></td> +<td>Public slot to join a channel.</td> +</tr><tr> <td><a href="#IrcWidget.on_channelsWidget_tabCloseRequested">on_channelsWidget_tabCloseRequested</a></td> <td>Private slot to close a channel by pressing the close button of the channels widget.</td> </tr><tr> @@ -271,6 +283,16 @@ <dd> flag indicating, if the message was handled (boolean) </dd> +</dl><a NAME="IrcWidget.__handleCtcpReply" ID="IrcWidget.__handleCtcpReply"></a> +<h4>IrcWidget.__handleCtcpReply</h4> +<b>__handleCtcpReply</b>(<i>match</i>) +<p> + Private method to handle a server message containing a CTCP reply. +</p><dl> +<dt><i>match</i></dt> +<dd> +reference to the match object +</dd> </dl><a NAME="IrcWidget.__handleNamedMessage" ID="IrcWidget.__handleNamedMessage"></a> <h4>IrcWidget.__handleNamedMessage</h4> <b>__handleNamedMessage</b>(<i>match</i>) @@ -369,25 +391,28 @@ <b>__hostFound</b>(<i></i>) <p> Private slot to indicate the host was found. -</p><a NAME="IrcWidget.__joinChannel" ID="IrcWidget.__joinChannel"></a> -<h4>IrcWidget.__joinChannel</h4> -<b>__joinChannel</b>(<i>name, key=""</i>) +</p><a NAME="IrcWidget.__leaveAllChannels" ID="IrcWidget.__leaveAllChannels"></a> +<h4>IrcWidget.__leaveAllChannels</h4> +<b>__leaveAllChannels</b>(<i></i>) <p> - Private slot to join a channel. -</p><dl> -<dt><i>name</i></dt> -<dd> -name of the channel (string) -</dd><dt><i>key</i></dt> -<dd> -key of the channel (string) -</dd> -</dl><a NAME="IrcWidget.__leaveChannel" ID="IrcWidget.__leaveChannel"></a> + Private slot to leave all channels and close their tabs. +</p><a NAME="IrcWidget.__leaveChannel" ID="IrcWidget.__leaveChannel"></a> <h4>IrcWidget.__leaveChannel</h4> <b>__leaveChannel</b>(<i></i>) <p> Private slot to leave a channel and close the associated tab. -</p><a NAME="IrcWidget.__networkDataChanged" ID="IrcWidget.__networkDataChanged"></a> +</p><a NAME="IrcWidget.__leaveChannels" ID="IrcWidget.__leaveChannels"></a> +<h4>IrcWidget.__leaveChannels</h4> +<b>__leaveChannels</b>(<i>channelNames</i>) +<p> + Private slot to leave a list of channels and close their associated + tabs. +</p><dl> +<dt><i>channelNames</i> (list of str)</dt> +<dd> +list of channels to leave +</dd> +</dl><a NAME="IrcWidget.__networkDataChanged" ID="IrcWidget.__networkDataChanged"></a> <h4>IrcWidget.__networkDataChanged</h4> <b>__networkDataChanged</b>(<i></i>) <p> @@ -458,12 +483,28 @@ <p> Private slot to send a CTCP reply. </p><dl> -<dt><i>receiver</i></dt> +<dt><i>receiver</i> (str)</dt> +<dd> +nick name of the receiver +</dd><dt><i>text</i> (str)</dt> <dd> -nick name of the receiver (string) -</dd><dt><i>text</i></dt> +text to be sent +</dd> +</dl><a NAME="IrcWidget.__sendCtcpRequest" ID="IrcWidget.__sendCtcpRequest"></a> +<h4>IrcWidget.__sendCtcpRequest</h4> +<b>__sendCtcpRequest</b>(<i>receiver, request, arguments</i>) +<p> + Private slot to send a CTCP request. +</p><dl> +<dt><i>receiver</i> (str)</dt> <dd> -text to be sent (string) +nick name of the receiver +</dd><dt><i>request</i> (str)</dt> +<dd> +CTCP request to be sent +</dd><dt><i>arguments</i> (str)</dt> +<dd> +arguments to be sent </dd> </dl><a NAME="IrcWidget.__setChannelTypePrefixes" ID="IrcWidget.__setChannelTypePrefixes"></a> <h4>IrcWidget.__setChannelTypePrefixes</h4> @@ -534,6 +575,19 @@ <dd> flag indicating a channel name (boolean) </dd> +</dl><a NAME="IrcWidget.joinChannel" ID="IrcWidget.joinChannel"></a> +<h4>IrcWidget.joinChannel</h4> +<b>joinChannel</b>(<i>name, key=""</i>) +<p> + Public slot to join a channel. +</p><dl> +<dt><i>name</i></dt> +<dd> +name of the channel (string) +</dd><dt><i>key</i></dt> +<dd> +key of the channel (string) +</dd> </dl><a NAME="IrcWidget.on_channelsWidget_tabCloseRequested" ID="IrcWidget.on_channelsWidget_tabCloseRequested"></a> <h4>IrcWidget.on_channelsWidget_tabCloseRequested</h4> <b>on_channelsWidget_tabCloseRequested</b>(<i>index</i>)
--- a/Documentation/Source/eric6.install.html Fri Sep 28 20:07:25 2018 +0200 +++ b/Documentation/Source/eric6.install.html Sat Sep 29 19:32:33 2018 +0200 @@ -88,6 +88,9 @@ <td><a href="#createWindowsLinks">createWindowsLinks</a></td> <td>Create Desktop and Start Menu links.</td> </tr><tr> +<td><a href="#createWindowsShortcut">createWindowsShortcut</a></td> +<td>Create Windows shortcut.</td> +</tr><tr> <td><a href="#determinePyQtVariant">determinePyQtVariant</a></td> <td>Module function to determine the PyQt variant to be used.</td> </tr><tr> @@ -97,6 +100,9 @@ <td><a href="#exit">exit</a></td> <td>Exit the install script.</td> </tr><tr> +<td><a href="#getWinregEntry">getWinregEntry</a></td> +<td>Function to get an entry from the Windows Registry.</td> +</tr><tr> <td><a href="#initGlobals">initGlobals</a></td> <td>Module function to set the values of globals that need more than a simple assignment.</td> </tr><tr> @@ -118,6 +124,15 @@ <td><a href="#usage">usage</a></td> <td>Display a usage message and exit.</td> </tr><tr> +<td><a href="#windowsDesktopEntries">windowsDesktopEntries</a></td> +<td>Function to generate data for the Windows Desktop links.</td> +</tr><tr> +<td><a href="#windowsDesktopNames">windowsDesktopNames</a></td> +<td>Function to generate the link names for the Windows Desktop.</td> +</tr><tr> +<td><a href="#windowsProgramsEntry">windowsProgramsEntry</a></td> +<td>Function to generate the name of the Start Menu top entry.</td> +</tr><tr> <td><a href="#wrapperNames">wrapperNames</a></td> <td>Create the platform specific names for the wrapper script.</td> </tr> @@ -360,6 +375,25 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="createWindowsShortcut" ID="createWindowsShortcut"></a> +<h2>createWindowsShortcut</h2> +<b>createWindowsShortcut</b>(<i>linkPath, targetPath, iconPath</i>) +<p> + Create Windows shortcut. +</p><dl> +<dt><i>linkPath</i> (str)</dt> +<dd> +path of the shortcut file +</dd><dt><i>targetPath</i> (str)</dt> +<dd> +path the shortcut shall point to +</dd><dt><i>iconPath</i> (str)</dt> +<dd> +path of the icon file +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="determinePyQtVariant" ID="determinePyQtVariant"></a> <h2>determinePyQtVariant</h2> <b>determinePyQtVariant</b>(<i></i>) @@ -389,6 +423,32 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="getWinregEntry" ID="getWinregEntry"></a> +<h2>getWinregEntry</h2> +<b>getWinregEntry</b>(<i>name, path</i>) +<p> + Function to get an entry from the Windows Registry. +</p><dl> +<dt><i>name</i> (str)</dt> +<dd> +variable name +</dd><dt><i>path</i> (str)</dt> +<dd> +registry path of the variable +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +value of requested registry variable +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +any +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="initGlobals" ID="initGlobals"></a> <h2>initGlobals</h2> <b>initGlobals</b>(<i></i>) @@ -495,6 +555,61 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="windowsDesktopEntries" ID="windowsDesktopEntries"></a> +<h2>windowsDesktopEntries</h2> +<b>windowsDesktopEntries</b>(<i></i>) +<p> + Function to generate data for the Windows Desktop links. +</p><dl> +<dt>Returns:</dt> +<dd> +list of tuples containing the desktop link name, + the link target and the icon target +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +list of tuples of (str, str, str) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="windowsDesktopNames" ID="windowsDesktopNames"></a> +<h2>windowsDesktopNames</h2> +<b>windowsDesktopNames</b>(<i></i>) +<p> + Function to generate the link names for the Windows Desktop. +</p><dl> +<dt>Returns:</dt> +<dd> +list of desktop link names +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +list of str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="windowsProgramsEntry" ID="windowsProgramsEntry"></a> +<h2>windowsProgramsEntry</h2> +<b>windowsProgramsEntry</b>(<i></i>) +<p> + Function to generate the name of the Start Menu top entry. +</p><dl> +<dt>Returns:</dt> +<dd> +name of the Start Menu top entry +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="wrapperNames" ID="wrapperNames"></a> <h2>wrapperNames</h2> <b>wrapperNames</b>(<i>dname, wfile</i>)
--- a/Documentation/Source/eric6.uninstall.html Fri Sep 28 20:07:25 2018 +0200 +++ b/Documentation/Source/eric6.uninstall.html Sat Sep 29 19:32:33 2018 +0200 @@ -40,6 +40,9 @@ <td><a href="#getConfigDir">getConfigDir</a></td> <td>Module function to get the name of the directory storing the config data.</td> </tr><tr> +<td><a href="#getWinregEntry">getWinregEntry</a></td> +<td>Function to get an entry from the Windows Registry.</td> +</tr><tr> <td><a href="#initGlobals">initGlobals</a></td> <td>Set the values of globals that need more than a simple assignment.</td> </tr><tr> @@ -64,9 +67,18 @@ <td><a href="#uninstallMacAppBundle">uninstallMacAppBundle</a></td> <td>Uninstall the macOS application bundle.</td> </tr><tr> +<td><a href="#uninstallWindowsLinks">uninstallWindowsLinks</a></td> +<td>Clean up the Desktop and Start Menu entries for Windows.</td> +</tr><tr> <td><a href="#usage">usage</a></td> <td>Display a usage message and exit.</td> </tr><tr> +<td><a href="#windowsDesktopNames">windowsDesktopNames</a></td> +<td>Function to generate the link names for the Windows Desktop.</td> +</tr><tr> +<td><a href="#windowsProgramsEntry">windowsProgramsEntry</a></td> +<td>Function to generate the name of the Start Menu top entry.</td> +</tr><tr> <td><a href="#wrapperNames">wrapperNames</a></td> <td>Create the platform specific names for the wrapper script.</td> </tr> @@ -98,6 +110,32 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="getWinregEntry" ID="getWinregEntry"></a> +<h2>getWinregEntry</h2> +<b>getWinregEntry</b>(<i>name, path</i>) +<p> + Function to get an entry from the Windows Registry. +</p><dl> +<dt><i>name</i> (str)</dt> +<dd> +variable name +</dd><dt><i>path</i> (str)</dt> +<dd> +registry path of the variable +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +value of requested registry variable +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +any +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="initGlobals" ID="initGlobals"></a> <h2>initGlobals</h2> <b>initGlobals</b>(<i></i>) @@ -167,6 +205,14 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="uninstallWindowsLinks" ID="uninstallWindowsLinks"></a> +<h2>uninstallWindowsLinks</h2> +<b>uninstallWindowsLinks</b>(<i></i>) +<p> + Clean up the Desktop and Start Menu entries for Windows. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="usage" ID="usage"></a> <h2>usage</h2> <b>usage</b>(<i>rcode=2</i>) @@ -180,6 +226,42 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="windowsDesktopNames" ID="windowsDesktopNames"></a> +<h2>windowsDesktopNames</h2> +<b>windowsDesktopNames</b>(<i></i>) +<p> + Function to generate the link names for the Windows Desktop. +</p><dl> +<dt>Returns:</dt> +<dd> +list of desktop link names +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +list of str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="windowsProgramsEntry" ID="windowsProgramsEntry"></a> +<h2>windowsProgramsEntry</h2> +<b>windowsProgramsEntry</b>(<i></i>) +<p> + Function to generate the name of the Start Menu top entry. +</p><dl> +<dt>Returns:</dt> +<dd> +name of the Start Menu top entry +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="wrapperNames" ID="wrapperNames"></a> <h2>wrapperNames</h2> <b>wrapperNames</b>(<i>dname, wfile</i>)
--- a/Network/IRC/IrcChannelWidget.py Fri Sep 28 20:07:25 2018 +0200 +++ b/Network/IRC/IrcChannelWidget.py Sat Sep 29 19:32:33 2018 +0200 @@ -9,10 +9,15 @@ from __future__ import unicode_literals +try: + from itertools import izip_longest as zip_longest # __IGNORE_EXCEPTION__ +except ImportError: + from itertools import zip_longest + import re from PyQt5.QtCore import pyqtSlot, pyqtSignal, QDateTime, QPoint, QFileInfo, \ - QTimer, QUrl + QTimer, QUrl, QCoreApplication from PyQt5.QtGui import QIcon, QPainter, QTextCursor, QDesktopServices from PyQt5.QtWidgets import QWidget, QListWidgetItem, QMenu, QApplication, \ QInputDialog, QLineEdit @@ -63,7 +68,9 @@ self.__privilege = IrcUserItem.Normal self.__name = name + self.__ignored = False + self.__setText() self.__setIcon() def name(self): @@ -81,7 +88,7 @@ @param name new nick name for the user (string) """ self.__name = name - self.setText(name) + self.__setText() def changePrivilege(self, privilege): """ @@ -106,6 +113,17 @@ self.__privilege = IrcUserItem.Normal self.__setIcon() + def __setText(self): + """ + Private method to set the user item text. + """ + if self.__ignored: + self.setText(QCoreApplication.translate( + "IrcUserItem", + "{0} (ignored)").format(self.__name)) + else: + self.setText(self.__name) + def __setIcon(self): """ Private method to set the icon dependent on user privileges. @@ -176,6 +194,25 @@ return(bool(self.__privilege & IrcUserItem.Operator) or bool(self.__privilege & IrcUserItem.Admin) or bool(self.__privilege & IrcUserItem.Owner)) + + def setIgnored(self, ignored): + """ + Public method to set the user status to ignored. + + @param ignored flag indicating the new ignored status + @type bool + """ + self.__ignored = ignored + self.__setText() + + def isIgnored(self): + """ + Public method to check, if this user is ignored. + + @return flag indicating the ignored status + @rtype bool + """ + return self.__ignored class IrcChannelWidget(QWidget, Ui_IrcChannelWidget): @@ -183,15 +220,24 @@ Class implementing the IRC channel widget. @signal sendData(str) emitted to send a message to the channel + @signal sendCtcpRequest(str, str, str) emitted to send a CTCP request @signal sendCtcpReply(str, str) emitted to send a CTCP reply @signal channelClosed(str) emitted after the user has left the channel @signal openPrivateChat(str) emitted to open a "channel" for private messages + @signal awayCommand(str) emitted to set the away status via the /away + command + @signal leaveChannels(list) emitted to leave a list of channels + @signal leaveAllChannels() emitted to leave all channels """ sendData = pyqtSignal(str) + sendCtcpRequest = pyqtSignal(str, str, str) sendCtcpReply = pyqtSignal(str, str) channelClosed = pyqtSignal(str) openPrivateChat = pyqtSignal(str) + awayCommand = pyqtSignal(str) + leaveChannels = pyqtSignal(list) + leaveAllChannels = pyqtSignal() UrlRe = re.compile( r"""((?:http|ftp|https):\/\/[\w\-_]+(?:\.[\w\-_]+)+""" @@ -358,6 +404,7 @@ Preferences.getIrc("OwnNickColour"), ircTimestamp(), self.__userName, Utilities.html_encode(msg))) + if msg.startswith("/"): if self.__private: E5MessageBox.information( @@ -367,9 +414,12 @@ """Messages starting with a '/' are not allowed""" """ in private chats.""")) else: + sendData = True + # flag set to False, if command was handled + msgList = msg.split() cmd = msgList[0][1:].upper() - if cmd == "MSG": + if cmd in ["MSG", "QUERY"]: cmd = "PRIVMSG" if len(msgList) > 1: if msgList[1].strip().lower() in \ @@ -383,9 +433,77 @@ else: msgList[0] = cmd msg = " ".join(msgList) + elif cmd == "NOTICE": + if len(msgList) > 2: + msg = "NOTICE {0} :{1}".format( + msgList[1], " ".join(msgList[2:])) + else: + msg = "NOTICE {0}".format(" ".join(msgList[1:])) + elif cmd == "PING": + receiver = msgList[1] + msg = "PING {0} " + self.sendCtcpRequest.emit(receiver, "PING", "") + sendData = False + elif cmd == "IGNORE": + sendData = False + if len(msgList) > 1: + if msgList[1] == "-r": + ignored = False + userNamesList = msgList[2:] + else: + ignored = True + userNamesList = msgList[1:] + else: + userNamesList = [] + userNames = ",".join( + u.rstrip(",") for u in userNamesList).split(",") + for userName in userNames: + itm = self.__findUser(userName) + if itm: + itm.setIgnored(ignored) + elif cmd == "UNIGNORE": + sendData = False + if len(msgList) > 1: + userNamesList = msgList[1:] + else: + userNamesList = [] + userNames = ",".join( + u.rstrip(",") for u in userNamesList).split(",") + for userName in userNames: + itm = self.__findUser(userName) + if itm: + itm.setIgnored(False) + elif cmd == "AWAY": + sendData = False + if len(msgList) > 1: + msg = " ".join(msgList[1:]) + else: + msg = "" + self.awayCommand.emit(msg) + elif cmd == "JOIN": + sendData = False + if len(msgList) > 1: + channels = msgList[1].split(",") + if len(msgList) > 2: + keys = msgList[2].split(",") + else: + keys = [] + for channel, key in zip_longest( + channels, keys, fillvalue=""): + self.__ircWidget.joinChannel(channel, key) + elif cmd == "PART": + sendData = False + if len(msgList) == 1: + self.leaveChannel() + else: + self.leaveChannels.emit(msgList[1:]) + elif cmd == "PARTALL": + sendData = False + self.leaveAllChannels.emit() else: msg = msg[1:] - self.sendData.emit(msg) + if sendData: + self.sendData.emit(msg) else: if self.__private: self.sendData.emit( @@ -393,6 +511,7 @@ else: self.sendData.emit( "PRIVMSG " + self.__name + " :" + msg) + self.messageEdit.clear() self.unsetMarkerLine() @@ -404,13 +523,19 @@ self, self.tr("Leave IRC channel"), self.tr( - """Do you really want to leave the IRC channel <b>{0}</b>?""") - .format(self.__name)) + """Do you really want to leave the IRC channel""" + """ <b>{0}</b>?""").format(self.__name)) if ok: - if not self.__private: - self.sendData.emit( - "PART " + self.__name + " :" + self.__partMessage) - self.channelClosed.emit(self.__name) + self.leaveChannel() + + def leaveChannel(self): + """ + Public slot to leave the channel. + """ + if not self.__private: + self.sendData.emit( + "PART " + self.__name + " :" + self.__partMessage) + self.channelClosed.emit(self.__name) def name(self): """ @@ -515,10 +640,16 @@ # group(3) target nick # group(4) message if match.group(3).lower() == self.__name.lower(): + senderName = match.group(1) + itm = self.__findUser(senderName) + if itm and itm.isIgnored(): + # user should be ignored + return True + if match.group(4).startswith("\x01"): return self.__handleCtcp(match) - self.addMessage(match.group(1), match.group(4)) + self.addMessage(senderName, match.group(4)) if self.__private and not self.topicLabel.text(): self.setPrivateInfo( "{0} - {1}".format(match.group(1), match.group(2)))
--- a/Network/IRC/IrcNetworkWidget.py Fri Sep 28 20:07:25 2018 +0200 +++ b/Network/IRC/IrcNetworkWidget.py Sat Sep 29 19:32:33 2018 +0200 @@ -167,20 +167,37 @@ Private slot to toggle the away status. """ if self.__away: - self.sendData.emit("AWAY") - self.awayButton.setIcon( - UI.PixmapCache.getIcon("ircUserPresent.png")) - self.__away = False + self.handleAwayCommand("") else: networkName = self.networkCombo.currentText() identityName = self.__manager.getNetwork(networkName)\ .getIdentityName() awayMessage = self.__manager.getIdentity(identityName)\ .getAwayMessage() + self.handleAwayCommand(awayMessage) + + @pyqtSlot(str) + def handleAwayCommand(self, awayMessage): + """ + Public slot to process an away command. + + @param awayMessage message to be set for being away + @type str + """ + if awayMessage and not self.__away: + # set being away + # don't send away, if the status is already set self.sendData.emit("AWAY :" + awayMessage) self.awayButton.setIcon(UI.PixmapCache.getIcon("ircUserAway.png")) self.__away = True - self.away.emit(self.__away) + self.away.emit(self.__away) + elif not awayMessage and self.__away: + # cancel being away + self.sendData.emit("AWAY") + self.awayButton.setIcon( + UI.PixmapCache.getIcon("ircUserPresent.png")) + self.__away = False + self.away.emit(self.__away) @pyqtSlot() def on_editButton_clicked(self):
--- a/Network/IRC/IrcWidget.py Fri Sep 28 20:07:25 2018 +0200 +++ b/Network/IRC/IrcWidget.py Sat Sep 29 19:32:33 2018 +0200 @@ -16,7 +16,8 @@ import re import logging -from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QByteArray, QTimer +from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QByteArray, QTimer, \ + QDateTime from PyQt5.QtWidgets import QWidget, QToolButton, QLabel, QTabWidget from PyQt5.QtNetwork import QTcpSocket, QAbstractSocket try: @@ -127,7 +128,7 @@ self.networkWidget.initialize(self.__ircNetworkManager) self.networkWidget.connectNetwork.connect(self.__connectNetwork) self.networkWidget.editNetwork.connect(self.__editNetwork) - self.networkWidget.joinChannel.connect(self.__joinChannel) + self.networkWidget.joinChannel.connect(self.joinChannel) self.networkWidget.nickChanged.connect(self.__changeNick) self.networkWidget.sendData.connect(self.__send) self.networkWidget.away.connect(self.__away) @@ -288,9 +289,9 @@ for channel in self.__channelList: channel.setPartMessage(partMsg) - def __joinChannel(self, name, key=""): + def joinChannel(self, name, key=""): """ - Private slot to join a channel. + Public slot to join a channel. @param name name of the channel (string) @param key key of the channel (string) @@ -310,9 +311,13 @@ channel.initAutoWho() channel.sendData.connect(self.__send) + channel.sendCtcpRequest.connect(self.__sendCtcpRequest) channel.sendCtcpReply.connect(self.__sendCtcpReply) channel.channelClosed.connect(self.__closeChannel) channel.openPrivateChat.connect(self.__openPrivate) + channel.awayCommand.connect(self.networkWidget.handleAwayCommand) + channel.leaveChannels.connect(self.__leaveChannels) + channel.leaveAllChannels.connect(self.__leaveAllChannels) self.channelsWidget.addTab(channel, name) self.__channelList.append(channel) @@ -371,8 +376,12 @@ channel.addUsers([name, self.__nickName]) channel.sendData.connect(self.__send) + channel.sendCtcpRequest.connect(self.__sendCtcpRequest) channel.sendCtcpReply.connect(self.__sendCtcpReply) channel.channelClosed.connect(self.__closeChannel) + channel.awayCommand.connect(self.networkWidget.handleAwayCommand) + channel.leaveChannels.connect(self.__leaveChannels) + channel.leaveAllChannels.connect(self.__leaveAllChannels) self.channelsWidget.addTab(channel, name) self.__channelList.append(channel) @@ -386,6 +395,29 @@ channel = self.channelsWidget.currentWidget() channel.requestLeave() + @pyqtSlot(list) + def __leaveChannels(self, channelNames): + """ + Private slot to leave a list of channels and close their associated + tabs. + + @param channelNames list of channels to leave + @type list of str + """ + for channelName in channelNames: + for channel in self.__channelList: + if channel.name() == channelName: + channel.leaveChannel() + + @pyqtSlot() + def __leaveAllChannels(self): + """ + Private slot to leave all channels and close their tabs. + """ + while self.__channelList: + channel = self.__channelList[0] + channel.leaveChannel() + def __closeAllChannels(self): """ Private method to close all channels. @@ -441,12 +473,33 @@ self.__socket.write( QByteArray("{0}\r\n".format(data).encode("utf-8"))) + def __sendCtcpRequest(self, receiver, request, arguments): + """ + Private slot to send a CTCP request. + + @param receiver nick name of the receiver + @type str + @param request CTCP request to be sent + @type str + @param arguments arguments to be sent + @type str + """ + request = request.upper() + if request == "PING": + arguments = "Eric IRC {0}".format( + QDateTime.currentMSecsSinceEpoch()) + + self.__send("PRIVMSG {0} :\x01{1} {2}\x01".format( + receiver, request, arguments)) + def __sendCtcpReply(self, receiver, text): """ Private slot to send a CTCP reply. - @param receiver nick name of the receiver (string) - @param text text to be sent (string) + @param receiver nick name of the receiver + @type str + @param text text to be sent + @type str """ self.__send("NOTICE {0} :\x01{1}\x01".format(receiver, text)) @@ -551,6 +604,42 @@ self.__updateUsersCount() self.__buffer = "" + def __handleCtcpReply(self, match): + """ + Private method to handle a server message containing a CTCP reply. + + @param match reference to the match object + """ + if "!" in match.group(1): + sender = match.group(1).split("!", 1)[0] + + try: + ctcpCommand = match.group(3).split(":", 1)[1] + except IndexError: + ctcpCommand = match.group(3) + ctcpCommand = ctcpCommand[1:].split("\x01", 1)[0] + if " " in ctcpCommand: + ctcpReply, ctcpArg = ctcpCommand.split(" ", 1) + else: + ctcpReply, ctcpArg = ctcpCommand, "" + ctcpReply = ctcpReply.upper() + + if ctcpReply == "PING" and ctcpArg.startswith("Eric IRC "): + # it is a response to a ping request + pingDateTime = int(ctcpArg.split()[-1]) + latency = QDateTime.currentMSecsSinceEpoch() - pingDateTime + self.networkWidget.addServerMessage( + self.tr("CTCP"), + self.tr( + "Received CTCP-PING response from {0} with latency" + " of {1} ms.").format(sender, latency)) + else: + self.networkWidget.addServerMessage( + self.tr("CTCP"), + self.tr( + "Received unknown CTCP-{0} response from {1}.") + .format(ctcpReply, sender)) + def __handleNamedMessage(self, match): """ Private method to handle a server message containing a message name. @@ -564,6 +653,11 @@ msg = match.group(3).split(":", 1)[1] except IndexError: msg = match.group(3) + + if msg.startswith("\x01"): + self.__handleCtcpReply(match) + return True + if "!" in match.group(1): name = match.group(1).split("!", 1)[0] msg = "-{0}- {1}".format(name, msg) @@ -612,6 +706,11 @@ self.tr("User {0} is now known as {1}.").format( oldNick, newNick)) return True + elif name == "PONG": + nick = match.group(3).split(":", 1)[1] + self.networkWidget.addMessage( + self.tr("Received PONG from {0}").format(nick)) + return True elif name == "ERROR": self.networkWidget.addErrorMessage( self.tr("Server Error"), match.group(3).split(":", 1)[1]) @@ -749,7 +848,7 @@ if channel.autoJoin(): name = channel.getName() key = channel.getKey() - self.__joinChannel(name, key) + self.joinChannel(name, key) def __tcpError(self, error): """
--- a/changelog Fri Sep 28 20:07:25 2018 +0200 +++ b/changelog Sat Sep 29 19:32:33 2018 +0200 @@ -8,6 +8,9 @@ - Debugger -- added code to use the default virtual environment, if none has been configured yet +- IRC + -- added support for the /query, /notice, /ping, /ignore, /unignore, /away, + /join, /part and /partall commands - Tasks -- added code to mark a line as not containing a task with '__NO-TASK__'
--- a/i18n/eric6_cs.ts Fri Sep 28 20:07:25 2018 +0200 +++ b/i18n/eric6_cs.ts Sat Sep 29 19:32:33 2018 +0200 @@ -15517,117 +15517,117 @@ <context> <name>EricSchemeReply</name> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="157"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="164"/> <source>Content blocked by AdBlock Plus</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="158"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="165"/> <source>Blocked by rule: <i>{0} ({1})</i></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="181"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="188"/> <source>Welcome to eric6 Web Browser!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="183"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="190"/> <source>About eric6</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="184"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="191"/> <source>eric6 Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="185"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="192"/> <source>Search!</source> <translation type="unfinished">Hledat!</translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="215"/> - <source>Speed Dial</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="216"/> - <source>URL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="217"/> - <source>Title</source> - <translation type="unfinished">Titulek</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="218"/> - <source>Apply</source> - <translation type="unfinished">Použít</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="219"/> - <source>Close</source> - <translation type="unfinished">Zavřít</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="220"/> - <source>New Page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="221"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="222"/> - <source>Remove</source> - <translation type="unfinished">Odebrat</translation> + <source>Speed Dial</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="223"/> - <source>Reload</source> - <translation type="unfinished">Obnovit</translation> + <source>URL</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="224"/> - <source>Are you sure to remove this speed dial?</source> - <translation type="unfinished"></translation> + <source>Title</source> + <translation type="unfinished">Titulek</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="225"/> + <source>Apply</source> + <translation type="unfinished">Použít</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="226"/> + <source>Close</source> + <translation type="unfinished">Zavřít</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="227"/> - <source>Are you sure you want to reload all speed dials?</source> - <translation type="unfinished"></translation> + <source>New Page</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="228"/> + <source>Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="229"/> + <source>Remove</source> + <translation type="unfinished">Odebrat</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="230"/> - <source>Load title from page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="232"/> - <source>Speed Dial Settings</source> + <source>Reload</source> + <translation type="unfinished">Obnovit</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="231"/> + <source>Are you sure to remove this speed dial?</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="234"/> - <source>Add New Page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="235"/> - <source>Maximum pages in a row:</source> + <source>Are you sure you want to reload all speed dials?</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="237"/> - <source>Change size of pages:</source> + <source>Load title from page</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="239"/> + <source>Speed Dial Settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="241"/> + <source>Add New Page</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="242"/> + <source>Maximum pages in a row:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="244"/> + <source>Change size of pages:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="246"/> <source>SpeedDial requires enabled JavaScript.</source> <translation type="unfinished"></translation> </message> @@ -18229,182 +18229,182 @@ <context> <name>Git</name> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="209"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="210"/> <source>The git process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1557"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1558"/> <source>The git process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="217"/> <source>Could not start the git executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="245"/> <source>Create project repository</source> <translation type="unfinished">Vytvořit repozitář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="245"/> <source>The project repository could not be created.</source> <translation type="unfinished">Úložiště projektu nelze vytvořit.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="273"/> <source>Creating Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="288"/> <source>Adding files to Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="299"/> <source>Initial commit to Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="329"/> <source>Cloning project from a Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="417"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="418"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="417"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="418"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="476"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="477"/> <source>Committing changes to Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="499"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="500"/> <source>Switch</source> <translation type="unfinished">Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="499"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="500"/> <source><p>Do you really want to switch to <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="531"/> <source>Synchronizing with the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="577"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="578"/> <source>Adding files/directories to the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="652"/> <source>Removing files/directories from the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="708"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="709"/> <source>Renaming {0}</source> <translation type="unfinished">Přejmenování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="832"/> <source>Unstage files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="883"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="874"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="883"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="889"/> <source>Reverting changes</source> <translation type="unfinished">Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="941"/> <source>Merging</source> <translation type="unfinished">Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="965"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="966"/> <source>Master branch head</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1198"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1199"/> <source>Git Command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1285"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1286"/> <source><tr><td><b>Commit</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1289"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1290"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1294"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1297"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1298"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1300"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1301"/> <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1303"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1304"/> <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1307"/> <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1310"/> <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1312"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1313"/> <source><tr><td><b>Subject</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1320"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1321"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Git V.</b></td><td>{0}</td></tr> @@ -18414,432 +18414,432 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> <source>Create {0} file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/> <source>Git Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1427"/> <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/> <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2627"/> <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/vcsGit/git.py" line="1628"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1629"/> <source>Git Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1628"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1629"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1677"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1678"/> <source>Fetching from a remote Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1716"/> <source>Pulling from a remote Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1756"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1757"/> <source>Pushing to a remote Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1784"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1785"/> <source>Committing failed merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1811"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1812"/> <source>Aborting uncommitted/failed merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1845"/> <source>Applying patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1876"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1877"/> <source>Check patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1879"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1880"/> <source>Apply patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1962"/> <source>Tagging in the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2193"/> <source>Branching in the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2232"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2233"/> <source>Delete Remote Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2254"/> <source>Current Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2254"/> <source><p>The current branch is <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2317"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2318"/> <source>Create Bundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2282"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2283"/> <source>Git Bundle Files (*.bundle)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2299"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2300"/> <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2347"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2348"/> <source>Verify Bundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2477"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2478"/> <source>Git Bundle Files (*.bundle);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2377"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2378"/> <source>List Bundle Heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2477"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2478"/> <source>Apply Bundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2500"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2501"/> <source>Applying a bundle file (fetch)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2527"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2528"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished">Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2730"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2731"/> <source>Git Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2627"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2671"/> <source>Create Bisect Replay File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2636"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2637"/> <source>Git Bisect Replay Files (*.replay)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2653"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2654"/> <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2671"/> <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2691"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2692"/> <source>Edit Bisect Replay File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/> <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/> <source>Bisect Replay</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3070"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3071"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2950"/> <source>Rename Remote Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2950"/> <source>Enter new name for remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3094"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3095"/> <source>Show Shortlog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3152"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3153"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3182"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3183"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3207"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3208"/> <source>Copy Changesets (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3233"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3234"/> <source>Copy Changesets (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3313"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3314"/> <source>Saving stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/> <source>Show Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/> <source>Select a stash (empty for latest stash):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3424"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3425"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3438"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3439"/> <source>Restoring stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3472"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3473"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3463"/> <source>Enter a branch name to restore a stash to:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3487"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3488"/> <source>Creating branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3522"/> <source>Delete Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3522"/> <source>Do you really want to delete the stash <b>{0}</b>?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3532"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3533"/> <source>Deleting stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3553"/> <source>Delete All Stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3553"/> <source>Do you really want to delete all stashes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3560"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3561"/> <source>Deleting all stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3632"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3633"/> <source>Showing the combined configuration settings</source> <translation type="unfinished">Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3658"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3659"/> <source>Verifying the integrity of the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3684"/> <source>Performing Repository Housekeeping</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3729"/> <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3732"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3733"/> <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3736"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3737"/> <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3740"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3741"/> <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3744"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3745"/> <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3748"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3749"/> <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3752"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3753"/> <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3756"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3757"/> <source><tr><td>Disk space used by garbage files: </td><td>{0} KiB</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3762"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3763"/> <source><p><b>No statistics available.</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3828"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3829"/> <source>Creating Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3871"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3872"/> <source>Add Submodule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3942"/> <source>List Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3942"/> <source>No submodules defined for the project.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3956"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3957"/> <source>All</source> <translation type="unfinished">Vše</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3960"/> <source>Submodule Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3960"/> <source>Select a submodule path:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4013"/> <source>Initialize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4049"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4050"/> <source>Unregister Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4129"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4130"/> <source>Update Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4163"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4164"/> <source>Synchronize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4221"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4222"/> <source>Submodules Summary</source> <translation type="unfinished"></translation> </message> @@ -41688,122 +41688,122 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="369"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="416"/> <source>Send Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="369"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="416"/> <source>Messages starting with a '/' are not allowed in private chats.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="405"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="528"/> <source>Leave IRC channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="405"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="528"/> <source>Do you really want to leave the IRC channel <b>{0}</b>?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="546"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="681"/> <source>Channel Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="551"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="686"/> <source>Nick mentioned</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="576"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="711"/> <source>{0} has joined the channel {1} ({2}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="582"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="717"/> <source>You have joined the channel {0} ({1}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="589"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="724"/> <source>Join Channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="608"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="743"/> <source>{0} has left {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="616"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="751"/> <source>{0} has left {1}: {2}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="622"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="757"/> <source>Leave Channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="641"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="776"/> <source>{0} has quit {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="646"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="781"/> <source>{0} has quit {1}: {2}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="652"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="787"/> <source>Quit</source> <translation type="unfinished">Konec</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="670"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="805"/> <source>You are now known as {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="676"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="811"/> <source>User {0} is now known as {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="714"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="849"/> <source>Away</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="714"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="849"/> <source>{0} is away: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="731"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="866"/> <source>The channel topic is: "{0}".</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="747"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="882"/> <source>The topic was set by {0} on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="764"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="899"/> <source>Channel URL: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="789"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="924"/> <source>password protected ({0})</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="793"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="928"/> <source>limited to %n user(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -41812,77 +41812,77 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="800"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="935"/> <source>Channel modes: {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="816"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="951"/> <source>This channel was created on {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="851"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="986"/> <source>{0} sets the channel mode to 'anonymous'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="855"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="990"/> <source>{0} removes the 'anonymous' mode from the channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="860"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="995"/> <source>{0} sets a ban on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="864"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="999"/> <source>{0} removes the ban on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="869"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1004"/> <source>{0} sets the channel mode to 'no colors allowed'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="873"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1008"/> <source>{0} sets the channel mode to 'allow color codes'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="878"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1013"/> <source>{0} sets a ban exception on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="882"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1017"/> <source>{0} removes the ban exception on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="887"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1022"/> <source>{0} sets the channel mode to 'invite only'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="891"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1026"/> <source>{0} removes the 'invite only' mode from the channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="896"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1031"/> <source>{0} sets the channel key to '{1}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="900"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1035"/> <source>{0} removes the channel key.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="904"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1039"/> <source>{0} sets the channel limit to %n nick(s).</source> <translation type="unfinished"> <numerusform></numerusform> @@ -41891,242 +41891,242 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="908"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1043"/> <source>{0} removes the channel limit.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="912"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1047"/> <source>{0} sets the channel mode to 'moderated'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="916"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1051"/> <source>{0} sets the channel mode to 'unmoderated'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="921"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1056"/> <source>{0} sets the channel mode to 'no messages from outside'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="925"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1060"/> <source>{0} sets the channel mode to 'allow messages from outside'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="930"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1065"/> <source>{0} sets the channel mode to 'private'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="934"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1069"/> <source>{0} sets the channel mode to 'public'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="939"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1074"/> <source>{0} sets the channel mode to 'quiet'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="943"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1078"/> <source>{0} removes the 'quiet' mode from the channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="950"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1085"/> <source>{0} sets the channel mode to 'secret'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="954"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1089"/> <source>{0} sets the channel mode to 'visible'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="959"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1094"/> <source>{0} switches on 'topic protection'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="962"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1097"/> <source>{0} switches off 'topic protection'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="967"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1102"/> <source>{0} sets invitation mask {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="971"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1106"/> <source>{0} removes the invitation mask {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="975"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1110"/> <source>Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="993"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1128"/> <source>{0} sets mode for {1}: {2}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1020"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1155"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1154"/> - <source>--- New From Here ---</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1237"/> - <source>Save Messages</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1220"/> - <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1237"/> - <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1256"/> - <source>Error saving Messages</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1256"/> - <source><p>The messages contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1270"/> - <source>Copy</source> - <translation type="unfinished">Kopírovat</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1275"/> - <source>Cut all</source> - <translation type="unfinished">Vyjmout vše</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1279"/> - <source>Copy all</source> - <translation type="unfinished">Kopírovat vše</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1284"/> - <source>Clear</source> - <translation type="unfinished">Vyčistit</translation> - </message> - <message> <location filename="../Network/IRC/IrcChannelWidget.py" line="1289"/> + <source>--- New From Here ---</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1372"/> + <source>Save Messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1355"/> + <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1372"/> + <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1391"/> + <source>Error saving Messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1391"/> + <source><p>The messages contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1405"/> + <source>Copy</source> + <translation type="unfinished">Kopírovat</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1410"/> + <source>Cut all</source> + <translation type="unfinished">Vyjmout vše</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1414"/> + <source>Copy all</source> + <translation type="unfinished">Kopírovat vše</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1419"/> + <source>Clear</source> + <translation type="unfinished">Vyčistit</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1424"/> <source>Save</source> <translation type="unfinished">Uložit</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1293"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1428"/> <source>Mark Current Position</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1295"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1430"/> <source>Remove Position Marker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1345"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1480"/> <source>Who Is</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1348"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1483"/> <source>Private Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1463"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1598"/> <source>Who</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1437"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1572"/> <source>End of WHO list for {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1460"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1595"/> <source> (Away)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1463"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1598"/> <source>{0} is {1}@{2} ({3}){4}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1801"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1936"/> <source>Whois</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1485"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1620"/> <source>{0} is {1}@{2} ({3}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1531"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1666"/> <source>{0} is a user on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1536"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1671"/> <source>{0} has voice on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1541"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1676"/> <source>{0} is a halfop on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1546"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1681"/> <source>{0} is an operator on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1551"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1686"/> <source>{0} is owner of channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1556"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1691"/> <source>{0} is admin on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1575"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1710"/> <source>{0} is online via {1} ({2}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1594"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1729"/> <source>{0} is an IRC Operator.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1627"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1762"/> <source>%n day(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -42135,7 +42135,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1641"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1776"/> <source>%n hour(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -42144,7 +42144,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1653"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1788"/> <source>%n minute(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -42153,7 +42153,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1654"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1789"/> <source>%n second(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -42162,25 +42162,25 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1631"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1766"/> <source>{0} has been idle for {1}, {2}, {3}, and {4}.</source> <comment>{0} = name of person, {1} = (x days), {2} = (x hours), {3} = (x minutes), {4} = (x seconds)</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1644"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1779"/> <source>{0} has been idle for {1}, {2}, and {3}.</source> <comment>{0} = name of person, {1} = (x hours), {2} = (x minutes), {3} = (x seconds)</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1655"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1790"/> <source>{0} has been idle for {1} and {2}.</source> <comment>{0} = name of person, {1} = (x minutes), {3} = (x seconds)</comment> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1663"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1798"/> <source>{0} has been idle for %n second(s).</source> <translation type="unfinished"> <numerusform></numerusform> @@ -42189,67 +42189,67 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1670"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1805"/> <source>{0} has been online since {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1691"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1826"/> <source>End of WHOIS list for {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1709"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1844"/> <source>{0} is an identified user.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1727"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1862"/> <source>{0} is available for help.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1745"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1880"/> <source>{0} is logged in as {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1764"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1899"/> <source>{0} is actually using the host {1} (IP: {2}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1782"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1917"/> <source>{0} is using a secure connection.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1801"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1936"/> <source>{0} is connecting from {1} (IP: {2}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1068"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1203"/> <source>CTCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1046"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1181"/> <source>Received Version request from {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1052"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1187"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1060"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1195"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1068"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1203"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation type="unfinished"></translation> </message> @@ -42259,17 +42259,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1351"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1486"/> <source>Refresh</source> <translation type="unfinished">Obnovit</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1822"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1957"/> <source>Edit Channel Topic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1822"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1957"/> <source>Enter the topic for this channel:</source> <translation type="unfinished"></translation> </message> @@ -42744,7 +42744,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="333"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="350"/> <source>Press to connect to the selected network</source> <translation type="unfinished"></translation> </message> @@ -42774,57 +42774,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="421"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="438"/> <source>Save Messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="404"/> - <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Network/IRC/IrcNetworkWidget.py" line="421"/> + <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="438"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="440"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="457"/> <source>Error saving Messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="440"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="457"/> <source><p>The messages contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="454"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="471"/> <source>Copy</source> <translation type="unfinished">Kopírovat</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="459"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="476"/> <source>Cut all</source> <translation type="unfinished">Vyjmout vše</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="463"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="480"/> <source>Copy all</source> <translation type="unfinished">Kopírovat vše</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="468"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="485"/> <source>Clear</source> <translation type="unfinished">Vyčistit</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="473"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="490"/> <source>Save</source> <translation type="unfinished">Uložit</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="328"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="345"/> <source>Press to disconnect from the network</source> <translation type="unfinished"></translation> </message> @@ -43181,6 +43181,14 @@ </message> </context> <context> + <name>IrcUserItem</name> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="121"/> + <source>{0} (ignored)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>IrcUtilities</name> <message> <location filename="../Network/IRC/IrcUtilities.py" line="157"/> @@ -43261,258 +43269,258 @@ <context> <name>IrcWidget</name> <message> - <location filename="../Network/IRC/IrcWidget.py" line="68"/> + <location filename="../Network/IRC/IrcWidget.py" line="69"/> <source>Press to leave the current channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="242"/> + <location filename="../Network/IRC/IrcWidget.py" line="243"/> <source>Disconnect from Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="242"/> + <location filename="../Network/IRC/IrcWidget.py" line="243"/> <source><p>Do you really want to disconnect from <b>{0}</b>?</p><p>All channels will be closed.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="195"/> + <location filename="../Network/IRC/IrcWidget.py" line="196"/> <source>SSL Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="195"/> + <location filename="../Network/IRC/IrcWidget.py" line="196"/> <source>An encrypted connection to the IRC network was requested but SSL is not available. Please change the server configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="510"/> + <location filename="../Network/IRC/IrcWidget.py" line="563"/> <source>Info</source> <translation type="unfinished">Info</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="221"/> + <location filename="../Network/IRC/IrcWidget.py" line="222"/> <source>Looking for server {0} (port {1}) using an SSL encrypted connection...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="230"/> + <location filename="../Network/IRC/IrcWidget.py" line="231"/> <source>Looking for server {0} (port {1})...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="251"/> + <location filename="../Network/IRC/IrcWidget.py" line="252"/> <source>Disconnecting from server {0}...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="466"/> + <location filename="../Network/IRC/IrcWidget.py" line="519"/> <source>Server found,connecting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="475"/> + <location filename="../Network/IRC/IrcWidget.py" line="528"/> <source>Connected,logging in...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="510"/> + <location filename="../Network/IRC/IrcWidget.py" line="563"/> <source>Server disconnected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="557"/> + <location filename="../Network/IRC/IrcWidget.py" line="610"/> <source>Message Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="557"/> + <location filename="../Network/IRC/IrcWidget.py" line="610"/> <source>Unknown message received from server:<br/>{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="583"/> + <location filename="../Network/IRC/IrcWidget.py" line="678"/> <source>Notice</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="601"/> - <source>Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="608"/> - <source>You have left channel {0}.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="619"/> - <source>You are now known as {0}.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="624"/> - <source>User {0} is now known as {1}.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="629"/> - <source>Server Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="665"/> - <source>Error</source> - <translation type="unfinished">Chyba</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="680"/> - <source>Welcome</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="682"/> - <source>Support</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="684"/> - <source>User</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="686"/> - <source>MOTD</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="688"/> - <source>Away</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="690"/> - <source>Info ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="694"/> - <source>Message of the day</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Network/IRC/IrcWidget.py" line="696"/> - <source>End of message of the day</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="699"/> - <source>Server {0} (Version {1}), User-Modes: {2}, Channel-Modes: {3}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="705"/> - <source>Current users on {0}: {1}, max. {2}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="710"/> - <source>Current users on the network: {0}, max. {1}</source> + <source>Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="703"/> + <source>You have left channel {0}.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Network/IRC/IrcWidget.py" line="714"/> + <source>You are now known as {0}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="719"/> + <source>User {0} is now known as {1}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="729"/> + <source>Server Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="765"/> + <source>Error</source> + <translation type="unfinished">Chyba</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="780"/> + <source>Welcome</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="782"/> + <source>Support</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="784"/> + <source>User</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="786"/> + <source>MOTD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="788"/> + <source>Away</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="790"/> + <source>Info ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="794"/> + <source>Message of the day</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="796"/> + <source>End of message of the day</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="799"/> + <source>Server {0} (Version {1}), User-Modes: {2}, Channel-Modes: {3}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="805"/> + <source>Current users on {0}: {1}, max. {2}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="810"/> + <source>Current users on the network: {0}, max. {1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="814"/> <source>You are no longer marked as being away.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="716"/> + <location filename="../Network/IRC/IrcWidget.py" line="816"/> <source>You have been marked as being away.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="835"/> + <location filename="../Network/IRC/IrcWidget.py" line="935"/> <source>SSL Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="777"/> + <location filename="../Network/IRC/IrcWidget.py" line="877"/> <source>Connection to server {0} (port {1}) lost while waiting for user response to an SSL error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="808"/> + <location filename="../Network/IRC/IrcWidget.py" line="908"/> <source>Socket Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="785"/> + <location filename="../Network/IRC/IrcWidget.py" line="885"/> <source>The host was not found. Please check the host name and port settings.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="791"/> + <location filename="../Network/IRC/IrcWidget.py" line="891"/> <source>The connection was refused by the peer. Please check the host name and port settings.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="802"/> - <source>The following network error occurred:<br/>{0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="934"/> - <source>{0} ({1})</source> - <comment>channel name, users count</comment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="969"/> - <source>Critical</source> - <translation type="unfinished">Kritický</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="949"/> - <source>No nickname acceptable to the server configured for <b>{0}</b>. Disconnecting...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="969"/> - <source>The given nickname is already in use.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="919"/> - <source>CTCP</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="896"/> - <source>Received Version request from {0}.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Network/IRC/IrcWidget.py" line="902"/> + <source>The following network error occurred:<br/>{0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="1034"/> + <source>{0} ({1})</source> + <comment>channel name, users count</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="1069"/> + <source>Critical</source> + <translation type="unfinished">Kritický</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="1049"/> + <source>No nickname acceptable to the server configured for <b>{0}</b>. Disconnecting...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="1069"/> + <source>The given nickname is already in use.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="1019"/> + <source>CTCP</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="996"/> + <source>Received Version request from {0}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="1002"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="910"/> + <location filename="../Network/IRC/IrcWidget.py" line="1010"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="919"/> + <location filename="../Network/IRC/IrcWidget.py" line="1019"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="594"/> + <location filename="../Network/IRC/IrcWidget.py" line="689"/> <source>You have set your personal modes to <b>[{0}]</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="598"/> + <location filename="../Network/IRC/IrcWidget.py" line="693"/> <source>{0} has changed your personal modes to <b>[{1}]</b>.</source> <translation type="unfinished"></translation> </message> @@ -43527,35 +43535,50 @@ <translation type="unfinished">Síť</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="797"/> + <location filename="../Network/IRC/IrcWidget.py" line="897"/> <source>The SSL handshake failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="808"/> + <location filename="../Network/IRC/IrcWidget.py" line="908"/> <source>A network error occurred.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="821"/> + <location filename="../Network/IRC/IrcWidget.py" line="921"/> <source>Could not connect to {0} (port {1}) using an SSL encrypted connection. Either the server does not support SSL (did you use the correct port?) or you rejected the certificate.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="835"/> + <location filename="../Network/IRC/IrcWidget.py" line="935"/> <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check. SSL errors were accepted by you.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="256"/> + <location filename="../Network/IRC/IrcWidget.py" line="257"/> <source>Disconnecting from network {0}...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="261"/> + <location filename="../Network/IRC/IrcWidget.py" line="262"/> <source>Disconnecting from server.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="645"/> + <source>Received CTCP-PING response from {0} with latency of {1} ms.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="651"/> + <source>Received unknown CTCP-{0} response from {1}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="725"/> + <source>Received PONG from {0}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>JavaScriptEricObject</name> @@ -60313,7 +60336,7 @@ <context> <name>QtHelpSchemeReply</name> <message> - <location filename="../WebBrowser/Network/QtHelpSchemeHandler.py" line="147"/> + <location filename="../WebBrowser/Network/QtHelpSchemeHandler.py" line="163"/> <source><html><head><title>Error 404...</title></head><body><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'{0}'</h3></div></body></html></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_de.ts Fri Sep 28 20:07:25 2018 +0200 +++ b/i18n/eric6_de.ts Sat Sep 29 19:32:33 2018 +0200 @@ -14928,117 +14928,117 @@ <context> <name>EricSchemeReply</name> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="157"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="164"/> <source>Content blocked by AdBlock Plus</source> <translation>Inhalt blockiert durch AdBlock Plus</translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="158"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="165"/> <source>Blocked by rule: <i>{0} ({1})</i></source> <translation>Blockiert durch Regel: <i>{0} ({1})</i></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="181"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="188"/> <source>Welcome to eric6 Web Browser!</source> <translation>Willkommen beim eric6-Web-Browser!</translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="183"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="190"/> <source>About eric6</source> <translation>Über eric6</translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="184"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="191"/> <source>eric6 Web Browser</source> <translation>eric6 Web-Browser</translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="185"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="192"/> <source>Search!</source> <translation>Suchen!</translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="215"/> - <source>Speed Dial</source> - <translation>Schnellwahl</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="216"/> - <source>URL</source> - <translation>URL</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="217"/> - <source>Title</source> - <translation>Titel</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="218"/> - <source>Apply</source> - <translation>Anwenden</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="219"/> - <source>Close</source> - <translation>Schließen</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="220"/> - <source>New Page</source> - <translation>Neue Seite</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="221"/> - <source>Edit</source> - <translation>Bearbeiten</translation> - </message> - <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="222"/> - <source>Remove</source> - <translation>Entfernen</translation> + <source>Speed Dial</source> + <translation>Schnellwahl</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="223"/> - <source>Reload</source> - <translation>Erneut laden</translation> + <source>URL</source> + <translation>URL</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="224"/> - <source>Are you sure to remove this speed dial?</source> - <translation>Soll diese Schnellwahl wirklich entfernt werden?</translation> + <source>Title</source> + <translation>Titel</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="225"/> + <source>Apply</source> + <translation>Anwenden</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="226"/> + <source>Close</source> + <translation>Schließen</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="227"/> - <source>Are you sure you want to reload all speed dials?</source> - <translation>Sind sie sicher,dass alle Schnellwahlen neu geladen werden sollen?</translation> + <source>New Page</source> + <translation>Neue Seite</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="228"/> + <source>Edit</source> + <translation>Bearbeiten</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="229"/> + <source>Remove</source> + <translation>Entfernen</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="230"/> - <source>Load title from page</source> - <translation>Titel von der Seite laden</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="232"/> - <source>Speed Dial Settings</source> - <translation>Schnellwahleinstellungen</translation> + <source>Reload</source> + <translation>Erneut laden</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="231"/> + <source>Are you sure to remove this speed dial?</source> + <translation>Soll diese Schnellwahl wirklich entfernt werden?</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="234"/> - <source>Add New Page</source> - <translation>Neue Seite hinzufügen</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="235"/> - <source>Maximum pages in a row:</source> - <translation>Maximale Zahl an Seiten pro Zeile:</translation> + <source>Are you sure you want to reload all speed dials?</source> + <translation>Sind sie sicher,dass alle Schnellwahlen neu geladen werden sollen?</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="237"/> - <source>Change size of pages:</source> - <translation>Größe der Seiten ändern:</translation> + <source>Load title from page</source> + <translation>Titel von der Seite laden</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="239"/> + <source>Speed Dial Settings</source> + <translation>Schnellwahleinstellungen</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="241"/> + <source>Add New Page</source> + <translation>Neue Seite hinzufügen</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="242"/> + <source>Maximum pages in a row:</source> + <translation>Maximale Zahl an Seiten pro Zeile:</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="244"/> + <source>Change size of pages:</source> + <translation>Größe der Seiten ändern:</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="246"/> <source>SpeedDial requires enabled JavaScript.</source> <translation>Schnellwahl benötigt aktiviertes JavaScript.</translation> </message> @@ -17569,172 +17569,172 @@ <context> <name>Git</name> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="209"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="210"/> <source>The git process finished with the exit code {0}</source> <translation>Der git-Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1557"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1558"/> <source>The git process did not finish within 30s.</source> <translation>Der git-Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="217"/> <source>Could not start the git executable.</source> <translation>Das git Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="245"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="245"/> <source>The project repository could not be created.</source> <translation>Das Projektrepository konnte nicht erzeugt werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="273"/> <source>Creating Git repository</source> <translation>Erzeuge Git Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="288"/> <source>Adding files to Git repository</source> <translation>Füge Dateien dem Git-Repository hinzu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="299"/> <source>Initial commit to Git repository</source> <translation>Erstes Commit für das Git-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="329"/> <source>Cloning project from a Git repository</source> <translation>Klone das Projekt aus dem Git-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="417"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="418"/> <source>Commit Changes</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="417"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="418"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="476"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="477"/> <source>Committing changes to Git repository</source> <translation>Änderungen in Git-Repository einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="531"/> <source>Synchronizing with the Git repository</source> <translation>Gleiche mit dem Git-Repository ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="577"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="578"/> <source>Adding files/directories to the Git repository</source> <translation>Füge Dateien/Verzeichnisse dem Git-Repository hinzu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="652"/> <source>Removing files/directories from the Git repository</source> <translation>Lösche Dateien/Verzeichnisse aus dem Git-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="708"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="709"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="832"/> <source>Unstage files/directories</source> <translation>Vormerkung rückgängig machen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="883"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="874"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>Wollen Sie wirklich alle Änderungen an den folgenden Datein oder Verzeichnissen rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="883"/> <source>Do you really want to revert all changes of the project?</source> <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="889"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="941"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="965"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="966"/> <source>Master branch head</source> <translation>Kopf des Hauptzweiges</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1198"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1199"/> <source>Git Command</source> <translation>Git Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1285"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1286"/> <source><tr><td><b>Commit</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Änderungs ID</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1289"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1290"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1294"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1297"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1298"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1300"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1301"/> <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> <translation><tr><td><b>Autor</b></td><td>{0} &lt;{1}&gt;</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1303"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1304"/> <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Datum</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1307"/> <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> <translation><tr><td><b>Bereitsteller</b></td><td>{0} &lt;{1}&gt;</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1310"/> <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Bereitstellungsdatum</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1312"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1313"/> <source><tr><td><b>Subject</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Betreff</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1320"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1321"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Git V.</b></td><td>{0}</td></tr> @@ -17749,442 +17749,442 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> <source>Create {0} file</source> <translation>Erzeuge {0}-Datei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/> <source>Git Copy</source> <translation>Git Kopiere</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1427"/> <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> <translation><p>Das Kopieren des Verzeichnisses <b>{0}</b> ist fehlgeschlagen.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/> <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> <translation><p>Das Kopieren der Datei <b>{0}</b> ist fehlgeschlagen.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2627"/> <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/vcsGit/git.py" line="1628"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1629"/> <source>Git Side-by-Side Difference</source> <translation>Git Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1628"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1629"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1677"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1678"/> <source>Fetching from a remote Git repository</source> <translation>Änderungen von einem entfernten Git Repository abholen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1716"/> <source>Pulling from a remote Git repository</source> <translation>Pull von einem entfernten Git-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1756"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1757"/> <source>Pushing to a remote Git repository</source> <translation>Push in ein entferntes Git-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1784"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1785"/> <source>Committing failed merge</source> <translation>Fehlgeschlagene Zusammenführung abschließen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1811"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1812"/> <source>Aborting uncommitted/failed merge</source> <translation>Zusammenführung abbrechen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1962"/> <source>Tagging in the Git repository</source> <translation>Marke im Git-Repository setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2193"/> <source>Branching in the Git repository</source> <translation>Zweig im Git-Repository erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2232"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2233"/> <source>Delete Remote Branch</source> <translation>Entfernten Zweig löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2254"/> <source>Current Branch</source> <translation>Aktueller Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2254"/> <source><p>The current branch is <b>{0}</b>.</p></source> <translation><p>Der aktuelle Zweig ist <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2317"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2318"/> <source>Create Bundle</source> <translation>Paket erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2282"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2283"/> <source>Git Bundle Files (*.bundle)</source> <translation>Git Paketdateien (*.bundle)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2299"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2300"/> <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Git Paketdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2347"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2348"/> <source>Verify Bundle</source> <translation>Paket verifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2477"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2478"/> <source>Git Bundle Files (*.bundle);;All Files (*)</source> <translation>Git Paketdateien (*.bundle);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2377"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2378"/> <source>List Bundle Heads</source> <translation>Köpfe des Pakets anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2477"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2478"/> <source>Apply Bundle</source> <translation>Paket anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2500"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2501"/> <source>Applying a bundle file (fetch)</source> <translation>Paketdatei anwenden (fetch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2527"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2528"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2730"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2731"/> <source>Git Bisect ({0})</source> <translation>Git-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2627"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2671"/> <source>Create Bisect Replay File</source> <translation>Erzeuge Bisect Wiederholungsdatei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2636"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2637"/> <source>Git Bisect Replay Files (*.replay)</source> <translation>Git Bisect Wiederholungsdateien (*.replay)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2653"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2654"/> <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Git Wiederholungsdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2671"/> <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gespeichert werden.<br/>Grund: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2691"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2692"/> <source>Edit Bisect Replay File</source> <translation>Bisect Wiederholungsdatei bearbeiten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/> <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> <translation>Git Bisect Wiederholungsdateien (*.replay);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/> <source>Bisect Replay</source> <translation>Bisect wiederholen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3070"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3071"/> <source>Show Remote Info</source> <translation>Zeige entfernte Informationen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2950"/> <source>Rename Remote Repository</source> <translation>Entferntes Repository umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2950"/> <source>Enter new name for remote repository:</source> <translation>Gib einen Namen für das entfernte Repository ein:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3094"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3095"/> <source>Show Shortlog</source> <translation>Kurzbeschreibungen anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3152"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3153"/> <source>Cherry-pick</source> <translation>Aussuchen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3182"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3183"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3207"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3208"/> <source>Copy Changesets (Quit)</source> <translation>Änderungssätze kopieren (Beenden)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3233"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3234"/> <source>Copy Changesets (Cancel)</source> <translation>Änderungssätze kopieren (Abbrechen)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3313"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3314"/> <source>Saving stash</source> <translation>Ablage sichern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/> <source>Show Stash</source> <translation>Ablage anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/> <source>Select a stash (empty for latest stash):</source> <translation>Wähle eine Ablage (leer für aktuellste):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3424"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3425"/> <source>Restore Stash</source> <translation>Ablage wiederherstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3438"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3439"/> <source>Restoring stash</source> <translation>Stelle Ablage wieder her</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3472"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3473"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3463"/> <source>Enter a branch name to restore a stash to:</source> <translation>Gib einen Zweignamen für die Ablagewiederherstellung ein:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3487"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3488"/> <source>Creating branch</source> <translation>Erzeuge Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3522"/> <source>Delete Stash</source> <translation>Ablage löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3522"/> <source>Do you really want to delete the stash <b>{0}</b>?</source> <translation>Soll die Ablage <b>{0}</b> wirklich gelöscht werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3532"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3533"/> <source>Deleting stash</source> <translation>Lösche Ablage</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3553"/> <source>Delete All Stashes</source> <translation>Alle Ablagen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3553"/> <source>Do you really want to delete all stashes?</source> <translation>Sollen wirklich alle Ablagen gelöscht werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3560"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3561"/> <source>Deleting all stashes</source> <translation>Lösche alle Ablagen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3632"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3633"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3658"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3659"/> <source>Verifying the integrity of the Git repository</source> <translation>Verifiziere die Integrität des Git-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3684"/> <source>Performing Repository Housekeeping</source> <translation>Führe Repository Reorganisation durch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation><tr><td><b>Statistik</b></td></tr></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation><tr><td><b>Statistik</b></td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3729"/> <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> <translation><tr><td>Anzahl loser Objekte: </td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3732"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3733"/> <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> <translation><tr><td>Festplattenverbrauch durch lose Objekte: </td><td>{0} KiB</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3736"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3737"/> <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> <translation><tr><td>Anzahl gepackter Objekte: </td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3740"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3741"/> <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> <translation><tr><td>Anzahl Pakete: </td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3744"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3745"/> <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> <translation><tr><td>Festplattenverbrauch durch lose Objekte </td><td>{0} KiB</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3748"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3749"/> <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> <translation><tr><td>Gepackte Objekte bereit zum Löschen: </td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3752"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3753"/> <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> <translation><tr><td>Wertlose Dateien: </td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3756"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3757"/> <source><tr><td>Disk space used by garbage files: </td><td>{0} KiB</td></tr></source> <translation><tr><td>Festplattenverbrauch durch wertlose Dateien: </td><td>{0} KiB</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3762"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3763"/> <source><p><b>No statistics available.</b></p></source> <translation><p><b>Keine Statistik verfügbar.</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3828"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3829"/> <source>Creating Archive</source> <translation>Erzeuge Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="499"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="500"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="499"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="500"/> <source><p>Do you really want to switch to <b>{0}</b>?</p></source> <translation><p>Soll wirklich auf <b>{0}</b> umgeschaltet werden?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1845"/> <source>Applying patch</source> <translation>Patch anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1876"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1877"/> <source>Check patch files</source> <translation>Patchdateien prüfen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1879"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1880"/> <source>Apply patch files</source> <translation>Patchdateien anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3871"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3872"/> <source>Add Submodule</source> <translation>Submodul hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3942"/> <source>List Submodules</source> <translation>Submodule auflisten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3942"/> <source>No submodules defined for the project.</source> <translation>Für das Projekt sind keine Submodule definiert.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3956"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3957"/> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3960"/> <source>Submodule Path</source> <translation>Submodulpfad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3960"/> <source>Select a submodule path:</source> <translation>Wähle einen Submodulpfad:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4013"/> <source>Initialize Submodules</source> <translation>Submodule initialisieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4049"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4050"/> <source>Unregister Submodules</source> <translation>Submodule deregistrieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4129"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4130"/> <source>Update Submodules</source> <translation>Submodule aktualisieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4163"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4164"/> <source>Synchronize Submodules</source> <translation>Submodule synchronisieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4221"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4222"/> <source>Submodules Summary</source> <translation>Submodulüberblick</translation> </message> @@ -40580,122 +40580,122 @@ <translation>Gib eine Nachricht ein, Senden durch Drücken von Return oder Enter</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="369"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="416"/> <source>Send Message</source> <translation>Nachricht senden</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="369"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="416"/> <source>Messages starting with a '/' are not allowed in private chats.</source> <translation>Nachrichten, die mit „/“ beginnen, sind in privaten Unterhaltungen nicht zugelassen.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="405"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="528"/> <source>Leave IRC channel</source> <translation>IRC-Kanal verlassen</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="405"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="528"/> <source>Do you really want to leave the IRC channel <b>{0}</b>?</source> <translation>Soll der IRC-Kanal <b>{0}</b> wirklich verlassen werden?</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="546"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="681"/> <source>Channel Message</source> <translation>Kanalnachricht</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="551"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="686"/> <source>Nick mentioned</source> <translation>Nick erwähnt</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="576"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="711"/> <source>{0} has joined the channel {1} ({2}).</source> <translation>{0} hat den Kanal {1} betreten ({2}).</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="582"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="717"/> <source>You have joined the channel {0} ({1}).</source> <translation>Sie sind dem Kanal {0} betreten.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="589"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="724"/> <source>Join Channel</source> <translation>Kanal betreten</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="608"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="743"/> <source>{0} has left {1}.</source> <translation>{0} hat den Kanal {1} verlassen.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="616"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="751"/> <source>{0} has left {1}: {2}.</source> <translation>{0} hat den Kanal {1} verlassen: {2}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="622"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="757"/> <source>Leave Channel</source> <translation>Kanal verlassen</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="641"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="776"/> <source>{0} has quit {1}.</source> <translation>{0} hat den Server verlassen.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="646"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="781"/> <source>{0} has quit {1}: {2}.</source> <translation>{0} hat den Server verlassen: {2}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="652"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="787"/> <source>Quit</source> <translation>Server verlassen</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="670"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="805"/> <source>You are now known as {0}.</source> <translation>Sie sind jetzt als {0} bekannt.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="676"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="811"/> <source>User {0} is now known as {1}.</source> <translation>Nutzer {0} ist nun als {1} bekannt.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="714"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="849"/> <source>Away</source> <translation>Abwesend</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="714"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="849"/> <source>{0} is away: {1}</source> <translation>{0} ist abwesend: {1}</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="731"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="866"/> <source>The channel topic is: "{0}".</source> <translation>Das Kanalthema ist: „{0}“.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="747"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="882"/> <source>The topic was set by {0} on {1}.</source> <translation>Das Thema wurde am {0} durch {1} gesetzt.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="764"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="899"/> <source>Channel URL: {0}</source> <translation>Kanal-URL: {0}</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="789"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="924"/> <source>password protected ({0})</source> <translation>Kennwortgeschützt ({0})</translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="793"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="928"/> <source>limited to %n user(s)</source> <translation> <numerusform>auf einen Nutzer begrenzt</numerusform> @@ -40703,77 +40703,77 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="800"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="935"/> <source>Channel modes: {0}.</source> <translation>Kanalmodi: {0}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="816"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="951"/> <source>This channel was created on {0}.</source> <translation>Dieser Kanal wurde am {0} erstellt.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="851"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="986"/> <source>{0} sets the channel mode to 'anonymous'.</source> <translation>{0} setzt den Kanalmodus „anonym“.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="855"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="990"/> <source>{0} removes the 'anonymous' mode from the channel.</source> <translation>{0} entfernt den Kanalmodus „anonym“.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="860"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="995"/> <source>{0} sets a ban on {1}.</source> <translation>{0} verhängt einen Bann auf {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="864"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="999"/> <source>{0} removes the ban on {1}.</source> <translation>{0} entfernt den Bann von {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="869"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1004"/> <source>{0} sets the channel mode to 'no colors allowed'.</source> <translation>{0} setzt den Kanalmodus „keine Farben zugelassen“.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="873"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1008"/> <source>{0} sets the channel mode to 'allow color codes'.</source> <translation>{0} setzt den Kanalmodus „Farben zugelassen“.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="878"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1013"/> <source>{0} sets a ban exception on {1}.</source> <translation>{0} setzt eine Bannausnahme auf {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="882"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1017"/> <source>{0} removes the ban exception on {1}.</source> <translation>{0} entfernt die Bannausnahme auf {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="887"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1022"/> <source>{0} sets the channel mode to 'invite only'.</source> <translation>{0} setzt den Kanalmodus „Einladung erforderlich“.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="891"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1026"/> <source>{0} removes the 'invite only' mode from the channel.</source> <translation>{0} entfernt den Kanalmodus „Einladung erforderlich“.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="896"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1031"/> <source>{0} sets the channel key to '{1}'.</source> <translation>{0} setzt den Kanalschlüssel „{1}“.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="900"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1035"/> <source>{0} removes the channel key.</source> <translation>{0} entfernt den Kanalschlüssel.</translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="904"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1039"/> <source>{0} sets the channel limit to %n nick(s).</source> <translation> <numerusform>{0} setzt die Kanalbegrenzung auf einen Nutzer.</numerusform> @@ -40781,242 +40781,242 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="908"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1043"/> <source>{0} removes the channel limit.</source> <translation>{0} entfernt die Kanalbegrenzung.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="912"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1047"/> <source>{0} sets the channel mode to 'moderated'.</source> <translation>{0} setzt den Kanalmodus „modereriert“.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="916"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1051"/> <source>{0} sets the channel mode to 'unmoderated'.</source> <translation>{0} setzt den Kanalmodus „unmoderiert“.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="921"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1056"/> <source>{0} sets the channel mode to 'no messages from outside'.</source> <translation>{0} setzt den Kanalmodus „keine Nachrichten von außerhalb“.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="925"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1060"/> <source>{0} sets the channel mode to 'allow messages from outside'.</source> <translation>{0} setzt den Kanalmodus „Nachrichten von außerhalb zugelassen“.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="930"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1065"/> <source>{0} sets the channel mode to 'private'.</source> <translation>{0} setzt den Kanalmodus „privat“.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="934"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1069"/> <source>{0} sets the channel mode to 'public'.</source> <translation>{0} setzt den Kanalmodus „öffentlich“.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="939"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1074"/> <source>{0} sets the channel mode to 'quiet'.</source> <translation>{0} setzt den Kanalmodus „schweigend“.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="943"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1078"/> <source>{0} removes the 'quiet' mode from the channel.</source> <translation>{0} entfernt den Kanalmodus „schweigend“.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="950"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1085"/> <source>{0} sets the channel mode to 'secret'.</source> <translation>{0} setzt den Kanalmodus „unsichtbar“.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="954"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1089"/> <source>{0} sets the channel mode to 'visible'.</source> <translation>{0} setzt den Kanalmodus „sichtbar“.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="959"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1094"/> <source>{0} switches on 'topic protection'.</source> <translation>{0} schaltet den „Themenschutz“ an.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="962"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1097"/> <source>{0} switches off 'topic protection'.</source> <translation>{0} schaltet den „Themenschutz“ aus.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="967"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1102"/> <source>{0} sets invitation mask {1}.</source> <translation>{0} setzt die Einladungsmaske {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="971"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1106"/> <source>{0} removes the invitation mask {1}.</source> <translation>{0} entfernt die Einladungsmaske {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="975"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1110"/> <source>Mode</source> <translation>Modus</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="993"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1128"/> <source>{0} sets mode for {1}: {2}.</source> <translation>{0} setzt den Modus für {1}: {2}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1020"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1155"/> <source>Help</source> <translation>Hilfe</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1154"/> - <source>--- New From Here ---</source> - <translation>--- Neu ab hier ---</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1237"/> - <source>Save Messages</source> - <translation>Nachrichten speichern</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1220"/> - <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> - <translation>HTML-Dateien (*.{0});;Textdateien (*.txt);;Alle Dateien (*)</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1237"/> - <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1256"/> - <source>Error saving Messages</source> - <translation>Fehler beim Speichern der Nachrichten</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1256"/> - <source><p>The messages contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> - <translation><p>Der Nachrichteninhalt konnte nicht nach <b>{0}</b> gespeichert werden.</p><p>Ursache: {1}</p></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1270"/> - <source>Copy</source> - <translation>Kopieren</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1275"/> - <source>Cut all</source> - <translation>Alles ausschneiden</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1279"/> - <source>Copy all</source> - <translation>Alles kopieren</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1284"/> - <source>Clear</source> - <translation>Löschen</translation> - </message> - <message> <location filename="../Network/IRC/IrcChannelWidget.py" line="1289"/> + <source>--- New From Here ---</source> + <translation>--- Neu ab hier ---</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1372"/> + <source>Save Messages</source> + <translation>Nachrichten speichern</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1355"/> + <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> + <translation>HTML-Dateien (*.{0});;Textdateien (*.txt);;Alle Dateien (*)</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1372"/> + <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1391"/> + <source>Error saving Messages</source> + <translation>Fehler beim Speichern der Nachrichten</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1391"/> + <source><p>The messages contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> + <translation><p>Der Nachrichteninhalt konnte nicht nach <b>{0}</b> gespeichert werden.</p><p>Ursache: {1}</p></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1405"/> + <source>Copy</source> + <translation>Kopieren</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1410"/> + <source>Cut all</source> + <translation>Alles ausschneiden</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1414"/> + <source>Copy all</source> + <translation>Alles kopieren</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1419"/> + <source>Clear</source> + <translation>Löschen</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1424"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1293"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1428"/> <source>Mark Current Position</source> <translation>Aktuellen Position markieren</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1295"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1430"/> <source>Remove Position Marker</source> <translation>Positionsmarke entfernen</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1345"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1480"/> <source>Who Is</source> <translation>Who Is</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1348"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1483"/> <source>Private Chat</source> <translation>Private Unterhaltung</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1463"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1598"/> <source>Who</source> <translation>Who</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1437"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1572"/> <source>End of WHO list for {0}.</source> <translation>Ende der WHO-Liste für {0}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1460"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1595"/> <source> (Away)</source> <translation> (Abwesend)</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1463"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1598"/> <source>{0} is {1}@{2} ({3}){4}</source> <translation>{0} ist {1}@{2} ({3}){4}</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1801"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1936"/> <source>Whois</source> <translation>Whois</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1485"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1620"/> <source>{0} is {1}@{2} ({3}).</source> <translation>{0} ist {1}@{2} ({3}).</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1531"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1666"/> <source>{0} is a user on channels: {1}</source> <translation>{0} ist ein Nutzer der Kanäle: {1}</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1536"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1671"/> <source>{0} has voice on channels: {1}</source> <translation>{0} hat Erlaubnis zu schreiben in den Kanälen: {1}</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1541"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1676"/> <source>{0} is a halfop on channels: {1}</source> <translation>{0} hat HalfOp-Status in den Kanälen: {1}</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1546"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1681"/> <source>{0} is an operator on channels: {1}</source> <translation>{0} hat Operator-Status in den Kanälen: {1}</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1551"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1686"/> <source>{0} is owner of channels: {1}</source> <translation>{0} hat Besitzer-Status in den Kanälen: {1}</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1556"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1691"/> <source>{0} is admin on channels: {1}</source> <translation>{0} hat Administrator-Status in den Kanälen: {1}</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1575"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1710"/> <source>{0} is online via {1} ({2}).</source> <translation>{0} ist auf dem Server {1} ({2}).</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1594"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1729"/> <source>{0} is an IRC Operator.</source> <translation>{0} ist ein IRC-Operator.</translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1627"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1762"/> <source>%n day(s)</source> <translation> <numerusform>%n Tag</numerusform> @@ -41024,7 +41024,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1641"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1776"/> <source>%n hour(s)</source> <translation> <numerusform>%n Stunde</numerusform> @@ -41032,7 +41032,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1653"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1788"/> <source>%n minute(s)</source> <translation> <numerusform>%n Minute</numerusform> @@ -41040,7 +41040,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1654"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1789"/> <source>%n second(s)</source> <translation> <numerusform>%n Sekunde</numerusform> @@ -41048,25 +41048,25 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1631"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1766"/> <source>{0} has been idle for {1}, {2}, {3}, and {4}.</source> <comment>{0} = name of person, {1} = (x days), {2} = (x hours), {3} = (x minutes), {4} = (x seconds)</comment> <translation>{0} ist seit {1}, {2}, {3} und {4} untätig.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1644"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1779"/> <source>{0} has been idle for {1}, {2}, and {3}.</source> <comment>{0} = name of person, {1} = (x hours), {2} = (x minutes), {3} = (x seconds)</comment> <translation>{0} ist seit {1}, {2} und {3} untätig.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1655"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1790"/> <source>{0} has been idle for {1} and {2}.</source> <comment>{0} = name of person, {1} = (x minutes), {3} = (x seconds)</comment> <translation>{0} ist seit {1} und {2} untätig.</translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1663"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1798"/> <source>{0} has been idle for %n second(s).</source> <translation> <numerusform>{0} ist seit %n Sekunde untätig.</numerusform> @@ -41074,67 +41074,67 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1670"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1805"/> <source>{0} has been online since {1}.</source> <translation>{0} is seit dem {1} online.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1691"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1826"/> <source>End of WHOIS list for {0}.</source> <translation>Ende der WHOIS Liste für {0}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1709"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1844"/> <source>{0} is an identified user.</source> <translation>{0} wurde identifiziert.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1727"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1862"/> <source>{0} is available for help.</source> <translation>{0} steht für Hilfe bereit.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1745"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1880"/> <source>{0} is logged in as {1}.</source> <translation>{0} ist angemeldet als {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1764"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1899"/> <source>{0} is actually using the host {1} (IP: {2}).</source> <translation>{0} verwendet den Host {1} (IP: {2}).</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1782"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1917"/> <source>{0} is using a secure connection.</source> <translation>{0} verwendet eine sichere Verbindung.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1801"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1936"/> <source>{0} is connecting from {1} (IP: {2}).</source> <translation>{0} ist verbunden von {1} (IP: {2}).</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1068"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1203"/> <source>CTCP</source> <translation>CTCP</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1046"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1181"/> <source>Received Version request from {0}.</source> <translation>Versionsanfrage von {0} empfangen.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1052"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1187"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation>CTCP-PING-Anfrage von {0} empfangen, Antwort wird gesendet.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1060"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1195"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation>CTCP-CLIENTINFO-Anfrage von {0} empfangen, Antwort wird gesendet.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1068"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1203"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation>Unbekannte CTCP-{0}-Anfrage von {1} empfangen.</translation> </message> @@ -41144,17 +41144,17 @@ <translation>Drücken, um das Thema zu ändern</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1351"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1486"/> <source>Refresh</source> <translation>Aktualisieren</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1822"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1957"/> <source>Edit Channel Topic</source> <translation>Kanalthema bearbeiten</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1822"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1957"/> <source>Enter the topic for this channel:</source> <translation>Gib das Thema für diesen Kanal ein:</translation> </message> @@ -41629,7 +41629,7 @@ <translation>Wähle ein zu verbindendes Netzwerk aus</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="333"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="350"/> <source>Press to connect to the selected network</source> <translation>Drücken, um zum ausgewählten Netzwerk zu verbinden</translation> </message> @@ -41659,57 +41659,57 @@ <translation>Drücken, um den Kanal zu betreten</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="421"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="438"/> <source>Save Messages</source> <translation>Nachrichten speichern</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="404"/> - <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> - <translation>HTML-Dateien (*.{0});;Textdateien (*.txt);;Alle Dateien (*)</translation> - </message> - <message> <location filename="../Network/IRC/IrcNetworkWidget.py" line="421"/> + <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> + <translation>HTML-Dateien (*.{0});;Textdateien (*.txt);;Alle Dateien (*)</translation> + </message> + <message> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="438"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="440"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="457"/> <source>Error saving Messages</source> <translation>Fehler beim Speichern der Nachrichten</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="440"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="457"/> <source><p>The messages contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation><p>Der Nachrichteninhalt konnte nicht nach <b>{0}</b> gespeichert werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="454"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="471"/> <source>Copy</source> <translation>Kopieren</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="459"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="476"/> <source>Cut all</source> <translation>Alles ausschneiden</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="463"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="480"/> <source>Copy all</source> <translation>Alles kopieren</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="468"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="485"/> <source>Clear</source> <translation>Löschen</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="473"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="490"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="328"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="345"/> <source>Press to disconnect from the network</source> <translation>Drücken, um die Verbindung zum Netzwerk zu beenden</translation> </message> @@ -42066,6 +42066,14 @@ </message> </context> <context> + <name>IrcUserItem</name> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="121"/> + <source>{0} (ignored)</source> + <translation>{0} (ignoriert)</translation> + </message> +</context> +<context> <name>IrcUtilities</name> <message> <location filename="../Network/IRC/IrcUtilities.py" line="157"/> @@ -42146,258 +42154,258 @@ <context> <name>IrcWidget</name> <message> - <location filename="../Network/IRC/IrcWidget.py" line="68"/> + <location filename="../Network/IRC/IrcWidget.py" line="69"/> <source>Press to leave the current channel</source> <translation>Drücken, um den aktuellen Kanal zu verlassen</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="242"/> + <location filename="../Network/IRC/IrcWidget.py" line="243"/> <source>Disconnect from Server</source> <translation>Verbindung zum Server beenden</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="242"/> + <location filename="../Network/IRC/IrcWidget.py" line="243"/> <source><p>Do you really want to disconnect from <b>{0}</b>?</p><p>All channels will be closed.</p></source> <translation><p>Soll die Verbindung zu <b>{0}</b> wirklich unterbrochen werden?</p><p>Alle Kanäle werden geschlossen.</p></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="195"/> + <location filename="../Network/IRC/IrcWidget.py" line="196"/> <source>SSL Connection</source> <translation>SSL Verbindung</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="195"/> + <location filename="../Network/IRC/IrcWidget.py" line="196"/> <source>An encrypted connection to the IRC network was requested but SSL is not available. Please change the server configuration.</source> <translation>Eine verschlüsselte Verbindung zum IRC-Netzwerk wurde angefragt, SSL steht jedoch nicht zur Verfügung. Bitte ändern Sie die Serverkonfiguration.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="510"/> + <location filename="../Network/IRC/IrcWidget.py" line="563"/> <source>Info</source> <translation>Info</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="221"/> + <location filename="../Network/IRC/IrcWidget.py" line="222"/> <source>Looking for server {0} (port {1}) using an SSL encrypted connection...</source> <translation>Suche nach Server {0} (Port {1}) über eine SSL verschlüsselte Verbindung...</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="230"/> + <location filename="../Network/IRC/IrcWidget.py" line="231"/> <source>Looking for server {0} (port {1})...</source> <translation>Suche nach Server {0} (Port {1})...</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="251"/> + <location filename="../Network/IRC/IrcWidget.py" line="252"/> <source>Disconnecting from server {0}...</source> <translation>Verbindung zum Server {0} wird unterbrochen...</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="466"/> + <location filename="../Network/IRC/IrcWidget.py" line="519"/> <source>Server found,connecting...</source> <translation>Server gefunden, Verbindung wird hergesteltl...</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="475"/> + <location filename="../Network/IRC/IrcWidget.py" line="528"/> <source>Connected,logging in...</source> <translation>Verbunden, Anmeldung läuft...</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="510"/> + <location filename="../Network/IRC/IrcWidget.py" line="563"/> <source>Server disconnected.</source> <translation>Serververbindung unterbrochen.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="557"/> + <location filename="../Network/IRC/IrcWidget.py" line="610"/> <source>Message Error</source> <translation>Nachrichtenfehler</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="557"/> + <location filename="../Network/IRC/IrcWidget.py" line="610"/> <source>Unknown message received from server:<br/>{0}</source> <translation>Unbekannte Nachricht vom Server empfangen:<br/>{0}</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="583"/> + <location filename="../Network/IRC/IrcWidget.py" line="678"/> <source>Notice</source> <translation>Notiz</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="601"/> - <source>Mode</source> - <translation>Modus</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="608"/> - <source>You have left channel {0}.</source> - <translation>Sie haben den Kanal {0} verlassen.</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="619"/> - <source>You are now known as {0}.</source> - <translation>Sie sind jetzt als {0} bekannt.</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="624"/> - <source>User {0} is now known as {1}.</source> - <translation>Nutzer {0} ist nun als {1} bekannt.</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="629"/> - <source>Server Error</source> - <translation>Server Fehler</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="665"/> - <source>Error</source> - <translation>Fehler</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="680"/> - <source>Welcome</source> - <translation>Willkommen</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="682"/> - <source>Support</source> - <translation>Support</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="684"/> - <source>User</source> - <translation>Nutzer</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="686"/> - <source>MOTD</source> - <translation>MOTD</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="688"/> - <source>Away</source> - <translation>Abwesend</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="690"/> - <source>Info ({0})</source> - <translation>Info ({0})</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="694"/> - <source>Message of the day</source> - <translation>Nachricht des Tages</translation> - </message> - <message> <location filename="../Network/IRC/IrcWidget.py" line="696"/> - <source>End of message of the day</source> - <translation>Ende der Nachricht des Tages</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="699"/> - <source>Server {0} (Version {1}), User-Modes: {2}, Channel-Modes: {3}</source> - <translation>Server {0} (Version {1}), Benutzermodi: {2}, Kanalmodi: {3}</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="705"/> - <source>Current users on {0}: {1}, max. {2}</source> - <translation>Anzahl der Benutzer auf {0}: {1}, max. {2}</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="710"/> - <source>Current users on the network: {0}, max. {1}</source> - <translation>Anzahl der Benutzer im Netzwerk: {0}, max. {1}</translation> + <source>Mode</source> + <translation>Modus</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="703"/> + <source>You have left channel {0}.</source> + <translation>Sie haben den Kanal {0} verlassen.</translation> </message> <message> <location filename="../Network/IRC/IrcWidget.py" line="714"/> + <source>You are now known as {0}.</source> + <translation>Sie sind jetzt als {0} bekannt.</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="719"/> + <source>User {0} is now known as {1}.</source> + <translation>Nutzer {0} ist nun als {1} bekannt.</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="729"/> + <source>Server Error</source> + <translation>Server Fehler</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="765"/> + <source>Error</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="780"/> + <source>Welcome</source> + <translation>Willkommen</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="782"/> + <source>Support</source> + <translation>Support</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="784"/> + <source>User</source> + <translation>Nutzer</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="786"/> + <source>MOTD</source> + <translation>MOTD</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="788"/> + <source>Away</source> + <translation>Abwesend</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="790"/> + <source>Info ({0})</source> + <translation>Info ({0})</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="794"/> + <source>Message of the day</source> + <translation>Nachricht des Tages</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="796"/> + <source>End of message of the day</source> + <translation>Ende der Nachricht des Tages</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="799"/> + <source>Server {0} (Version {1}), User-Modes: {2}, Channel-Modes: {3}</source> + <translation>Server {0} (Version {1}), Benutzermodi: {2}, Kanalmodi: {3}</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="805"/> + <source>Current users on {0}: {1}, max. {2}</source> + <translation>Anzahl der Benutzer auf {0}: {1}, max. {2}</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="810"/> + <source>Current users on the network: {0}, max. {1}</source> + <translation>Anzahl der Benutzer im Netzwerk: {0}, max. {1}</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="814"/> <source>You are no longer marked as being away.</source> <translation>Sie sind nicht länger als „abwesend“ gekennzeichnet.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="716"/> + <location filename="../Network/IRC/IrcWidget.py" line="816"/> <source>You have been marked as being away.</source> <translation>Sie sind als „abwesend“ gekennzeichnet.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="835"/> + <location filename="../Network/IRC/IrcWidget.py" line="935"/> <source>SSL Error</source> <translation>SSL Fehler</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="777"/> + <location filename="../Network/IRC/IrcWidget.py" line="877"/> <source>Connection to server {0} (port {1}) lost while waiting for user response to an SSL error.</source> <translation>Die Verbindung zum Server {0} (Port {1}) wurde während des Wartens auf eine Benutzerantwort auf einen SSL Fehler verloren.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="808"/> + <location filename="../Network/IRC/IrcWidget.py" line="908"/> <source>Socket Error</source> <translation>Socker Fehler</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="785"/> + <location filename="../Network/IRC/IrcWidget.py" line="885"/> <source>The host was not found. Please check the host name and port settings.</source> <translation>Der Server wurde nicht gefunden. Bitte prüfen Sie den Servernamen und die Porteinstellungen.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="791"/> + <location filename="../Network/IRC/IrcWidget.py" line="891"/> <source>The connection was refused by the peer. Please check the host name and port settings.</source> <translation>Die Verbindung wurde von der Gegenseite abgelehnt. Bitte prüfen Sie den Servernamen und die Porteinstellungen.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="802"/> + <location filename="../Network/IRC/IrcWidget.py" line="902"/> <source>The following network error occurred:<br/>{0}</source> <translation>Der folgende Netzwerkfehler trat auf:<br/>{0}</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="934"/> + <location filename="../Network/IRC/IrcWidget.py" line="1034"/> <source>{0} ({1})</source> <comment>channel name, users count</comment> <translation>{0} ({1})</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="969"/> + <location filename="../Network/IRC/IrcWidget.py" line="1069"/> <source>Critical</source> <translation>Kritischer Fehler</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="949"/> + <location filename="../Network/IRC/IrcWidget.py" line="1049"/> <source>No nickname acceptable to the server configured for <b>{0}</b>. Disconnecting...</source> <translation>Es ist kein für den Server <b>{0}</b> akzeptabler Spitzname konfiguriert. Verbindungsabbruch...</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="969"/> + <location filename="../Network/IRC/IrcWidget.py" line="1069"/> <source>The given nickname is already in use.</source> <translation>Der übergebene Spitzname wird bereits verwendet.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="919"/> + <location filename="../Network/IRC/IrcWidget.py" line="1019"/> <source>CTCP</source> <translation>CTCP</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="896"/> + <location filename="../Network/IRC/IrcWidget.py" line="996"/> <source>Received Version request from {0}.</source> <translation>Versionsanfrage von {0} empfangen.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="902"/> + <location filename="../Network/IRC/IrcWidget.py" line="1002"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation>CTCP-PING-Anfrage von {0} empfangen, Antwort wird gesendet.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="910"/> + <location filename="../Network/IRC/IrcWidget.py" line="1010"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation>CTCP-CLIENTINFO-Anfrage von {0} empfangen, Antwort wird gesendet.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="919"/> + <location filename="../Network/IRC/IrcWidget.py" line="1019"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation>Unbekannte CTCP-{0}-Anfrage von {1} empfangen.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="594"/> + <location filename="../Network/IRC/IrcWidget.py" line="689"/> <source>You have set your personal modes to <b>[{0}]</b>.</source> <translation>Sie haben Ihre persönlichen Modi auf <b>[{0}]</b> gesetzt.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="598"/> + <location filename="../Network/IRC/IrcWidget.py" line="693"/> <source>{0} has changed your personal modes to <b>[{1}]</b>.</source> <translation>{0} hat Ihre persönlichen Modi auf <b>[{0}]</b> geändert.</translation> </message> @@ -42412,35 +42420,50 @@ <translation>Netzwerk</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="797"/> + <location filename="../Network/IRC/IrcWidget.py" line="897"/> <source>The SSL handshake failed.</source> <translation>Der SSL Handshake schlug fehl.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="808"/> + <location filename="../Network/IRC/IrcWidget.py" line="908"/> <source>A network error occurred.</source> <translation>Ein Netzwerkfehler trat auf.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="821"/> + <location filename="../Network/IRC/IrcWidget.py" line="921"/> <source>Could not connect to {0} (port {1}) using an SSL encrypted connection. Either the server does not support SSL (did you use the correct port?) or you rejected the certificate.</source> <translation>Es konnte keine SSL-verschlüsselte Verbindung zum Server {0} (Port {1}) aufgebaut werden. Entweder unterstützt der Server kein SSL (haben Sie den richtigen Port verwendet?) oder Sie haben das Zertifikat abgelehnt.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="835"/> + <location filename="../Network/IRC/IrcWidget.py" line="935"/> <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check. SSL errors were accepted by you.</source> <translation>Das SSL-Zertifikat für den Server {0} (Port {1}) hat die Authentizitätsprüfung nicht bestanden. Die SSL-Fehler wurden von Ihnen akzeptiert.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="256"/> + <location filename="../Network/IRC/IrcWidget.py" line="257"/> <source>Disconnecting from network {0}...</source> <translation>Verbindung zum Netzwerk {0} wird unterbrochen...</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="261"/> + <location filename="../Network/IRC/IrcWidget.py" line="262"/> <source>Disconnecting from server.</source> <translation>Verbindung zum Server wird unterbrochen.</translation> </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="645"/> + <source>Received CTCP-PING response from {0} with latency of {1} ms.</source> + <translation>CTCP-PING-Antwort von {0} mit einer Latenz von {1} ms empfangen.</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="651"/> + <source>Received unknown CTCP-{0} response from {1}.</source> + <translation>Unbekannte CTCP-{0}-Antwort von {1} empfangen.</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="725"/> + <source>Received PONG from {0}</source> + <translation>PONG von {0} empfangen</translation> + </message> </context> <context> <name>JavaScriptEricObject</name> @@ -59102,7 +59125,7 @@ <context> <name>QtHelpSchemeReply</name> <message> - <location filename="../WebBrowser/Network/QtHelpSchemeHandler.py" line="147"/> + <location filename="../WebBrowser/Network/QtHelpSchemeHandler.py" line="163"/> <source><html><head><title>Error 404...</title></head><body><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'{0}'</h3></div></body></html></source> <translation><html><head><title>Fehler 404...</title></head><body><div align="center"><br><br><h1>Die Seite konnte nicht gefunden werden.</h1><br><h3>'{0}'</h3></div></body></html></translation> </message>
--- a/i18n/eric6_empty.ts Fri Sep 28 20:07:25 2018 +0200 +++ b/i18n/eric6_empty.ts Sat Sep 29 19:32:33 2018 +0200 @@ -14818,117 +14818,117 @@ <context> <name>EricSchemeReply</name> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="157"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="164"/> <source>Content blocked by AdBlock Plus</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="158"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="165"/> <source>Blocked by rule: <i>{0} ({1})</i></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="181"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="188"/> <source>Welcome to eric6 Web Browser!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="183"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="190"/> <source>About eric6</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="184"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="191"/> <source>eric6 Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="185"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="192"/> <source>Search!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="215"/> - <source>Speed Dial</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="216"/> - <source>URL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="217"/> - <source>Title</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="218"/> - <source>Apply</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="219"/> - <source>Close</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="220"/> - <source>New Page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="221"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="222"/> - <source>Remove</source> + <source>Speed Dial</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="223"/> - <source>Reload</source> + <source>URL</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="224"/> - <source>Are you sure to remove this speed dial?</source> + <source>Title</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="225"/> + <source>Apply</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="226"/> + <source>Close</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="227"/> - <source>Are you sure you want to reload all speed dials?</source> + <source>New Page</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="228"/> + <source>Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="229"/> + <source>Remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="230"/> - <source>Load title from page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="232"/> - <source>Speed Dial Settings</source> + <source>Reload</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="231"/> + <source>Are you sure to remove this speed dial?</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="234"/> - <source>Add New Page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="235"/> - <source>Maximum pages in a row:</source> + <source>Are you sure you want to reload all speed dials?</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="237"/> - <source>Change size of pages:</source> + <source>Load title from page</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="239"/> + <source>Speed Dial Settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="241"/> + <source>Add New Page</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="242"/> + <source>Maximum pages in a row:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="244"/> + <source>Change size of pages:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="246"/> <source>SpeedDial requires enabled JavaScript.</source> <translation type="unfinished"></translation> </message> @@ -17441,182 +17441,182 @@ <context> <name>Git</name> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="209"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="210"/> <source>The git process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1557"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1558"/> <source>The git process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="217"/> <source>Could not start the git executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="245"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="245"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="273"/> <source>Creating Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="288"/> <source>Adding files to Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="299"/> <source>Initial commit to Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="329"/> <source>Cloning project from a Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="417"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="418"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="417"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="418"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="476"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="477"/> <source>Committing changes to Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="499"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="500"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="499"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="500"/> <source><p>Do you really want to switch to <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="531"/> <source>Synchronizing with the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="577"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="578"/> <source>Adding files/directories to the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="652"/> <source>Removing files/directories from the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="708"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="709"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="832"/> <source>Unstage files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="883"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="874"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="883"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="889"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="941"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="965"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="966"/> <source>Master branch head</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1198"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1199"/> <source>Git Command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1285"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1286"/> <source><tr><td><b>Commit</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1289"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1290"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1294"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1297"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1298"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1300"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1301"/> <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1303"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1304"/> <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1307"/> <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1310"/> <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1312"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1313"/> <source><tr><td><b>Subject</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1320"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1321"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Git V.</b></td><td>{0}</td></tr> @@ -17626,432 +17626,432 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> <source>Create {0} file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/> <source>Git Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1427"/> <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/> <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2627"/> <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/vcsGit/git.py" line="1628"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1629"/> <source>Git Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1628"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1629"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1677"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1678"/> <source>Fetching from a remote Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1716"/> <source>Pulling from a remote Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1756"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1757"/> <source>Pushing to a remote Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1784"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1785"/> <source>Committing failed merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1811"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1812"/> <source>Aborting uncommitted/failed merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1845"/> <source>Applying patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1876"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1877"/> <source>Check patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1879"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1880"/> <source>Apply patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1962"/> <source>Tagging in the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2193"/> <source>Branching in the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2232"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2233"/> <source>Delete Remote Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2254"/> <source>Current Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2254"/> <source><p>The current branch is <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2317"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2318"/> <source>Create Bundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2282"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2283"/> <source>Git Bundle Files (*.bundle)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2299"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2300"/> <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2347"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2348"/> <source>Verify Bundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2477"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2478"/> <source>Git Bundle Files (*.bundle);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2377"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2378"/> <source>List Bundle Heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2477"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2478"/> <source>Apply Bundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2500"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2501"/> <source>Applying a bundle file (fetch)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2527"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2528"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2730"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2731"/> <source>Git Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2627"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2671"/> <source>Create Bisect Replay File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2636"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2637"/> <source>Git Bisect Replay Files (*.replay)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2653"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2654"/> <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2671"/> <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2691"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2692"/> <source>Edit Bisect Replay File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/> <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/> <source>Bisect Replay</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3070"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3071"/> <source>Show Remote Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2950"/> <source>Rename Remote Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2950"/> <source>Enter new name for remote repository:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3094"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3095"/> <source>Show Shortlog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3152"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3153"/> <source>Cherry-pick</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3182"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3183"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3207"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3208"/> <source>Copy Changesets (Quit)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3233"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3234"/> <source>Copy Changesets (Cancel)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3313"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3314"/> <source>Saving stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/> <source>Show Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/> <source>Select a stash (empty for latest stash):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3424"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3425"/> <source>Restore Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3438"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3439"/> <source>Restoring stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3472"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3473"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3463"/> <source>Enter a branch name to restore a stash to:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3487"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3488"/> <source>Creating branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3522"/> <source>Delete Stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3522"/> <source>Do you really want to delete the stash <b>{0}</b>?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3532"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3533"/> <source>Deleting stash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3553"/> <source>Delete All Stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3553"/> <source>Do you really want to delete all stashes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3560"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3561"/> <source>Deleting all stashes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3632"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3633"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3658"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3659"/> <source>Verifying the integrity of the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3684"/> <source>Performing Repository Housekeeping</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3729"/> <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3732"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3733"/> <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3736"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3737"/> <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3740"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3741"/> <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3744"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3745"/> <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3748"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3749"/> <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3752"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3753"/> <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3756"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3757"/> <source><tr><td>Disk space used by garbage files: </td><td>{0} KiB</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3762"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3763"/> <source><p><b>No statistics available.</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3828"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3829"/> <source>Creating Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3871"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3872"/> <source>Add Submodule</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3942"/> <source>List Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3942"/> <source>No submodules defined for the project.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3956"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3957"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3960"/> <source>Submodule Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3960"/> <source>Select a submodule path:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4013"/> <source>Initialize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4049"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4050"/> <source>Unregister Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4129"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4130"/> <source>Update Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4163"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4164"/> <source>Synchronize Submodules</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4221"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4222"/> <source>Submodules Summary</source> <translation type="unfinished"></translation> </message> @@ -40355,569 +40355,569 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="369"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="416"/> <source>Send Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="369"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="416"/> <source>Messages starting with a '/' are not allowed in private chats.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="405"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="528"/> <source>Leave IRC channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="405"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="528"/> <source>Do you really want to leave the IRC channel <b>{0}</b>?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="546"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="681"/> <source>Channel Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="551"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="686"/> <source>Nick mentioned</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="576"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="711"/> <source>{0} has joined the channel {1} ({2}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="582"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="717"/> <source>You have joined the channel {0} ({1}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="589"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="724"/> <source>Join Channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="608"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="743"/> <source>{0} has left {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="616"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="751"/> <source>{0} has left {1}: {2}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="622"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="757"/> <source>Leave Channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="641"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="776"/> <source>{0} has quit {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="646"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="781"/> <source>{0} has quit {1}: {2}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="652"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="787"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="670"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="805"/> <source>You are now known as {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="676"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="811"/> <source>User {0} is now known as {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="714"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="849"/> <source>Away</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="714"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="849"/> <source>{0} is away: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="731"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="866"/> <source>The channel topic is: "{0}".</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="747"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="882"/> <source>The topic was set by {0} on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="764"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="899"/> <source>Channel URL: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="789"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="924"/> <source>password protected ({0})</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="793"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="928"/> <source>limited to %n user(s)</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="800"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="935"/> <source>Channel modes: {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="816"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="951"/> <source>This channel was created on {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="851"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="986"/> <source>{0} sets the channel mode to 'anonymous'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="855"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="990"/> <source>{0} removes the 'anonymous' mode from the channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="860"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="995"/> <source>{0} sets a ban on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="864"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="999"/> <source>{0} removes the ban on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="869"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1004"/> <source>{0} sets the channel mode to 'no colors allowed'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="873"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1008"/> <source>{0} sets the channel mode to 'allow color codes'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="878"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1013"/> <source>{0} sets a ban exception on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="882"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1017"/> <source>{0} removes the ban exception on {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="887"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1022"/> <source>{0} sets the channel mode to 'invite only'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="891"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1026"/> <source>{0} removes the 'invite only' mode from the channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="896"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1031"/> <source>{0} sets the channel key to '{1}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="900"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1035"/> <source>{0} removes the channel key.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="904"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1039"/> <source>{0} sets the channel limit to %n nick(s).</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="908"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1043"/> <source>{0} removes the channel limit.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="912"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1047"/> <source>{0} sets the channel mode to 'moderated'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="916"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1051"/> <source>{0} sets the channel mode to 'unmoderated'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="921"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1056"/> <source>{0} sets the channel mode to 'no messages from outside'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="925"/> - <source>{0} sets the channel mode to 'allow messages from outside'.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="930"/> - <source>{0} sets the channel mode to 'private'.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="934"/> - <source>{0} sets the channel mode to 'public'.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="939"/> - <source>{0} sets the channel mode to 'quiet'.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="943"/> - <source>{0} removes the 'quiet' mode from the channel.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="950"/> - <source>{0} sets the channel mode to 'secret'.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="954"/> - <source>{0} sets the channel mode to 'visible'.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="959"/> - <source>{0} switches on 'topic protection'.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="962"/> - <source>{0} switches off 'topic protection'.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="967"/> - <source>{0} sets invitation mask {1}.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="971"/> - <source>{0} removes the invitation mask {1}.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="975"/> - <source>Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="993"/> - <source>{0} sets mode for {1}: {2}.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1020"/> - <source>Help</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1068"/> - <source>CTCP</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1046"/> - <source>Received Version request from {0}.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1052"/> - <source>Received CTCP-PING request from {0}, sending answer.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Network/IRC/IrcChannelWidget.py" line="1060"/> + <source>{0} sets the channel mode to 'allow messages from outside'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1065"/> + <source>{0} sets the channel mode to 'private'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1069"/> + <source>{0} sets the channel mode to 'public'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1074"/> + <source>{0} sets the channel mode to 'quiet'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1078"/> + <source>{0} removes the 'quiet' mode from the channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1085"/> + <source>{0} sets the channel mode to 'secret'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1089"/> + <source>{0} sets the channel mode to 'visible'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1094"/> + <source>{0} switches on 'topic protection'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1097"/> + <source>{0} switches off 'topic protection'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1102"/> + <source>{0} sets invitation mask {1}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1106"/> + <source>{0} removes the invitation mask {1}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1110"/> + <source>Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1128"/> + <source>{0} sets mode for {1}: {2}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1155"/> + <source>Help</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1203"/> + <source>CTCP</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1181"/> + <source>Received Version request from {0}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1187"/> + <source>Received CTCP-PING request from {0}, sending answer.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1195"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1068"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1203"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1154"/> - <source>--- New From Here ---</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1237"/> - <source>Save Messages</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1220"/> - <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1237"/> - <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1256"/> - <source>Error saving Messages</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1256"/> - <source><p>The messages contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1270"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1275"/> - <source>Cut all</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1279"/> - <source>Copy all</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1284"/> - <source>Clear</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Network/IRC/IrcChannelWidget.py" line="1289"/> + <source>--- New From Here ---</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1372"/> + <source>Save Messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1355"/> + <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1372"/> + <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1391"/> + <source>Error saving Messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1391"/> + <source><p>The messages contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1405"/> + <source>Copy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1410"/> + <source>Cut all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1414"/> + <source>Copy all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1419"/> + <source>Clear</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1424"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1293"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1428"/> <source>Mark Current Position</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1295"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1430"/> <source>Remove Position Marker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1345"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1480"/> <source>Who Is</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1348"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1483"/> <source>Private Chat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1351"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1486"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1463"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1598"/> <source>Who</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1437"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1572"/> <source>End of WHO list for {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1460"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1595"/> <source> (Away)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1463"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1598"/> <source>{0} is {1}@{2} ({3}){4}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1801"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1936"/> <source>Whois</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1485"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1620"/> <source>{0} is {1}@{2} ({3}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1531"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1666"/> <source>{0} is a user on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1536"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1671"/> <source>{0} has voice on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1541"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1676"/> <source>{0} is a halfop on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1546"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1681"/> <source>{0} is an operator on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1551"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1686"/> <source>{0} is owner of channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1556"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1691"/> <source>{0} is admin on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1575"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1710"/> <source>{0} is online via {1} ({2}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1594"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1729"/> <source>{0} is an IRC Operator.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1627"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1762"/> <source>%n day(s)</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1641"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1776"/> <source>%n hour(s)</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1653"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1788"/> <source>%n minute(s)</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1654"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1789"/> <source>%n second(s)</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1631"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1766"/> <source>{0} has been idle for {1}, {2}, {3}, and {4}.</source> <comment>{0} = name of person, {1} = (x days), {2} = (x hours), {3} = (x minutes), {4} = (x seconds)</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1644"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1779"/> <source>{0} has been idle for {1}, {2}, and {3}.</source> <comment>{0} = name of person, {1} = (x hours), {2} = (x minutes), {3} = (x seconds)</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1655"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1790"/> <source>{0} has been idle for {1} and {2}.</source> <comment>{0} = name of person, {1} = (x minutes), {3} = (x seconds)</comment> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1663"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1798"/> <source>{0} has been idle for %n second(s).</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1670"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1805"/> <source>{0} has been online since {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1691"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1826"/> <source>End of WHOIS list for {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1709"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1844"/> <source>{0} is an identified user.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1727"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1862"/> <source>{0} is available for help.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1745"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1880"/> <source>{0} is logged in as {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1764"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1899"/> <source>{0} is actually using the host {1} (IP: {2}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1782"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1917"/> <source>{0} is using a secure connection.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1801"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1936"/> <source>{0} is connecting from {1} (IP: {2}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1822"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1957"/> <source>Edit Channel Topic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1822"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1957"/> <source>Enter the topic for this channel:</source> <translation type="unfinished"></translation> </message> @@ -41417,62 +41417,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="328"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="345"/> <source>Press to disconnect from the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="333"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="350"/> <source>Press to connect to the selected network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="421"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="438"/> <source>Save Messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="404"/> - <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Network/IRC/IrcNetworkWidget.py" line="421"/> + <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="438"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="440"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="457"/> <source>Error saving Messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="440"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="457"/> <source><p>The messages contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="454"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="471"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="459"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="476"/> <source>Cut all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="463"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="480"/> <source>Copy all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="468"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="485"/> <source>Clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="473"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="490"/> <source>Save</source> <translation type="unfinished"></translation> </message> @@ -41829,6 +41829,14 @@ </message> </context> <context> + <name>IrcUserItem</name> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="121"/> + <source>{0} (ignored)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>IrcUtilities</name> <message> <location filename="../Network/IRC/IrcUtilities.py" line="157"/> @@ -41919,291 +41927,306 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="68"/> + <location filename="../Network/IRC/IrcWidget.py" line="69"/> <source>Press to leave the current channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="242"/> + <location filename="../Network/IRC/IrcWidget.py" line="243"/> <source>Disconnect from Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="242"/> + <location filename="../Network/IRC/IrcWidget.py" line="243"/> <source><p>Do you really want to disconnect from <b>{0}</b>?</p><p>All channels will be closed.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="195"/> + <location filename="../Network/IRC/IrcWidget.py" line="196"/> <source>SSL Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="195"/> + <location filename="../Network/IRC/IrcWidget.py" line="196"/> <source>An encrypted connection to the IRC network was requested but SSL is not available. Please change the server configuration.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="510"/> + <location filename="../Network/IRC/IrcWidget.py" line="563"/> <source>Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="221"/> + <location filename="../Network/IRC/IrcWidget.py" line="222"/> <source>Looking for server {0} (port {1}) using an SSL encrypted connection...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="230"/> + <location filename="../Network/IRC/IrcWidget.py" line="231"/> <source>Looking for server {0} (port {1})...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="251"/> + <location filename="../Network/IRC/IrcWidget.py" line="252"/> <source>Disconnecting from server {0}...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="256"/> + <location filename="../Network/IRC/IrcWidget.py" line="257"/> <source>Disconnecting from network {0}...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="261"/> + <location filename="../Network/IRC/IrcWidget.py" line="262"/> <source>Disconnecting from server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="466"/> + <location filename="../Network/IRC/IrcWidget.py" line="519"/> <source>Server found,connecting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="475"/> + <location filename="../Network/IRC/IrcWidget.py" line="528"/> <source>Connected,logging in...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="510"/> + <location filename="../Network/IRC/IrcWidget.py" line="563"/> <source>Server disconnected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="557"/> + <location filename="../Network/IRC/IrcWidget.py" line="610"/> <source>Message Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="557"/> + <location filename="../Network/IRC/IrcWidget.py" line="610"/> <source>Unknown message received from server:<br/>{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="583"/> + <location filename="../Network/IRC/IrcWidget.py" line="678"/> <source>Notice</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="594"/> + <location filename="../Network/IRC/IrcWidget.py" line="689"/> <source>You have set your personal modes to <b>[{0}]</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="598"/> + <location filename="../Network/IRC/IrcWidget.py" line="693"/> <source>{0} has changed your personal modes to <b>[{1}]</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="601"/> - <source>Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="608"/> - <source>You have left channel {0}.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="619"/> - <source>You are now known as {0}.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="624"/> - <source>User {0} is now known as {1}.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="629"/> - <source>Server Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="665"/> - <source>Error</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="680"/> - <source>Welcome</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="682"/> - <source>Support</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="684"/> - <source>User</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="686"/> - <source>MOTD</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="688"/> - <source>Away</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="690"/> - <source>Info ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="694"/> - <source>Message of the day</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Network/IRC/IrcWidget.py" line="696"/> - <source>End of message of the day</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="699"/> - <source>Server {0} (Version {1}), User-Modes: {2}, Channel-Modes: {3}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="705"/> - <source>Current users on {0}: {1}, max. {2}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="710"/> - <source>Current users on the network: {0}, max. {1}</source> + <source>Mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="703"/> + <source>You have left channel {0}.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Network/IRC/IrcWidget.py" line="714"/> + <source>You are now known as {0}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="719"/> + <source>User {0} is now known as {1}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="729"/> + <source>Server Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="765"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="780"/> + <source>Welcome</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="782"/> + <source>Support</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="784"/> + <source>User</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="786"/> + <source>MOTD</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="788"/> + <source>Away</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="790"/> + <source>Info ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="794"/> + <source>Message of the day</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="796"/> + <source>End of message of the day</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="799"/> + <source>Server {0} (Version {1}), User-Modes: {2}, Channel-Modes: {3}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="805"/> + <source>Current users on {0}: {1}, max. {2}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="810"/> + <source>Current users on the network: {0}, max. {1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="814"/> <source>You are no longer marked as being away.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="716"/> + <location filename="../Network/IRC/IrcWidget.py" line="816"/> <source>You have been marked as being away.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="835"/> + <location filename="../Network/IRC/IrcWidget.py" line="935"/> <source>SSL Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="777"/> + <location filename="../Network/IRC/IrcWidget.py" line="877"/> <source>Connection to server {0} (port {1}) lost while waiting for user response to an SSL error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="808"/> + <location filename="../Network/IRC/IrcWidget.py" line="908"/> <source>Socket Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="785"/> + <location filename="../Network/IRC/IrcWidget.py" line="885"/> <source>The host was not found. Please check the host name and port settings.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="791"/> + <location filename="../Network/IRC/IrcWidget.py" line="891"/> <source>The connection was refused by the peer. Please check the host name and port settings.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="797"/> + <location filename="../Network/IRC/IrcWidget.py" line="897"/> <source>The SSL handshake failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="802"/> - <source>The following network error occurred:<br/>{0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="808"/> - <source>A network error occurred.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="821"/> - <source>Could not connect to {0} (port {1}) using an SSL encrypted connection. Either the server does not support SSL (did you use the correct port?) or you rejected the certificate.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="835"/> - <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check. SSL errors were accepted by you.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="919"/> - <source>CTCP</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="896"/> - <source>Received Version request from {0}.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Network/IRC/IrcWidget.py" line="902"/> + <source>The following network error occurred:<br/>{0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="908"/> + <source>A network error occurred.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="921"/> + <source>Could not connect to {0} (port {1}) using an SSL encrypted connection. Either the server does not support SSL (did you use the correct port?) or you rejected the certificate.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="935"/> + <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check. SSL errors were accepted by you.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="1019"/> + <source>CTCP</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="996"/> + <source>Received Version request from {0}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="1002"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="910"/> + <location filename="../Network/IRC/IrcWidget.py" line="1010"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="919"/> + <location filename="../Network/IRC/IrcWidget.py" line="1019"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="934"/> + <location filename="../Network/IRC/IrcWidget.py" line="1034"/> <source>{0} ({1})</source> <comment>channel name, users count</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="969"/> + <location filename="../Network/IRC/IrcWidget.py" line="1069"/> <source>Critical</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="949"/> + <location filename="../Network/IRC/IrcWidget.py" line="1049"/> <source>No nickname acceptable to the server configured for <b>{0}</b>. Disconnecting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="969"/> + <location filename="../Network/IRC/IrcWidget.py" line="1069"/> <source>The given nickname is already in use.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="645"/> + <source>Received CTCP-PING response from {0} with latency of {1} ms.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="651"/> + <source>Received unknown CTCP-{0} response from {1}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="725"/> + <source>Received PONG from {0}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>JavaScriptEricObject</name> @@ -58662,7 +58685,7 @@ <context> <name>QtHelpSchemeReply</name> <message> - <location filename="../WebBrowser/Network/QtHelpSchemeHandler.py" line="147"/> + <location filename="../WebBrowser/Network/QtHelpSchemeHandler.py" line="163"/> <source><html><head><title>Error 404...</title></head><body><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'{0}'</h3></div></body></html></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric6_en.ts Fri Sep 28 20:07:25 2018 +0200 +++ b/i18n/eric6_en.ts Sat Sep 29 19:32:33 2018 +0200 @@ -14835,117 +14835,117 @@ <context> <name>EricSchemeReply</name> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="157"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="164"/> <source>Content blocked by AdBlock Plus</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="158"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="165"/> <source>Blocked by rule: <i>{0} ({1})</i></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="181"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="188"/> <source>Welcome to eric6 Web Browser!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="183"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="190"/> <source>About eric6</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="184"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="191"/> <source>eric6 Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="185"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="192"/> <source>Search!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="215"/> - <source>Speed Dial</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="216"/> - <source>URL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="217"/> - <source>Title</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="218"/> - <source>Apply</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="219"/> - <source>Close</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="220"/> - <source>New Page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="221"/> - <source>Edit</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="222"/> - <source>Remove</source> + <source>Speed Dial</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="223"/> - <source>Reload</source> + <source>URL</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="224"/> - <source>Are you sure to remove this speed dial?</source> + <source>Title</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="225"/> + <source>Apply</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="226"/> + <source>Close</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="227"/> - <source>Are you sure you want to reload all speed dials?</source> + <source>New Page</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="228"/> + <source>Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="229"/> + <source>Remove</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="230"/> - <source>Load title from page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="232"/> - <source>Speed Dial Settings</source> + <source>Reload</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="231"/> + <source>Are you sure to remove this speed dial?</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="234"/> - <source>Add New Page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="235"/> - <source>Maximum pages in a row:</source> + <source>Are you sure you want to reload all speed dials?</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="237"/> - <source>Change size of pages:</source> + <source>Load title from page</source> <translation type="unfinished"></translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="239"/> + <source>Speed Dial Settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="241"/> + <source>Add New Page</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="242"/> + <source>Maximum pages in a row:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="244"/> + <source>Change size of pages:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="246"/> <source>SpeedDial requires enabled JavaScript.</source> <translation type="unfinished"></translation> </message> @@ -17460,172 +17460,172 @@ <context> <name>Git</name> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="209"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="210"/> <source>The git process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1557"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1558"/> <source>The git process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="217"/> <source>Could not start the git executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="245"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="245"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="273"/> <source>Creating Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="288"/> <source>Adding files to Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="299"/> <source>Initial commit to Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="329"/> <source>Cloning project from a Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="417"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="418"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="417"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="418"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="476"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="477"/> <source>Committing changes to Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="531"/> <source>Synchronizing with the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="577"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="578"/> <source>Adding files/directories to the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="652"/> <source>Removing files/directories from the Git repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="708"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="709"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="832"/> <source>Unstage files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="883"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="874"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="883"/> <source>Do you really want to revert all changes of the project?</source>