sepiola-commits Mailing List for Sepiola - Online Backup Client

Brought to you by: meichenberger, moonraider, tizianomueller

sepiola-commits — Messages generated by commits to the Sepiola vcs

You can subscribe to this list here.

2011	_Jan	_Feb	_Mar (4)	_Apr (1)	_May	_Jun	_Jul	_Aug	_Sep (4)	_Oct	_Nov	_Dec
2012	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul (29)	_Aug (9)	_Sep (21)	_Oct	_Nov	_Dec

Flat | Threaded

1 2 3 > >> (Page 1 of 3)

[Sepiola-commits] SF.net SVN: sepiola:[343] tags/release-2.1.2/

From: <tiz...@us...> - 2012-09-17 08:17:36

Revision: 343
          http://sepiola.svn.sourceforge.net/sepiola/?rev=343&view=rev
Author:   tizianomueller
Date:     2012-09-17 08:17:30 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
Tag for version 2.1.2

Added Paths:
-----------
    tags/release-2.1.2/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[342] trunk/CMakeLists.txt

From: <tiz...@us...> - 2012-09-17 08:15:34

Revision: 342
          http://sepiola.svn.sourceforge.net/sepiola/?rev=342&view=rev
Author:   tizianomueller
Date:     2012-09-17 08:15:23 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
Version bump to 2.1.2

Modified Paths:
--------------
    trunk/CMakeLists.txt

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2012-09-17 08:15:11 UTC (rev 341)
+++ trunk/CMakeLists.txt	2012-09-17 08:15:23 UTC (rev 342)
@@ -49,7 +49,7 @@
 SET(CPACK_PACKAGE_VENDOR "stepping stone GmbH")
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
 SET(CPACK_PACKAGE_VERSION_MINOR "1")
-SET(CPACK_PACKAGE_VERSION_PATCH "1")
+SET(CPACK_PACKAGE_VERSION_PATCH "2")
 SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 SET(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_FULL_NAME})
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[341] trunk/src/i18n/app_de.ts

From: <tiz...@us...> - 2012-09-17 08:15:18

Revision: 341
          http://sepiola.svn.sourceforge.net/sepiola/?rev=341&view=rev
Author:   tizianomueller
Date:     2012-09-17 08:15:11 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
Update translation and add translation for newly added bandwidth limitation option.

Modified Paths:
--------------
    trunk/src/i18n/app_de.ts

Modified: trunk/src/i18n/app_de.ts
===================================================================
--- trunk/src/i18n/app_de.ts	2012-09-15 09:31:48 UTC (rev 340)
+++ trunk/src/i18n/app_de.ts	2012-09-17 08:15:11 UTC (rev 341)
@@ -253,102 +253,102 @@
 <context>
     <name>BackupThread</name>
     <message>
-        <location filename="../model/backup_thread.cc" line="106"/>
+        <location filename="../model/backup_thread.cc" line="109"/>
         <source>Creating/validating server directories</source>
         <translation>Server Verzeichnisse werden erstellt und überprüft</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="124"/>
+        <location filename="../model/backup_thread.cc" line="127"/>
         <source>Uploading files and directories</source>
         <translation>Lade Dateien und Verzeichnisse hoch</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="138"/>
+        <location filename="../model/backup_thread.cc" line="141"/>
         <source>Getting backup content meta data</source>
         <translation>Metadaten des Backupinhalts werden ermittelt</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="143"/>
+        <location filename="../model/backup_thread.cc" line="146"/>
         <source>Uploading backup content meta data</source>
         <translation>Metadaten des Backupinhalts werden übertragen</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="154"/>
+        <location filename="../model/backup_thread.cc" line="157"/>
         <source>Uploading backup info data</source>
         <translation>Backup Infodaten werden übertragen</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="165"/>
+        <location filename="../model/backup_thread.cc" line="168"/>
         <source>Getting permission meta data</source>
         <translation>Dateiberechtigungen werden ermittelt</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="178"/>
+        <location filename="../model/backup_thread.cc" line="181"/>
         <source>Uploading permission meta data</source>
         <translation>Lade Berechtigungs Metadaten hoch</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="191"/>
+        <location filename="../model/backup_thread.cc" line="194"/>
         <source>Warning: Could not backup file permissions due to following problem:</source>
         <translation>Warnung: Konnte keine Backup Dateiberechtigungen erstellen aufgrund folgenden Problem:</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="207"/>
+        <location filename="../model/backup_thread.cc" line="210"/>
         <source>Backup succeeded.</source>
         <translation>Backup erfolgreich.</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="214"/>
+        <location filename="../model/backup_thread.cc" line="217"/>
         <source>Backup succeeded with warnings.</source>
         <translation>Backup erfolgreich (mit Warnungen).</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="233"/>
+        <location filename="../model/backup_thread.cc" line="236"/>
         <source>Backup failed.</source>
         <translation>Backup fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="446"/>
+        <location filename="../model/backup_thread.cc" line="449"/>
         <source>Can not create a backup info file</source>
         <translation>Backup Infodatei konnte nicht erstellt werden</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="227"/>
+        <location filename="../model/backup_thread.cc" line="230"/>
         <source>Backup aborted.</source>
         <translation>Backup abgebrochen.</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="257"/>
+        <location filename="../model/backup_thread.cc" line="260"/>
         <source>Backup has been aborted</source>
         <translation>Backup wurde abgebrochen</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="298"/>
-        <location filename="../model/backup_thread.cc" line="313"/>
-        <location filename="../model/backup_thread.cc" line="347"/>
-        <location filename="../model/backup_thread.cc" line="374"/>
+        <location filename="../model/backup_thread.cc" line="301"/>
+        <location filename="../model/backup_thread.cc" line="316"/>
+        <location filename="../model/backup_thread.cc" line="350"/>
+        <location filename="../model/backup_thread.cc" line="377"/>
         <source>current task</source>
         <translation>Aktueller Prozess</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="299"/>
-        <location filename="../model/backup_thread.cc" line="314"/>
+        <location filename="../model/backup_thread.cc" line="302"/>
+        <location filename="../model/backup_thread.cc" line="317"/>
         <source>current file</source>
         <translation>Aktuelle Datei</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="300"/>
+        <location filename="../model/backup_thread.cc" line="303"/>
         <source>files processed</source>
         <translation>Dateien abgearbeitet</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="301"/>
-        <location filename="../model/backup_thread.cc" line="316"/>
+        <location filename="../model/backup_thread.cc" line="304"/>
+        <location filename="../model/backup_thread.cc" line="319"/>
         <source>estimated remaining time</source>
         <translation>Geschätzte Restdauer</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="315"/>
+        <location filename="../model/backup_thread.cc" line="318"/>
         <source>traffic / transferred</source>
         <translation>Datenverkehr / übertragen</translation>
     </message>
@@ -382,72 +382,72 @@
 <context>
     <name>MainModel</name>
     <message>
-        <location filename="../model/main_model.cc" line="114"/>
+        <location filename="../model/main_model.cc" line="116"/>
         <source>Key has not been generated.</source>
         <translation>Schlüssel konnte nicht generiert werden.</translation>
     </message>
     <message>
-        <location filename="../model/main_model.cc" line="129"/>
+        <location filename="../model/main_model.cc" line="131"/>
         <source>Trying to login</source>
         <translation>Anmeldeversuch</translation>
     </message>
     <message>
-        <location filename="../model/main_model.cc" line="132"/>
+        <location filename="../model/main_model.cc" line="134"/>
         <source>Can not login to the server. Please review your settings.</source>
         <translation>Anmeldung fehlgeschlagen. Bitte überprüfen Sie Ihre Einstellungen.</translation>
     </message>
     <message>
-        <location filename="../model/main_model.cc" line="136"/>
+        <location filename="../model/main_model.cc" line="138"/>
         <source>Login succeeded.</source>
         <translation>Anmeldung erfolgreich.</translation>
     </message>
     <message>
-        <location filename="../model/main_model.cc" line="94"/>
+        <location filename="../model/main_model.cc" line="96"/>
         <source>Establishing connection ...</source>
         <translation>Verbindung wird hergestellt ...</translation>
     </message>
     <message>
-        <location filename="../model/main_model.cc" line="124"/>
+        <location filename="../model/main_model.cc" line="126"/>
         <source>Login failed.</source>
         <translation>Anmeldung fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../model/main_model.cc" line="143"/>
+        <location filename="../model/main_model.cc" line="145"/>
         <source>Login with key was successful</source>
         <translation>Anmeldung mit Schlüssel war erfolgreich</translation>
     </message>
     <message>
-        <location filename="../model/main_model.cc" line="146"/>
+        <location filename="../model/main_model.cc" line="148"/>
         <source>Connection established.</source>
         <translation>Verbindung hergestellt.</translation>
     </message>
     <message>
-        <location filename="../model/main_model.cc" line="95"/>
+        <location filename="../model/main_model.cc" line="97"/>
         <source>Validating server&apos;s fingerprint ...</source>
         <translation>Fingerabdruck des Servers wird überprüft ...</translation>
     </message>
     <message>
-        <location filename="../model/main_model.cc" line="103"/>
+        <location filename="../model/main_model.cc" line="105"/>
         <source>Server&apos;s fingerprint is correct.</source>
         <translation>Fingerabdruck des Servers ist korrekt.</translation>
     </message>
     <message>
-        <location filename="../model/main_model.cc" line="207"/>
+        <location filename="../model/main_model.cc" line="209"/>
         <source>Verify connection</source>
         <translation>Verbindung wird überprüft</translation>
     </message>
     <message>
-        <location filename="../model/main_model.cc" line="215"/>
+        <location filename="../model/main_model.cc" line="217"/>
         <source>Task has not been scheduled, because the connection could not be established</source>
         <translation>Zeitgesteuertes Backup konnte nicht erstellt werden, da die Verbindung nicht hergestellt werden konnte</translation>
     </message>
     <message>
-        <location filename="../model/main_model.cc" line="98"/>
+        <location filename="../model/main_model.cc" line="100"/>
         <source>Server fingerprint validation failed</source>
         <translation>Fingerabdruck des Servers konnte nicht validiert werden</translation>
     </message>
     <message>
-        <location filename="../model/main_model.cc" line="348"/>
+        <location filename="../model/main_model.cc" line="350"/>
         <source>Some restore info files could not be opened</source>
         <translation>Einige Wiederhergestellten Info Dokumente konnten nicht geöffnet werden</translation>
     </message>
@@ -816,28 +816,28 @@
         <translation>Der Prozess %1 ist wurde nicht gestartet. Entweder ist das aufgerufene Programm nicht vorhanden, oder Sie haben nicht genügend Rechte um es auszuführen.</translation>
     </message>
     <message>
-        <location filename="../settings/settings.cc" line="146"/>
+        <location filename="../settings/settings.cc" line="140"/>
         <source>English</source>
         <translation>Englisch</translation>
     </message>
     <message>
-        <location filename="../settings/settings.cc" line="147"/>
+        <location filename="../settings/settings.cc" line="141"/>
         <source>German</source>
         <translation>Deutsch</translation>
     </message>
     <message>
-        <location filename="../main.cc" line="352"/>
+        <location filename="../main.cc" line="350"/>
         <source>Application started</source>
         <translation>Applikation wurde gestartet</translation>
     </message>
     <message>
-        <location filename="../main.cc" line="354"/>
+        <location filename="../main.cc" line="352"/>
         <source>Application closed</source>
         <translation>Applikation wurde beendet</translation>
     </message>
     <message>
+        <location filename="../tools/schtasks.cc" line="149"/>
         <location filename="../tools/at.cc" line="83"/>
-        <location filename="../tools/schtasks.cc" line="149"/>
         <source>Scheduled task has been created</source>
         <translation>Zeitgesteuertes Backup wurde eingerichtet</translation>
     </message>
@@ -912,7 +912,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../main.cc" line="344"/>
+        <location filename="../main.cc" line="342"/>
         <source>Update started</source>
         <translation>Aktualisierung gestartet</translation>
     </message>
@@ -1046,7 +1046,7 @@
         <translation>Nicht definiert</translation>
     </message>
     <message>
-        <location filename="../model/backup_thread.cc" line="330"/>
+        <location filename="../model/backup_thread.cc" line="333"/>
         <source>creating server directories</source>
         <translation>Erstellen von Serververzeichnissen</translation>
     </message>
@@ -1106,13 +1106,13 @@
         <translation>%1 Minuten nach dem Hochfahren der Computers</translation>
     </message>
     <message>
-        <location filename="../settings/settings.cc" line="262"/>
+        <location filename="../settings/settings.cc" line="256"/>
         <source>reseller address (missing)</source>
         <translation>Wiederverkäufer Adresse (fehlend)</translation>
     </message>
     <message>
-        <location filename="../tools/rsync.cc" line="522"/>
-        <location filename="../tools/rsync.cc" line="599"/>
+        <location filename="../tools/rsync.cc" line="531"/>
+        <location filename="../tools/rsync.cc" line="608"/>
         <source>rsync exited with with exitCode %1 (%2 %3).</source>
         <translation>rsync beendern mit dem exitCode %1 (%2 %3).</translation>
     </message>
@@ -1130,7 +1130,7 @@
         <translation>Gesamtgrösse: %1 GB, Frei: %2 GB</translation>
     </message>
     <message>
-        <location filename="../tools/rsync.cc" line="1034"/>
+        <location filename="../tools/rsync.cc" line="1043"/>
         <source>rsync exited with exitCode %1 (%2 %3).</source>
         <translation>rsync beendern mit dem exitCode %1 (%2 %3).</translation>
     </message>
@@ -1252,37 +1252,37 @@
 <context>
     <name>RestoreThread</name>
     <message>
-        <location filename="../model/restore_thread.cc" line="75"/>
+        <location filename="../model/restore_thread.cc" line="76"/>
         <source>Downloading files and/or directories ...</source>
         <translation>Lade Daten und/oder Verzeichnisse herunter ...</translation>
     </message>
     <message>
-        <location filename="../model/restore_thread.cc" line="86"/>
+        <location filename="../model/restore_thread.cc" line="87"/>
         <source>Applying Metadata</source>
         <translation>Metadaten werden übernommen</translation>
     </message>
     <message>
-        <location filename="../model/restore_thread.cc" line="90"/>
+        <location filename="../model/restore_thread.cc" line="91"/>
         <source>Restore done.</source>
         <translation>Wiederherstellung der Daten abgeschlossen.</translation>
     </message>
     <message>
-        <location filename="../model/restore_thread.cc" line="94"/>
+        <location filename="../model/restore_thread.cc" line="95"/>
         <source>Restore failed.</source>
         <translation>Wiederherstellung fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../model/restore_thread.cc" line="138"/>
+        <location filename="../model/restore_thread.cc" line="139"/>
         <source>Restore has been aborted</source>
         <translation>Wiederherstellung wurde abgebrochen</translation>
     </message>
     <message>
-        <location filename="../model/restore_thread.cc" line="100"/>
+        <location filename="../model/restore_thread.cc" line="101"/>
         <source>Restore aborted.</source>
         <translation>Wiederherstellen abgebrochen.</translation>
     </message>
     <message>
-        <location filename="../model/restore_thread.cc" line="121"/>
+        <location filename="../model/restore_thread.cc" line="122"/>
         <source>WARNING: Setting of metadata failed. File %1 has not been found on the server. Possibly you are restoring data from a backup of another platform/os.</source>
         <translation>WARNUNG: Die Einstellung der Metadaten ist fehlgeschlagen. Die Datei %1 ist nicht auf dem Server gefunden worden. Eventuell ist die Wiederherstellung der Daten auseinem Backup oder einer anderen Plattform/OS.</translation>
     </message>
@@ -1290,57 +1290,57 @@
 <context>
     <name>Rsync</name>
     <message>
-        <location filename="../tools/rsync.cc" line="506"/>
-        <location filename="../tools/rsync.cc" line="579"/>
-        <location filename="../tools/rsync.cc" line="580"/>
+        <location filename="../tools/rsync.cc" line="515"/>
+        <location filename="../tools/rsync.cc" line="588"/>
+        <location filename="../tools/rsync.cc" line="589"/>
         <source>%1 files and/or directories downloaded</source>
         <translation>%1 Dateien und/oder Verzeichnisse heruntergeladen</translation>
     </message>
     <message>
-        <location filename="../tools/rsync.cc" line="515"/>
-        <location filename="../tools/rsync.cc" line="591"/>
+        <location filename="../tools/rsync.cc" line="524"/>
+        <location filename="../tools/rsync.cc" line="600"/>
         <source>Error occurred while downloading: </source>
         <translation>Während dem Herunterladen ist ein Fehler aufgetreten:</translation>
     </message>
     <message>
-        <location filename="../tools/rsync.cc" line="199"/>
-        <location filename="../tools/rsync.cc" line="339"/>
+        <location filename="../tools/rsync.cc" line="204"/>
+        <location filename="../tools/rsync.cc" line="348"/>
         <source>%1 files and/or directories processed</source>
         <translation>%1 Dateien und/oder Verzeichnisse bearbeitet</translation>
     </message>
     <message>
-        <location filename="../tools/rsync.cc" line="170"/>
-        <location filename="../tools/rsync.cc" line="320"/>
+        <location filename="../tools/rsync.cc" line="175"/>
+        <location filename="../tools/rsync.cc" line="329"/>
         <source>Uploading %1</source>
         <translation>Lade %1 hoch</translation>
     </message>
     <message>
-        <location filename="../tools/rsync.cc" line="177"/>
-        <location filename="../tools/rsync.cc" line="327"/>
+        <location filename="../tools/rsync.cc" line="182"/>
+        <location filename="../tools/rsync.cc" line="336"/>
         <source>Deleting %1</source>
         <translation>Lösche %1</translation>
     </message>
     <message>
-        <location filename="../tools/rsync.cc" line="499"/>
-        <location filename="../tools/rsync.cc" line="572"/>
+        <location filename="../tools/rsync.cc" line="508"/>
+        <location filename="../tools/rsync.cc" line="581"/>
         <source>Downloading %1</source>
         <translation>Lade %1 herunter</translation>
     </message>
     <message>
-        <location filename="../tools/rsync.cc" line="1023"/>
+        <location filename="../tools/rsync.cc" line="1032"/>
         <source>Warning: At least one file could not be backuped up. See above for details.</source>
         <translation>Warnung: Mindestens eine Datei konnte nicht gesichert werden. Siehe oben für weitere Details.</translation>
     </message>
     <message>
-        <location filename="../tools/rsync.cc" line="1028"/>
+        <location filename="../tools/rsync.cc" line="1037"/>
         <source>Warning: Some files have been renamed, moved or deleted during backup before they could be uploaded to the server.
 Usually this concerns temporary files and this warning can be ignored. See above for details.</source>
         <translation>Warnung: Einige Dateien wurden währen des backups umbenannt, verschoben oder gelöscht bevor sie auf den Server hochgeladen werden konnten.
 In der Regel betrifft dies temporäre Dateien und diese Warnung kann ignoriert werden. Siehe oben für weitere Details.</translation>
     </message>
     <message>
-        <location filename="../tools/rsync.cc" line="174"/>
-        <location filename="../tools/rsync.cc" line="324"/>
+        <location filename="../tools/rsync.cc" line="179"/>
+        <location filename="../tools/rsync.cc" line="333"/>
         <source>Skipping %1</source>
         <translation>Überspringe %1</translation>
     </message>
@@ -1348,18 +1348,18 @@
 <context>
     <name>SettingsForm</name>
     <message>
-        <location filename="../gui/settings_form.cc" line="101"/>
+        <location filename="../gui/settings_form.cc" line="103"/>
         <source>Settings saved</source>
         <translation>Einstellungen gespeichert</translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.cc" line="112"/>
-        <location filename="../gui/settings_form.cc" line="130"/>
+        <location filename="../gui/settings_form.cc" line="114"/>
+        <location filename="../gui/settings_form.cc" line="132"/>
         <source>Unsaved settings</source>
         <translation>Nicht gespeicherte Einstellungen</translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.cc" line="112"/>
+        <location filename="../gui/settings_form.cc" line="114"/>
         <source>Your settings have been modified.
 Do you want to restore the original settings?</source>
         <translation>Ihre Einstellungen wurden geändert.
@@ -1381,7 +1381,7 @@
         <translation>S&amp;peichern</translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.cc" line="101"/>
+        <location filename="../gui/settings_form.cc" line="103"/>
         <source>Settings have been saved.</source>
         <translation>Einstellungen wurden gespeichert.</translation>
     </message>
@@ -1396,7 +1396,7 @@
         <translation>Abbre&amp;chen</translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.cc" line="130"/>
+        <location filename="../gui/settings_form.cc" line="132"/>
         <source>Your settings have been modified.
 Do you want to save the settings before leaving this view?</source>
         <translation>Ihre Einstellungen wurden geändert.
@@ -1458,7 +1458,7 @@
     </message>
     <message>
         <location filename="../gui/settings_form.ui" line="323"/>
-        <location filename="../settings/settings.cc" line="731"/>
+        <location filename="../settings/settings.cc" line="726"/>
         <source>English</source>
         <translatorcomment>Hier wird die Sprache in der jeweiligen Sprache eingetragen.</translatorcomment>
         <translation>Deutsch</translation>
@@ -1490,6 +1490,16 @@
         <source>Verbose logging</source>
         <translation>Ausführliche Protokollierung</translation>
     </message>
+    <message>
+        <location filename="../gui/settings_form.ui" line="483"/>
+        <source>Limit upload bandwidth to</source>
+        <translation>Begrenze Bandbreite beim Hochladen auf</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings_form.ui" line="500"/>
+        <source>Kilobytes/Second</source>
+        <translation>Kilobyte/Sekunde</translation>
+    </message>
 </context>
 <context>
     <name>TextInputDialog</name>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[340] trunk/src/main.cc

From: <tiz...@us...> - 2012-09-15 09:31:54

Revision: 340
          http://sepiola.svn.sourceforge.net/sepiola/?rev=340&view=rev
Author:   tizianomueller
Date:     2012-09-15 09:31:48 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
Print messages like Qt does natively instead of mangling the characters.

Modified Paths:
--------------
    trunk/src/main.cc

Modified: trunk/src/main.cc
===================================================================
--- trunk/src/main.cc	2012-09-14 19:27:20 UTC (rev 339)
+++ trunk/src/main.cc	2012-09-15 09:31:48 UTC (rev 340)
@@ -44,6 +44,7 @@
 #include "gui/main_window.hh"
 #include "model/main_model.hh"
 #include "settings/settings.hh"
+#include "settings/platform.hh"
 #include "test/test_manager.hh"
 #include "utils/log_file_utils.hh"
 
