--- a/i18n/eric5_it.ts Wed Mar 31 12:52:59 2010 +0000
+++ b/i18n/eric5_it.ts Wed Mar 31 17:11:28 2010 +0000
@@ -1950,7 +1950,7 @@
<context>
<name>ChatWidget</name>
<message>
- <location filename="Cooperation/ChatWidget.ui" line="48"/>
+ <location filename="Cooperation/ChatWidget.ui" line="51"/>
<source>Chat</source>
<translation type="unfinished"></translation>
</message>
@@ -1960,204 +1960,237 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.ui" line="87"/>
+ <location filename="Cooperation/ChatWidget.ui" line="90"/>
<source>Press to send the text above</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.ui" line="90"/>
+ <location filename="Cooperation/ChatWidget.ui" line="93"/>
<source>Send</source>
<translation type="unfinished">Spedisci</translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.ui" line="196"/>
+ <location filename="Cooperation/ChatWidget.ui" line="199"/>
<source>Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.ui" line="204"/>
+ <location filename="Cooperation/ChatWidget.ui" line="207"/>
<source>Host:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.ui" line="297"/>
+ <location filename="Cooperation/ChatWidget.ui" line="300"/>
<source>Port:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.ui" line="279"/>
+ <location filename="Cooperation/ChatWidget.ui" line="282"/>
<source>Shows the connection status</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.ui" line="291"/>
+ <location filename="Cooperation/ChatWidget.ui" line="294"/>
<source>Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.ui" line="339"/>
+ <location filename="Cooperation/ChatWidget.ui" line="342"/>
<source>Shows the status of the server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.py" line="313"/>
+ <location filename="Cooperation/ChatWidget.py" line="287"/>
<source>Start Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.py" line="179"/>
+ <location filename="Cooperation/ChatWidget.py" line="153"/>
<source>! Unknown command: {0}
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.py" line="200"/>
+ <location filename="Cooperation/ChatWidget.py" line="174"/>
<source>* {0} has joined.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.py" line="229"/>
+ <location filename="Cooperation/ChatWidget.py" line="203"/>
<source>* {0} has left.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.py" line="321"/>
+ <location filename="Cooperation/ChatWidget.py" line="295"/>
<source>Stop Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.py" line="326"/>
+ <location filename="Cooperation/ChatWidget.py" line="300"/>
<source>! Server Error: {0}
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.py" line="338"/>
+ <location filename="Cooperation/ChatWidget.py" line="312"/>
<source>Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.py" line="342"/>
+ <location filename="Cooperation/ChatWidget.py" line="316"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.ui" line="103"/>
+ <location filename="Cooperation/ChatWidget.ui" line="106"/>
<source>Share Editor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.ui" line="125"/>
+ <location filename="Cooperation/ChatWidget.ui" line="128"/>
<source>Press to toggle the shared status of the current editor</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="Cooperation/ChatWidget.ui" line="242"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.ui" line="144"/>
+ <source>Press to start a shared edit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.ui" line="160"/>
+ <source>Press to end the edit and send the changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.ui" line="173"/>
+ <source>Press to cancel the shared edit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.py" line="488"/>
+ <source>Clear</source>
+ <translation type="unfinished">Pulisci</translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.py" line="493"/>
+ <source>Save</source>
+ <translation type="unfinished">Salva</translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.py" line="474"/>
+ <source>Copy</source>
+ <translation type="unfinished">Copia</translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.py" line="546"/>
+ <source>Save Chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.py" line="532"/>
+ <source>Text Files (*.txt);;All Files (*)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.py" line="546"/>
+ <source><p>The file <b>{0}</b> already exists.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.py" line="563"/>
+ <source>Error saving Chat</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.py" line="563"/>
+ <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.ui" line="70"/>
+ <source>Enter the text to send</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.ui" line="307"/>
+ <source>Enter the server port</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.ui" line="80"/>
+ <source>Press to clear the message text</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.ui" line="220"/>
+ <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="239"/>
- <source>...</source>
- <translation type="unfinished">...</translation>
- </message>
- <message>
- <location filename="Cooperation/ChatWidget.ui" line="141"/>
- <source>Press to start a shared edit</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Cooperation/ChatWidget.ui" line="157"/>
- <source>Press to end the edit and send the changes</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Cooperation/ChatWidget.ui" line="170"/>
- <source>Press to cancel the shared edit</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Cooperation/ChatWidget.py" line="95"/>
- <source>Clear</source>
- <translation type="unfinished">Pulisci</translation>
- </message>
- <message>
- <location filename="Cooperation/ChatWidget.py" line="100"/>
- <source>Save</source>
- <translation type="unfinished">Salva</translation>
- </message>
- <message>
- <location filename="Cooperation/ChatWidget.py" line="81"/>
- <source>Copy</source>
- <translation type="unfinished">Copia</translation>
- </message>
- <message>
- <location filename="Cooperation/ChatWidget.py" line="539"/>
- <source>Save Chat</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Cooperation/ChatWidget.py" line="525"/>
- <source>Text Files (*.txt);;All Files (*)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Cooperation/ChatWidget.py" line="539"/>
- <source><p>The file <b>{0}</b> already exists.</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Cooperation/ChatWidget.py" line="556"/>
- <source>Error saving Chat</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Cooperation/ChatWidget.py" line="556"/>
- <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Cooperation/ChatWidget.ui" line="67"/>
- <source>Enter the text to send</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Cooperation/ChatWidget.ui" line="304"/>
- <source>Enter the server port</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Cooperation/ChatWidget.ui" line="77"/>
- <source>Press to clear the message text</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="Cooperation/ChatWidget.ui" line="217"/>
- <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="236"/>
<source>Press to clear the host</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.ui" line="250"/>
+ <location filename="Cooperation/ChatWidget.ui" line="253"/>
<source>Press to clear the hosts list</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.py" line="77"/>
+ <location filename="Cooperation/ChatWidget.py" line="470"/>
<source>Cut</source>
<translation type="unfinished">Taglia</translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.py" line="86"/>
+ <location filename="Cooperation/ChatWidget.py" line="479"/>
<source>Cut all</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/ChatWidget.py" line="90"/>
+ <location filename="Cooperation/ChatWidget.py" line="483"/>
<source>Copy all</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Cooperation/ChatWidget.py" line="606"/>
+ <source>Kick User</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.py" line="610"/>
+ <source>Ban User</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.py" line="614"/>
+ <source>Ban and Kick User</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.py" line="642"/>
+ <source>* {0} has been kicked.
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.py" line="657"/>
+ <source>* {0} has been banned.
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Cooperation/ChatWidget.py" line="672"/>
+ <source>* {0} has been banned and kicked.
+</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CodeMetricsDialog</name>
@@ -2998,20 +3031,25 @@
<translation type="unfinished">sconosciuto</translation>
</message>
<message>
- <location filename="Cooperation/Connection.py" line="182"/>
+ <location filename="Cooperation/Connection.py" line="194"/>
<source>New Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/Connection.py" line="182"/>
+ <location filename="Cooperation/Connection.py" line="194"/>
<source><p>Accept connection from <strong>{0}@{1}</strong>?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Cooperation/Connection.py" line="405"/>
+ <location filename="Cooperation/Connection.py" line="417"/>
<source>* Connection to {0}:{1} refused.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Cooperation/Connection.py" line="184"/>
+ <source>* Connection attempted by banned user '{0}'.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CookieDetailsDialog</name>
@@ -3349,12 +3387,12 @@
<context>
<name>CooperationClient</name>
<message>
- <location filename="Cooperation/CooperationClient.py" line="68"/>
+ <location filename="Cooperation/CooperationClient.py" line="70"/>
<source>unknown</source>
<translation type="unfinished">sconosciuto</translation>
</message>
<message>
- <location filename="Cooperation/CooperationClient.py" line="268"/>
+ <location filename="Cooperation/CooperationClient.py" line="273"/>
<source>Illegal address: {0}:{1}
</source>
<translation type="unfinished"></translation>
@@ -3427,6 +3465,36 @@
<source>Accept connections automatically</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="166"/>
+ <source>Banned Users</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="185"/>
+ <source>Delete the selected entries from the list of banned users</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="188"/>
+ <source>Delete</source>
+ <translation type="unfinished">Cancella</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="195"/>
+ <source>Enter the user and host of the banned user</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="205"/>
+ <source>Add the user to the list of banned users</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/CooperationPage.ui" line="208"/>
+ <source>Add</source>
+ <translation type="unfinished">Aggiungi</translation>
+ </message>
</context>
<context>
<name>CorbaPage</name>
@@ -20241,12 +20309,12 @@
<context>
<name>Preferences</name>
<message>
- <location filename="Preferences/__init__.py" line="826"/>
+ <location filename="Preferences/__init__.py" line="828"/>
<source>Export Preferences</source>
<translation>Esporta Preferenze</translation>
</message>
<message>
- <location filename="Preferences/__init__.py" line="845"/>
+ <location filename="Preferences/__init__.py" line="847"/>
<source>Import Preferences</source>
<translation>Importa Preferenze</translation>
</message>
