--- a/i18n/eric5_en.ts Wed Dec 26 15:42:32 2012 +0100 +++ b/i18n/eric5_en.ts Wed Dec 26 15:42:52 2012 +0100 @@ -2510,11 +2510,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/ChatWidget.ui" line="210"/> - <source>Enter the host and port to connect to in the form "host:port"</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Cooperation/ChatWidget.ui" line="230"/> <source>Press to clear the hosts list</source> <translation type="unfinished"></translation> @@ -2701,6 +2696,11 @@ <source>Message from <{0}></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Cooperation/ChatWidget.ui" line="210"/> + <source>Enter the host and port to connect to in the form "host@port"</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ChromeImporter</name> @@ -3667,22 +3667,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="196"/> + <location filename="Cooperation/Connection.py" line="197"/> <source>* Connection attempted by banned user '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="206"/> + <location filename="Cooperation/Connection.py" line="207"/> <source>New Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="206"/> + <location filename="Cooperation/Connection.py" line="207"/> <source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Cooperation/Connection.py" line="431"/> + <location filename="Cooperation/Connection.py" line="432"/> <source>* Connection to {0}:{1} refused.</source> <translation type="unfinished"></translation> </message> @@ -17313,112 +17313,112 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1937"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1962"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1969"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1985"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1992"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2008"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2015"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2031"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2074"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2074"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2219"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2252"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2229"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2270"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2251"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2258"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2287"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2314"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2409"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2389"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2429"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -17428,72 +17428,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2954"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2827"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2954"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2494"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2541"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2548"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2665"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2752"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -24946,17 +24946,17 @@ <context> <name>IrcChannelWidget</name> <message> - <location filename="Network/IRC/IrcChannelWidget.ui" line="57"/> + <location filename="Network/IRC/IrcChannelWidget.ui" line="60"/> <source>Shows the list of users</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.ui" line="77"/> + <location filename="Network/IRC/IrcChannelWidget.ui" line="80"/> <source>Shows the channel messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.ui" line="94"/> + <location filename="Network/IRC/IrcChannelWidget.ui" line="97"/> <source>Enter a message, send by pressing Return or Enter</source> <translation type="unfinished"></translation> </message> @@ -25257,152 +25257,152 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1126"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1127"/> <source>Save Messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1109"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1110"/> <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1126"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1127"/> <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="1144"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1145"/> <source>Error saving Messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1144"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1145"/> <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="1156"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1157"/> <source>Cut</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1160"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1161"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1165"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1166"/> <source>Cut all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1169"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1170"/> <source>Copy all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1174"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1175"/> <source>Clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1179"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1180"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1184"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1185"/> <source>Mark Current Position</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1187"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1188"/> <source>Remove Position Marker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1237"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1238"/> <source>Who Is</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1241"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1242"/> <source>Private Chat</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Network/IRC/IrcChannelWidget.py" line="1354"/> + <source>Who</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcChannelWidget.py" line="1332"/> + <source>End of WHO list for {0}.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Network/IRC/IrcChannelWidget.py" line="1353"/> - <source>Who</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1331"/> - <source>End of WHO list for {0}.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1352"/> <source> (Away)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1353"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1354"/> <source>{0} is {1}@{2} ({3}){4}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1654"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1655"/> <source>Whois</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1373"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1374"/> <source>{0} is {1}@{2} ({3}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1418"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1419"/> <source>{0} is a user on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1422"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1423"/> <source>{0} has voice on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1426"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1427"/> <source>{0} is a halfop on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1430"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1431"/> <source>{0} is an operator on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1434"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1435"/> <source>{0} is owner of channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1438"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1439"/> <source>{0} is admin on channels: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1456"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1457"/> <source>{0} is online via {1} ({2}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1474"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1475"/> <source>{0} is an IRC Operator.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="Network/IRC/IrcChannelWidget.py" line="1504"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1505"/> <source>%n day(s)</source> <translation> <numerusform>1 day</numerusform> @@ -25410,7 +25410,7 @@ </translation> </message> <message numerus="yes"> - <location filename="Network/IRC/IrcChannelWidget.py" line="1515"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1516"/> <source>%n hour(s)</source> <translation> <numerusform>1 hour</numerusform> @@ -25418,7 +25418,7 @@ </translation> </message> <message numerus="yes"> - <location filename="Network/IRC/IrcChannelWidget.py" line="1524"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1525"/> <source>%n minute(s)</source> <translation> <numerusform>1 minute</numerusform> @@ -25426,7 +25426,7 @@ </translation> </message> <message numerus="yes"> - <location filename="Network/IRC/IrcChannelWidget.py" line="1525"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1526"/> <source>%n second(s)</source> <translation> <numerusform>1 seconds</numerusform> @@ -25434,25 +25434,25 @@ </translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1508"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1509"/> <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="1518"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1519"/> <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="1526"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1527"/> <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="1532"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1533"/> <source>{0} has been idle for %n second(s).</source> <translation> <numerusform>{0} has been idle for 1 second.</numerusform> @@ -25460,42 +25460,42 @@ </translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1537"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1538"/> <source>{0} has been online since {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1555"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1556"/> <source>End of WHOIS list for {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1571"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1572"/> <source>{0} is an identified user.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1587"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1588"/> <source>{0} is available for help.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1603"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1604"/> <source>{0} is logged in as {1}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1621"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1622"/> <source>{0} is actually using the host {1} (IP: {2}).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1637"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1638"/> <source>{0} is using a secure connection.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1654"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1655"/> <source>{0} is connecting from {1} (IP: {2}).</source> <translation type="unfinished"></translation> </message> @@ -25525,22 +25525,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.ui" line="38"/> + <location filename="Network/IRC/IrcChannelWidget.ui" line="41"/> <source>Press to change the topic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1245"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1246"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1666"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1667"/> <source>Edit Channel Topic</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcChannelWidget.py" line="1666"/> + <location filename="Network/IRC/IrcChannelWidget.py" line="1667"/> <source>Enter the topic for this channel:</source> <translation type="unfinished"></translation> </message> @@ -25995,97 +25995,97 @@ <context> <name>IrcNetworkWidget</name> <message> - <location filename="Network/IRC/IrcNetworkWidget.ui" line="26"/> + <location filename="Network/IRC/IrcNetworkWidget.ui" line="29"/> <source>Shows the network messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcNetworkWidget.ui" line="41"/> + <location filename="Network/IRC/IrcNetworkWidget.ui" line="44"/> <source>Select a network to connect to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcNetworkWidget.ui" line="48"/> + <location filename="Network/IRC/IrcNetworkWidget.ui" line="51"/> <source>Press to connect to the selected network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcNetworkWidget.ui" line="58"/> + <location filename="Network/IRC/IrcNetworkWidget.ui" line="61"/> <source>Press to set the user status to AWAY</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcNetworkWidget.ui" line="68"/> + <location filename="Network/IRC/IrcNetworkWidget.ui" line="71"/> <source>Press to edit the networks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcNetworkWidget.ui" line="88"/> + <location filename="Network/IRC/IrcNetworkWidget.ui" line="91"/> <source>Select a nick name for the channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcNetworkWidget.ui" line="114"/> + <location filename="Network/IRC/IrcNetworkWidget.ui" line="117"/> <source>Enter the channel to join</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcNetworkWidget.ui" line="127"/> + <location filename="Network/IRC/IrcNetworkWidget.ui" line="130"/> <source>Press to join the channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcNetworkWidget.py" line="364"/> + <location filename="Network/IRC/IrcNetworkWidget.py" line="368"/> <source>Save Messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcNetworkWidget.py" line="347"/> + <location filename="Network/IRC/IrcNetworkWidget.py" line="351"/> <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcNetworkWidget.py" line="364"/> + <location filename="Network/IRC/IrcNetworkWidget.py" line="368"/> <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="382"/> + <location filename="Network/IRC/IrcNetworkWidget.py" line="386"/> <source>Error saving Messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcNetworkWidget.py" line="382"/> + <location filename="Network/IRC/IrcNetworkWidget.py" line="386"/> <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="394"/> - <source>Cut</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Network/IRC/IrcNetworkWidget.py" line="398"/> + <source>Cut</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcNetworkWidget.py" line="402"/> <source>Copy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcNetworkWidget.py" line="403"/> - <source>Cut all</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Network/IRC/IrcNetworkWidget.py" line="407"/> + <source>Cut all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcNetworkWidget.py" line="411"/> <source>Copy all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcNetworkWidget.py" line="412"/> + <location filename="Network/IRC/IrcNetworkWidget.py" line="416"/> <source>Clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcNetworkWidget.py" line="417"/> + <location filename="Network/IRC/IrcNetworkWidget.py" line="421"/> <source>Save</source> <translation type="unfinished"></translation> </message> @@ -26429,77 +26429,77 @@ <context> <name>IrcUtilities</name> <message> - <location filename="Network/IRC/IrcUtilities.py" line="149"/> + <location filename="Network/IRC/IrcUtilities.py" line="151"/> <source>anonymous</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcUtilities.py" line="150"/> - <source>ban mask</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Network/IRC/IrcUtilities.py" line="151"/> - <source>no colors allowed</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Network/IRC/IrcUtilities.py" line="152"/> - <source>ban exception mask</source> + <source>ban mask</source> <translation type="unfinished"></translation> </message> <message> <location filename="Network/IRC/IrcUtilities.py" line="153"/> - <source>invite only</source> + <source>no colors allowed</source> <translation type="unfinished"></translation> </message> <message> <location filename="Network/IRC/IrcUtilities.py" line="154"/> - <source>password protected</source> + <source>ban exception mask</source> <translation type="unfinished"></translation> </message> <message> <location filename="Network/IRC/IrcUtilities.py" line="155"/> - <source>user limit</source> + <source>invite only</source> <translation type="unfinished"></translation> </message> <message> <location filename="Network/IRC/IrcUtilities.py" line="156"/> - <source>moderated</source> + <source>password protected</source> <translation type="unfinished"></translation> </message> <message> <location filename="Network/IRC/IrcUtilities.py" line="157"/> - <source>no messages from outside</source> + <source>user limit</source> <translation type="unfinished"></translation> </message> <message> <location filename="Network/IRC/IrcUtilities.py" line="158"/> - <source>private</source> + <source>moderated</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcUtilities.py" line="159"/> + <source>no messages from outside</source> <translation type="unfinished"></translation> </message> <message> <location filename="Network/IRC/IrcUtilities.py" line="160"/> - <source>reop channel</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Network/IRC/IrcUtilities.py" line="161"/> - <source>secret</source> + <source>private</source> <translation type="unfinished"></translation> </message> <message> <location filename="Network/IRC/IrcUtilities.py" line="162"/> - <source>topic protection</source> + <source>reop channel</source> <translation type="unfinished"></translation> </message> <message> <location filename="Network/IRC/IrcUtilities.py" line="163"/> + <source>secret</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcUtilities.py" line="164"/> + <source>topic protection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Network/IRC/IrcUtilities.py" line="165"/> <source>invitation mask</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcUtilities.py" line="159"/> + <location filename="Network/IRC/IrcUtilities.py" line="161"/> <source>quiet</source> <translation type="unfinished"></translation> </message> @@ -26727,48 +26727,48 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="814"/> + <location filename="Network/IRC/IrcWidget.py" line="818"/> <source>{0} ({1})</source> <comment>channel name, users count</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="843"/> + <location filename="Network/IRC/IrcWidget.py" line="847"/> <source>Critical</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="828"/> + <location filename="Network/IRC/IrcWidget.py" line="832"/> <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="843"/> + <location filename="Network/IRC/IrcWidget.py" line="847"/> <source>The given nickname is already in use.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="801"/> + <location filename="Network/IRC/IrcWidget.py" line="805"/> <source>CTCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="785"/> + <location filename="Network/IRC/IrcWidget.py" line="789"/> <source>Received Version request from {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="790"/> + <location filename="Network/IRC/IrcWidget.py" line="794"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="795"/> + <location filename="Network/IRC/IrcWidget.py" line="799"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Network/IRC/IrcWidget.py" line="801"/> + <location filename="Network/IRC/IrcWidget.py" line="805"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation type="unfinished"></translation> </message>