@@ -79,20 +80,17 @@
 {
 	if (Settings::getInstance()->isLogDebugMessageEnabled() )
 	{
-		QString message;
-		message.append(msg);
-		message.append(Settings::getInstance()->getEOLCharacter() );
 		switch (type)
 		{
 		case QtDebugMsg:
 		case QtWarningMsg:
-			fprintf( stdout, "%s", (const char*) message.toLocal8Bit());
-			fflush( stdout);
+			fprintf(stdout, "%s%s", msg, Platform::EOL_CHARACTER);
+			fflush(stdout);
 			break;
 		case QtCriticalMsg:
 		case QtFatalMsg:
-			fprintf( stderr, "%s", (const char*) message.toLocal8Bit());
-			fflush( stderr);
+			fprintf(stderr, "%s%s", msg, Platform::EOL_CHARACTER);
+			fflush(stderr);
 			break;
 		}
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[339] trunk/patches/contributed/bw_limit.patch

From: <tiz...@us...> - 2012-09-14 19:27:31

Revision: 339
          http://sepiola.svn.sourceforge.net/sepiola/?rev=339&view=rev
Author:   tizianomueller
Date:     2012-09-14 19:27:20 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
Drop old bandwidth limitation patch

Removed Paths:
-------------
    trunk/patches/contributed/bw_limit.patch

Deleted: trunk/patches/contributed/bw_limit.patch
===================================================================
--- trunk/patches/contributed/bw_limit.patch	2012-09-14 19:25:00 UTC (rev 338)
+++ trunk/patches/contributed/bw_limit.patch	2012-09-14 19:27:20 UTC (rev 339)
@@ -1,257 +0,0 @@
-Index: model/backup_thread.cc
-===================================================================
---- model/backup_thread.cc	(revision 267)
-+++ model/backup_thread.cc	(working copy)
-@@ -50,6 +50,8 @@
- 	Settings* settings = Settings::getInstance();
- 	this->setDeleteFlag = settings->getDeleteExtraneousItems();
- 	this->compressedUpload = settings->isCompressedRsyncTraffic();
-+	this->limitBandwidth = settings->getLimitBandwidth();
-+	this->bandWidth = settings->getBandwidth();
- 	this->backupStartDateTime = QDateTime(); // null-Time
- 	this->backupCurrentStatus = ConstUtils::STATUS_UNDEFINED;
- 
-Index: model/backup_thread.hh
-===================================================================
---- model/backup_thread.hh	(revision 267)
-+++ model/backup_thread.hh	(working copy)
-@@ -107,6 +107,8 @@
- 	QStringList excludePatternList;
- 	bool setDeleteFlag;
- 	bool compressedUpload;
-+	bool limitBandwidth;
-+	QString bandWidth;
- 	QDateTime backupStartDateTime;
- 	ConstUtils::StatusEnum backupCurrentStatus;
- 	ProgressTask pt;
-Index: settings/settings.cc
-===================================================================
---- settings/settings.cc	(revision 267)
-+++ settings/settings.cc	(working copy)
-@@ -112,8 +112,9 @@
- const QString Settings::SETTINGS_WINDOW_SIZE = "WindowSize";
- const QString Settings::SETTINGS_DELETE_EXTRANEOUS_ITEMS = "DeleteExtraneousItems";
- const QString Settings::SETTINGS_SHOW_HIDDEN_FILES_AND_FOLDERS = "ShowHiddenFilesAndFolders";
-+const QString Settings::SETTINGS_LIMIT_BANDWIDTH = "LimitBandwidth";
-+const QString Settings::SETTINGS_BANDWIDTH = "Bandwidth";
- 
--
- // [Reseller]
- const QString Settings::SETTINGS_GROUP_RESELLER = "Reseller";
- const QString Settings::SETTINGS_RESELLER_ADDRESS = "ResellerAddress";
-@@ -295,6 +296,8 @@
- 	privateOpenSshKey = userSettings->value( SETTINGS_PRIVATE_OPEN_SSH_KEY ).toString();
- 	deleteExtraneousItems = userSettings->value( SETTINGS_DELETE_EXTRANEOUS_ITEMS, true ).toBool();
- 	showHiddenFilesAndFolders = userSettings->value( SETTINGS_SHOW_HIDDEN_FILES_AND_FOLDERS, false ).toBool();
-+	limitBandwidth = userSettings->value( SETTINGS_LIMIT_BANDWIDTH, false ).toBool();
-+	bandWidth = userSettings->value( SETTINGS_BANDWIDTH ).toString();
- 	windowSize = userSettings->value( SETTINGS_WINDOW_SIZE ).toSize();
- 	windowPosition = userSettings->value( SETTINGS_WINDOW_POSITION, QPoint( 200, 200 ) ).toPoint();
- 
-@@ -508,6 +511,23 @@
- 	}
- }
- 
-+void Settings::saveLimitBandwidth( const bool limitBandwidth ) {
-+	if ( this->limitBandwidth != limitBandwidth )
-+	{
-+		this->limitBandwidth = limitBandwidth;
-+		userSettings->setValue( SETTINGS_LIMIT_BANDWIDTH, limitBandwidth );
-+	}
-+}
-+
-+void Settings::saveBandwidth( const QString &bandWidth )
-+{
-+        if ( this->bandWidth != bandWidth )
-+	{
-+		this->bandWidth = bandWidth;
-+		userSettings->setValue( SETTINGS_BANDWIDTH, bandWidth );
-+	}
-+}
-+
- void Settings::saveServerUserName( const QString &userName )
- {
- 	if ( this->serverUserName != userName )
-Index: settings/settings.hh
-===================================================================
---- settings/settings.hh	(revision 267)
-+++ settings/settings.hh	(working copy)
-@@ -261,7 +261,11 @@
- 		void saveDeleteExtraneousItems( const bool& deleteExtraneousItems );
- 		bool getDeleteExtraneousItems();
- 		void saveShowHiddenFilesAndFolders( const bool showHiddenFilesAndFolders );
-+		void saveLimitBandwidth( const bool limitBandwidth );
-+                QString getBandwidth();
-+                void saveBandwidth( const QString& bandwidth );
- 		bool getShowHiddenFilesAndFolders();
-+		bool getLimitBandwidth();
- 		bool isCompressedRsyncTraffic();
- 		QSize getWindowSize();
- 		void saveWindowSize( QSize size );
-@@ -339,6 +343,8 @@
- 		static const QString SETTINGS_WINDOW_POSITION;
- 		static const QString SETTINGS_DELETE_EXTRANEOUS_ITEMS;
- 		static const QString SETTINGS_SHOW_HIDDEN_FILES_AND_FOLDERS;
-+		static const QString SETTINGS_LIMIT_BANDWIDTH;
-+                static const QString SETTINGS_BANDWIDTH;
- 
- 
- 		// [Reseller]
-@@ -424,6 +430,8 @@
- 		QString privateOpenSshKey;
- 		bool deleteExtraneousItems;
- 		bool showHiddenFilesAndFolders;
-+		bool limitBandwidth;
-+                QString bandWidth;
- 		bool compressedRsyncTraffic; // read only at the moment
- 		QSize windowSize;
- 		QPoint windowPosition;
-@@ -491,6 +499,16 @@
- 	return showHiddenFilesAndFolders;
- }
- 
-+inline bool Settings::getLimitBandwidth()
-+{
-+	return limitBandwidth;
-+}
-+
-+inline QString Settings::getBandwidth()
-+{
-+	return bandWidth;
-+}
-+
- inline bool Settings::isCompressedRsyncTraffic() {
- 	return false;
- }
-Index: tools/rsync.cc
-===================================================================
---- tools/rsync.cc	(revision 267)
-+++ tools/rsync.cc	(working copy)
-@@ -80,6 +80,12 @@
- 	{
- 		arguments << "-z";
- 	}
-+        this->limitBandwidth = Settings::getInstance()->getLimitBandwidth();
-+        this->bandWidth = Settings::getInstance()->getBandwidth();
-+	if ( this->limitBandwidth && this->bandWidth > 0 ) 
-+	{
-+		arguments << "--bwlimit=" + bandWidth;
-+	}
- 	arguments << source;
- 	arguments << getValidDestinationPath( destination );
- 	arguments << "--include-from=-";
-Index: tools/rsync.hh
-===================================================================
---- tools/rsync.hh	(revision 267)
-+++ tools/rsync.hh	(working copy)
-@@ -186,6 +186,8 @@
- 	static QFileInfo getWriteIncludeFileName(const BackupSelectionHash& includeRules);
- 	static QByteArray convertRuleToByteArray(QString rule, bool modifier );
- 	static QByteArray convertQStringToQByteArray(QString aStr);
-+	bool limitBandwidth;
-+	QString bandWidth;
- };
- 
- #endif
-Index: gui/settings_form.hh
-===================================================================
---- gui/settings_form.hh	(revision 267)
-+++ gui/settings_form.hh	(working copy)
-@@ -68,6 +68,8 @@
- 	void on_spinBoxNOfShownLastBackups_valueChanged( int i );
- 	void on_checkBoxShowHiddenFiles_stateChanged( int state );
- 	void on_checkBoxKeepDeletedFiles_stateChanged( int state );
-+        void on_checkBoxLimitBandwidth_stateChanged( int state );
-+	void on_lineEditBandwidth_textEdited( QString bandWidth );
- };
- 
- #endif
-Index: gui/settings_form.cc
-===================================================================
---- gui/settings_form.cc	(revision 267)
-+++ gui/settings_form.cc	(working copy)
-@@ -70,6 +70,8 @@
- 	this->lineEditBackupPrefix->setText( settings->getBackupPrefix() );
- 	this->spinBoxNOfShownLastBackups->setValue( settings->getNOfLastBackups() );
- 	this->checkBoxShowHiddenFiles->setChecked( settings->getShowHiddenFilesAndFolders() );
-+	this->checkBoxLimitBandwidth->setChecked( settings->getLimitBandwidth() );
-+	this->lineEditBandwidth->setText( settings->getBandwidth() );
- 	this->checkBoxKeepDeletedFiles->setChecked( !settings->getDeleteExtraneousItems() );
- 
- 	this->comboBoxLanguage->clear();
-@@ -91,6 +93,8 @@
- 		settings->saveLanguageIndex( this->comboBoxLanguage->currentIndex() );
- 		settings->saveNOfLastBackups( this->spinBoxNOfShownLastBackups->value() );
- 		settings->saveShowHiddenFilesAndFolders( this->checkBoxShowHiddenFiles->isChecked() );
-+		settings->saveLimitBandwidth( this->checkBoxLimitBandwidth->isChecked() );
-+		settings->saveBandwidth( this->lineEditBandwidth->text() );
- 		settings->saveDeleteExtraneousItems( !this->checkBoxKeepDeletedFiles->isChecked() );
- 
- 		QMessageBox::information( this, tr( "Settings saved" ), tr( "Settings have been saved." ) );
-@@ -173,6 +177,15 @@
- 	formChanged = ((state==Qt::Checked) != Settings::getInstance()->getShowHiddenFilesAndFolders());
- }
- 
-+void SettingsForm::on_checkBoxLimitBandwidth_stateChanged( int state ) {
-+	formChanged = ((state==Qt::Checked) != Settings::getInstance()->getLimitBandwidth());
-+}
-+
-+void SettingsForm::on_lineEditBandwidth_textEdited( QString bandWidth )
-+{
-+	formChanged = ( bandWidth != Settings::getInstance()->getBandwidth() );
-+}
-+
- void SettingsForm::on_checkBoxKeepDeletedFiles_stateChanged( int state ) {
- 	formChanged = ((state==Qt::Checked) != (!Settings::getInstance()->getDeleteExtraneousItems()));
- }
-Index: gui/settings_form.ui
-===================================================================
---- gui/settings_form.ui	(revision 267)
-+++ gui/settings_form.ui	(working copy)
-@@ -578,6 +578,46 @@
-         </item>
-        </layout>
-       </item>
-+      <item>
-+       <widget class="QCheckBox" name="checkBoxLimitBandwidth">
-+        <property name="text">
-+         <string>Limit bandwidth</string>
-+        </property>
-+       </widget>
-+      </item>
-+      <item>
-+       <layout class="QHBoxLayout" name="horizontalLayout">
-+        <item>
-+         <widget class="QLineEdit" name="lineEditBandwidth">
-+          <property name="enabled">
-+           <bool>true</bool>
-+          </property>
-+          <property name="sizePolicy">
-+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-+            <horstretch>0</horstretch>
-+            <verstretch>0</verstretch>
-+           </sizepolicy>
-+          </property>
-+          <property name="maximumSize">
-+           <size>
-+            <width>50</width>
-+            <height>16777215</height>
-+           </size>
-+          </property>
-+          <property name="inputMethodHints">
-+           <set>Qt::ImhDigitsOnly</set>
-+          </property>
-+         </widget>
-+        </item>
-+        <item>
-+         <widget class="QLabel" name="label">
-+          <property name="text">
-+           <string>KB</string>
-+          </property>
-+         </widget>
-+        </item>
-+       </layout>
-+      </item>
-      </layout>
-     </widget>
-    </item>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[338] trunk/src/gui

From: <tiz...@us...> - 2012-09-14 19:25:10

Revision: 338
          http://sepiola.svn.sourceforge.net/sepiola/?rev=338&view=rev
Author:   tizianomueller
Date:     2012-09-14 19:25:00 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
Add interface for setting the bandwidth limit

thanks to Steve Ludovicy for the initial patch

Modified Paths:
--------------
    trunk/src/gui/settings_form.cc
    trunk/src/gui/settings_form.hh
    trunk/src/gui/settings_form.ui

Modified: trunk/src/gui/settings_form.cc
===================================================================
--- trunk/src/gui/settings_form.cc	2012-09-14 19:22:17 UTC (rev 337)
+++ trunk/src/gui/settings_form.cc	2012-09-14 19:25:00 UTC (rev 338)
@@ -76,6 +76,7 @@
 	this->checkBoxShowHiddenFiles->setChecked( settings->getShowHiddenFilesAndFolders() );
 	this->checkBoxKeepDeletedFiles->setChecked( !settings->getDeleteExtraneousItems() );
 	this->checkBoxVerboseLogging->setChecked( settings->getLogDebugMessages() );
+	this->spinBoxBandwidthLimit->setValue( settings->getBandwidthLimit() );
 
 	this->comboBoxLanguage->clear();
     for ( auto language: settings->getAvailableLanguages() )
@@ -97,6 +98,7 @@
 		settings->saveShowHiddenFilesAndFolders( this->checkBoxShowHiddenFiles->isChecked() );
 		settings->saveDeleteExtraneousItems( !this->checkBoxKeepDeletedFiles->isChecked() );
 		settings->saveLogDebugMessages( this->checkBoxVerboseLogging->isChecked() );
+		settings->saveBandwidthLimit( this->spinBoxBandwidthLimit->value() );
 
 		QMessageBox::information( this, tr( "Settings saved" ), tr( "Settings have been saved." ) );
 		emit updateOverviewFormLastBackupsInfo();
@@ -168,6 +170,11 @@
 	formChanged = (i != Settings::getInstance()->getNOfLastBackups());
 }
 
+void SettingsForm::on_spinBoxBandwidthLimit_valueChanged( int i )
+{
+	formChanged = (i != Settings::getInstance()->getBandwidthLimit());
+}
+
 void SettingsForm::on_btnDefaultPrefix_clicked()
 {
 	this->lineEditBackupPrefix->setText( Settings::getInstance()->getLocalHostName() );

Modified: trunk/src/gui/settings_form.hh
===================================================================
--- trunk/src/gui/settings_form.hh	2012-09-14 19:22:17 UTC (rev 337)
+++ trunk/src/gui/settings_form.hh	2012-09-14 19:25:00 UTC (rev 338)
@@ -70,6 +70,7 @@
 	void on_checkBoxShowHiddenFiles_stateChanged( int state );
 	void on_checkBoxKeepDeletedFiles_stateChanged( int state );
     void on_checkBoxVerboseLogging_stateChanged( int state );
+	void on_spinBoxBandwidthLimit_valueChanged( int i );
 };
 
 #endif

Modified: trunk/src/gui/settings_form.ui
===================================================================
--- trunk/src/gui/settings_form.ui	2012-09-14 19:22:17 UTC (rev 337)
+++ trunk/src/gui/settings_form.ui	2012-09-14 19:25:00 UTC (rev 338)
@@ -472,6 +472,52 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string/>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Limit upload bandwidth to</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QSpinBox" name="spinBoxBandwidthLimit">
+        <property name="maximum">
+         <number>1000000</number>
+        </property>
+        <property name="singleStep">
+         <number>10</number>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Kilobytes/Second</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer_3">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[337] trunk/src

From: <tiz...@us...> - 2012-09-14 19:22:28

Revision: 337
          http://sepiola.svn.sourceforge.net/sepiola/?rev=337&view=rev
Author:   tizianomueller
Date:     2012-09-14 19:22:17 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
Bandwidth-Limit support in rsync

thanks to Steve Ludovicy

Modified Paths:
--------------
    trunk/src/model/backup_thread.cc
    trunk/src/model/backup_thread.hh
    trunk/src/settings/settings.cc
    trunk/src/settings/settings.hh
    trunk/src/tools/abstract_rsync.hh
    trunk/src/tools/rsync.cc
    trunk/src/tools/rsync.hh

Modified: trunk/src/model/backup_thread.cc
===================================================================
--- trunk/src/model/backup_thread.cc	2012-09-14 19:18:38 UTC (rev 336)
+++ trunk/src/model/backup_thread.cc	2012-09-14 19:22:17 UTC (rev 337)
@@ -54,6 +54,7 @@
 	Settings* settings = Settings::getInstance();
 	this->setDeleteFlag = settings->getDeleteExtraneousItems();
 	this->compressedUpload = settings->isCompressedRsyncTraffic();
+	this->bandwidthLimit = settings->getBandwidthLimit();
 
 	// TODO adjust the given values for subtask steps and durations
 	this->pt = ProgressTask("Backup", DateTimeUtils::getDateTimeFromSecs(60), 50);
@@ -124,7 +125,7 @@
 
 		this->pt.debugIsCorrectCurrentTask(TASKNAME_FILE_UPLOAD);
 		emit infoSignal( tr( "Uploading files and directories" ) );
-		QList< QPair<QString, AbstractRsync::ITEMIZE_CHANGE_TYPE> > processedItems = rsync->upload( includeRules, source, destination, setDeleteFlag, compressedUpload, &warnings, false );
+		QList< QPair<QString, AbstractRsync::ITEMIZE_CHANGE_TYPE> > processedItems = rsync->upload( includeRules, source, destination, setDeleteFlag, compressedUpload, bandwidthLimit, &warnings, false );
 
 		checkAbortState();
 		if ((subPt = this->pt.getSubtask(TASKNAME_FILE_UPLOAD)) != 0) subPt->setTerminated(true);
@@ -147,7 +148,7 @@
 			updateBackupContentFile( currentBackupContentFile, processedItems );
 
 			QString warning;
-			rsync->upload( currentBackupContentFile, metaDataDir, true, 0 );
+			rsync->upload( currentBackupContentFile, metaDataDir, true, 0, 0 );
 
 			checkAbortState();
 			if ((subPt = this->pt.getSubtask(TASKNAME_UPLOAD_METADATA)) != 0) subPt->setTerminated(true);
@@ -157,7 +158,7 @@
 			this->pt.debugIsCorrectCurrentTask(TASKNAME_METAINFO);
 			QString currentBackupTimeFile = createCurrentBackupTimeFile();
 
-			rsync->upload( currentBackupTimeFile, metaDataDir, true, 0 );
+			rsync->upload( currentBackupTimeFile, metaDataDir, true, 0, 0 );
 			FileSystemUtils::removeFile( currentBackupTimeFile );
 			checkAbortState();
 
@@ -181,7 +182,7 @@
 
 			try
 			{
-				rsync->upload( currentMetadataFileName, metaDataDir, true, &warning );
+				rsync->upload( currentMetadataFileName, metaDataDir, true, bandwidthLimit, &warning );
 			}
 			catch ( const ProcessException& e )
 			{
@@ -349,11 +350,11 @@
 	vars.append(QPair<QString,QString>(tr("current task"), infoText));
 	emit progressSignal(mySubPt->getName(), mySubPt->getRootTask()->getFinishedRatio(), mySubPt->getRootTask()->getEstimatedTimeLeft(), vars);
 
-	rsync->upload( QStringList( backupPrefixFolder ), source, destination, QStringList(), QStringList(), false, false, 0, false );
+	rsync->upload( QStringList( backupPrefixFolder ), source, destination, QStringList(), QStringList(), false, false, 0, 0, false );
 	checkAbortState();
 	backupPrefixDir.mkdir( settings->getMetaFolderName() );
 	backupPrefixDir.mkdir( settings->getBackupFolderName() );
-	rsync->upload( QStringList( backupPrefixFolder ), source, destination, QStringList(), QStringList(), false, false, 0, false );
+	rsync->upload( QStringList( backupPrefixFolder ), source, destination, QStringList(), QStringList(), false, false, 0, 0, false );
 	checkAbortState();
 	mySubPt->addFixpointNow(2);
 	emit progressSignal(mySubPt->getName(), mySubPt->getRootTask()->getFinishedRatio(), mySubPt->getRootTask()->getEstimatedTimeLeft(), vars);
@@ -378,7 +379,7 @@
 
 	QObject::connect( rsync.get(), SIGNAL( volumeCalculationInfoSignal( const QString&, long, long ) ),
 					  this, SLOT( rsyncDryrunProgressHandler( const QString&, long, long ) ) );
-	quint64 uploadSize = rsync->calculateUploadTransfer( includeRules, src, destination, false, false, NULL, NULL );
+	quint64 uploadSize = rsync->calculateUploadTransfer( includeRules, src, destination, false, false, bandwidthLimit, NULL, NULL );
 	QObject::disconnect( rsync.get(), SIGNAL( volumeCalculationInfoSignal( const QString&, long, long ) ),
 					  this, SLOT( rsyncDryrunProgressHandler( const QString&, long, long ) ) );
 

Modified: trunk/src/model/backup_thread.hh
===================================================================
--- trunk/src/model/backup_thread.hh	2012-09-14 19:18:38 UTC (rev 336)
+++ trunk/src/model/backup_thread.hh	2012-09-14 19:22:17 UTC (rev 337)
@@ -107,6 +107,7 @@
 	QStringList excludePatternList;
 	bool setDeleteFlag;
 	bool compressedUpload;
+    int bandwidthLimit;
 	QDateTime backupStartDateTime;
 	ConstUtils::StatusEnum backupCurrentStatus;
 	ProgressTask pt;

Modified: trunk/src/settings/settings.cc
===================================================================
--- trunk/src/settings/settings.cc	2012-09-14 19:18:38 UTC (rev 336)
+++ trunk/src/settings/settings.cc	2012-09-14 19:22:17 UTC (rev 337)
@@ -56,7 +56,6 @@
 const QString Settings::SETTINGS_PRIVATE_OPEN_SSH_KEY_FILE_NAME = "PrivateOpenSshKeyFileName";
 const QString Settings::SETTINGS_LOCK_FILE_NAME = "LockFileName";
 const QString Settings::SETTINGS_LOG_FILE_NAME = "LogFileName";
-const QString Settings::SETTINGS_LOG_DEBUG_MESSAGE = "LogDebugMessage";
 const QString Settings::SETTINGS_IGNORE_REINSTALL = "IgnoreReinstall";
 const QString Settings::SETTINGS_INCLUDE_PATTERN_FILE_NAME = "InlcudePatternFileName";
 const QString Settings::SETTINGS_EXCLUDE_PATTERN_FILE_NAME = "ExcludePatternFileName";
@@ -101,8 +100,9 @@
 const QString Settings::SETTINGS_WINDOW_SIZE = "WindowSize";
 const QString Settings::SETTINGS_DELETE_EXTRANEOUS_ITEMS = "DeleteExtraneousItems";
 const QString Settings::SETTINGS_SHOW_HIDDEN_FILES_AND_FOLDERS = "ShowHiddenFilesAndFolders";
+const QString Settings::SETTINGS_LOG_DEBUG_MESSAGE = "LogDebugMessage";
+const QString Settings::SETTINGS_BANDWITH_LIMIT = "BandwidthLimit";
 
-
 // [Reseller]
 const QString Settings::SETTINGS_GROUP_RESELLER = "Reseller";
 const QString Settings::SETTINGS_RESELLER_ADDRESS = "ResellerAddress";
@@ -298,6 +298,7 @@
 	windowSize = userSettings->value( SETTINGS_WINDOW_SIZE ).toSize();
 	windowPosition = userSettings->value( SETTINGS_WINDOW_POSITION, QPoint( 200, 200 ) ).toPoint();
 	logDebugMessage = userSettings->value( SETTINGS_LOG_DEBUG_MESSAGE ).toBool();
+	bandwidthLimit = userSettings->value( SETTINGS_BANDWITH_LIMIT ).toInt();
 
 	// [AppData]
 	appData->beginGroup( SETTINGS_GROUP_APPDATA );
@@ -969,3 +970,17 @@
 {
     return logDebugMessage;
 }
+
+void Settings::saveBandwidthLimit(int bandwidthLimit)
+{
+	if (this->bandwidthLimit != bandwidthLimit)
+	{
+		this->bandwidthLimit = bandwidthLimit;
+		userSettings->setValue(SETTINGS_BANDWITH_LIMIT, bandwidthLimit);
+	}
+}
+
+int Settings::getBandwidthLimit() const
+{
+    return bandwidthLimit;
+}

Modified: trunk/src/settings/settings.hh
===================================================================
--- trunk/src/settings/settings.hh	2012-09-14 19:18:38 UTC (rev 336)
+++ trunk/src/settings/settings.hh	2012-09-14 19:22:17 UTC (rev 337)
@@ -250,6 +250,10 @@
 		void saveWindowSize( QSize size );
 		QPoint getWindowPosition();
 		void saveWindowPosition( QPoint position );
+        void saveLogDebugMessages(bool logDebugMessage);
+        bool getLogDebugMessages() const;
+        void saveBandwidthLimit(int bandwidthLimit);
+        int getBandwidthLimit() const;
 
 		int getNOfLastBackups() const;
 		void saveNOfLastBackups( int nOfLastBackups );
@@ -262,9 +266,6 @@
 		const BackupSelectionHash& getLastBackupSelectionRules() const;
 		void saveBackupSelectionRules( const BackupSelectionHash& selectionRules );
 
-        void saveLogDebugMessages(bool logDebugMessage);
-        bool getLogDebugMessages() const;
-
 		static const QString VERSION;
 
 	private:
@@ -326,8 +327,8 @@
 		static const QString SETTINGS_WINDOW_POSITION;
 		static const QString SETTINGS_DELETE_EXTRANEOUS_ITEMS;
 		static const QString SETTINGS_SHOW_HIDDEN_FILES_AND_FOLDERS;
+        static const QString SETTINGS_BANDWITH_LIMIT;
 
-
 		// [Reseller]
 		static const QString SETTINGS_GROUP_RESELLER;
 		static const QString SETTINGS_RESELLER_ADDRESS;
@@ -412,6 +413,7 @@
 		bool deleteExtraneousItems;
 		bool showHiddenFilesAndFolders;
 		bool compressedRsyncTraffic; // read only at the moment
+        int bandwidthLimit;
 		QSize windowSize;
 		QPoint windowPosition;
 

Modified: trunk/src/tools/abstract_rsync.hh
===================================================================
--- trunk/src/tools/abstract_rsync.hh	2012-09-14 19:18:38 UTC (rev 336)
+++ trunk/src/tools/abstract_rsync.hh	2012-09-14 19:22:17 UTC (rev 337)
@@ -58,12 +58,12 @@
 	 * @param errors a QString pointer for saving errors
 	 * @return a list of transfered items
 	 */
-	virtual QList< QPair<QString, AbstractRsync::ITEMIZE_CHANGE_TYPE> > upload( const BackupSelectionHash& includeRules, const QString& src, const QString& destination, bool setDeleteFlag, bool compress, QString* warnings, bool dry_run ) = 0;
-	virtual QList< QPair<QString, AbstractRsync::ITEMIZE_CHANGE_TYPE> > upload( const QStringList& items, const QString& source, const QString& destination, const QStringList& includePatternList, const QStringList& excludePatternList, bool setDeleteFlag, bool compress, QString* warnings, bool dry_run ) = 0;
+	virtual QList< QPair<QString, AbstractRsync::ITEMIZE_CHANGE_TYPE> > upload( const BackupSelectionHash& includeRules, const QString& src, const QString& destination, bool setDeleteFlag, bool compress, int bandwidthLimit, QString* warnings, bool dry_run ) = 0;
+	virtual QList< QPair<QString, AbstractRsync::ITEMIZE_CHANGE_TYPE> > upload( const QStringList& items, const QString& source, const QString& destination, const QStringList& includePatternList, const QStringList& excludePatternList, bool setDeleteFlag, bool compress, int bandwidthLimit, QString* warnings, bool dry_run ) = 0;
 
-	virtual long calculateUploadTransfer( const BackupSelectionHash includeRules, const QString& src, const QString& destination, bool setDeleteFlag, bool compress, QString* errors, QString* warnings ) = 0;
+	virtual long calculateUploadTransfer( const BackupSelectionHash includeRules, const QString& src, const QString& destination, bool setDeleteFlag, bool compress, int bandwidthLimit, QString* errors, QString* warnings ) = 0;
 
-	void upload( const QFileInfo& fileInfo, const QString& destination, bool bCompress, QString* warnings);
+	void upload( const QFileInfo& fileInfo, const QString& destination, bool bCompress, int bandwidthLimit, QString* warnings);
 
 	/**
 	 * Downloads a full backup of the given name
@@ -145,11 +145,11 @@
 {
 }
 
-inline void AbstractRsync::upload( const QFileInfo& fileInfo, const QString& destination, bool compress, QString* warnings )
+inline void AbstractRsync::upload( const QFileInfo& fileInfo, const QString& destination, bool compress, int bandwidthLimit, QString* warnings )
 {
 	QStringList fileNameList;
 	fileNameList << fileInfo.fileName();
-	upload(fileNameList, fileInfo.absolutePath(), destination, QStringList(), QStringList(), false, compress, warnings, false );
+	upload(fileNameList, fileInfo.absolutePath(), destination, QStringList(), QStringList(), false, compress, bandwidthLimit, warnings, false );
 }
 
 #endif

Modified: trunk/src/tools/rsync.cc
===================================================================
--- trunk/src/tools/rsync.cc	2012-09-14 19:18:38 UTC (rev 336)
+++ trunk/src/tools/rsync.cc	2012-09-14 19:22:17 UTC (rev 337)
@@ -39,20 +39,21 @@
 #include "utils/log_file_utils.hh"
 #include "utils/string_utils.hh"
 
-Rsync::Rsync() {
-	this->files_total = -1;
-	this->cur_n_files_done = 0;
-	this->lastUpdateTime = QDateTime::currentDateTime();
+Rsync::Rsync() :
+    progress_bytesRead(0),
+    progress_bytesWritten(0),
+    progress_trafficB_s(0),
+    files_total(-1),
+    cur_n_files_done(0),
+    lastUpdateTime(QDateTime::currentDateTime())
+{
+}
 
-	this->progress_trafficB_s = 0;
-	this->progress_bytesRead = 0;
-	this->progress_bytesWritten = 0;
+Rsync::~Rsync()
+{
 }
 
-Rsync::~Rsync() {}
-
-
-QList< QPair<QString, AbstractRsync::ITEMIZE_CHANGE_TYPE> > Rsync::upload( const BackupSelectionHash& includeRules, const QString& src, const QString& destination, bool setDeleteFlag, bool compress, QString* warnings, bool dry_run )
+QList< QPair<QString, AbstractRsync::ITEMIZE_CHANGE_TYPE> > Rsync::upload( const BackupSelectionHash& includeRules, const QString& src, const QString& destination, bool setDeleteFlag, bool compress, int bandwidthLimit, QString* warnings, bool dry_run )
 {
 	qDebug() << "Rsync::upload(" << includeRules << "," << src << "," << destination << "," << setDeleteFlag << "," << compress << "," << (warnings ? *warnings : "(no warnings)") << "," << dry_run << ")";
 	enum DryrunStates { DRY_RUN_START, DRY_RUN_COUNT_FILES, DRY_RUN_CALCULATE_SIZE, DRY_RUN_END };
@@ -81,6 +82,10 @@
 	{
 		arguments << "-z";
 	}
+
+    if (bandwidthLimit > 0)
+        arguments << QString("--bwlimit=%1").arg(bandwidthLimit);
+
 	arguments << source;
 	arguments << getValidDestinationPath( destination );
 	arguments << "--include-from=-";
@@ -227,7 +232,7 @@
 /**
  * deprecated
  */
-QList< QPair<QString, AbstractRsync::ITEMIZE_CHANGE_TYPE> > Rsync::upload( const QStringList& items, const QString& src, const QString& destination, const QStringList& includePatternList, const QStringList& excludePatternList, bool setDeleteFlag, bool compress, QString* warnings, bool dry_run )
+QList< QPair<QString, AbstractRsync::ITEMIZE_CHANGE_TYPE> > Rsync::upload( const QStringList& items, const QString& src, const QString& destination, const QStringList& includePatternList, const QStringList& excludePatternList, bool setDeleteFlag, bool compress, int bandwidthLimit, QString* warnings, bool dry_run )
 {
 	QString STATISTICS_FIRST_USED_LABEL = "Literal data:";
 	QString STATISTICS_FIRST_LABEL = "Number of files:";
@@ -251,6 +256,10 @@
 	{
 		arguments << "-z";
 	}
+
+    if (bandwidthLimit > 0)
+        arguments << QString("--bwlimit=%1").arg(bandwidthLimit);
+
 	arguments << source;
 	arguments << getValidDestinationPath( destination );
 
@@ -345,9 +354,9 @@
 }
 
 
-long Rsync::calculateUploadTransfer( const BackupSelectionHash includeRules, const QString& src, const QString& destination, bool setDeleteFlag, bool compress, QString* /* errors */, QString* warnings )
+long Rsync::calculateUploadTransfer( const BackupSelectionHash includeRules, const QString& src, const QString& destination, bool setDeleteFlag, bool compress, int bandwidthLimit, QString* /* errors */, QString* warnings )
 {
-	this->upload( includeRules, src, destination, setDeleteFlag, compress, warnings, true );
+	this->upload( includeRules, src, destination, setDeleteFlag, compress, bandwidthLimit, warnings, true );
 	return this->last_calculatedLiteralData;
 }
 
@@ -1061,7 +1070,7 @@
 	QString destination = settings->getServerUserName() + "@" + settings->getServerName() + ":" + StringUtils::quoteText(settings->getBackupRootFolder() + backup_prefix + "/" + settings->getBackupFolderName() + "/", "'");
 	Rsync rsync;
 	QString warnings;
-	rsync.upload( files, source, destination, QStringList(), QStringList(), false, false, &warnings, false );
+	rsync.upload( files, source, destination, QStringList(), QStringList(), false, false, 0, &warnings, false );
 	qDebug() << "warnings: " << warnings;
 }
 

