--- a/i18n/eric5_it.ts Sat Mar 10 15:17:52 2012 +0100 +++ b/i18n/eric5_it.ts Sat Mar 10 17:42:07 2012 +0100 @@ -5810,6 +5810,32 @@ </message> </context> <context> + <name>DirectorySyncHandler</name> + <message> + <location filename="Helpviewer/Sync/DirectorySyncHandler.py" line="68"/> + <source>Error creating the shared directory. +{0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/DirectorySyncHandler.py" line="89"/> + <source>Cannot read remote file. +{0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/DirectorySyncHandler.py" line="120"/> + <source>Cannot write remote file. +{0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/DirectorySyncHandler.py" line="179"/> + <source>Synchronization finished</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>DownloadAskActionDialog</name> <message> <location filename="Helpviewer/Download/DownloadAskActionDialog.ui" line="14"/> @@ -12923,92 +12949,12 @@ <context> <name>FtpSyncHandler</name> <message> - <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="59"/> - <source>Remote bookmarks file exists! Syncing local copy...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="61"/> - <source>Remote bookmarks file does NOT exists. Exporting local copy...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="63"/> - <source>Local bookmarks file does NOT exist. Skipping synchronization!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="68"/> - <source>Remote history file exists! Syncing local copy...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="70"/> - <source>Remote history file does NOT exists. Exporting local copy...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="72"/> - <source>Local history file does NOT exist. Skipping synchronization!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="77"/> - <source>Remote logins file exists! Syncing local copy...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="79"/> - <source>Remote logins file does NOT exists. Exporting local copy...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="81"/> - <source>Local logins file does NOT exist. Skipping synchronization!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="86"/> - <source>Remote user agent settings file exists! Syncing local copy...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="88"/> - <source>Remote user agent settings file does NOT exists. Exporting local copy...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="91"/> - <source>Local user agent settings file does NOT exist. Skipping synchronization!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="135"/> + <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="89"/> <source>No suitable proxy found.</source> <translation type="unfinished">Nessun proxy utilizzabile trovato.</translation> </message> <message> - <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="65"/> - <source>Uploading local bookmarks file...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="74"/> - <source>Uploading local history file...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="83"/> - <source>Uploading local logins file...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="94"/> - <source>Uploading local user agent settings file...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="211"/> + <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="166"/> <source>Synchronization finished</source> <translation type="unfinished"></translation> </message> @@ -28660,27 +28606,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="996"/> + <location filename="Preferences/__init__.py" line="997"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1023"/> + <location filename="Preferences/__init__.py" line="1024"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1023"/> + <location filename="Preferences/__init__.py" line="1024"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>File proprietà (*.ini);;Tutti i file(*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1116"/> + <location filename="Preferences/__init__.py" line="1117"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1116"/> + <location filename="Preferences/__init__.py" line="1117"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -41639,20 +41585,25 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncCheckPage.py" line="51"/> + <location filename="Helpviewer/Sync/SyncCheckPage.py" line="53"/> <source>FTP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncCheckPage.py" line="54"/> + <location filename="Helpviewer/Sync/SyncCheckPage.py" line="59"/> <source>No Synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncCheckPage.py" line="153"/> + <location filename="Helpviewer/Sync/SyncCheckPage.py" line="157"/> <source><font color="#FF0000"><b>Error:</b> {0}</font></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Sync/SyncCheckPage.py" line="56"/> + <source>Shared Directory</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SyncDataPage</name> @@ -41723,6 +41674,49 @@ </message> </context> <context> + <name>SyncDirectorySettingsPage</name> + <message> + <location filename="Helpviewer/Sync/SyncDirectorySettingsPage.ui" line="17"/> + <source>Synchronize to a shared directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncDirectorySettingsPage.ui" line="20"/> + <source>Please enter the data for synchronization via a shared directory. All fields must be filled.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncDirectorySettingsPage.ui" line="26"/> + <source>Shared Directory Settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncDirectorySettingsPage.ui" line="32"/> + <source>Directory Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncDirectorySettingsPage.ui" line="39"/> + <source>Enter the full path of the shared directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncDirectorySettingsPage.ui" line="46"/> + <source>Select the shared directory via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncDirectorySettingsPage.ui" line="49"/> + <source>...</source> + <translation type="unfinished">...</translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncDirectorySettingsPage.py" line="65"/> + <source>Shared Directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>SyncEncryptionPage</name> <message> <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="14"/> @@ -41906,15 +41900,115 @@ <context> <name>SyncHandler</name> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="134"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="191"/> <source>Invalid encryption key given.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="139"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="196"/> <source>Data cannot be decrypted.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="56"/> + <source>Remote bookmarks file exists! Syncing local copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="58"/> + <source>Remote bookmarks file does NOT exists. Exporting local copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="60"/> + <source>Local bookmarks file is NEWER. Exporting local copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="62"/> + <source>Local bookmarks file does NOT exist. Skipping synchronization!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="64"/> + <source>Uploading local bookmarks file...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="67"/> + <source>Remote history file exists! Syncing local copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="69"/> + <source>Remote history file does NOT exists. Exporting local copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="71"/> + <source>Local history file is NEWER. Exporting local copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="73"/> + <source>Local history file does NOT exist. Skipping synchronization!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="75"/> + <source>Uploading local history file...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="78"/> + <source>Remote logins file exists! Syncing local copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="80"/> + <source>Remote logins file does NOT exists. Exporting local copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="82"/> + <source>Local logins file is NEWER. Exporting local copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="84"/> + <source>Local logins file does NOT exist. Skipping synchronization!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="86"/> + <source>Uploading local logins file...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="89"/> + <source>Remote user agent settings file exists! Syncing local copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="91"/> + <source>Remote user agent settings file does NOT exists. Exporting local copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="94"/> + <source>Local user agent settings file is NEWER. Exporting local copy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="96"/> + <source>Local user agent settings file does NOT exist. Skipping synchronization!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHandler.py" line="99"/> + <source>Uploading local user agent settings file...</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SyncHostTypePage</name> @@ -41944,14 +42038,24 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="Helpviewer/Sync/SyncHostTypePage.ui" line="49"/> + <source>Select to use no particular host type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncHostTypePage.ui" line="52"/> + <source>None</source> + <translation type="unfinished">Nessuno</translation> + </message> + <message> <location filename="Helpviewer/Sync/SyncHostTypePage.ui" line="39"/> - <source>Select to use no particular host type</source> + <source>Select to use a shared directory</source> <translation type="unfinished"></translation> </message> <message> <location filename="Helpviewer/Sync/SyncHostTypePage.ui" line="42"/> - <source>None</source> - <translation type="unfinished">Nessuno</translation> + <source>Shared Directory</source> + <translation type="unfinished"></translation> </message> </context> <context>