Modified: trunk/src/tools/rsync.hh
===================================================================
--- trunk/src/tools/rsync.hh	2012-09-14 19:18:38 UTC (rev 336)
+++ trunk/src/tools/rsync.hh	2012-09-14 19:22:17 UTC (rev 337)
@@ -58,13 +58,13 @@
 	/**
 	 * @see AbstractRsync::upload( const QStringList& items, const QString& source, const QString& destination, const QString& includePattern, const QString& excludePattern, QString* errors )
 	 */
-	QList< QPair<QString, AbstractRsync::ITEMIZE_CHANGE_TYPE> > upload( const BackupSelectionHash& includeRules, const QString& src, const QString& destination, bool setDeleteFlag, bool compress, QString* warnings, bool dry_run );
-	QList< QPair<QString, AbstractRsync::ITEMIZE_CHANGE_TYPE> > upload( const QStringList& items, const QString& source, const QString& destination, const QStringList& includePatternList, const QStringList& excludePatternList, bool setDeleteFlag, bool bCompress, QString* warnings, bool dry_run );
+	QList< QPair<QString, AbstractRsync::ITEMIZE_CHANGE_TYPE> > upload( const BackupSelectionHash& includeRules, const QString& src, const QString& destination, bool setDeleteFlag, bool compress, int bandwidthLimit, QString* warnings, bool dry_run );
+	QList< QPair<QString, AbstractRsync::ITEMIZE_CHANGE_TYPE> > upload( const QStringList& items, const QString& source, const QString& destination, const QStringList& includePatternList, const QStringList& excludePatternList, bool setDeleteFlag, bool bCompress, int bandwidthLimit, QString* warnings, bool dry_run );
 
 	/**
 	 *
 	 */
-	long calculateUploadTransfer( const BackupSelectionHash includeRules, const QString& src, const QString& destination, bool setDeleteFlag, bool compress, QString* errors, QString* warnings );
+	long calculateUploadTransfer( const BackupSelectionHash includeRules, const QString& src, const QString& destination, bool setDeleteFlag, bool compress, int bandwidthLimit, QString* errors, QString* warnings );
 
 	/**
 	 * @see AbstractRsync::downloadFullBackup( const QString& backup_prefix, const QString& backupName, const QString& destination )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[336] trunk/src

From: <tiz...@us...> - 2012-09-14 19:18:48

Revision: 336
          http://sepiola.svn.sourceforge.net/sepiola/?rev=336&view=rev
Author:   tizianomueller
Date:     2012-09-14 19:18:38 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
Use forward declarations to reduce compilation time and impact on changes in tool_factory.hh

Modified Paths:
--------------
    trunk/src/model/backup_thread.cc
    trunk/src/model/main_model.cc
    trunk/src/model/restore_thread.cc
    trunk/src/tools/tool_factory.cc
    trunk/src/tools/tool_factory.hh

Modified: trunk/src/model/backup_thread.cc
===================================================================
--- trunk/src/model/backup_thread.cc	2012-09-14 19:15:20 UTC (rev 335)
+++ trunk/src/model/backup_thread.cc	2012-09-14 19:18:38 UTC (rev 336)
@@ -27,6 +27,8 @@
 #include "model/main_model.hh"
 #include "settings/settings.hh"
 #include "tools/tool_factory.hh"
+#include "tools/abstract_metadata.hh"
+#include "tools/abstract_rsync.hh"
 #include "tools/rsync.hh"
 #include "utils/file_system_utils.hh"
 #include "utils/log_file_utils.hh"

Modified: trunk/src/model/main_model.cc
===================================================================
--- trunk/src/model/main_model.cc	2012-09-14 19:15:20 UTC (rev 335)
+++ trunk/src/model/main_model.cc	2012-09-14 19:18:38 UTC (rev 336)
@@ -29,6 +29,8 @@
 #include "model/restore_thread.hh"
 #include "tools/abstract_rsync.hh"
 #include "tools/abstract_metadata.hh"
+#include "tools/abstract_ssh.hh"
+#include "tools/abstract_scheduler.hh"
 #include "tools/rsync.hh"
 #include "tools/posix_acl.hh"
 #include "tools/tool_factory.hh"

Modified: trunk/src/model/restore_thread.cc
===================================================================
--- trunk/src/model/restore_thread.cc	2012-09-14 19:15:20 UTC (rev 335)
+++ trunk/src/model/restore_thread.cc	2012-09-14 19:18:38 UTC (rev 336)
@@ -21,6 +21,7 @@
 #include "model/restore_thread.hh"
 #include "settings/settings.hh"
 #include "tools/tool_factory.hh"
+#include "tools/abstract_metadata.hh"
 #include "utils/file_system_utils.hh"
 
 RestoreThread::RestoreThread( const QString& backup_prefix, const QString& backupName, const BackupSelectionHash& selectionRules, const QString& destination )

Modified: trunk/src/tools/tool_factory.cc
===================================================================
--- trunk/src/tools/tool_factory.cc	2012-09-14 19:15:20 UTC (rev 335)
+++ trunk/src/tools/tool_factory.cc	2012-09-14 19:18:38 UTC (rev 336)
@@ -18,6 +18,12 @@
 
 #include <QtCore/QtGlobal>
 
+#include "settings/settings.hh"
+#include "tools/abstract_metadata.hh"
+#include "tools/abstract_rsync.hh"
+#include "tools/abstract_ssh.hh"
+#include "tools/abstract_scheduler.hh"
+
 #ifdef Q_OS_WIN32
 #include "tools/at.hh"
 #include "tools/schtasks.hh"

Modified: trunk/src/tools/tool_factory.hh
===================================================================
--- trunk/src/tools/tool_factory.hh	2012-09-14 19:15:20 UTC (rev 335)
+++ trunk/src/tools/tool_factory.hh	2012-09-14 19:18:38 UTC (rev 336)
@@ -21,11 +21,10 @@
 
 #include <memory>
 
-#include "settings/settings.hh"
-#include "tools/abstract_metadata.hh"
-#include "tools/abstract_rsync.hh"
-#include "tools/abstract_ssh.hh"
-#include "tools/abstract_scheduler.hh"
+class AbstractMetadata;
+class AbstractRsync;
+class AbstractSsh;
+class AbstractScheduler;
 
 using std::auto_ptr;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[335] trunk/src/i18n/app_de.ts

From: <tiz...@us...> - 2012-09-14 19:15:26

Revision: 335
          http://sepiola.svn.sourceforge.net/sepiola/?rev=335&view=rev
Author:   tizianomueller
Date:     2012-09-14 19:15:20 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
Revert translation for CSS/HTML attributes

Resulted in errors like "Unknown property Hintergrundfarbe" when using the
german translation and the menu bar was missing the white background.

Modified Paths:
--------------
    trunk/src/i18n/app_de.ts

Modified: trunk/src/i18n/app_de.ts
===================================================================
--- trunk/src/i18n/app_de.ts	2012-09-14 19:12:58 UTC (rev 334)
+++ trunk/src/i18n/app_de.ts	2012-09-14 19:15:20 UTC (rev 335)
@@ -462,7 +462,8 @@
     <message>
         <location filename="../gui/main_window.ui" line="47"/>
         <source>background-color: white</source>
-        <translation>Hintergrundfarbe: weiss</translation>
+        <translatorcomment>do not translate</translatorcomment>
+        <translation>background-color: white</translation>
     </message>
     <message>
         <location filename="../gui/main_window.ui" line="105"/>
@@ -1024,17 +1025,20 @@
     <message>
         <location filename="../model/backup_task.cc" line="62"/>
         <source>&lt;font color=&quot;green&quot;&gt;Successful&lt;/font&gt;</source>
-        <translation>&lt;font color=&quot;grün&quot;&gt;Erfolgreich&lt;/font&gt;</translation>
+        <translatorcomment>do not translate the color name!</translatorcomment>
+        <translation>&lt;font color=&quot;green&quot;&gt;Erfolgreich&lt;/font&gt;</translation>
     </message>
     <message>
         <location filename="../model/backup_task.cc" line="63"/>
         <source>&lt;font color=&quot;orange&quot;&gt;Warnings&lt;/font&gt;</source>
+        <translatorcomment>do not translate the color name!</translatorcomment>
         <translation>&lt;font color=&quot;orange&quot;&gt;Warnungen&lt;/font&gt;</translation>
     </message>
     <message>
         <location filename="../model/backup_task.cc" line="64"/>
         <source>&lt;font color=&quot;red&quot;&gt;Failed&lt;/font&gt;</source>
-        <translation>&lt;font color=&quot;rot&quot;&gt;Fehlgeschlagen&lt;/font&gt;</translation>
+        <translatorcomment>do not translate the color name!</translatorcomment>
+        <translation>&lt;font color=&quot;red&quot;&gt;Fehlgeschlagen&lt;/font&gt;</translation>
     </message>
     <message>
         <location filename="../model/backup_task.cc" line="65"/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[334] trunk/src/settings

From: <tiz...@us...> - 2012-09-14 19:13:04

Revision: 334
          http://sepiola.svn.sourceforge.net/sepiola/?rev=334&view=rev
Author:   tizianomueller
Date:     2012-09-14 19:12:58 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
Move executable suffix const to Platform

- Move const variable for executable suffix to Platform namespace
- Create an array instead of a pointer+data which also solves warnings about
  unused variables.

Modified Paths:
--------------
    trunk/src/settings/platform.hh
    trunk/src/settings/settings.cc
    trunk/src/settings/settings.hh

Modified: trunk/src/settings/platform.hh
===================================================================
--- trunk/src/settings/platform.hh	2012-09-13 16:52:38 UTC (rev 333)
+++ trunk/src/settings/platform.hh	2012-09-14 19:12:58 UTC (rev 334)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007-2011 stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License
@@ -24,9 +24,11 @@
 namespace Platform {
 
 #ifdef Q_OS_WIN32
-    static const char* EOL_CHARACTER = "\r\n";
+    static const char EOL_CHARACTER[] = "\r\n";
+    static const char EXECUTABLE_SUFFIX[] = ".exe";
 #else
-    static const char* EOL_CHARACTER = "\n";
+    static const char EOL_CHARACTER[] = "\n";
+    static const char EXECUTABLE_SUFFIX[] = "";
 #endif
 
 }

Modified: trunk/src/settings/settings.cc
===================================================================
--- trunk/src/settings/settings.cc	2012-09-13 16:52:38 UTC (rev 333)
+++ trunk/src/settings/settings.cc	2012-09-14 19:12:58 UTC (rev 334)
@@ -26,6 +26,7 @@
 #include <cstdio>
 #include <QtCore/QTranslator>
 
+#include "settings/platform.hh"
 #include "settings/settings.hh"
 #include "utils/file_system_utils.hh"
 #include "utils/string_utils.hh"
@@ -35,13 +36,6 @@
 
 #include "config.h"
 
-#ifdef Q_OS_WIN32
-const QString Settings::SETTINGS_EXECUTABLE_EXTENSION = ".exe";
-#else
-const QString Settings::SETTINGS_EXECUTABLE_EXTENSION = "";
-#endif
-
-
 const bool Settings::SHOW_PROGRESS = false;
 
 const QString Settings::EXECUTABLE_NAME = QString( SSBACKUP_EXECUTABLE_NAME );
@@ -249,13 +243,13 @@
 
 	// [Executables]
 	applicationSettings->beginGroup( SETTINGS_GROUP_EXECUTABLES );
-	thisApplication = StringUtils::encaps( EXECUTABLE_NAME, "", SETTINGS_EXECUTABLE_EXTENSION );
-	rsync = StringUtils::encaps( applicationSettings->value( SETTINGS_RSYNC ).toString(), "", SETTINGS_EXECUTABLE_EXTENSION );
-	plink = StringUtils::encaps( applicationSettings->value( SETTINGS_PLINK ).toString(), "", SETTINGS_EXECUTABLE_EXTENSION );
-	ssh = StringUtils::encaps( applicationSettings->value( SETTINGS_SSH ).toString(), "", SETTINGS_EXECUTABLE_EXTENSION );
-	getfacl = StringUtils::encaps( applicationSettings->value( SETTINGS_GETFACL ).toString(), "", SETTINGS_EXECUTABLE_EXTENSION );
-	setfacl = StringUtils::encaps( applicationSettings->value( SETTINGS_SETFACL ).toString(), "", SETTINGS_EXECUTABLE_EXTENSION );
-	setacl = StringUtils::encaps( applicationSettings->value( SETTINGS_SETACL ).toString(), "", SETTINGS_EXECUTABLE_EXTENSION );
+	thisApplication = StringUtils::encaps( EXECUTABLE_NAME, "", Platform::EXECUTABLE_SUFFIX );
+	rsync = StringUtils::encaps( applicationSettings->value( SETTINGS_RSYNC ).toString(), "", Platform::EXECUTABLE_SUFFIX );
+	plink = StringUtils::encaps( applicationSettings->value( SETTINGS_PLINK ).toString(), "", Platform::EXECUTABLE_SUFFIX );
+	ssh = StringUtils::encaps( applicationSettings->value( SETTINGS_SSH ).toString(), "", Platform::EXECUTABLE_SUFFIX );
+	getfacl = StringUtils::encaps( applicationSettings->value( SETTINGS_GETFACL ).toString(), "", Platform::EXECUTABLE_SUFFIX );
+	setfacl = StringUtils::encaps( applicationSettings->value( SETTINGS_SETFACL ).toString(), "", Platform::EXECUTABLE_SUFFIX );
+	setacl = StringUtils::encaps( applicationSettings->value( SETTINGS_SETACL ).toString(), "", Platform::EXECUTABLE_SUFFIX );
 	applicationSettings->endGroup();
 
 	// [Reseller]

Modified: trunk/src/settings/settings.hh
===================================================================
--- trunk/src/settings/settings.hh	2012-09-13 16:52:38 UTC (rev 333)
+++ trunk/src/settings/settings.hh	2012-09-14 19:12:58 UTC (rev 334)
@@ -348,7 +348,6 @@
 
 
 		// Settings given at build-time or by platform
-		static const QString SETTINGS_EXECUTABLE_EXTENSION;
 		static const bool IS_RESELLER;
 
 		static Settings* instance;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[333] trunk/src/tools/tool_factory.cc

From: <tiz...@us...> - 2012-09-13 16:52:44

Revision: 333
          http://sepiola.svn.sourceforge.net/sepiola/?rev=333&view=rev
Author:   tizianomueller
Date:     2012-09-13 16:52:38 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
Fix regression which prevents correct restore on Linux.

Modified Paths:
--------------
    trunk/src/tools/tool_factory.cc

Modified: trunk/src/tools/tool_factory.cc
===================================================================
--- trunk/src/tools/tool_factory.cc	2012-09-13 16:22:03 UTC (rev 332)
+++ trunk/src/tools/tool_factory.cc	2012-09-13 16:52:38 UTC (rev 333)
@@ -53,7 +53,7 @@
 #elif defined Q_OS_WIN32
 	return auto_ptr< AbstractMetadata >( new SetAcl(Settings::getInstance()->getSetAclName()) );
 #else
-	return auto_ptr< AbstractMetadata >( new PosixAcl(Settings::getInstance()->getGetfaclName(), Settings::getInstance()->getGetfaclName()) );
+	return auto_ptr< AbstractMetadata >( new PosixAcl(Settings::getInstance()->getGetfaclName(), Settings::getInstance()->getSetfaclName()) );
 #endif
 
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[332] trunk/src

From: <tiz...@us...> - 2012-09-13 16:22:16

Revision: 332
          http://sepiola.svn.sourceforge.net/sepiola/?rev=332&view=rev
Author:   tizianomueller
Date:     2012-09-13 16:22:03 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
Copyright and header fix.

* Add missing headers
* Fix incorrect headers
* Update copyright date to reflect latest change

Modified Paths:
--------------
    trunk/src/cli/cli_manager.cc
    trunk/src/cli/cli_manager.hh
    trunk/src/exception/abort_exception.hh
    trunk/src/exception/exception.hh
    trunk/src/exception/login_exception.hh
    trunk/src/exception/process_exception.hh
    trunk/src/exception/runtime_exception.hh
    trunk/src/gui/about_dialog.cc
    trunk/src/gui/about_dialog.hh
    trunk/src/gui/backup_form.cc
    trunk/src/gui/backup_form.hh
    trunk/src/gui/logfile_form.cc
    trunk/src/gui/logfile_form.hh
    trunk/src/gui/main_window.cc
    trunk/src/gui/main_window.hh
    trunk/src/gui/output_dialog.cc
    trunk/src/gui/output_dialog.hh
    trunk/src/gui/overview_form.cc
    trunk/src/gui/overview_form.hh
    trunk/src/gui/password_dialog.cc
    trunk/src/gui/password_dialog.hh
    trunk/src/gui/pattern_dialog.cc
    trunk/src/gui/pattern_dialog.hh
    trunk/src/gui/restore_form.cc
    trunk/src/gui/restore_form.hh
    trunk/src/gui/settings_form.cc
    trunk/src/gui/settings_form.hh
    trunk/src/gui/text_input_dialog.cc
    trunk/src/gui/text_input_dialog.hh
    trunk/src/gui/traffic_progress_dialog.cc
    trunk/src/gui/traffic_progress_dialog.hh
    trunk/src/main.cc
    trunk/src/model/backup_task.cc
    trunk/src/model/backup_task.hh
    trunk/src/model/backup_thread.cc
    trunk/src/model/backup_thread.hh
    trunk/src/model/dir_tree_item.cc
    trunk/src/model/dir_tree_item.hh
    trunk/src/model/local_dir_model.cc
    trunk/src/model/local_dir_model.hh
    trunk/src/model/main_model.cc
    trunk/src/model/main_model.hh
    trunk/src/model/remote_dir_model.cc
    trunk/src/model/remote_dir_model.hh
    trunk/src/model/restore_name.cc
    trunk/src/model/restore_name.hh
    trunk/src/model/restore_thread.cc
    trunk/src/model/restore_thread.hh
    trunk/src/model/scheduled_task.cc
    trunk/src/model/scheduled_task.hh
    trunk/src/settings/platform.hh
    trunk/src/settings/settings.cc
    trunk/src/settings/settings.hh
    trunk/src/test/test_host_file_utils.cc
    trunk/src/test/test_host_file_utils.hh
    trunk/src/test/test_manager.cc
    trunk/src/test/test_manager.hh
    trunk/src/test/test_posix_acl.cc
    trunk/src/test/test_posix_acl.hh
    trunk/src/tools/abstract_informing_process.hh
    trunk/src/tools/abstract_metadata.hh
    trunk/src/tools/abstract_rsync.hh
    trunk/src/tools/abstract_scheduler.hh
    trunk/src/tools/abstract_ssh.hh
    trunk/src/tools/at.cc
    trunk/src/tools/at.hh
    trunk/src/tools/crontab.cc
    trunk/src/tools/crontab.hh
    trunk/src/tools/extended_qprocess.hh
    trunk/src/tools/plink.cc
    trunk/src/tools/plink.hh
    trunk/src/tools/posix_acl.cc
    trunk/src/tools/posix_acl.hh
    trunk/src/tools/process.cc
    trunk/src/tools/process.hh
    trunk/src/tools/rsync.cc
    trunk/src/tools/rsync.hh
    trunk/src/tools/schtasks.cc
    trunk/src/tools/schtasks.hh
    trunk/src/tools/set_acl.cc
    trunk/src/tools/set_acl.hh
    trunk/src/tools/tool_factory.cc
    trunk/src/tools/tool_factory.hh
    trunk/src/tools/unix_permissions.cc
    trunk/src/tools/unix_permissions.hh
    trunk/src/utils/const_utils.hh
    trunk/src/utils/datatypes.hh
    trunk/src/utils/datetime_utils.hh
    trunk/src/utils/debug_timer.hh
    trunk/src/utils/extended_file.cc
    trunk/src/utils/extended_file.hh
    trunk/src/utils/file_system_utils.cc
    trunk/src/utils/file_system_utils.hh
    trunk/src/utils/host_file_utils.cc
    trunk/src/utils/log_file_utils.cc
    trunk/src/utils/log_file_utils.hh
    trunk/src/utils/progress_task.cc
    trunk/src/utils/progress_task.hh
    trunk/src/utils/string_utils.cc
    trunk/src/utils/string_utils.hh
    trunk/src/utils/unicode_text_stream.hh

Modified: trunk/src/cli/cli_manager.cc
===================================================================
--- trunk/src/cli/cli_manager.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/cli/cli_manager.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/cli/cli_manager.hh
===================================================================
--- trunk/src/cli/cli_manager.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/cli/cli_manager.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/exception/abort_exception.hh
===================================================================
--- trunk/src/exception/abort_exception.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/exception/abort_exception.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/exception/exception.hh
===================================================================
--- trunk/src/exception/exception.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/exception/exception.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/exception/login_exception.hh
===================================================================
--- trunk/src/exception/login_exception.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/exception/login_exception.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/exception/process_exception.hh
===================================================================
--- trunk/src/exception/process_exception.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/exception/process_exception.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/exception/runtime_exception.hh
===================================================================
--- trunk/src/exception/runtime_exception.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/exception/runtime_exception.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/about_dialog.cc
===================================================================
--- trunk/src/gui/about_dialog.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/about_dialog.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/about_dialog.hh
===================================================================
--- trunk/src/gui/about_dialog.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/about_dialog.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/backup_form.cc
===================================================================
--- trunk/src/gui/backup_form.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/backup_form.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/backup_form.hh
===================================================================
--- trunk/src/gui/backup_form.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/backup_form.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/logfile_form.cc
===================================================================
--- trunk/src/gui/logfile_form.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/logfile_form.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/logfile_form.hh
===================================================================
--- trunk/src/gui/logfile_form.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/logfile_form.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/main_window.cc
===================================================================
--- trunk/src/gui/main_window.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/main_window.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008 stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License
@@ -8,12 +8,12 @@
 #|
 #| This program is distributed in the hope that it will be useful,
 #| but WITHOUT ANY WARRANTY; without even the implied warranty of
-#| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #| GNU General Public License for more details.
 #|
 #| You should have received a copy of the GNU General Public License
 #| along with this program; if not, write to the Free Software
-#| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 #include <QDebug>

Modified: trunk/src/gui/main_window.hh
===================================================================
--- trunk/src/gui/main_window.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/main_window.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/output_dialog.cc
===================================================================
--- trunk/src/gui/output_dialog.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/output_dialog.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/output_dialog.hh
===================================================================
--- trunk/src/gui/output_dialog.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/output_dialog.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/overview_form.cc
===================================================================
--- trunk/src/gui/overview_form.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/overview_form.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/overview_form.hh
===================================================================
--- trunk/src/gui/overview_form.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/overview_form.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/password_dialog.cc
===================================================================
--- trunk/src/gui/password_dialog.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/password_dialog.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/password_dialog.hh
===================================================================
--- trunk/src/gui/password_dialog.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/password_dialog.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/pattern_dialog.cc
===================================================================
--- trunk/src/gui/pattern_dialog.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/pattern_dialog.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/pattern_dialog.hh
===================================================================
--- trunk/src/gui/pattern_dialog.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/pattern_dialog.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/restore_form.cc
===================================================================
--- trunk/src/gui/restore_form.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/restore_form.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/restore_form.hh
===================================================================
--- trunk/src/gui/restore_form.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/restore_form.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/settings_form.cc
===================================================================
--- trunk/src/gui/settings_form.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/settings_form.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008 stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License
@@ -8,12 +8,12 @@
 #|
 #| This program is distributed in the hope that it will be useful,
 #| but WITHOUT ANY WARRANTY; without even the implied warranty of
-#| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #| GNU General Public License for more details.
 #|
 #| You should have received a copy of the GNU General Public License
 #| along with this program; if not, write to the Free Software
-#| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 #include <QDebug>

Modified: trunk/src/gui/settings_form.hh
===================================================================
--- trunk/src/gui/settings_form.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/settings_form.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/text_input_dialog.cc
===================================================================
--- trunk/src/gui/text_input_dialog.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/text_input_dialog.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/text_input_dialog.hh
===================================================================
--- trunk/src/gui/text_input_dialog.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/text_input_dialog.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/traffic_progress_dialog.cc
===================================================================
--- trunk/src/gui/traffic_progress_dialog.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/traffic_progress_dialog.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/gui/traffic_progress_dialog.hh
===================================================================
--- trunk/src/gui/traffic_progress_dialog.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/gui/traffic_progress_dialog.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/main.cc
===================================================================
--- trunk/src/main.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/main.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/model/backup_task.cc
===================================================================
--- trunk/src/model/backup_task.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/model/backup_task.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,20 +1,20 @@
 /*
- #| sepiola - Open Source Online Backup Client
- #| Copyright (C) 2007, 2008  stepping stone GmbH
- #|
- #| This program is free software; you can redistribute it and/or
- #| modify it under the terms of the GNU General Public License
- #| Version 2 as published by the Free Software Foundation.
- #|
- #| This program is distributed in the hope that it will be useful,
- #| but WITHOUT ANY WARRANTY; without even the implied warranty of
- #| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- #| GNU General Public License for more details.
- #|
- #| You should have received a copy of the GNU General Public License
- #| along with this program; if not, write to the Free Software
- #| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
+#| sepiola - Open Source Online Backup Client
+#| Copyright (C) 2007-2011 stepping stone GmbH
+#|
+#| This program is free software; you can redistribute it and/or
+#| modify it under the terms of the GNU General Public License
+#| Version 2 as published by the Free Software Foundation.
+#|
+#| This program is distributed in the hope that it will be useful,
+#| but WITHOUT ANY WARRANTY; without even the implied warranty of
+#| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#| GNU General Public License for more details.
+#|
+#| You should have received a copy of the GNU General Public License
+#| along with this program; if not, write to the Free Software
+#| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 #include <QDebug>
 #include <QDateTime>

Modified: trunk/src/model/backup_task.hh
===================================================================
--- trunk/src/model/backup_task.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/model/backup_task.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,20 +1,20 @@
 /*
- #| sepiola - Open Source Online Backup Client
- #| Copyright (C) 2007, 2008  stepping stone GmbH
- #|
- #| This program is free software; you can redistribute it and/or
- #| modify it under the terms of the GNU General Public License
- #| Version 2 as published by the Free Software Foundation.
- #|
- #| This program is distributed in the hope that it will be useful,
- #| but WITHOUT ANY WARRANTY; without even the implied warranty of
- #| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- #| GNU General Public License for more details.
- #|
- #| You should have received a copy of the GNU General Public License
- #| along with this program; if not, write to the Free Software
- #| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
+#| sepiola - Open Source Online Backup Client
+#| Copyright (C) 2007-2011 stepping stone GmbH
+#|
+#| This program is free software; you can redistribute it and/or
+#| modify it under the terms of the GNU General Public License
+#| Version 2 as published by the Free Software Foundation.
+#|
+#| This program is distributed in the hope that it will be useful,
+#| but WITHOUT ANY WARRANTY; without even the implied warranty of
+#| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#| GNU General Public License for more details.
+#|
+#| You should have received a copy of the GNU General Public License
+#| along with this program; if not, write to the Free Software
+#| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 #ifndef BACKUPTASK_H_
 #define BACKUPTASK_H_

Modified: trunk/src/model/backup_thread.cc
===================================================================
--- trunk/src/model/backup_thread.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/model/backup_thread.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/model/backup_thread.hh
===================================================================
--- trunk/src/model/backup_thread.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/model/backup_thread.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/model/dir_tree_item.cc
===================================================================
--- trunk/src/model/dir_tree_item.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/model/dir_tree_item.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/model/dir_tree_item.hh
===================================================================
--- trunk/src/model/dir_tree_item.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/model/dir_tree_item.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/model/local_dir_model.cc
===================================================================
--- trunk/src/model/local_dir_model.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/model/local_dir_model.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/model/local_dir_model.hh
===================================================================
--- trunk/src/model/local_dir_model.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/model/local_dir_model.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/model/main_model.cc
===================================================================
--- trunk/src/model/main_model.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/model/main_model.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/model/main_model.hh
===================================================================
--- trunk/src/model/main_model.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/model/main_model.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/model/remote_dir_model.cc
===================================================================
--- trunk/src/model/remote_dir_model.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/model/remote_dir_model.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/model/remote_dir_model.hh
===================================================================
--- trunk/src/model/remote_dir_model.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/model/remote_dir_model.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/model/restore_name.cc
===================================================================
--- trunk/src/model/restore_name.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/model/restore_name.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/model/restore_name.hh
===================================================================
--- trunk/src/model/restore_name.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/model/restore_name.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/model/restore_thread.cc
===================================================================
--- trunk/src/model/restore_thread.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/model/restore_thread.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/model/restore_thread.hh
===================================================================
--- trunk/src/model/restore_thread.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/model/restore_thread.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/model/scheduled_task.cc
===================================================================
--- trunk/src/model/scheduled_task.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/model/scheduled_task.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,20 +1,20 @@
 /*
- #| sepiola - Open Source Online Backup Client
- #| Copyright (C) 2007, 2008  stepping stone GmbH
- #|
- #| This program is free software; you can redistribute it and/or
- #| modify it under the terms of the GNU General Public License
- #| Version 2 as published by the Free Software Foundation.
- #|
- #| This program is distributed in the hope that it will be useful,
- #| but WITHOUT ANY WARRANTY; without even the implied warranty of
- #| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- #| GNU General Public License for more details.
- #|
- #| You should have received a copy of the GNU General Public License
- #| along with this program; if not, write to the Free Software
- #| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
+#| sepiola - Open Source Online Backup Client
+#| Copyright (C) 2007-2012 stepping stone GmbH
+#|
+#| This program is free software; you can redistribute it and/or
+#| modify it under the terms of the GNU General Public License
+#| Version 2 as published by the Free Software Foundation.
+#|
+#| This program is distributed in the hope that it will be useful,
+#| but WITHOUT ANY WARRANTY; without even the implied warranty of
+#| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#| GNU General Public License for more details.
+#|
+#| You should have received a copy of the GNU General Public License
+#| along with this program; if not, write to the Free Software
+#| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 #include <QDebug>
 #include <QtAlgorithms>

Modified: trunk/src/model/scheduled_task.hh
===================================================================
--- trunk/src/model/scheduled_task.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/model/scheduled_task.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,20 +1,20 @@
 /*
- #| sepiola - Open Source Online Backup Client
- #| Copyright (C) 2007, 2008  stepping stone GmbH
- #|
- #| This program is free software; you can redistribute it and/or
- #| modify it under the terms of the GNU General Public License
- #| Version 2 as published by the Free Software Foundation.
- #|
- #| This program is distributed in the hope that it will be useful,
- #| but WITHOUT ANY WARRANTY; without even the implied warranty of
- #| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- #| GNU General Public License for more details.
- #|
- #| You should have received a copy of the GNU General Public License
- #| along with this program; if not, write to the Free Software
- #| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
+#| sepiola - Open Source Online Backup Client
+#| Copyright (C) 2007-2011 stepping stone GmbH
+#|
+#| This program is free software; you can redistribute it and/or
+#| modify it under the terms of the GNU General Public License
+#| Version 2 as published by the Free Software Foundation.
+#|
+#| This program is distributed in the hope that it will be useful,
+#| but WITHOUT ANY WARRANTY; without even the implied warranty of
+#| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#| GNU General Public License for more details.
+#|
+#| You should have received a copy of the GNU General Public License
+#| along with this program; if not, write to the Free Software
+#| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 #ifndef SCHEDULEDTASK_H_
 #define SCHEDULEDTASK_H_

Modified: trunk/src/settings/platform.hh
===================================================================
--- trunk/src/settings/platform.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/settings/platform.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/settings/settings.cc
===================================================================
--- trunk/src/settings/settings.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/settings/settings.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/settings/settings.hh
===================================================================
--- trunk/src/settings/settings.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/settings/settings.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/test/test_host_file_utils.cc
===================================================================
--- trunk/src/test/test_host_file_utils.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/test/test_host_file_utils.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,11 +1,20 @@
-/* vim: set sw=4 sts=4 ft=cpp et foldmethod=syntax : */
-
 /*
- * Copyright (c) 2012 Tiziano Müller <tm...@de...>
- *
- *
- *
- */
+#| sepiola - Open Source Online Backup Client
+#| Copyright (C) 2012 stepping stone GmbH
+#|
+#| This program is free software; you can redistribute it and/or
+#| modify it under the terms of the GNU General Public License
+#| Version 2 as published by the Free Software Foundation.
+#|
+#| This program is distributed in the hope that it will be useful,
+#| but WITHOUT ANY WARRANTY; without even the implied warranty of
+#| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#| GNU General Public License for more details.
+#|
+#| You should have received a copy of the GNU General Public License
+#| along with this program; if not, write to the Free Software
+#| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 #include "test_host_file_utils.hh"
 

Modified: trunk/src/test/test_host_file_utils.hh
===================================================================
--- trunk/src/test/test_host_file_utils.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/test/test_host_file_utils.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,11 +1,20 @@
-/* vim: set sw=4 sts=4 ft=cpp et foldmethod=syntax : */
-
 /*
- * Copyright (c) 2012 Tiziano Müller <tm...@de...>
- *
- *
- *
- */
+#| sepiola - Open Source Online Backup Client
+#| Copyright (C) 2012 stepping stone GmbH
+#|
+#| This program is free software; you can redistribute it and/or
+#| modify it under the terms of the GNU General Public License
+#| Version 2 as published by the Free Software Foundation.
+#|
+#| This program is distributed in the hope that it will be useful,
+#| but WITHOUT ANY WARRANTY; without even the implied warranty of
+#| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#| GNU General Public License for more details.
+#|
+#| You should have received a copy of the GNU General Public License
+#| along with this program; if not, write to the Free Software
+#| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 #ifndef TEST_HOST_FILE_UTILS_HH
 #define TEST_HOST_FILE_UTILS_HH

Modified: trunk/src/test/test_manager.cc
===================================================================
--- trunk/src/test/test_manager.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/test/test_manager.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/test/test_manager.hh
===================================================================
--- trunk/src/test/test_manager.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/test/test_manager.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/test/test_posix_acl.cc
===================================================================
--- trunk/src/test/test_posix_acl.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/test/test_posix_acl.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,11 +1,20 @@
-/* vim: set sw=4 sts=4 ft=cpp et foldmethod=syntax : */
-
 /*
- * Copyright (c) 2011 Tiziano Müller <tm...@de...>
- *
- *
- *
- */
+#| sepiola - Open Source Online Backup Client
+#| Copyright (C) 2012 stepping stone GmbH
+#|
+#| This program is free software; you can redistribute it and/or
+#| modify it under the terms of the GNU General Public License
+#| Version 2 as published by the Free Software Foundation.
+#|
+#| This program is distributed in the hope that it will be useful,
+#| but WITHOUT ANY WARRANTY; without even the implied warranty of
+#| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#| GNU General Public License for more details.
+#|
+#| You should have received a copy of the GNU General Public License
+#| along with this program; if not, write to the Free Software
+#| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 #include "test_posix_acl.hh"
 

Modified: trunk/src/test/test_posix_acl.hh
===================================================================
--- trunk/src/test/test_posix_acl.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/test/test_posix_acl.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,11 +1,20 @@
-/* vim: set sw=4 sts=4 ft=cpp et foldmethod=syntax : */
-
 /*
- * Copyright (c) 2011 Tiziano Müller <tm...@de...>
- *
- *
- *
- */
+#| sepiola - Open Source Online Backup Client
+#| Copyright (C) 2012 stepping stone GmbH
+#|
+#| This program is free software; you can redistribute it and/or
+#| modify it under the terms of the GNU General Public License
+#| Version 2 as published by the Free Software Foundation.
+#|
+#| This program is distributed in the hope that it will be useful,
+#| but WITHOUT ANY WARRANTY; without even the implied warranty of
+#| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#| GNU General Public License for more details.
+#|
+#| You should have received a copy of the GNU General Public License
+#| along with this program; if not, write to the Free Software
+#| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 #ifndef TEST_POSIX_ACL_H
 #define TEST_POSIX_ACL_H

Modified: trunk/src/tools/abstract_informing_process.hh
===================================================================
--- trunk/src/tools/abstract_informing_process.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/abstract_informing_process.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2009 stepping stone GmbH
+#| Copyright (C) 2009-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/abstract_metadata.hh
===================================================================
--- trunk/src/tools/abstract_metadata.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/abstract_metadata.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/abstract_rsync.hh
===================================================================
--- trunk/src/tools/abstract_rsync.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/abstract_rsync.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/abstract_scheduler.hh
===================================================================
--- trunk/src/tools/abstract_scheduler.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/abstract_scheduler.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/abstract_ssh.hh
===================================================================
--- trunk/src/tools/abstract_ssh.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/abstract_ssh.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/at.cc
===================================================================
--- trunk/src/tools/at.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/at.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/at.hh
===================================================================
--- trunk/src/tools/at.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/at.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/crontab.cc
===================================================================
--- trunk/src/tools/crontab.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/crontab.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/crontab.hh
===================================================================
--- trunk/src/tools/crontab.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/crontab.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/extended_qprocess.hh
===================================================================
--- trunk/src/tools/extended_qprocess.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/extended_qprocess.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,3 +1,21 @@
+/*
+#| sepiola - Open Source Online Backup Client
+#| Copyright (C) 2010-2011 stepping stone GmbH
+#|
+#| This program is free software; you can redistribute it and/or
+#| modify it under the terms of the GNU General Public License
+#| Version 2 as published by the Free Software Foundation.
+#|
+#| This program is distributed in the hope that it will be useful,
+#| but WITHOUT ANY WARRANTY; without even the implied warranty of
+#| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#| GNU General Public License for more details.
+#|
+#| You should have received a copy of the GNU General Public License
+#| along with this program; if not, write to the Free Software
+#| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 #ifndef EXTENDED_QPROCESS_HH
 #define EXTENDED_QPROCESS_HH
 

Modified: trunk/src/tools/plink.cc
===================================================================
--- trunk/src/tools/plink.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/plink.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/plink.hh
===================================================================
--- trunk/src/tools/plink.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/plink.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/posix_acl.cc
===================================================================
--- trunk/src/tools/posix_acl.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/posix_acl.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/posix_acl.hh
===================================================================
--- trunk/src/tools/posix_acl.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/posix_acl.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/process.cc
===================================================================
--- trunk/src/tools/process.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/process.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/process.hh
===================================================================
--- trunk/src/tools/process.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/process.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/rsync.cc
===================================================================
--- trunk/src/tools/rsync.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/rsync.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/rsync.hh
===================================================================
--- trunk/src/tools/rsync.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/rsync.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/schtasks.cc
===================================================================
--- trunk/src/tools/schtasks.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/schtasks.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/schtasks.hh
===================================================================
--- trunk/src/tools/schtasks.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/schtasks.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/set_acl.cc
===================================================================
--- trunk/src/tools/set_acl.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/set_acl.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/set_acl.hh
===================================================================
--- trunk/src/tools/set_acl.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/set_acl.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/tool_factory.cc
===================================================================
--- trunk/src/tools/tool_factory.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/tool_factory.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/tool_factory.hh
===================================================================
--- trunk/src/tools/tool_factory.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/tool_factory.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2011 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/unix_permissions.cc
===================================================================
--- trunk/src/tools/unix_permissions.cc	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/unix_permissions.cc	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/tools/unix_permissions.hh
===================================================================
--- trunk/src/tools/unix_permissions.hh	2012-09-06 08:41:04 UTC (rev 331)
+++ trunk/src/tools/unix_permissions.hh	2012-09-13 16:22:03 UTC (rev 332)
@@ -1,6 +1,6 @@
 /*
 #| sepiola - Open Source Online Backup Client
-#| Copyright (C) 2007, 2008  stepping stone GmbH
+#| Copyright (C) 2007-2012 stepping stone GmbH
 #|
 #| This program is free software; you can redistribute it and/or
 #| modify it under the terms of the GNU General Public License

Modified: trunk/src/utils/const_utils.hh
===================================================================
--- trunk/src/utils/const_utils.hh	2012-09-06 08...
 
[truncated message content]

[Sepiola-commits] SF.net SVN: sepiola:[331] trunk/CMakeLists.txt

From: <tiz...@us...> - 2012-09-06 08:41:15

Revision: 331
          http://sepiola.svn.sourceforge.net/sepiola/?rev=331&view=rev
Author:   tizianomueller
Date:     2012-09-06 08:41:04 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
Bump version to 2.1.1

Modified Paths:
--------------
    trunk/CMakeLists.txt

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2012-09-06 08:40:53 UTC (rev 330)
+++ trunk/CMakeLists.txt	2012-09-06 08:41:04 UTC (rev 331)
@@ -49,7 +49,7 @@
 SET(CPACK_PACKAGE_VENDOR "stepping stone GmbH")
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
 SET(CPACK_PACKAGE_VERSION_MINOR "1")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
 SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 SET(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_FULL_NAME})
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[330] trunk/src/i18n/app_de.ts

From: <tiz...@us...> - 2012-09-06 08:41:03

Revision: 330
          http://sepiola.svn.sourceforge.net/sepiola/?rev=330&view=rev
Author:   tizianomueller
Date:     2012-09-06 08:40:53 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
Add translation for newly added verbose logging option.

Modified Paths:
--------------
    trunk/src/i18n/app_de.ts

Modified: trunk/src/i18n/app_de.ts
===================================================================
--- trunk/src/i18n/app_de.ts	2012-09-06 08:40:39 UTC (rev 329)
+++ trunk/src/i18n/app_de.ts	2012-09-06 08:40:53 UTC (rev 330)
@@ -825,12 +825,12 @@
         <translation>Deutsch</translation>
     </message>
     <message>
-        <location filename="../main.cc" line="351"/>
+        <location filename="../main.cc" line="352"/>
         <source>Application started</source>
         <translation>Applikation wurde gestartet</translation>
     </message>
     <message>
-        <location filename="../main.cc" line="353"/>
+        <location filename="../main.cc" line="354"/>
         <source>Application closed</source>
         <translation>Applikation wurde beendet</translation>
     </message>
@@ -911,7 +911,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../main.cc" line="343"/>
+        <location filename="../main.cc" line="344"/>
         <source>Update started</source>
         <translation>Aktualisierung gestartet</translation>
     </message>
@@ -992,7 +992,7 @@
     </message>
     <message>
         <location filename="../gui/overview_form.cc" line="53"/>
-        <location filename="../gui/settings_form.cc" line="52"/>
+        <location filename="../gui/settings_form.cc" line="53"/>
         <source>&lt;a href=&quot;%1&quot;&gt;Change quota&lt;/a&gt; (opens a browser window)</source>
         <translation>&lt;a href=&quot;%1&quot;&gt;Quota ändern&lt;/a&gt; (Öffnet ein Browserfenster)</translation>
     </message>
@@ -1102,7 +1102,7 @@
         <translation>%1 Minuten nach dem Hochfahren der Computers</translation>
     </message>
     <message>
-        <location filename="../settings/settings.cc" line="263"/>
+        <location filename="../settings/settings.cc" line="262"/>
         <source>reseller address (missing)</source>
         <translation>Wiederverkäufer Adresse (fehlend)</translation>
     </message>
@@ -1120,8 +1120,8 @@
   -&gt;Datei %1 konnte nicht entfernt werden. </translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.cc" line="48"/>
-        <location filename="../gui/settings_form.cc" line="50"/>
+        <location filename="../gui/settings_form.cc" line="49"/>
+        <location filename="../gui/settings_form.cc" line="51"/>
         <source>Total size: %1 GB, free: %2 GB</source>
         <translation>Gesamtgrösse: %1 GB, Frei: %2 GB</translation>
     </message>
@@ -1344,18 +1344,18 @@
 <context>
     <name>SettingsForm</name>
     <message>
-        <location filename="../gui/settings_form.cc" line="98"/>
+        <location filename="../gui/settings_form.cc" line="101"/>
         <source>Settings saved</source>
         <translation>Einstellungen gespeichert</translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.cc" line="109"/>
-        <location filename="../gui/settings_form.cc" line="127"/>
+        <location filename="../gui/settings_form.cc" line="112"/>
+        <location filename="../gui/settings_form.cc" line="130"/>
         <source>Unsaved settings</source>
         <translation>Nicht gespeicherte Einstellungen</translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.cc" line="109"/>
+        <location filename="../gui/settings_form.cc" line="112"/>
         <source>Your settings have been modified.
 Do you want to restore the original settings?</source>
         <translation>Ihre Einstellungen wurden geändert.
@@ -1372,12 +1372,12 @@
         <translation>Benutzername:</translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.cc" line="34"/>
+        <location filename="../gui/settings_form.cc" line="35"/>
         <source>S&amp;ave</source>
         <translation>S&amp;peichern</translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.cc" line="98"/>
+        <location filename="../gui/settings_form.cc" line="101"/>
         <source>Settings have been saved.</source>
         <translation>Einstellungen wurden gespeichert.</translation>
     </message>
@@ -1387,12 +1387,12 @@
         <translation>St&amp;andard</translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.cc" line="37"/>
+        <location filename="../gui/settings_form.cc" line="38"/>
         <source>&amp;Cancel</source>
         <translation>Abbre&amp;chen</translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.cc" line="127"/>
+        <location filename="../gui/settings_form.cc" line="130"/>
         <source>Your settings have been modified.
 Do you want to save the settings before leaving this view?</source>
         <translation>Ihre Einstellungen wurden geändert.
@@ -1454,7 +1454,7 @@
     </message>
     <message>
         <location filename="../gui/settings_form.ui" line="323"/>
-        <location filename="../settings/settings.cc" line="721"/>
+        <location filename="../settings/settings.cc" line="731"/>
         <source>English</source>
         <translatorcomment>Hier wird die Sprache in der jeweiligen Sprache eingetragen.</translatorcomment>
         <translation>Deutsch</translation>
@@ -1481,6 +1481,11 @@
         <translation>Halten Sie lokal gelöschten Dateien für immer auf dem Server 
 (es wird empfohlen diese Option nicht zu wählen, weil die Backups sehr schnell gross werden)</translation>
     </message>
+    <message>
+        <location filename="../gui/settings_form.ui" line="467"/>
+        <source>Verbose logging</source>
+        <translation>Ausführliche Protokollierung</translation>
+    </message>
 </context>
 <context>
     <name>TextInputDialog</name>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[329] trunk/src/CMakeLists.txt

From: <tiz...@us...> - 2012-09-06 08:40:48

Revision: 329
          http://sepiola.svn.sourceforge.net/sepiola/?rev=329&view=rev
Author:   tizianomueller
Date:     2012-09-06 08:40:39 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
Copy Qt translations at compile-time and bundle it in the install-package

Modified Paths:
--------------
    trunk/src/CMakeLists.txt

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2012-09-06 08:40:26 UTC (rev 328)
+++ trunk/src/CMakeLists.txt	2012-09-06 08:40:39 UTC (rev 329)
@@ -119,17 +119,17 @@
 	# Clear list
 	SET(qms)
 
-	# Add command to build X.qm from X.po
-	FOREACH(po ${translation_sources})
-		GET_FILENAME_COMPONENT(qm ${po} NAME_WE)
+	# Add command to build X.qm from X.ts
+	FOREACH(ts ${translation_sources})
+		GET_FILENAME_COMPONENT(qm ${ts} NAME_WE)
 		SET(qm "${CMAKE_CURRENT_BINARY_DIR}/${qm}.qm")
-		SET(po "${CMAKE_CURRENT_SOURCE_DIR}/${po}")
+		SET(ts "${CMAKE_CURRENT_SOURCE_DIR}/${ts}")
 		ADD_CUSTOM_COMMAND(OUTPUT ${qm} 
-		COMMAND ${QT_LRELEASE} ${po} -qm ${qm}
-		DEPENDS ${po})
+		COMMAND ${QT_LRELEASE} ${ts} -qm ${qm}
+		DEPENDS ${ts})
 		SET(qms ${qms} ${qm})
 		SET(translation_binaries ${translation_binaries} ${qm})
-	ENDFOREACH(po)
+	ENDFOREACH(ts)
 
 	# Finish off with a command that builds *.qm
 	ADD_CUSTOM_TARGET(lrelease ALL DEPENDS ${qms})
@@ -137,6 +137,22 @@
 	MESSAGE(STATUS "lrelease could not be found. You're losing the localisation.")
 ENDIF(QT_LRELEASE)
 
+# Clear list
+SET(qms)
+
+FOREACH(qt_translation ${qt_translations})
+    GET_FILENAME_COMPONENT(qm ${qt_translation} NAME_WE)
+    SET(qm "${CMAKE_CURRENT_BINARY_DIR}/${qm}.qm")
+    ADD_CUSTOM_COMMAND(OUTPUT ${qm} 
+        COMMAND ${CMAKE_COMMAND} -E copy ${qt_translation} ${qm}
+        DEPENDS ${qt_translation})
+    SET(qms ${qms} ${qm})
+    SET(translation_binaries ${translation_binaries} ${qm})
+ENDFOREACH(qt_translation)
+
+# Finish off with a command that builds *.qm
+ADD_CUSTOM_TARGET(copy-qt-translation ALL DEPENDS ${qms})
+
 SET(PORTABLE_INSTALLATION TRUE CACHE BOOL "Build a portable version (ignore installation prefix)")
 
 IF (NOT PORTABLE_INSTALLATION)
@@ -265,8 +281,6 @@
 ADD_LIBRARY(sepiola_base_objects OBJECT ${BASE_SOURCE_FILES})
 ADD_LIBRARY(sepiola_ui_objects OBJECT ${UI_SOURCE_FILES})
 
-FILE(COPY ${qt_translations} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
 ADD_EXECUTABLE(
 	${SSBACKUP_EXECUTABLE_NAME}
 	WIN32

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[328] trunk/src

From: <tiz...@us...> - 2012-09-06 08:40:35

Revision: 328
          http://sepiola.svn.sourceforge.net/sepiola/?rev=328&view=rev
Author:   tizianomueller
Date:     2012-09-06 08:40:26 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
Add checkbox to enable debug output

- add checkbox
- move logDebugMessage setting from application to user settings to make it
  configureable

Modified Paths:
--------------
    trunk/src/gui/settings_form.cc
    trunk/src/gui/settings_form.hh
    trunk/src/gui/settings_form.ui
    trunk/src/settings/settings.cc
    trunk/src/settings/settings.hh

Modified: trunk/src/gui/settings_form.cc
===================================================================
--- trunk/src/gui/settings_form.cc	2012-09-04 15:17:00 UTC (rev 327)
+++ trunk/src/gui/settings_form.cc	2012-09-06 08:40:26 UTC (rev 328)
@@ -19,6 +19,7 @@
 #include <QDebug>
 
 #include "gui/settings_form.hh"
+#include "model/main_model.hh"
 
 SettingsForm::SettingsForm( QWidget *parent, MainModel *model ) : QWidget( parent )
 {
@@ -74,6 +75,7 @@
 	this->spinBoxNOfShownLastBackups->setValue( settings->getNOfLastBackups() );
 	this->checkBoxShowHiddenFiles->setChecked( settings->getShowHiddenFilesAndFolders() );
 	this->checkBoxKeepDeletedFiles->setChecked( !settings->getDeleteExtraneousItems() );
+	this->checkBoxVerboseLogging->setChecked( settings->getLogDebugMessages() );
 
 	this->comboBoxLanguage->clear();
     for ( auto language: settings->getAvailableLanguages() )
@@ -94,6 +96,7 @@
 		settings->saveNOfLastBackups( this->spinBoxNOfShownLastBackups->value() );
 		settings->saveShowHiddenFilesAndFolders( this->checkBoxShowHiddenFiles->isChecked() );
 		settings->saveDeleteExtraneousItems( !this->checkBoxKeepDeletedFiles->isChecked() );
+		settings->saveLogDebugMessages( this->checkBoxVerboseLogging->isChecked() );
 
 		QMessageBox::information( this, tr( "Settings saved" ), tr( "Settings have been saved." ) );
 		emit updateOverviewFormLastBackupsInfo();
@@ -171,10 +174,17 @@
 	formChanged = true;
 }
 
-void SettingsForm::on_checkBoxShowHiddenFiles_stateChanged( int state ) {
+void SettingsForm::on_checkBoxShowHiddenFiles_stateChanged( int state )
+{
 	formChanged = ((state==Qt::Checked) != Settings::getInstance()->getShowHiddenFilesAndFolders());
 }
 
-void SettingsForm::on_checkBoxKeepDeletedFiles_stateChanged( int state ) {
+void SettingsForm::on_checkBoxKeepDeletedFiles_stateChanged( int state )
+{
 	formChanged = ((state==Qt::Checked) != (!Settings::getInstance()->getDeleteExtraneousItems()));
 }
+
+void SettingsForm::on_checkBoxVerboseLogging_stateChanged( int state )
+{
+	formChanged = ((state==Qt::Checked) != (Settings::getInstance()->getLogDebugMessages()));
+}

Modified: trunk/src/gui/settings_form.hh
===================================================================
--- trunk/src/gui/settings_form.hh	2012-09-04 15:17:00 UTC (rev 327)
+++ trunk/src/gui/settings_form.hh	2012-09-06 08:40:26 UTC (rev 328)
@@ -25,7 +25,8 @@
 
 #include "ui_settings_form.h"
 
-#include "model/main_model.hh"
+// forward declarations
+class MainModel;
 
 /**
  * The SettingsForm class is the form displaying the settings
@@ -68,6 +69,7 @@
 	void on_spinBoxNOfShownLastBackups_valueChanged( int i );
 	void on_checkBoxShowHiddenFiles_stateChanged( int state );
 	void on_checkBoxKeepDeletedFiles_stateChanged( int state );
+    void on_checkBoxVerboseLogging_stateChanged( int state );
 };
 
 #endif

Modified: trunk/src/gui/settings_form.ui
===================================================================
--- trunk/src/gui/settings_form.ui	2012-09-04 15:17:00 UTC (rev 327)
+++ trunk/src/gui/settings_form.ui	2012-09-06 08:40:26 UTC (rev 328)
@@ -461,6 +461,13 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="checkBoxVerboseLogging">
+        <property name="text">
+         <string>Verbose logging</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>

Modified: trunk/src/settings/settings.cc
===================================================================
--- trunk/src/settings/settings.cc	2012-09-04 15:17:00 UTC (rev 327)
+++ trunk/src/settings/settings.cc	2012-09-06 08:40:26 UTC (rev 328)
@@ -139,7 +139,7 @@
     resellerSettings(0),
     userSettings(0),
     appData(0),
-    logDebugMessage(true),
+    logDebugMessage(false),
     effectiveUserId(0)
 {
 	//TODO: load language name translations after setting the current langauge
@@ -223,7 +223,6 @@
 	privateOpenSshKeyFileName = applicationSettings->value( SETTINGS_PRIVATE_OPEN_SSH_KEY_FILE_NAME ).toString();
 	lockFileName = applicationSettings->value( SETTINGS_LOCK_FILE_NAME ).toString();
 	logFileName = applicationSettings->value( SETTINGS_LOG_FILE_NAME ).toString();
-	logDebugMessage = applicationSettings->value( SETTINGS_LOG_DEBUG_MESSAGE ).toBool();
 	ignoreReinstall = applicationSettings->value( SETTINGS_IGNORE_REINSTALL ).toBool();
 	maxLogLines = applicationSettings->value( SETTINGS_MAX_LOG_LINES ).toInt();
 	includePatternFileName = applicationSettings->value( SETTINGS_INCLUDE_PATTERN_FILE_NAME ).toString();
@@ -304,6 +303,7 @@
 	showHiddenFilesAndFolders = userSettings->value( SETTINGS_SHOW_HIDDEN_FILES_AND_FOLDERS, false ).toBool();
 	windowSize = userSettings->value( SETTINGS_WINDOW_SIZE ).toSize();
 	windowPosition = userSettings->value( SETTINGS_WINDOW_POSITION, QPoint( 200, 200 ) ).toPoint();
+	logDebugMessage = userSettings->value( SETTINGS_LOG_DEBUG_MESSAGE ).toBool();
 
 	// [AppData]
 	appData->beginGroup( SETTINGS_GROUP_APPDATA );
@@ -962,4 +962,16 @@
 	return lastBackupRules;
 }
 
+void Settings::saveLogDebugMessages(bool logDebugMessage)
+{
+	if (this->logDebugMessage != logDebugMessage)
+	{
+		this->logDebugMessage = logDebugMessage;
+		userSettings->setValue(SETTINGS_LOG_DEBUG_MESSAGE, logDebugMessage);
+	}
+}
 
+bool Settings::getLogDebugMessages() const
+{
+    return logDebugMessage;
+}

Modified: trunk/src/settings/settings.hh
===================================================================
--- trunk/src/settings/settings.hh	2012-09-04 15:17:00 UTC (rev 327)
+++ trunk/src/settings/settings.hh	2012-09-06 08:40:26 UTC (rev 328)
@@ -262,6 +262,9 @@
 		const BackupSelectionHash& getLastBackupSelectionRules() const;
 		void saveBackupSelectionRules( const BackupSelectionHash& selectionRules );
 
+        void saveLogDebugMessages(bool logDebugMessage);
+        bool getLogDebugMessages() const;
+
 		static const QString VERSION;
 
 	private:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[327] trunk/src

From: <tiz...@us...> - 2012-09-04 15:17:06

Revision: 327
          http://sepiola.svn.sourceforge.net/sepiola/?rev=327&view=rev
Author:   tizianomueller
Date:     2012-09-04 15:17:00 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
Update translations to get translation of the language and matching buttons

Modified Paths:
--------------
    trunk/src/gui/settings_form.ui
    trunk/src/i18n/app_de.ts

Modified: trunk/src/gui/settings_form.ui
===================================================================
--- trunk/src/gui/settings_form.ui	2012-09-04 15:16:42 UTC (rev 326)
+++ trunk/src/gui/settings_form.ui	2012-09-04 15:17:00 UTC (rev 327)
@@ -317,7 +317,13 @@
          </widget>
         </item>
         <item>
-         <widget class="QComboBox" name="comboBoxLanguage"/>
+         <widget class="QComboBox" name="comboBoxLanguage">
+          <item>
+           <property name="text">
+            <string>English</string>
+           </property>
+          </item>
+         </widget>
         </item>
         <item>
          <spacer>
@@ -496,7 +502,7 @@
      <item>
       <widget class="QDialogButtonBox" name="buttonBox">
        <property name="standardButtons">
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
        </property>
       </widget>
      </item>

Modified: trunk/src/i18n/app_de.ts
===================================================================
--- trunk/src/i18n/app_de.ts	2012-09-04 15:16:42 UTC (rev 326)
+++ trunk/src/i18n/app_de.ts	2012-09-04 15:17:00 UTC (rev 327)
@@ -189,7 +189,7 @@
     <message>
         <location filename="../gui/backup_form.ui" line="318"/>
         <source>Select which files and folders you want to back up:</source>
-        <translation>Wählen Sie die gewünschten Dateien und Verzeichnisse aus, welche Sie backupen wollen</translation>
+        <translation>Wählen Sie die zu sichernden Dateien und Verzeichnisse aus:</translation>
     </message>
 </context>
 <context>
@@ -300,7 +300,7 @@
     <message>
         <location filename="../model/backup_thread.cc" line="214"/>
         <source>Backup succeeded with warnings.</source>
-        <translation>Backup gelungen (mit Warnungen)</translation>
+        <translation>Backup erfolgreich (mit Warnungen).</translation>
     </message>
     <message>
         <location filename="../model/backup_thread.cc" line="233"/>
@@ -815,28 +815,28 @@
         <translation>Der Prozess %1 ist wurde nicht gestartet. Entweder ist das aufgerufene Programm nicht vorhanden, oder Sie haben nicht genügend Rechte um es auszuführen.</translation>
     </message>
     <message>
-        <location filename="../settings/settings.cc" line="145"/>
+        <location filename="../settings/settings.cc" line="146"/>
         <source>English</source>
         <translation>Englisch</translation>
     </message>
     <message>
-        <location filename="../settings/settings.cc" line="146"/>
+        <location filename="../settings/settings.cc" line="147"/>
         <source>German</source>
         <translation>Deutsch</translation>
     </message>
     <message>
-        <location filename="../main.cc" line="370"/>
+        <location filename="../main.cc" line="351"/>
         <source>Application started</source>
         <translation>Applikation wurde gestartet</translation>
     </message>
     <message>
-        <location filename="../main.cc" line="372"/>
+        <location filename="../main.cc" line="353"/>
         <source>Application closed</source>
         <translation>Applikation wurde beendet</translation>
     </message>
     <message>
         <location filename="../tools/at.cc" line="83"/>
-        <location filename="../tools/schtasks.cc" line="154"/>
+        <location filename="../tools/schtasks.cc" line="149"/>
         <source>Scheduled task has been created</source>
         <translation>Zeitgesteuertes Backup wurde eingerichtet</translation>
     </message>
@@ -866,8 +866,8 @@
         <translation>Dateiberechtigungen werden für %1 ermittelt</translation>
     </message>
     <message>
+        <location filename="../tools/unix_permissions.cc" line="120"/>
         <location filename="../tools/posix_acl.cc" line="174"/>
-        <location filename="../tools/unix_permissions.cc" line="120"/>
         <source>Setting metadata for %1</source>
         <translation>Dateiberechtigungen werden für %1 gesetzt</translation>
     </message>
@@ -889,8 +889,8 @@
         <translation>Name</translation>
     </message>
     <message>
+        <location filename="../tools/set_acl.cc" line="197"/>
         <location filename="../tools/posix_acl.cc" line="210"/>
-        <location filename="../tools/set_acl.cc" line="197"/>
         <source>Error occurred while setting ACL&apos;s:
 </source>
         <translation>Während dem setzen der ACLs ist ein Fehler aufgetreten:
@@ -911,7 +911,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../main.cc" line="362"/>
+        <location filename="../main.cc" line="343"/>
         <source>Update started</source>
         <translation>Aktualisierung gestartet</translation>
     </message>
@@ -921,27 +921,27 @@
         <translation>Bereite Metadaten vor</translation>
     </message>
     <message>
-        <location filename="../tools/schtasks.cc" line="105"/>
+        <location filename="../tools/schtasks.cc" line="100"/>
         <source>Enter login information to create the schedule task.</source>
         <translation>Geben sie ihre Login Informationen ein um den geplanten Task zu erzeugen.</translation>
     </message>
     <message>
-        <location filename="../tools/schtasks.cc" line="158"/>
+        <location filename="../tools/schtasks.cc" line="153"/>
         <source>Scheduled task could not be created</source>
         <translation>Geplanter Task konnte nicht erzeugt werden</translation>
     </message>
     <message>
-        <location filename="../tools/schtasks.cc" line="205"/>
+        <location filename="../tools/schtasks.cc" line="197"/>
         <source>Enter login information to update the existing schedule task.</source>
         <translation>Geben sie ihre Login Informationen ein um den geplanten Task zu aktualisieren.</translation>
     </message>
     <message>
-        <location filename="../tools/schtasks.cc" line="254"/>
+        <location filename="../tools/schtasks.cc" line="246"/>
         <source>Scheduled task has been updated</source>
         <translation>Geplanter Task wurde aktualisiert</translation>
     </message>
     <message>
-        <location filename="../tools/schtasks.cc" line="258"/>
+        <location filename="../tools/schtasks.cc" line="250"/>
         <source>Scheduled task could not be updated</source>
         <translation>Geplanter Task konnte nicht aktualisiert werden</translation>
     </message>
@@ -1102,7 +1102,7 @@
         <translation>%1 Minuten nach dem Hochfahren der Computers</translation>
     </message>
     <message>
-        <location filename="../settings/settings.cc" line="262"/>
+        <location filename="../settings/settings.cc" line="263"/>
         <source>reseller address (missing)</source>
         <translation>Wiederverkäufer Adresse (fehlend)</translation>
     </message>
@@ -1325,7 +1325,7 @@
     <message>
         <location filename="../tools/rsync.cc" line="1023"/>
         <source>Warning: At least one file could not be backuped up. See above for details.</source>
-        <translation>Warnung: Mindestens eine Datei konnte nicht gesichert werden. Siehe oben für weitere Details </translation>
+        <translation>Warnung: Mindestens eine Datei konnte nicht gesichert werden. Siehe oben für weitere Details.</translation>
     </message>
     <message>
         <location filename="../tools/rsync.cc" line="1028"/>
@@ -1344,18 +1344,18 @@
 <context>
     <name>SettingsForm</name>
     <message>
-        <location filename="../gui/settings_form.cc" line="99"/>
+        <location filename="../gui/settings_form.cc" line="98"/>
         <source>Settings saved</source>
         <translation>Einstellungen gespeichert</translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.cc" line="110"/>
-        <location filename="../gui/settings_form.cc" line="128"/>
+        <location filename="../gui/settings_form.cc" line="109"/>
+        <location filename="../gui/settings_form.cc" line="127"/>
         <source>Unsaved settings</source>
         <translation>Nicht gespeicherte Einstellungen</translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.cc" line="110"/>
+        <location filename="../gui/settings_form.cc" line="109"/>
         <source>Your settings have been modified.
 Do you want to restore the original settings?</source>
         <translation>Ihre Einstellungen wurden geändert.
@@ -1377,7 +1377,7 @@
         <translation>S&amp;peichern</translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.cc" line="99"/>
+        <location filename="../gui/settings_form.cc" line="98"/>
         <source>Settings have been saved.</source>
         <translation>Einstellungen wurden gespeichert.</translation>
     </message>
@@ -1392,7 +1392,7 @@
         <translation>Abbre&amp;chen</translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.cc" line="128"/>
+        <location filename="../gui/settings_form.cc" line="127"/>
         <source>Your settings have been modified.
 Do you want to save the settings before leaving this view?</source>
         <translation>Ihre Einstellungen wurden geändert.
@@ -1417,12 +1417,12 @@
 default-button to use the system-settings.</source>
         <translation>Durch die benutzung verschiedener Computernamen ist es möglich
 Dokumente von verschiedenen Computern auf den gleichen Backup-Server zu sichern.
-Geben Sie einen eindeutigen Namen in dieses Feld ein, oder dürcken Sie die Standardschaltfläche um die Systemeinstellungen zu verwenden</translation>
+Geben Sie einen eindeutigen Namen in dieses Feld ein, oder drücken Sie die Standardschaltfläche um die Systemeinstellungen zu verwenden.</translation>
     </message>
     <message>
         <location filename="../gui/settings_form.ui" line="315"/>
         <source>Language (requires restart):</source>
-        <translation>Sprache (Neustart erforderlich)</translation>
+        <translation>Sprache (Neustart erforderlich):</translation>
     </message>
     <message>
         <location filename="../gui/settings_form.ui" line="192"/>
@@ -1453,22 +1453,29 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://www.quotaChangeTemp.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;quotaChangeLink&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.ui" line="373"/>
+        <location filename="../gui/settings_form.ui" line="323"/>
+        <location filename="../settings/settings.cc" line="721"/>
+        <source>English</source>
+        <translatorcomment>Hier wird die Sprache in der jeweiligen Sprache eingetragen.</translatorcomment>
+        <translation>Deutsch</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings_form.ui" line="379"/>
         <source>Display</source>
         <translation>Anzeige</translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.ui" line="405"/>
+        <location filename="../gui/settings_form.ui" line="411"/>
         <source>elapsed backups in the Overview</source>
         <translation>letzte Backups im Überblick</translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.ui" line="446"/>
+        <location filename="../gui/settings_form.ui" line="452"/>
         <source>Show hidden files &amp;&amp; folders</source>
         <translation>Versteckte Dateien und Ordner anzeigen</translation>
     </message>
     <message>
-        <location filename="../gui/settings_form.ui" line="453"/>
+        <location filename="../gui/settings_form.ui" line="459"/>
         <source>Keep locally deleted files on the server forever
 (it is recommended not to choose this option, as your backups would grow very big very rapidly)</source>
         <translation>Halten Sie lokal gelöschten Dateien für immer auf dem Server 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[326] trunk/src

From: <tiz...@us...> - 2012-09-04 15:16:51

Revision: 326
          http://sepiola.svn.sourceforge.net/sepiola/?rev=326&view=rev
Author:   tizianomueller
Date:     2012-09-04 15:16:42 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
Translation system update

- rename translation files to app_*.ts/qm for automated loading
- dynamically search for translation files
- store language code instead of QComboBox index
- convert old index value to new language code
- add entry in UI combo box to get translation of the language name

Modified Paths:
--------------
    trunk/src/gui/settings_form.cc
    trunk/src/main.cc
    trunk/src/settings/settings.cc
    trunk/src/settings/settings.hh

Modified: trunk/src/gui/settings_form.cc
===================================================================
--- trunk/src/gui/settings_form.cc	2012-09-04 15:16:20 UTC (rev 325)
+++ trunk/src/gui/settings_form.cc	2012-09-04 15:16:42 UTC (rev 326)
@@ -76,11 +76,10 @@
 	this->checkBoxKeepDeletedFiles->setChecked( !settings->getDeleteExtraneousItems() );
 
 	this->comboBoxLanguage->clear();
-	foreach( QString language, settings->getSupportedLanguages() )
-	{
-		this->comboBoxLanguage->addItem( language );
-	}
-	this->comboBoxLanguage->setCurrentIndex( settings->getLanguageIndex() );
+    for ( auto language: settings->getAvailableLanguages() )
+		this->comboBoxLanguage->addItem( language.first, language.second );
+
+	this->comboBoxLanguage->setCurrentIndex( this->comboBoxLanguage->findData(settings->getLanguage()) );
 	formChanged = false;
 }
 
@@ -91,7 +90,7 @@
 		Settings* settings = Settings::getInstance();
 		settings->saveServerUserName( this->lineEditUsername->text() );
 		settings->saveBackupPrefix( this->lineEditBackupPrefix->text() );
-		settings->saveLanguageIndex( this->comboBoxLanguage->currentIndex() );
+		settings->saveLanguage( this->comboBoxLanguage->itemData(this->comboBoxLanguage->currentIndex()).toString() );
 		settings->saveNOfLastBackups( this->spinBoxNOfShownLastBackups->value() );
 		settings->saveShowHiddenFilesAndFolders( this->checkBoxShowHiddenFiles->isChecked() );
 		settings->saveDeleteExtraneousItems( !this->checkBoxKeepDeletedFiles->isChecked() );
@@ -153,7 +152,7 @@
 
 void SettingsForm::on_comboBoxLanguage_currentIndexChanged( int languageIndex )
 {
-	formChanged = ( languageIndex != Settings::getInstance()->getLanguageIndex() );
+	formChanged = ( this->comboBoxLanguage->itemData(languageIndex).toString() != Settings::getInstance()->getLanguage() );
 }
 
 void SettingsForm::on_lineEditBackupPrefix_textEdited( QString backupPrefix )

Modified: trunk/src/main.cc
===================================================================
--- trunk/src/main.cc	2012-09-04 15:16:20 UTC (rev 325)
+++ trunk/src/main.cc	2012-09-04 15:16:42 UTC (rev 326)
@@ -54,7 +54,6 @@
 static const QString CONFIG_FILE_NAME = "config";
 static const QString VERSION_ARGUMENT = "-version";
 static const char* DEPENDENCY_MISSING = "Dependent files are missing. Please reinstall the application.\n";
-static const char* TRANSLATION_MISSING = "Translation files are missing, using default language. Please reinstall the application.\n";
 static const char* SINGLE_APPLICATION_ERROR =
 		"The application is already running. Only one instance of this application can be run concurrently.\n";
 }
@@ -138,24 +137,6 @@
     return true;
 }
 
-bool loadTranslations()
-{
-	QTranslator translator;
-	Settings* settings = Settings::getInstance();
-	QStringList supportedLanguages = settings->getSupportedLanguages();
-
-	// skip the default langauge, because there is no translation file for it
-	for (int i=1; i<supportedLanguages.size(); i++)
-	{
-		if (!translator.load(supportedLanguages.at(i), settings->getApplicationBinDir() ) )
-		{
-            qDebug() << "translation for" << supportedLanguages.at(i) << "could not be found";
-			return false;
-		}
-	}
-	return true;
-}
-
 bool isProcessRunning(const int& processId)
 {
 #ifdef Q_OS_UNIX
@@ -337,10 +318,6 @@
 		QMessageBox::critical( 0, "Dependency missing", DEPENDENCY_MISSING);
 		return -1;
 	}
-    if (!loadTranslations())
-    {
-   		QMessageBox::critical( 0, "Translations missing", TRANSLATION_MISSING);
-    }
 	if ( !assertSingleApplication() )
 	{
 		QMessageBox::critical( 0, "Application is already running", SINGLE_APPLICATION_ERROR);
@@ -350,11 +327,14 @@
 	LogFileUtils::getInstance()->open(Settings::getInstance()->getLogFileAbsolutePath(), Settings::getInstance()->getMaxLogLines());
 	MainModel model;
 
-	QTranslator translator;
 	Settings* settings = Settings::getInstance();
-	translator.load(settings->getSupportedLanguages().at(settings->getLanguageIndex() ), settings->getApplicationBinDir() );
-	app.installTranslator( &translator);
 
+	QTranslator appTranslator, qtTranslator;
+	appTranslator.load("app_" + settings->getLanguage(), settings->getApplicationBinDir());
+    qtTranslator.load("qt_" + settings->getLanguage(), settings->getApplicationBinDir());
+	app.installTranslator(&appTranslator);
+	app.installTranslator(&qtTranslator);
+
 	MainWindow mainWindow( &model);
 	QObject::connect( &mainWindow, SIGNAL( writeLog( const QString& ) ), LogFileUtils::getInstance(), SLOT( writeLog( const QString& ) ));
 

Modified: trunk/src/settings/settings.cc
===================================================================
--- trunk/src/settings/settings.cc	2012-09-04 15:16:20 UTC (rev 325)
+++ trunk/src/settings/settings.cc	2012-09-04 15:16:42 UTC (rev 326)
@@ -23,7 +23,8 @@
 #include <QDebug>
 #include <QCoreApplication>
 #include <QLocale>
-#include <stdio.h>
+#include <cstdio>
+#include <QtCore/QTranslator>
 
 #include "settings/settings.hh"
 #include "utils/file_system_utils.hh"
@@ -275,8 +276,18 @@
 
 	serverName = userSettings->value( SETTINGS_HOST, serverName ).toString();
 	serverUserName = userSettings->value( SETTINGS_USERNAME ).toString();
-	languageIndex = userSettings->value( SETTINGS_LANGUAGE ).toInt();
+    
+    language = userSettings->value( SETTINGS_LANGUAGE ).toString();
 
+    // Convert old index values to new language codes
+    bool languageIsIndex(false);
+    int languageIndex = language.toInt(&languageIsIndex);
+    if ( languageIsIndex )
+    {
+        qDebug() << "converting deprecated language index to new language code";
+        saveLanguage((languageIndex == 1) ? "de" : "en");
+    }
+
 	backupPrefix = userSettings->value( SETTINGS_BACKUP_PREFIX ).toString();
 	if ( backupPrefix == "" )
 	{
@@ -516,12 +527,12 @@
 	}
 }
 
-void Settings::saveLanguageIndex( const int& languageIndex )
+void Settings::saveLanguage( const QString& language )
 {
-	if ( this->languageIndex != languageIndex )
+	if ( this->language != language )
 	{
-		this->languageIndex = languageIndex;
-		userSettings->setValue( SETTINGS_LANGUAGE, languageIndex );
+		this->language = language;
+		userSettings->setValue( SETTINGS_LANGUAGE, language );
 	}
 }
 
@@ -703,9 +714,23 @@
 	return false;
 }
 
-QStringList Settings::getSupportedLanguages()
+QList<std::pair<QString, QString>> Settings::getAvailableLanguages()
 {
-	return supportedLanguages;
+    QList<std::pair<QString, QString>> languages;
+    languages << std::make_pair("English", "en"); // the native language
+    
+    QDir translationDir(getApplicationBinDir());
+
+    QRegExp regex("^app_(.*)\\.qm$");
+    QStringList translationFiles(translationDir.entryList(QStringList("app_*.qm"), QDir::Files, QDir::Name));
+    for ( auto l: translationFiles )
+    {
+        QTranslator translator;
+        translator.load(translationDir.filePath(l));
+        regex.indexIn(l);
+        languages << std::make_pair(translator.translate("SettingsForm", "English"), regex.cap(1));
+    }
+    return languages;
 }
 
 bool Settings::isLogDebugMessageEnabled()
@@ -748,7 +773,6 @@
 	return applicationDataDir;
 }
 
-
 QString Settings::getSetAclName()
 {
 	return getApplicationBinDir() + setacl;
@@ -864,9 +888,9 @@
 	return getApplicationBinDir() + ssh;
 }
 
-int Settings::getLanguageIndex()
+QString Settings::getLanguage() const
 {
-	return languageIndex;
+	return language;
 }
 
 QString Settings::getBackupContentFileName()

Modified: trunk/src/settings/settings.hh
===================================================================
--- trunk/src/settings/settings.hh	2012-09-04 15:16:20 UTC (rev 325)
+++ trunk/src/settings/settings.hh	2012-09-04 15:16:42 UTC (rev 326)
@@ -19,16 +19,15 @@
 #ifndef SETTINGS_HH
 #define SETTINGS_HH
 
-#include <stdlib.h>
 #include <QObject>
 #include <QFileInfo>
 #include <QSettings>
 #include <QString>
 #include <QStringList>
+#include <QList>
 #include <QDateTime>
 #include <QSize>
 #include <QPoint>
-#include <QHash>
 
 #include "model/backup_task.hh"
 #include "model/scheduled_task.hh"
@@ -78,10 +77,10 @@
 		const char* getEOLCharacter();
 
 		/**
-		 * Gets a list of supported application languages
+		 * Gets a list of available application languages
 		 * @return list of languages
 		 */
-		QStringList getSupportedLanguages();
+		QList<std::pair<QString, QString>> getAvailableLanguages();
 
 		/**
 		 * Creates a file containing the private putty key
@@ -226,11 +225,11 @@
 		QString getClientPassword();
 		QString getServerUserName();
 		QString getServerPassword();
-		int getLanguageIndex();
+		QString getLanguage() const;
 		void saveServerUserName( const QString& userName );
 		void setServerPassword( const QString& password );
 		void setClientPassword( const QString& password );
-		void saveLanguageIndex( const int& languageIndex );
+		void saveLanguage( const QString& language );
 		QString getBackupPrefix();
 		void saveBackupPrefix( const QString& backupPrefix );
 		QString getServerKey();
@@ -404,7 +403,7 @@
 		// writable
 		QString serverName;
 		QString serverUserName;
-		int languageIndex;
+		QString language;
 		QString serverKey;
 		QString privatePuttyKey;
 		QString privateOpenSshKey;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[325] trunk/src/CMakeLists.txt

From: <tiz...@us...> - 2012-09-04 15:16:29

Revision: 325
          http://sepiola.svn.sourceforge.net/sepiola/?rev=325&view=rev
Author:   tizianomueller
Date:     2012-09-04 15:16:20 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
Enable -std=c++0x and copy Qt translations

Modified Paths:
--------------
    trunk/src/CMakeLists.txt

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2012-09-04 15:16:05 UTC (rev 324)
+++ trunk/src/CMakeLists.txt	2012-09-04 15:16:20 UTC (rev 325)
@@ -30,6 +30,7 @@
 ENDIF(CMAKE_BUILD_TYPE STREQUAL Deploy)
 
 IF(CMAKE_COMPILER_IS_GNUCXX)
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wuninitialized -Winit-self")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wredundant-decls -Wstrict-null-sentinel")
@@ -92,6 +93,7 @@
 )
 
 SET(translation_sources ${translation_sources} i18n/app_de.ts)
+SET(qt_translations /usr/share/qt4/translations/qt_de.qm)
 
 # Update translations (note that lupdate target write to source directory)
 IF(QT_LUPDATE)
@@ -263,6 +265,8 @@
 ADD_LIBRARY(sepiola_base_objects OBJECT ${BASE_SOURCE_FILES})
 ADD_LIBRARY(sepiola_ui_objects OBJECT ${UI_SOURCE_FILES})
 
+FILE(COPY ${qt_translations} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
 ADD_EXECUTABLE(
 	${SSBACKUP_EXECUTABLE_NAME}
 	WIN32

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[324] trunk/src

From: <tiz...@us...> - 2012-09-04 15:16:17

Revision: 324
          http://sepiola.svn.sourceforge.net/sepiola/?rev=324&view=rev
Author:   tizianomueller
Date:     2012-09-04 15:16:05 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
Rename german language file.

Modified Paths:
--------------
    trunk/src/CMakeLists.txt
    trunk/src/i18n/translation-stats.xq

Added Paths:
-----------
    trunk/src/i18n/app_de.ts

Removed Paths:
-------------
    trunk/src/i18n/German.ts

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2012-09-04 15:15:45 UTC (rev 323)
+++ trunk/src/CMakeLists.txt	2012-09-04 15:16:05 UTC (rev 324)
@@ -91,7 +91,7 @@
 	DOC "Path to the lrelease program"
 )
 
-SET(translation_sources ${translation_sources} i18n/German.ts)
+SET(translation_sources ${translation_sources} i18n/app_de.ts)
 
 # Update translations (note that lupdate target write to source directory)
 IF(QT_LUPDATE)

Deleted: trunk/src/i18n/German.ts
===================================================================
--- trunk/src/i18n/German.ts	2012-09-04 15:15:45 UTC (rev 323)
+++ trunk/src/i18n/German.ts	2012-09-04 15:16:05 UTC (rev 324)
@@ -1,1585 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="de_CH">
-<context>
-    <name>AboutDialog</name>
-    <message>
-        <location filename="../gui/about_dialog.ui" line="22"/>
-        <source>About</source>
-        <translation>Über Sepiola</translation>
-    </message>
-    <message>
-        <location filename="../gui/about_dialog.ui" line="34"/>
-        <source>Version</source>
-        <translation>Version</translation>
-    </message>
-    <message>
-        <location filename="../gui/about_dialog.ui" line="76"/>
-        <source>Copyright by</source>
-        <translation>Urheberrecht bei</translation>
-    </message>
-    <message>
-        <location filename="../gui/about_dialog.ui" line="113"/>
-        <source>Developed by</source>
-        <translation>Entwickelt durch</translation>
-    </message>
-    <message>
-        <location filename="../gui/about_dialog.ui" line="163"/>
-        <source>&amp;OK</source>
-        <translation>&amp;OK</translation>
-    </message>
-    <message>
-        <location filename="../gui/about_dialog.cc" line="32"/>
-        <source>%1 Version %2</source>
-        <translation>%1 Version %2</translation>
-    </message>
-    <message>
-        <location filename="../gui/about_dialog.ui" line="125"/>
-        <source>Puzzle ITC GmbH
-Eigerplatz 4
-CH-3007 Bern</source>
-        <translation>Puzzle ITC GmbH
-Eigerplatz 4
-CH-3007 Bern</translation>
-    </message>
-    <message>
-        <location filename="../gui/about_dialog.ui" line="41"/>
-        <source>Reseller</source>
-        <translation>Wiederverkäufer</translation>
-    </message>
-    <message>
-        <location filename="../gui/about_dialog.ui" line="56"/>
-        <source>[ResellerAddress]</source>
-        <translation>Wiederverkäufer Adresse</translation>
-    </message>
-    <message>
-        <location filename="../gui/about_dialog.ui" line="88"/>
-        <source>stepping stone GmbH
-Neufeldstrasse 9
-CH-3012 Bern</source>
-        <translation>stepping stone GmbH
-Neufeldstrasse 9
-CH-3012 Bern</translation>
-    </message>
-</context>
-<context>
-    <name>BackupForm</name>
-    <message>
-        <location filename="../gui/backup_form.cc" line="117"/>
-        <location filename="../gui/backup_form.cc" line="182"/>
-        <source>Empty backup list</source>
-        <translation>Leere Backup Liste</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.cc" line="182"/>
-        <source>No items have been selected for backup</source>
-        <translation>Es wurden keine Dateien oder Verzeichnisse ausgewählt</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.cc" line="117"/>
-        <source>No items have been selected for scheduling</source>
-        <translation>Es wurden keine Dateien oder Verzeichnisse für eine Datensicherung ausgewählt</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formular</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="98"/>
-        <location filename="../gui/backup_form.cc" line="185"/>
-        <source>Backup</source>
-        <translation>Backup</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="296"/>
-        <source>&amp;Refresh</source>
-        <translation>&amp;Aktualisieren</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.cc" line="158"/>
-        <source>Check at least one day</source>
-        <translation>Mindestens ein Tag muss ausgewählt sein</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="29"/>
-        <source>&lt;span style=&quot; color:#5f5f67;&quot;&gt;Backup&lt;/span&gt;</source>
-        <translation>&lt;span style=&quot; color:#5f5f67;&quot;&gt;Backup&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="227"/>
-        <source>hh:mm</source>
-        <translation>hh:mm</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="159"/>
-        <source>Monday</source>
-        <translation>Montag</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="166"/>
-        <source>Saturday</source>
-        <translation>Samstag</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="173"/>
-        <source>Tuesday</source>
-        <translation>Dienstag</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="180"/>
-        <source>Wednesday</source>
-        <translation>Mittwoch</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="187"/>
-        <source>Thursday</source>
-        <translation>Donnerstag</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="194"/>
-        <source>Friday</source>
-        <translation>Freitag</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="201"/>
-        <source>Sunday</source>
-        <translation>Sonntag</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.cc" line="126"/>
-        <source>Reset</source>
-        <translation>Zurücksetzen</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.cc" line="126"/>
-        <source>Are you sure you want to reset all form values?</source>
-        <translation>Sind Sie sicher, dass Sie alle Werte zurücksetzen wollen?</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="58"/>
-        <source>Schedule</source>
-        <translation>Backup Planung</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="86"/>
-        <source>No schedule, only manual backups</source>
-        <translation>Nur Manuelle Backups</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="112"/>
-        <source>minutes after starting the computer</source>
-        <translation>Minuten nach Starten des Computers</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="142"/>
-        <source>At</source>
-        <translation>Um</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="152"/>
-        <source>on selected weekdays</source>
-        <translation>an ausgewählten Wochentagen</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="273"/>
-        <source>Files and folders</source>
-        <translation>Dateien und Verzeichnisse</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_form.ui" line="318"/>
-        <source>Select which files and folders you want to back up:</source>
-        <translation>Wählen Sie die gewünschten Dateien und Verzeichnisse aus, welche Sie backupen wollen</translation>
-    </message>
-</context>
-<context>
-    <name>BackupProgressDialog</name>
-    <message>
-        <location filename="../gui/backup_progress_dialog.ui" line="16"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_progress_dialog.ui" line="37"/>
-        <source>Backup in progress...</source>
-        <translation>Backup wird durchgeführt...</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_progress_dialog.ui" line="103"/>
-        <source>Backing up</source>
-        <translation>Sichern</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_progress_dialog.ui" line="110"/>
-        <source>currentFile</source>
-        <translation>Aktuelle Datei</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_progress_dialog.ui" line="123"/>
-        <source>Uploading</source>
-        <translation>Hochladen</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_progress_dialog.ui" line="136"/>
-        <source>Time remaining</source>
-        <translation>Verbleibende Zeit</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_progress_dialog.ui" line="143"/>
-        <source>remainingTime</source>
-        <translation>Verbleibende Zeit</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_progress_dialog.ui" line="163"/>
-        <source>traffic</source>
-        <translation>Datenverkehr</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_progress_dialog.ui" line="204"/>
-        <source>&amp;Pause</source>
-        <translation>&amp;Pause</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_progress_dialog.ui" line="214"/>
-        <source>&amp;Abort</source>
-        <translation>&amp;Abbrechen</translation>
-    </message>
-    <message>
-        <location filename="../gui/backup_progress_dialog.ui" line="224"/>
-        <source>C&amp;lose</source>
-        <translation>S&amp;chliessen</translation>
-    </message>
-</context>
-<context>
-    <name>BackupThread</name>
-    <message>
-        <location filename="../model/backup_thread.cc" line="106"/>
-        <source>Creating/validating server directories</source>
-        <translation>Server Verzeichnisse werden erstellt und überprüft</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="124"/>
-        <source>Uploading files and directories</source>
-        <translation>Lade Dateien und Verzeichnisse hoch</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="138"/>
-        <source>Getting backup content meta data</source>
-        <translation>Metadaten des Backupinhalts werden ermittelt</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="143"/>
-        <source>Uploading backup content meta data</source>
-        <translation>Metadaten des Backupinhalts werden übertragen</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="154"/>
-        <source>Uploading backup info data</source>
-        <translation>Backup Infodaten werden übertragen</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="165"/>
-        <source>Getting permission meta data</source>
-        <translation>Dateiberechtigungen werden ermittelt</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="178"/>
-        <source>Uploading permission meta data</source>
-        <translation>Lade Berechtigungs Metadaten hoch</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="191"/>
-        <source>Warning: Could not backup file permissions due to following problem:</source>
-        <translation>Warnung: Konnte keine Backup Dateiberechtigungen erstellen aufgrund folgenden Problem:</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="207"/>
-        <source>Backup succeeded.</source>
-        <translation>Backup erfolgreich.</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="214"/>
-        <source>Backup succeeded with warnings.</source>
-        <translation>Backup gelungen (mit Warnungen)</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="233"/>
-        <source>Backup failed.</source>
-        <translation>Backup fehlgeschlagen.</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="446"/>
-        <source>Can not create a backup info file</source>
-        <translation>Backup Infodatei konnte nicht erstellt werden</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="227"/>
-        <source>Backup aborted.</source>
-        <translation>Backup abgebrochen.</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="257"/>
-        <source>Backup has been aborted</source>
-        <translation>Backup wurde abgebrochen</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="298"/>
-        <location filename="../model/backup_thread.cc" line="313"/>
-        <location filename="../model/backup_thread.cc" line="347"/>
-        <location filename="../model/backup_thread.cc" line="374"/>
-        <source>current task</source>
-        <translation>Aktueller Prozess</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="299"/>
-        <location filename="../model/backup_thread.cc" line="314"/>
-        <source>current file</source>
-        <translation>Aktuelle Datei</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="300"/>
-        <source>files processed</source>
-        <translation>Dateien abgearbeitet</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="301"/>
-        <location filename="../model/backup_thread.cc" line="316"/>
-        <source>estimated remaining time</source>
-        <translation>Geschätzte Restdauer</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="315"/>
-        <source>traffic / transferred</source>
-        <translation>Datenverkehr / übertragen</translation>
-    </message>
-</context>
-<context>
-    <name>LogfileDialog</name>
-    <message>
-        <location filename="../gui/logfile_dialog.ui" line="19"/>
-        <source>Logfile</source>
-        <translation>Logdatei</translation>
-    </message>
-    <message>
-        <location filename="../gui/logfile_dialog.ui" line="25"/>
-        <source>Logfile:</source>
-        <translation>Logdatei:</translation>
-    </message>
-</context>
-<context>
-    <name>LogfileForm</name>
-    <message>
-        <location filename="../gui/logfile_form.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formular</translation>
-    </message>
-    <message>
-        <location filename="../gui/logfile_form.ui" line="27"/>
-        <source>&lt;span style=&quot; color:#5f5f67;&quot;&gt;Logfile&lt;/span&gt;</source>
-        <translation>Logdatei</translation>
-    </message>
-</context>
-<context>
-    <name>MainModel</name>
-    <message>
-        <location filename="../model/main_model.cc" line="114"/>
-        <source>Key has not been generated.</source>
-        <translation>Schlüssel konnte nicht generiert werden.</translation>
-    </message>
-    <message>
-        <location filename="../model/main_model.cc" line="129"/>
-        <source>Trying to login</source>
-        <translation>Anmeldeversuch</translation>
-    </message>
-    <message>
-        <location filename="../model/main_model.cc" line="132"/>
-        <source>Can not login to the server. Please review your settings.</source>
-        <translation>Anmeldung fehlgeschlagen. Bitte überprüfen Sie Ihre Einstellungen.</translation>
-    </message>
-    <message>
-        <location filename="../model/main_model.cc" line="136"/>
-        <source>Login succeeded.</source>
-        <translation>Anmeldung erfolgreich.</translation>
-    </message>
-    <message>
-        <location filename="../model/main_model.cc" line="94"/>
-        <source>Establishing connection ...</source>
-        <translation>Verbindung wird hergestellt ...</translation>
-    </message>
-    <message>
-        <location filename="../model/main_model.cc" line="124"/>
-        <source>Login failed.</source>
-        <translation>Anmeldung fehlgeschlagen.</translation>
-    </message>
-    <message>
-        <location filename="../model/main_model.cc" line="143"/>
-        <source>Login with key was successful</source>
-        <translation>Anmeldung mit Schlüssel war erfolgreich</translation>
-    </message>
-    <message>
-        <location filename="../model/main_model.cc" line="146"/>
-        <source>Connection established.</source>
-        <translation>Verbindung hergestellt.</translation>
-    </message>
-    <message>
-        <location filename="../model/main_model.cc" line="95"/>
-        <source>Validating server&apos;s fingerprint ...</source>
-        <translation>Fingerabdruck des Servers wird überprüft ...</translation>
-    </message>
-    <message>
-        <location filename="../model/main_model.cc" line="103"/>
-        <source>Server&apos;s fingerprint is correct.</source>
-        <translation>Fingerabdruck des Servers ist korrekt.</translation>
-    </message>
-    <message>
-        <location filename="../model/main_model.cc" line="207"/>
-        <source>Verify connection</source>
-        <translation>Verbindung wird überprüft</translation>
-    </message>
-    <message>
-        <location filename="../model/main_model.cc" line="215"/>
-        <source>Task has not been scheduled, because the connection could not be established</source>
-        <translation>Zeitgesteuertes Backup konnte nicht erstellt werden, da die Verbindung nicht hergestellt werden konnte</translation>
-    </message>
-    <message>
-        <location filename="../model/main_model.cc" line="98"/>
-        <source>Server fingerprint validation failed</source>
-        <translation>Fingerabdruck des Servers konnte nicht validiert werden</translation>
-    </message>
-    <message>
-        <location filename="../model/main_model.cc" line="348"/>
-        <source>Some restore info files could not be opened</source>
-        <translation>Einige Wiederhergestellten Info Dokumente konnten nicht geöffnet werden</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <location filename="../gui/main_window.cc" line="44"/>
-        <source>Keep settings?</source>
-        <translation>Einstellungen beibehalten?</translation>
-    </message>
-    <message>
-        <location filename="../gui/main_window.ui" line="47"/>
-        <source>background-color: white</source>
-        <translation>Hintergrundfarbe: weiss</translation>
-    </message>
-    <message>
-        <location filename="../gui/main_window.ui" line="105"/>
-        <location filename="../gui/main_window.ui" line="308"/>
-        <source>&amp;Backup</source>
-        <translation>&amp;Backup</translation>
-    </message>
-    <message>
-        <location filename="../gui/main_window.ui" line="136"/>
-        <location filename="../gui/main_window.ui" line="316"/>
-        <source>&amp;Restore</source>
-        <translation>&amp;Wiederherstellen</translation>
-    </message>
-    <message>
-        <location filename="../gui/main_window.ui" line="167"/>
-        <location filename="../gui/main_window.ui" line="324"/>
-        <source>&amp;Settings</source>
-        <translation>&amp;Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../gui/main_window.ui" line="262"/>
-        <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
-    </message>
-    <message>
-        <location filename="../gui/main_window.ui" line="268"/>
-        <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
-    </message>
-    <message>
-        <location filename="../gui/main_window.ui" line="274"/>
-        <source>&amp;Tools</source>
-        <translation>&amp;Werkzeuge</translation>
-    </message>
-    <message>
-        <location filename="../gui/main_window.ui" line="292"/>
-        <source>&amp;Exit</source>
-        <translation>&amp;Beenden</translation>
-    </message>
-    <message>
-        <location filename="../gui/main_window.ui" line="332"/>
-        <source>&amp;About</source>
-        <translation>&amp;Über Sepiola</translation>
-    </message>
-    <message>
-        <location filename="../gui/main_window.ui" line="335"/>
-        <location filename="../gui/main_window.ui" line="338"/>
-        <source>About</source>
-        <translation>Über Sepiola</translation>
-    </message>
-    <message>
-        <location filename="../gui/main_window.ui" line="346"/>
-        <source>&amp;Help Contents</source>
-        <translation>&amp;Hilfe Inhalte</translation>
-    </message>
-    <message>
-        <location filename="../gui/main_window.ui" line="19"/>
-        <source>Sepiola Online Backup Client</source>
-        <translation>Sepiola Online Backup Client</translation>
-    </message>
-    <message>
-        <location filename="../gui/main_window.cc" line="44"/>
-        <source>The application has been reinstalled.
-Do you want to keep the settings?</source>
-        <translation>Die Anwendung wurde neu installiert.
-Möchten Sie Ihre Einstellungen beibehalten?</translation>
-    </message>
-    <message>
-        <location filename="../gui/main_window.ui" line="351"/>
-        <source>View Logfile</source>
-        <translation>Logdatei ansehen</translation>
-    </message>
-    <message>
-        <location filename="../gui/main_window.ui" line="198"/>
-        <location filename="../gui/main_window.ui" line="359"/>
-        <source>&amp;Logfile</source>
-        <translation>&amp;Logdatei</translation>
-    </message>
-    <message>
-        <location filename="../gui/main_window.cc" line="88"/>
-        <source>Missing Settings</source>
-        <translation>Fehlende Einstellung</translation>
-    </message>
-    <message>
-        <location filename="../gui/main_window.cc" line="88"/>
-        <source>Please fill in username (as provided by the backup-space provider) as well as the computername.</source>
-        <translation>Bitte geben sie Ihren Benutzernamen sowie Computernamen ein.</translation>
-    </message>
-    <message>
-        <location filename="../gui/main_window.ui" line="74"/>
-        <location filename="../gui/main_window.ui" line="300"/>
-        <source>&amp;Overview</source>
-        <translation>&amp;Übersicht</translation>
-    </message>
-</context>
-<context>
-    <name>OutputDialog</name>
-    <message>
-        <location filename="../gui/output_dialog.ui" line="16"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <location filename="../gui/output_dialog.ui" line="22"/>
-        <source>Info:</source>
-        <translation>Info:</translation>
-    </message>
-    <message>
-        <location filename="../gui/output_dialog.ui" line="45"/>
-        <source>Error:</source>
-        <translation>Fehler:</translation>
-    </message>
-    <message>
-        <location filename="../gui/output_dialog.ui" line="87"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Abbrechen</translation>
-    </message>
-    <message>
-        <location filename="../gui/output_dialog.ui" line="97"/>
-        <source>C&amp;lose</source>
-        <translation>&amp;Schliessen</translation>
-    </message>
-</context>
-<context>
-    <name>OverviewForm</name>
-    <message>
-        <location filename="../gui/overview_form.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formular</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="29"/>
-        <source>&lt;span style=&quot; color:#5f5f67;&quot;&gt;Overview&lt;/span&gt;</source>
-        <translation>&lt;span style=&quot; color:#5f5f67;&quot;&gt;Übersicht&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="51"/>
-        <source>Backup space usage</source>
-        <translation>Backup Speichernutzung</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="111"/>
-        <location filename="../gui/overview_form.ui" line="466"/>
-        <location filename="../gui/overview_form.ui" line="534"/>
-        <location filename="../gui/overview_form.ui" line="602"/>
-        <location filename="../gui/overview_form.ui" line="670"/>
-        <location filename="../gui/overview_form.ui" line="738"/>
-        <source>Backup</source>
-        <translation>Backup</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="118"/>
-        <source>Incremental backups</source>
-        <translation>Inkrementelles Backup</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="125"/>
-        <source>Free</source>
-        <translation>Freier Speicherplatz</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="132"/>
-        <source>Quota</source>
-        <translation>Quota</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="139"/>
-        <source>30%</source>
-        <translation>30%</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="146"/>
-        <location filename="../gui/overview_form.ui" line="153"/>
-        <source>35%</source>
-        <translation>35%</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="166"/>
-        <source>711 MB</source>
-        <translation>711 MB</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="182"/>
-        <source>2 GB</source>
-        <translation>2 GB</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="198"/>
-        <source>598 MB</source>
-        <translation>598 MB</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="214"/>
-        <source>739 MB</source>
-        <translation>739 MB</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="270"/>
-        <source>&lt;a href=&quot;http://www.quotaChangeTemp.org&quot;&gt;quotaChangeLink&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://www.quotaChangeTemp.org&quot;&gt;quotaChangeLink&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="387"/>
-        <source>Backup schedule</source>
-        <translation>Backup Planung</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="420"/>
-        <source>Last Backups</source>
-        <translation>Letzte Backups</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="779"/>
-        <source>
-Next Backup</source>
-        <translation>Geplante Backups</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="820"/>
-        <source>next Backup</source>
-        <translation>Nächster Backup</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="854"/>
-        <source>B&amp;ackup now</source>
-        <translation>B&amp;ackup jetzt starten</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="479"/>
-        <location filename="../gui/overview_form.ui" line="615"/>
-        <location filename="../gui/overview_form.ui" line="683"/>
-        <location filename="../gui/overview_form.ui" line="751"/>
-        <source>Freitag, 10.03.2011  12:34</source>
-        <translation>Freitag, 10.03.2011  12:34</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="547"/>
-        <source>Donnerstag, 10.03.2011  12:34</source>
-        <translation>Donnerstag, 10.03.2011  12:34</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.ui" line="827"/>
-        <source>Freitag, 04.06.2012  23:05</source>
-        <translation>Freitag, 04.06.2012  23:05</translation>
-    </message>
-</context>
-<context>
-    <name>PasswordDialog</name>
-    <message>
-        <location filename="../gui/password_dialog.ui" line="16"/>
-        <source>Login</source>
-        <translation>Anmeldung</translation>
-    </message>
-    <message>
-        <location filename="../gui/password_dialog.ui" line="22"/>
-        <source>Please enter your username and password:</source>
-        <translation>Bitte geben Sie Ihren Benutzernamen und Ihr Passwort ein:</translation>
-    </message>
-    <message>
-        <location filename="../gui/password_dialog.ui" line="41"/>
-        <source>Password:</source>
-        <translation>Passwort:</translation>
-    </message>
-    <message>
-        <location filename="../gui/password_dialog.ui" line="72"/>
-        <source>&amp;OK</source>
-        <translation>&amp;OK</translation>
-    </message>
-    <message>
-        <location filename="../gui/password_dialog.ui" line="79"/>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Abbrechen</translation>
-    </message>
-    <message>
-        <location filename="../gui/password_dialog.ui" line="31"/>
-        <source>Username:</source>
-        <translation>Benutzername:</translation>
-    </message>
-</context>
-<context>
-    <name>PatternDialog</name>
-    <message>
-        <location filename="../gui/pattern_dialog.cc" line="70"/>
-        <source>Add</source>
-        <translation>Hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../gui/pattern_dialog.cc" line="70"/>
-        <source>Add a pattern</source>
-        <translation>Verzeichnis hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../gui/pattern_dialog.ui" line="13"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <location filename="../gui/pattern_dialog.ui" line="19"/>
-        <source>Label</source>
-        <translation>Beschriftung</translation>
-    </message>
-    <message>
-        <location filename="../gui/pattern_dialog.ui" line="29"/>
-        <source>&amp;Add</source>
-        <translation>&amp;Hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../gui/pattern_dialog.ui" line="43"/>
-        <source>&amp;Remove</source>
-        <translation>&amp;Entfernen</translation>
-    </message>
-    <message>
-        <location filename="../gui/pattern_dialog.cc" line="84"/>
-        <source>Edit</source>
-        <translation>Bearbeiten</translation>
-    </message>
-    <message>
-        <location filename="../gui/pattern_dialog.cc" line="84"/>
-        <source>Edit %1 pattern</source>
-        <translation>Verzeichnis %1 bearbeiten</translation>
-    </message>
-    <message>
-        <location filename="../gui/pattern_dialog.ui" line="36"/>
-        <source>&amp;Edit</source>
-        <translation>&amp;Bearbeiten</translation>
-    </message>
-</context>
-<context>
-    <name>Plink</name>
-    <message>
-        <location filename="../tools/plink.cc" line="266"/>
-        <source>Username or password not valid</source>
-        <translation>Benutzername oder Password ungültig</translation>
-    </message>
-</context>
-<context>
-    <name>PosixAcl</name>
-    <message>
-        <location filename="../tools/posix_acl.cc" line="90"/>
-        <source>
-Warning: The permissions of some files could not be backed up. See above for details.</source>
-        <translation>Warnung: Die Berechtigungen von einigen Dateien konten nicht gebackupt werden. Siehe oben für weitere Details.</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <location filename="../tools/process.cc" line="76"/>
-        <source>The process %1 failed to start. Either the invoked program is missing, or you may have insufficient permissions to invoke the program.</source>
-        <translation>Der Prozess %1 ist wurde nicht gestartet. Entweder ist das aufgerufene Programm nicht vorhanden, oder Sie haben nicht genügend Rechte um es auszuführen.</translation>
-    </message>
-    <message>
-        <location filename="../settings/settings.cc" line="145"/>
-        <source>English</source>
-        <translation>Englisch</translation>
-    </message>
-    <message>
-        <location filename="../settings/settings.cc" line="146"/>
-        <source>German</source>
-        <translation>Deutsch</translation>
-    </message>
-    <message>
-        <location filename="../main.cc" line="370"/>
-        <source>Application started</source>
-        <translation>Applikation wurde gestartet</translation>
-    </message>
-    <message>
-        <location filename="../main.cc" line="372"/>
-        <source>Application closed</source>
-        <translation>Applikation wurde beendet</translation>
-    </message>
-    <message>
-        <location filename="../tools/at.cc" line="83"/>
-        <location filename="../tools/schtasks.cc" line="154"/>
-        <source>Scheduled task has been created</source>
-        <translation>Zeitgesteuertes Backup wurde eingerichtet</translation>
-    </message>
-    <message>
-        <location filename="../tools/crontab.cc" line="44"/>
-        <source>Scheduling failed, because no vixie cron has been found</source>
-        <translation>Der Task konnte nicht hinzugefügt werden, da kein Vixie Cron gefunden wurde</translation>
-    </message>
-    <message>
-        <location filename="../tools/crontab.cc" line="124"/>
-        <source>Scheduling failed, because file %1 could not be written</source>
-        <translation>Der Task konnte nicht hinzugefügt werden, da die Datei %1 nicht erstellt werden konnte</translation>
-    </message>
-    <message>
-        <location filename="../tools/crontab.cc" line="170"/>
-        <source>Job has been scheduled.</source>
-        <translation>Auftrag wurde geplant.</translation>
-    </message>
-    <message>
-        <location filename="../tools/crontab.cc" line="143"/>
-        <source>Scheduling failed. Reason is: </source>
-        <translation>Zeitplanung fehlgeschlagen. Grund:</translation>
-    </message>
-    <message>
-        <location filename="../tools/posix_acl.cc" line="67"/>
-        <source>Getting metadata for %1</source>
-        <translation>Dateiberechtigungen werden für %1 ermittelt</translation>
-    </message>
-    <message>
-        <location filename="../tools/posix_acl.cc" line="174"/>
-        <location filename="../tools/unix_permissions.cc" line="120"/>
-        <source>Setting metadata for %1</source>
-        <translation>Dateiberechtigungen werden für %1 gesetzt</translation>
-    </message>
-    <message>
-        <location filename="../tools/unix_permissions.cc" line="130"/>
-        <source>Cannot change owner/group for %1
-</source>
-        <translation>Besitzer/Gruppe können für %1 nicht gesetzt werden
-</translation>
-    </message>
-    <message>
-        <location filename="../tools/posix_acl.cc" line="147"/>
-        <source>Can not set metadata for %1 because the metadata are broken</source>
-        <translation>Dateiberechtigungen für %1 können nicht gesetzt werden, da die Metadaten fehlerhaft sind</translation>
-    </message>
-    <message>
-        <location filename="../model/remote_dir_model.cc" line="55"/>
-        <source>Name</source>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <location filename="../tools/posix_acl.cc" line="210"/>
-        <location filename="../tools/set_acl.cc" line="197"/>
-        <source>Error occurred while setting ACL&apos;s:
-</source>
-        <translation>Während dem setzen der ACLs ist ein Fehler aufgetreten:
-</translation>
-    </message>
-    <message>
-        <location filename="../tools/set_acl.cc" line="82"/>
-        <source>Error occurred while getting ACL&apos;s:
-</source>
-        <translation>Während dem lesen der ACLs ist ein Fehler aufgetreten:
-</translation>
-    </message>
-    <message>
-        <location filename="../tools/unix_permissions.cc" line="137"/>
-        <source>Error occurred while setting permissions:
-</source>
-        <translation>Während dem setzen der Berechtigungen ist ein Fehler aufgetreten:
-</translation>
-    </message>
-    <message>
-        <location filename="../main.cc" line="362"/>
-        <source>Update started</source>
-        <translation>Aktualisierung gestartet</translation>
-    </message>
-    <message>
-        <location filename="../tools/set_acl.cc" line="116"/>
-        <source>Preparing metadata</source>
-        <translation>Bereite Metadaten vor</translation>
-    </message>
-    <message>
-        <location filename="../tools/schtasks.cc" line="105"/>
-        <source>Enter login information to create the schedule task.</source>
-        <translation>Geben sie ihre Login Informationen ein um den geplanten Task zu erzeugen.</translation>
-    </message>
-    <message>
-        <location filename="../tools/schtasks.cc" line="158"/>
-        <source>Scheduled task could not be created</source>
-        <translation>Geplanter Task konnte nicht erzeugt werden</translation>
-    </message>
-    <message>
-        <location filename="../tools/schtasks.cc" line="205"/>
-        <source>Enter login information to update the existing schedule task.</source>
-        <translation>Geben sie ihre Login Informationen ein um den geplanten Task zu aktualisieren.</translation>
-    </message>
-    <message>
-        <location filename="../tools/schtasks.cc" line="254"/>
-        <source>Scheduled task has been updated</source>
-        <translation>Geplanter Task wurde aktualisiert</translation>
-    </message>
-    <message>
-        <location filename="../tools/schtasks.cc" line="258"/>
-        <source>Scheduled task could not be updated</source>
-        <translation>Geplanter Task konnte nicht aktualisiert werden</translation>
-    </message>
-    <message>
-        <location filename="../utils/file_system_utils.cc" line="94"/>
-        <source>converted data could not be written to temporary file %1</source>
-        <translation>Konvertierte Daten konnten nicht in die temporäre Datei %1 geschrieben werden</translation>
-    </message>
-    <message>
-        <location filename="../utils/file_system_utils.cc" line="104"/>
-        <source>Could not rename file %1 to %2.</source>
-        <translation>Konnte Datei %1 nicht nach %2 umbenennen.</translation>
-    </message>
-    <message>
-        <location filename="../tools/plink.cc" line="134"/>
-        <source>Unable to open connection</source>
-        <translation>Verbindung konnte nicht hergestellt werden</translation>
-    </message>
-    <message>
-        <location filename="../tools/plink.cc" line="234"/>
-        <source>Log in ...</source>
-        <translation>Anmelden ...</translation>
-    </message>
-    <message>
-        <location filename="../tools/plink.cc" line="268"/>
-        <source>Login successful</source>
-        <translation>Anmeldung erfolgreich</translation>
-    </message>
-    <message>
-        <location filename="../tools/plink.cc" line="269"/>
-        <source>Generating key pair ... (This may take a while)</source>
-        <translation>Generiere Schlüssel Paar ...(Dies kann einen Moment dauern)</translation>
-    </message>
-    <message>
-        <location filename="../tools/plink.cc" line="293"/>
-        <source>Key has not been generated</source>
-        <translation>Schlüssel konnte nicht generiert werden</translation>
-    </message>
-    <message>
-        <location filename="../tools/plink.cc" line="301"/>
-        <source>Key has been generated</source>
-        <translation>Schlüssel wurde generiert</translation>
-    </message>
-    <message>
-        <location filename="../cli/cli_manager.cc" line="324"/>
-        <source>Caution: Cannot turn off the password echoing! Password will be shown when typed.</source>
-        <translation>Achtung: Die Passwortanzeige kann nicht ausgeschaltet werden! Passwort wird beim eintippen angezeigt.</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.cc" line="53"/>
-        <location filename="../gui/settings_form.cc" line="52"/>
-        <source>&lt;a href=&quot;%1&quot;&gt;Change quota&lt;/a&gt; (opens a browser window)</source>
-        <translation>&lt;a href=&quot;%1&quot;&gt;Quota ändern&lt;/a&gt; (Öffnet ein Browserfenster)</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.cc" line="126"/>
-        <source>Scheduled</source>
-        <translation>Geplant</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.cc" line="131"/>
-        <source>Not scheduled</source>
-        <translation>Momentan sind keine Backups vorhanden</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.cc" line="190"/>
-        <source>&amp;mdash; GB</source>
-        <translation>&amp;mdash; GB</translation>
-    </message>
-    <message>
-        <location filename="../gui/overview_form.cc" line="195"/>
-        <source>&amp;mdash; %</source>
-        <translation>&amp;mdash; %</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.cc" line="217"/>
-        <source>Restore destination folder</source>
-        <translation>Zielordner Wiederherstellen</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_task.cc" line="62"/>
-        <source>&lt;font color=&quot;green&quot;&gt;Successful&lt;/font&gt;</source>
-        <translation>&lt;font color=&quot;grün&quot;&gt;Erfolgreich&lt;/font&gt;</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_task.cc" line="63"/>
-        <source>&lt;font color=&quot;orange&quot;&gt;Warnings&lt;/font&gt;</source>
-        <translation>&lt;font color=&quot;orange&quot;&gt;Warnungen&lt;/font&gt;</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_task.cc" line="64"/>
-        <source>&lt;font color=&quot;red&quot;&gt;Failed&lt;/font&gt;</source>
-        <translation>&lt;font color=&quot;rot&quot;&gt;Fehlgeschlagen&lt;/font&gt;</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_task.cc" line="65"/>
-        <source>undefined</source>
-        <translation>Nicht definiert</translation>
-    </message>
-    <message>
-        <location filename="../model/backup_thread.cc" line="330"/>
-        <source>creating server directories</source>
-        <translation>Erstellen von Serververzeichnissen</translation>
-    </message>
-    <message>
-        <location filename="../model/scheduled_task.cc" line="33"/>
-        <source>Monday</source>
-        <translation>Montag</translation>
-    </message>
-    <message>
-        <location filename="../model/scheduled_task.cc" line="34"/>
-        <source>Tuesday</source>
-        <translation>Dienstag</translation>
-    </message>
-    <message>
-        <location filename="../model/scheduled_task.cc" line="35"/>
-        <source>Wednesday</source>
-        <translation>Mittwoch</translation>
-    </message>
-    <message>
-        <location filename="../model/scheduled_task.cc" line="36"/>
-        <source>Thursday</source>
-        <translation>Donnerstag</translation>
-    </message>
-    <message>
-        <location filename="../model/scheduled_task.cc" line="37"/>
-        <source>Friday</source>
-        <translation>Freitag</translation>
-    </message>
-    <message>
-        <location filename="../model/scheduled_task.cc" line="38"/>
-        <source>Saturday</source>
-        <translation>Samstag</translation>
-    </message>
-    <message>
-        <location filename="../model/scheduled_task.cc" line="39"/>
-        <source>Sunday</source>
-        <translation>Sonntag</translation>
-    </message>
-    <message>
-        <location filename="../model/scheduled_task.cc" line="155"/>
-        <source>never</source>
-        <translation>nie</translation>
-    </message>
-    <message>
-        <location filename="../model/scheduled_task.cc" line="183"/>
-        <source>%1</source>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../model/scheduled_task.cc" line="185"/>
-        <source>no weekdays selected</source>
-        <translation>Keine Wochentage ausgewählt</translation>
-    </message>
-    <message>
-        <location filename="../model/scheduled_task.cc" line="191"/>
-        <source>%1 minutes after startup</source>
-        <translation>%1 Minuten nach dem Hochfahren der Computers</translation>
-    </message>
-    <message>
-        <location filename="../settings/settings.cc" line="262"/>
-        <source>reseller address (missing)</source>
-        <translation>Wiederverkäufer Adresse (fehlend)</translation>
-    </message>
-    <message>
-        <location filename="../tools/rsync.cc" line="522"/>
-        <location filename="../tools/rsync.cc" line="599"/>
-        <source>rsync exited with with exitCode %1 (%2 %3).</source>
-        <translation>rsync beendern mit dem exitCode %1 (%2 %3).</translation>
-    </message>
-    <message>
-        <location filename="../utils/file_system_utils.cc" line="102"/>
-        <source>Trying to rename file %1 to %2:
-  -&gt; file %1 could nod be removed.</source>
-        <translation>Versuch die Datei %1 zu %2 umzubenennen:
-  -&gt;Datei %1 konnte nicht entfernt werden. </translation>
-    </message>
-    <message>
-        <location filename="../gui/settings_form.cc" line="48"/>
-        <location filename="../gui/settings_form.cc" line="50"/>
-        <source>Total size: %1 GB, free: %2 GB</source>
-        <translation>Gesamtgrösse: %1 GB, Frei: %2 GB</translation>
-    </message>
-    <message>
-        <location filename="../tools/rsync.cc" line="1034"/>
-        <source>rsync exited with exitCode %1 (%2 %3).</source>
-        <translation>rsync beendern mit dem exitCode %1 (%2 %3).</translation>
-    </message>
-</context>
-<context>
-    <name>RestoreForm</name>
-    <message>
-        <location filename="../gui/restore_form.cc" line="265"/>
-        <source>No files and/or directories has been selected.</source>
-        <translation>Es wurden keine Dateien und/oder Verzeichnisse ausgewählt.</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.cc" line="258"/>
-        <source>No backup has been selected.</source>
-        <translation>Es wurde kein Backup ausgewählt.</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.cc" line="277"/>
-        <source>Specific destination path is not valid</source>
-        <translation>Ausgewählter Ziel Pfad ist ungültig</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.cc" line="109"/>
-        <source>Today</source>
-        <translation>Heute</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.ui" line="14"/>
-        <source>Restore</source>
-        <translation>Wiederherstellen</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.ui" line="125"/>
-        <location filename="../gui/restore_form.ui" line="214"/>
-        <source>info</source>
-        <translation>Info</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.cc" line="284"/>
-        <source>Full restore</source>
-        <translation>Vollständige Wiederherstellung</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.cc" line="288"/>
-        <source>Custom restore</source>
-        <translation>Benutzerdefiniertes Wiederherstellen</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.cc" line="133"/>
-        <source>No prefixes found</source>
-        <translation>Kein Präfix gefunden</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.cc" line="145"/>
-        <source>Nothing found to restore</source>
-        <translation>Nichts zum Widerherstellen gefunden</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.cc" line="54"/>
-        <source>Downloading prefixes</source>
-        <translation>Lade Präfixe herunter</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.cc" line="94"/>
-        <source>Downloading restore meta data</source>
-        <translation>Lade zurückzusichernde Metadaten herunter</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.cc" line="253"/>
-        <source>You can not start a restore because no backup is available.</source>
-        <translation>Sie können kein Restore starten weil noch kein Backup auf dem Server verfügbar ist.</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.ui" line="29"/>
-        <source>&lt;span style=&quot; color:#5f5f67;&quot;&gt;Restore&lt;/span&gt;</source>
-        <translation>&lt;span style=&quot; color:#5f5f67;&quot;&gt;Wiederherstellen&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.ui" line="52"/>
-        <source>&amp;Refresh</source>
-        <translation>&amp;Aktualisieren</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.ui" line="102"/>
-        <source>Select name:</source>
-        <translation>Name auwsählen:</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.ui" line="188"/>
-        <source>Select date:</source>
-        <translation>Datum auswählen:</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.ui" line="251"/>
-        <source>F&amp;ull Restore (restore all files)</source>
-        <translation>V&amp;ollständige Wiederherstellung </translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.ui" line="261"/>
-        <source>Restore selected &amp;files and folder</source>
-        <translation>Wiederherstellung der ausgewählten &amp;Dateien und Ordner</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.ui" line="312"/>
-        <source>Restore to &amp;custom location</source>
-        <translation>Wiederherstellung an &amp;Alternativpfad</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.ui" line="319"/>
-        <source>Restore to &amp;original location</source>
-        <translation>Wiederherstellung an &amp;Originalpfad</translation>
-    </message>
-    <message>
-        <location filename="../gui/restore_form.ui" line="139"/>
-        <source>Backups are saved under the computer name you chose under settings</source>
-        <translation>Backups wurden unter dem Computernamen gesichert, welchen Sie unter Einstellungen gewählt haben</translation>
-    </message>
-</context>
-<context>
-    <name>RestoreThread</name>
-    <message>
-        <location filename="../model/restore_thread.cc" line="75"/>
-        <source>Downloading files and/or directories ...</source>
-        <translation>Lade Daten und/oder Verzeichnisse herunter ...</translation>
-    </message>
-    <message>
-        <location filename="../model/restore_thread.cc" line="86"/>
-        <source>Applying Metadata</source>
-        <translation>Metadaten werden übernommen</translation>
-    </message>
-    <message>
-        <location filename="../model/restore_thread.cc" line="90"/>
-        <source>Restore done.</source>
-        <translation>Wiederherstellung der Daten abgeschlossen.</translation>
-    </message>
-    <message>
-        <location filename="../model/restore_thread.cc" line="94"/>
-        <source>Restore failed.</source>
-        <translation>Wiederherstellung fehlgeschlagen.</translation>
-    </message>
-    <message>
-        <location filename="../model/restore_thread.cc" line="138"/>
-        <source>Restore has been aborted</source>
-        <translation>Wiederherstellung wurde abgebrochen</translation>
-    </message>
-    <message>
-        <location filename="../model/restore_thread.cc" line="100"/>
-        <source>Restore aborted.</source>
-        <translation>Wiederherstellen abgebrochen.</translation>
-    </message>
-    <message>
-        <location filename="../model/restore_thread.cc" line="121"/>
-        <source>WARNING: Setting of metadata failed. File %1 has not been found on the server. Possibly you are restoring data from a backup of another platform/os.</source>
-        <translation>WARNUNG: Die Einstellung der Metadaten ist fehlgeschlagen. Die Datei %1 ist nicht auf dem Server gefunden worden. Eventuell ist die Wiederherstellung der Daten auseinem Backup oder einer anderen Plattform/OS.</translation>
-    </message>
-</context>
-<context>
-    <name>Rsync</name>
-    <message>
-        <location filename="../tools/rsync.cc" line="506"/>
-        <location filename="../tools/rsync.cc" line="579"/>
-        <location filename="../tools/rsync.cc" line="580"/>
-        <source>%1 files and/or directories downloaded</source>
-        <translation>%1 Dateien und/oder Verzeichnisse heruntergeladen</translation>
-    </message>
-    <message>
-        <location filename="../tools/rsync.cc" line="515"/>
-        <location filename="../tools/rsync.cc" line="591"/>
-        <source>Error occurred while downloading: </source>
-        <translation>Während dem Herunterladen ist ein Fehler aufgetreten:</translation>
-    </message>
-    <message>
-        <location filename="../tools/rsync.cc" line="199"/>
-        <location filename="../tools/rsync.cc" line="339"/>
-        <source>%1 files and/or directories processed</source>
-        <translation>%1 Dateien und/oder Verzeichnisse bearbeitet</translation>
-    </message>
-    <message>
-        <location filename="../tools/rsync.cc" line="170"/>
-        <location filename="../tools/rsync.cc" line="320"/>
-        <source>Uploading %1</source>
-        <translation>Lade %1 hoch</translation>
-    </message>
-    <message>
-        <location filename="../tools/rsync.cc" line="177"/>
-        <location filename="../tools/rsync.cc" line="327"/>
-        <source>Deleting %1</source>
-        <translation>Lösche %1</translation>
-    </message>
-    <message>
-        <location filename="../tools/rsync.cc" line="499"/>
-        <location filename="../tools/rsync.cc" line="572"/>
-        <source>Downloading %1</source>
-        <translation>Lade %1 herunter</translation>
-    </message>
-    <message>
-        <location filename="../tools/rsync.cc" line="1023"/>
-        <source>Warning: At least one file could not be backuped up. See above for details.</source>
-        <translation>Warnung: Mindestens eine Datei konnte nicht gesichert werden. Siehe oben für weitere Details </translation>
-    </message>
-    <message>
-        <location filename="../tools/rsync.cc" line="1028"/>
-        <source>Warning: Some files have been renamed, moved or deleted during backup before they could be uploaded to the server.
-Usually this concerns temporary files and this warning can be ignored. See above for details.</source>
-        <translation>Warnung: Einige Dateien wurden währen des backups umbenannt, verschoben oder gelöscht bevor sie auf den Server hochgeladen werden konnten.
-In der Regel betrifft dies temporäre Dateien und diese Warnung kann ignoriert werden. Siehe oben für weitere Details.</translation>
-    </message>
-    <message>
-        <location filename="../tools/rsync.cc" line="174"/>
-        <location filename="../tools/rsync.cc" line="324"/>
-        <source>Skipping %1</source>
-        <translation>Überspringe %1</translation>
-    </message>
-</context>
-<context>
-    <name>SettingsForm</name>
-    <message>
-        <location filename="../gui/settings_form.cc" line="99"/>
-        <source>Settings saved</source>
-        <translation>Einstellungen gespeichert</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings_form.cc" line="110"/>
-        <location filename="../gui/settings_form.cc" line="128"/>
-        <source>Unsaved settings</source>
-        <translation>Nicht gespeicherte Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings_form.cc" line="110"/>
-        <source>Your settings have been modified.
-Do you want to restore the original settings?</source>
-        <translation>Ihre Einstellungen wurden geändert.
-Wollen Sie Ihre original Einstellungen wiederherstellen?</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings_form.ui" line="14"/>
-        <source>Settings</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings_form.ui" line="87"/>
-        <source>Username:</source>
-        <translation>Benutzername:</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings_form.cc" line="34"/>
-        <source>S&amp;ave</source>
-        <translation>S&amp;peichern</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings_form.cc" line="99"/>
-        <source>Settings have been saved.</source>
-        <translation>Einstellungen wurden gespeichert.</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings_form.ui" line="167"/>
-        <source>Defa&amp;ult</source>
-        <translation>St&amp;andard</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings_form.cc" line="37"/>
-        <source>&amp;Cancel</source>
-        <translation>Abbre&amp;chen</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings_form.cc" line="128"/>
-        <source>Your settings have been modified.
-Do you want to save the settings before leaving this view?</source>
-        <translation>Ihre Einstellungen wurden geändert.
-Wollen Sie die Einstellungen vor dem verlassen speichern?</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings_form.ui" line="35"/>
-        <source>&lt;span style=&quot; color:#5f5f67;&quot;&gt;Settings&lt;/span&gt;</source>
-        <translation>&lt;span style=&quot; color:#5f5f67;&quot;&gt;Einstellungen&lt;/span&gt;</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings_form.ui" line="122"/>
-        <source>Computername:</source>
-        <translation>Computern...
 
[truncated message content]

[Sepiola-commits] SF.net SVN: sepiola:[323] trunk

From: <tiz...@us...> - 2012-09-04 15:15:56

Revision: 323
          http://sepiola.svn.sourceforge.net/sepiola/?rev=323&view=rev
Author:   tizianomueller
Date:     2012-09-04 15:15:45 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
Introduce cmake OBJECT library to reduce build-time significantly on Windows and as prep work for cli client.

Modified Paths:
--------------
    trunk/CMakeLists.txt
    trunk/src/CMakeLists.txt

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2012-08-14 05:50:45 UTC (rev 322)
+++ trunk/CMakeLists.txt	2012-09-04 15:15:45 UTC (rev 323)
@@ -14,7 +14,9 @@
 #| along with this program; if not, write to the Free Software
 #| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-cmake_minimum_required(VERSION 2.6.2)
+cmake_minimum_required(VERSION 2.8.0)
+
+# If available, enable developer warnings for the build system
 if(POLICY CMP0005)
     cmake_policy(SET CMP0005 NEW)
 endif(POLICY CMP0005)

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2012-08-14 05:50:45 UTC (rev 322)
+++ trunk/src/CMakeLists.txt	2012-09-04 15:15:45 UTC (rev 323)
@@ -145,7 +145,20 @@
 CONFIGURE_FILE(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
 QT4_WRAP_CPP(
-	sepiola_MOC 
+	sepiola_base_MOC
+	tools/abstract_informing_process.hh
+	tools/abstract_rsync.hh
+	tools/abstract_scheduler.hh
+	tools/rsync.hh
+	settings/settings.hh
+	utils/log_file_utils.hh
+	model/backup_thread.hh
+	model/main_model.hh
+	model/restore_thread.hh
+)
+
+QT4_WRAP_CPP(
+	sepiola_ui_MOC
 	cli/cli_manager.hh
 	gui/about_dialog.hh
 	gui/backup_form.hh 
@@ -159,15 +172,6 @@
 	gui/pattern_dialog.hh
 	gui/output_dialog.hh 
 	gui/traffic_progress_dialog.hh
-	model/backup_thread.hh
-	model/main_model.hh
-	model/restore_thread.hh
-	tools/abstract_informing_process.hh
-	tools/abstract_rsync.hh
-	tools/abstract_scheduler.hh
-	tools/rsync.hh
-	settings/settings.hh
-	utils/log_file_utils.hh
 )
 
 QT4_WRAP_UI(
@@ -192,7 +196,31 @@
 	${RESELLER_LOGO_QRC_FULLFILENAME}
 )
 
-SET(SOURCE_FILES
+SET(BASE_SOURCE_FILES
+	settings/settings.cc
+	tools/plink.cc
+	tools/process.cc
+	tools/rsync.cc
+	tools/tool_factory.cc
+	utils/string_utils.cc
+	utils/extended_file.cc
+	utils/file_system_utils.cc
+	utils/log_file_utils.cc
+	utils/host_file_utils.cc
+	utils/progress_task.cc
+	model/backup_thread.cc
+	model/dir_tree_item.cc
+	model/main_model.cc
+	model/restore_name.cc
+	model/restore_thread.cc
+	model/remote_dir_model.cc
+	model/local_dir_model.cc
+	model/scheduled_task.cc
+	model/backup_task.cc
+	${sepiola_base_MOC}
+)
+
+SET(UI_SOURCE_FILES
 	main.cc
 	cli/cli_manager.cc
 	gui/about_dialog.cc
@@ -207,64 +235,49 @@
 	gui/restore_form.cc 
 	gui/settings_form.cc
 	gui/text_input_dialog.cc
-	model/backup_thread.cc
-	model/dir_tree_item.cc
-	model/main_model.cc 
-	model/restore_name.cc
-	model/restore_thread.cc
-	model/remote_dir_model.cc
-	model/local_dir_model.cc
-	model/scheduled_task.cc
-	model/backup_task.cc
-	settings/settings.cc
 	test/test_manager.cc
-	tools/plink.cc 
-	tools/process.cc 
-	tools/rsync.cc 
-	tools/tool_factory.cc
-	utils/string_utils.cc 
-	utils/extended_file.cc
-	utils/file_system_utils.cc
-	utils/log_file_utils.cc
-	utils/host_file_utils.cc
-	utils/progress_task.cc
 	${sepiola_UI}
-	${sepiola_MOC}
-	${sepiola_RC}
+	${sepiola_ui_MOC}
 	${sepiola_CFG}
 )
 
 # Use Q_WS_WIN from Qt-module instead of WIN32 from cmake
 # to make it work when cross-compiling using MinGW
 IF(Q_WS_WIN)
-    LIST(APPEND SOURCE_FILES
+    LIST(APPEND BASE_SOURCE_FILES
         tools/at.cc
         tools/schtasks.cc
         tools/set_acl.cc
     )
 ELSEIF(Q_WS_MAC)
-    LIST(APPEND SOURCE_FILES
+    LIST(APPEND BASE_SOURCE_FILES
 	    tools/unix_permissions.cc
     )
 ELSEIF(Q_WS_X11)
-    LIST(APPEND SOURCE_FILES
+    LIST(APPEND BASE_SOURCE_FILES
         tools/crontab.cc
         tools/posix_acl.cc
     )
 ENDIF(Q_WS_WIN)
 
+ADD_LIBRARY(sepiola_base_objects OBJECT ${BASE_SOURCE_FILES})
+ADD_LIBRARY(sepiola_ui_objects OBJECT ${UI_SOURCE_FILES})
 
 ADD_EXECUTABLE(
 	${SSBACKUP_EXECUTABLE_NAME}
 	WIN32
 	MACOSX_BUNDLE
-	${SOURCE_FILES}
+    $<TARGET_OBJECTS:sepiola_base_objects>
+    $<TARGET_OBJECTS:sepiola_ui_objects>
+    ${sepiola_RC}
 )
 
 IF(Q_WS_WIN)
 	ADD_EXECUTABLE(
 		${SSBACKUP_EXECUTABLE_NAME}.com
-		${SOURCE_FILES}
+        $<TARGET_OBJECTS:sepiola_base_objects>
+        $<TARGET_OBJECTS:sepiola_ui_objects>
+   	    ${sepiola_RC}
 	)
 	SET_TARGET_PROPERTIES(${SSBACKUP_EXECUTABLE_NAME}.com PROPERTIES SUFFIX "")  # don't add .exe suffix
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[322] tags/release-2.1.0/

From: <tiz...@us...> - 2012-08-14 05:50:51

Revision: 322
          http://sepiola.svn.sourceforge.net/sepiola/?rev=322&view=rev
Author:   tizianomueller
Date:     2012-08-14 05:50:45 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
Tagging release 2.1.0.

Added Paths:
-----------
    tags/release-2.1.0/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[321] trunk/src/test/CMakeLists.txt

From: <tiz...@us...> - 2012-08-10 17:06:11

Revision: 321
          http://sepiola.svn.sourceforge.net/sepiola/?rev=321&view=rev
Author:   tizianomueller
Date:     2012-08-10 17:06:04 +0000 (Fri, 10 Aug 2012)
Log Message:
-----------
Add missing source-deps for building the unittest test_posix_acl.

Modified Paths:
--------------
    trunk/src/test/CMakeLists.txt

Modified: trunk/src/test/CMakeLists.txt
===================================================================
--- trunk/src/test/CMakeLists.txt	2012-08-10 17:05:49 UTC (rev 320)
+++ trunk/src/test/CMakeLists.txt	2012-08-10 17:06:04 UTC (rev 321)
@@ -18,11 +18,16 @@
 
 IF(Q_WS_X11)
 
+# TODO:
+# - remove Settings::SHOW_PROGRESS in process.cc such that we can
+#   remove settings.{cc,hh} and it's rev-deps here
+
 QT4_WRAP_CPP(test_posix_acl_MOC
     test_posix_acl.hh
     ../tools/posix_acl.hh
     ../tools/abstract_informing_process.hh
     ../utils/log_file_utils.hh
+    ../settings/settings.hh
     )
 
 ADD_EXECUTABLE(test_posix_acl test_posix_acl.cc
@@ -32,6 +37,9 @@
     ../utils/log_file_utils.cc
     ../utils/file_system_utils.cc
     ../utils/string_utils.cc
+    ../settings/settings.cc
+    ../model/backup_task.cc
+    ../model/scheduled_task.cc
     )
 
 TARGET_LINK_LIBRARIES(test_posix_acl

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[320] trunk

From: <tiz...@us...> - 2012-08-10 17:05:56

Revision: 320
          http://sepiola.svn.sourceforge.net/sepiola/?rev=320&view=rev
Author:   tizianomueller
Date:     2012-08-10 17:05:49 +0000 (Fri, 10 Aug 2012)
Log Message:
-----------
Various build system fixes (mostly for MinGW building)

- Bump version to 2.1.0
- Small cleanup of debug compiler flags on Linux
- Use CMakeDetermineRCCompilers $CMAKE_RC_COMPILER instead of hardcoded windres path
- Compile platform-specific code only when building for that platform
- Some tests are platform specific, do not build them on others
- Include libraries required when building using MinGW in the installer

Modified Paths:
--------------
    trunk/CMakeLists.txt
    trunk/installer/win32-x86/NSIS.template.in
    trunk/src/CMakeLists.txt
    trunk/src/test/CMakeLists.txt
    trunk/src/tools/schtasks.cc

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2012-08-10 17:05:27 UTC (rev 319)
+++ trunk/CMakeLists.txt	2012-08-10 17:05:49 UTC (rev 320)
@@ -46,13 +46,17 @@
 SET(CPACK_PACKAGE_FULL_NAME ${SSBACKUP_APPLICATION_FULL_NAME})
 SET(CPACK_PACKAGE_VENDOR "stepping stone GmbH")
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "1")
+SET(CPACK_PACKAGE_VERSION_MINOR "1")
+SET(CPACK_PACKAGE_VERSION_PATCH "0")
 SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 SET(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_FULL_NAME})
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
 SET(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README")
 
+IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    SET(CPACK_NSIS_QT_SUFFIX "d")
+ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
+
 # Has to be below the variables because they are accessed in the src/CMakeLists.txt
 ADD_SUBDIRECTORY(src)
 

Modified: trunk/installer/win32-x86/NSIS.template.in
===================================================================
--- trunk/installer/win32-x86/NSIS.template.in	2012-08-10 17:05:27 UTC (rev 319)
+++ trunk/installer/win32-x86/NSIS.template.in	2012-08-10 17:05:49 UTC (rev 320)
@@ -457,6 +457,15 @@
   SetOutPath "$INSTDIR"
   File /r "${INST_DIR}\*.*"
 
+  ;Libraries from the MinGW installation
+  File "@CPACK_INSTALL_PREFIX@/bin/QtCore@CPACK_NSIS_QT_SUFFIX@4.dll"
+  File "@CPACK_INSTALL_PREFIX@/bin/QtGui@CPACK_NSIS_QT_SUFFIX@4.dll"
+  File "@CPACK_INSTALL_PREFIX@/bin/QtNetwork@CPACK_NSIS_QT_SUFFIX@4.dll"
+  File "@CPACK_INSTALL_PREFIX@/bin/zlib1.dll"
+  File "@CPACK_INSTALL_PREFIX@/bin/libpng15-*.dll"
+  File "@CPACK_INSTALL_PREFIX@/bin/libstdc++-6.dll"
+  File "@CPACK_INSTALL_PREFIX@/bin/libgcc_s_sjlj-1.dll"
+
   ;Store installation folder
   WriteRegStr SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "" $INSTDIR
   

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2012-08-10 17:05:27 UTC (rev 319)
+++ trunk/src/CMakeLists.txt	2012-08-10 17:05:49 UTC (rev 320)
@@ -30,7 +30,6 @@
 ENDIF(CMAKE_BUILD_TYPE STREQUAL Deploy)
 
 IF(CMAKE_COMPILER_IS_GNUCXX)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wuninitialized -Winit-self")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wredundant-decls -Wstrict-null-sentinel")
@@ -39,17 +38,18 @@
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wfloat-equal -Wno-long-long")
 
-	SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG")# -Werror")
+	SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG -ggdb")# -Werror")
     SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}" )
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 SET(CMAKE_CXX_FLAGS_DEPLOY ${CMAKE_CXX_FLAGS_RELWITHDEBUGINFO})
 
 IF(Q_WS_WIN)
+    include(CMakeDetermineRCCompiler)
 	# add windows icon
 	SET(ICON_RC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/icon/windows)
 	ADD_CUSTOM_COMMAND(
 		OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/icon.o
-		COMMAND windres.exe -I${ICON_RC_DIR}
+		COMMAND ${CMAKE_RC_COMPILER} -I${ICON_RC_DIR}
 		-i${CMAKE_CURRENT_SOURCE_DIR}/icon/windows/icon.rc
 		-o ${CMAKE_CURRENT_BINARY_DIR}/icon.o
 	)
@@ -193,7 +193,7 @@
 )
 
 SET(SOURCE_FILES
-	main.cc 
+	main.cc
 	cli/cli_manager.cc
 	gui/about_dialog.cc
 	gui/backup_form.cc 
@@ -218,15 +218,9 @@
 	model/backup_task.cc
 	settings/settings.cc
 	test/test_manager.cc
-	tools/at.cc 
-	tools/schtasks.cc
-	tools/crontab.cc
 	tools/plink.cc 
-	tools/posix_acl.cc 
 	tools/process.cc 
 	tools/rsync.cc 
-	tools/set_acl.cc
-	tools/unix_permissions.cc
 	tools/tool_factory.cc
 	utils/string_utils.cc 
 	utils/extended_file.cc
@@ -234,12 +228,32 @@
 	utils/log_file_utils.cc
 	utils/host_file_utils.cc
 	utils/progress_task.cc
-	${sepiola_UI} 
-	${sepiola_MOC} 
+	${sepiola_UI}
+	${sepiola_MOC}
 	${sepiola_RC}
 	${sepiola_CFG}
 )
 
+# Use Q_WS_WIN from Qt-module instead of WIN32 from cmake
+# to make it work when cross-compiling using MinGW
+IF(Q_WS_WIN)
+    LIST(APPEND SOURCE_FILES
+        tools/at.cc
+        tools/schtasks.cc
+        tools/set_acl.cc
+    )
+ELSEIF(Q_WS_MAC)
+    LIST(APPEND SOURCE_FILES
+	    tools/unix_permissions.cc
+    )
+ELSEIF(Q_WS_X11)
+    LIST(APPEND SOURCE_FILES
+        tools/crontab.cc
+        tools/posix_acl.cc
+    )
+ENDIF(Q_WS_WIN)
+
+
 ADD_EXECUTABLE(
 	${SSBACKUP_EXECUTABLE_NAME}
 	WIN32

Modified: trunk/src/test/CMakeLists.txt
===================================================================
--- trunk/src/test/CMakeLists.txt	2012-08-10 17:05:27 UTC (rev 319)
+++ trunk/src/test/CMakeLists.txt	2012-08-10 17:05:49 UTC (rev 320)
@@ -1,3 +1,23 @@
+#| sepiola - Open Source Online Backup Client
+#| Copyright (C) 2012 stepping stone GmbH
+#|
+#| This program is free software; you can redistribute it and/or
+#| modify it under the terms of the GNU General Public License
+#| Version 2 as published by the Free Software Foundation.
+#|
+#| This program is distributed in the hope that it will be useful,
+#| but WITHOUT ANY WARRANTY; without even the implied warranty of
+#| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#| GNU General Public License for more details.
+#|
+#| You should have received a copy of the GNU General Public License
+#| along with this program; if not, write to the Free Software
+#| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+# Unix specific tests
+
+IF(Q_WS_X11)
+
 QT4_WRAP_CPP(test_posix_acl_MOC
     test_posix_acl.hh
     ../tools/posix_acl.hh
@@ -19,6 +39,12 @@
     ${QT_QTCORE_LIBRARY}
     ${QT_QTNETWORK_LIBRARY})
 
+ADD_TEST(test_posix_acl ${CMAKE_CURRENT_BINARY_DIR}/test_posix_acl)
+
+ENDIF(Q_WS_X11)
+
+# All-platform tests
+
 QT4_WRAP_CPP(test_host_file_utils_MOC
     test_host_file_utils.hh
     ../utils/host_file_utils.hh
@@ -35,5 +61,4 @@
     ${QT_QTCORE_LIBRARY}
     ${QT_QTNETWORK_LIBRARY})
 
-ADD_TEST(test_posix_acl ${CMAKE_CURRENT_BINARY_DIR}/test_posix_acl)
 ADD_TEST(test_host_file_utils ${CMAKE_CURRENT_BINARY_DIR}/test_host_file_utils)

Modified: trunk/src/tools/schtasks.cc
===================================================================
--- trunk/src/tools/schtasks.cc	2012-08-10 17:05:27 UTC (rev 319)
+++ trunk/src/tools/schtasks.cc	2012-08-10 17:05:49 UTC (rev 320)
@@ -22,9 +22,7 @@
 #include <QTextCodec>
 #include <QStringList>
 #include <QRegExp>
-#ifdef Q_OS_WIN32
 #include <windows.h>
-#endif
 
 #include "tools/schtasks.hh"
 #include "settings/settings.hh"
@@ -95,10 +93,7 @@
 {
 	qDebug() << "Schtasks::schedule( " << execName << ", " << cliArgument << ", " << schtasksArguments << ", " << locale << " )";
 
-	QString username = "";
-#ifdef Q_OS_WIN32
-	username = QString::fromWCharArray( _wgetenv( L"USERDOMAIN" ) ) + "\\" + QString::fromWCharArray( _wgetenv( L"USERNAME" ) );
-#endif
+	QString username = QString::fromWCharArray( _wgetenv( L"USERDOMAIN" ) ) + "\\" + QString::fromWCharArray( _wgetenv( L"USERNAME" ) );
 
 	QString password;
 	bool schtasks_success = false;
@@ -197,10 +192,7 @@
 	if ( taskExists() )
 	{
 		QLocale locale = getSchtasksBinaryLocale();
-		QString username = "";
-#ifdef Q_OS_WIN32
-		username = QString::fromWCharArray( _wgetenv( L"USERDOMAIN" ) ) + "\\" + QString::fromWCharArray( _wgetenv( L"USERNAME" ) );
-#endif
+		QString username = QString::fromWCharArray( _wgetenv( L"USERDOMAIN" ) ) + "\\" + QString::fromWCharArray( _wgetenv( L"USERNAME" ) );
 		QString password;
 		bool password_ok = getWindowsPassword( username, password, QObject::tr( "Enter login information to update the existing schedule task." ) );
 
@@ -419,11 +411,9 @@
 QString Schtasks::getCodecName()
 {
 	QString codecName = "";
-#ifdef Q_OS_WIN32
 	char oemCodePage[6];
 	GetLocaleInfo( LOCALE_USER_DEFAULT, LOCALE_IDEFAULTCODEPAGE, oemCodePage, sizeof( oemCodePage ) / sizeof( char ) );
 	codecName = QString( oemCodePage );
-#endif
 	return codecName;
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sepiola-commits] SF.net SVN: sepiola:[319] trunk/src/main.cc

From: <tiz...@us...> - 2012-08-10 17:05:33

Revision: 319
          http://sepiola.svn.sourceforge.net/sepiola/?rev=319&view=rev
Author:   tizianomueller
Date:     2012-08-10 17:05:27 +0000 (Fri, 10 Aug 2012)
Log Message:
-----------
Disable createConsole code completely since unused and fails to compile

Modified Paths:
--------------
    trunk/src/main.cc

Modified: trunk/src/main.cc
===================================================================
--- trunk/src/main.cc	2012-08-10 17:05:13 UTC (rev 318)
+++ trunk/src/main.cc	2012-08-10 17:05:27 UTC (rev 319)
@@ -209,6 +209,7 @@
 #endif
 }
 
+#if 0
 void createConsole()
 {
 #ifdef Q_OS_WIN32
@@ -244,6 +245,7 @@
 	// ios::sync_with_stdio();
 #endif
 }
+#endif
 
 int main(int argc, char *argv[])
 {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

1 2 3 > >> (Page 1 of 3)

2011	Jan	Feb	Mar (4)	Apr (1)	May	Jun	Jul	Aug	Sep (4)	Oct	Nov	Dec
2012	Jan	Feb	Mar	Apr	May	Jun	Jul (29)	Aug (9)	Sep (21)	Oct	Nov	Dec