From a6562e5c53162fe92884438c74226c10def2cc8b Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Thu, 24 Jul 2008 15:16:32 +0200 Subject: import boxbackup_0.11~rc2-1.dsc --- bin/bbackupctl/bbackupctl.cpp | 2 + bin/bbackupd/bbackupd-config | 4 +- bin/bbackupd/bbackupd-config.in | 4 +- bin/bbackupquery/bbackupquery.cpp | 2 + bin/bbstoreaccounts/bbstoreaccounts.cpp | 2 + bin/bbstored/bbstored-config | 4 +- debian/boxbackup-client.init | 8 +- debian/boxbackup-client.install | 8 +- debian/boxbackup-client.postinst | 12 +- debian/boxbackup-server.init | 6 +- debian/boxbackup-server.install | 10 +- debian/changelog | 52 ++- debian/control | 4 +- debian/copyright | 4 +- debian/po/cs.po | 44 +- debian/po/de.po | 522 +++++++++++++++++++++++ debian/po/fr.po | 17 +- debian/po/templates.pot | 345 ++++++++------- debian/po/vi.po | 341 +++++++++------ debian/watch | 4 +- documentation/adminguide.xml | 6 - lib/backupclient/BackupClientFileAttributes.cpp | 2 + lib/backupclient/BackupStoreFile.h | 1 + lib/backupclient/BackupStoreFileDiff.cpp | 2 + lib/backupclient/BackupStoreFileEncodeStream.cpp | 2 + lib/common/BoxPortsAndFiles.h | 6 +- lib/common/Configuration.cpp | 2 + lib/common/WaitForEvent.h | 2 + lib/raidfile/RaidFileRead.cpp | 2 + lib/raidfile/raidfile-config.in | 2 +- 30 files changed, 1066 insertions(+), 356 deletions(-) create mode 100644 debian/po/de.po diff --git a/bin/bbackupctl/bbackupctl.cpp b/bin/bbackupctl/bbackupctl.cpp index 033715b6..1eb3d015 100644 --- a/bin/bbackupctl/bbackupctl.cpp +++ b/bin/bbackupctl/bbackupctl.cpp @@ -75,6 +75,8 @@ enum Command SyncAndWaitForEnd, }; +#include + void PrintUsageAndExit() { printf("Usage: bbackupctl [-q] [-c config_file] \n" diff --git a/bin/bbackupd/bbackupd-config b/bin/bbackupd/bbackupd-config index d2fc49fb..37847d7e 100755 --- a/bin/bbackupd/bbackupd-config +++ b/bin/bbackupd/bbackupd-config @@ -58,7 +58,7 @@ Usage: working-dir [backup directories] Parameters: - config-dir is usually /etc/boxbackup + config-dir is usually /etc/box backup-mode is lazy or snapshot: lazy mode runs continously, uploading files over a specified age snapshot mode uploads a snapshot of the filesystem when instructed @@ -96,7 +96,7 @@ __E } # default locations -my $default_config_location = '/etc/boxbackup/bbackupd.conf'; +my $default_config_location = '/etc/box/bbackupd.conf'; # command line parameters my ($config_dir,$backup_mode,$account_num,$server,$working_dir,@tobackup) = @ARGV; diff --git a/bin/bbackupd/bbackupd-config.in b/bin/bbackupd/bbackupd-config.in index a88749fc..16ddb75c 100755 --- a/bin/bbackupd/bbackupd-config.in +++ b/bin/bbackupd/bbackupd-config.in @@ -19,7 +19,7 @@ Usage: working-dir [backup directories] Parameters: - config-dir is usually @sysconfdir_expanded@/boxbackup + config-dir is usually @sysconfdir_expanded@/box backup-mode is lazy or snapshot: lazy mode runs continously, uploading files over a specified age snapshot mode uploads a snapshot of the filesystem when instructed @@ -57,7 +57,7 @@ __E } # default locations -my $default_config_location = '@sysconfdir_expanded@/boxbackup/bbackupd.conf'; +my $default_config_location = '@sysconfdir_expanded@/box/bbackupd.conf'; # command line parameters my ($config_dir,$backup_mode,$account_num,$server,$working_dir,@tobackup) = @ARGV; diff --git a/bin/bbackupquery/bbackupquery.cpp b/bin/bbackupquery/bbackupquery.cpp index fdd7cb6e..3b115ac2 100644 --- a/bin/bbackupquery/bbackupquery.cpp +++ b/bin/bbackupquery/bbackupquery.cpp @@ -94,6 +94,8 @@ #include "MemLeakFindOn.h" +#include + void PrintUsageAndExit() { printf("Usage: bbackupquery [-q] [-w] " diff --git a/bin/bbstoreaccounts/bbstoreaccounts.cpp b/bin/bbstoreaccounts/bbstoreaccounts.cpp index 3e866181..fc1e2e0c 100644 --- a/bin/bbstoreaccounts/bbstoreaccounts.cpp +++ b/bin/bbstoreaccounts/bbstoreaccounts.cpp @@ -69,6 +69,8 @@ #include "MemLeakFindOn.h" +#include + // max size of soft limit as percent of hard limit #define MAX_SOFT_LIMIT_SIZE 97 diff --git a/bin/bbstored/bbstored-config b/bin/bbstored/bbstored-config index 4490c4ed..7f1d7cc8 100755 --- a/bin/bbstored/bbstored-config +++ b/bin/bbstored/bbstored-config @@ -58,7 +58,7 @@ Usage: bbstored-config config-dir server-hostname username [raidfile-config] Parameters: - config-dir is usually /etc/boxbackup + config-dir is usually /etc/box server-hostname is the hostname that clients will use to connect to this server username is the user to run the server under @@ -86,7 +86,7 @@ __E } # default locations -my $default_config_location = '/etc/boxbackup/bbstored.conf'; +my $default_config_location = '/etc/box/bbstored.conf'; # command line parameters my ($config_dir,$server,$username,$raidfile_config) = @ARGV; diff --git a/debian/boxbackup-client.init b/debian/boxbackup-client.init index 905873fc..e6ceced7 100644 --- a/debian/boxbackup-client.init +++ b/debian/boxbackup-client.init @@ -1,11 +1,11 @@ #! /bin/sh # ### BEGIN INIT INFO -# Provides: boxbackup-server -# Required-Start: $syslog $local_fs $network -# Required-Stop: $syslog $local_fs $network +# Provides: boxbackup-client +# Required-Start: $syslog $remote_fs $network +# Required-Stop: $syslog $remote_fs $network # Default-Start: 2 3 4 5 -# Default-Stop: S 0 1 6 +# Default-Stop: 0 1 6 # Short-Description: boxbackup client # Description: Init script to start and stop the boxbackup client ### END INIT INFO diff --git a/debian/boxbackup-client.install b/debian/boxbackup-client.install index 859b5a49..30b75ea1 100644 --- a/debian/boxbackup-client.install +++ b/debian/boxbackup-client.install @@ -1,4 +1,4 @@ -parcels/boxbackup-0.11rc1-backup-client-linux-gnu/bbackupd /usr/sbin/ -parcels/boxbackup-0.11rc1-backup-client-linux-gnu/bbackupctl /usr/sbin/ -parcels/boxbackup-0.11rc1-backup-client-linux-gnu/bbackupquery /usr/sbin/ -parcels/boxbackup-0.11rc1-backup-client-linux-gnu/bbackupd-config /usr/sbin/ +parcels/boxbackup-0.11rc2-backup-client-linux-gnu/bbackupd /usr/sbin/ +parcels/boxbackup-0.11rc2-backup-client-linux-gnu/bbackupctl /usr/sbin/ +parcels/boxbackup-0.11rc2-backup-client-linux-gnu/bbackupquery /usr/sbin/ +parcels/boxbackup-0.11rc2-backup-client-linux-gnu/bbackupd-config /usr/sbin/ diff --git a/debian/boxbackup-client.postinst b/debian/boxbackup-client.postinst index 220b2e78..e21db03a 100644 --- a/debian/boxbackup-client.postinst +++ b/debian/boxbackup-client.postinst @@ -314,37 +314,33 @@ EOM fi __EOF - db_stop - if [ -x /usr/bin/ucf ]; then - /usr/bin/ucf --three-way $DEBCONFBB $BBCONF >&2 &2 &2 - db_stop exit 1 ;; esac +db_stop + # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. diff --git a/debian/boxbackup-server.init b/debian/boxbackup-server.init index b7b1b970..11529b4d 100644 --- a/debian/boxbackup-server.init +++ b/debian/boxbackup-server.init @@ -2,10 +2,10 @@ # ### BEGIN INIT INFO # Provides: boxbackup-server -# Required-Start: $syslog $local_fs $network -# Required-Stop: $syslog $local_fs $network +# Required-Start: $syslog $remote_fs $network +# Required-Stop: $syslog $remote_fs $network # Default-Start: 2 3 4 5 -# Default-Stop: S 0 1 6 +# Default-Stop: 0 1 6 # Short-Description: boxbackup server # Description: Init script to start and stop the boxbackup server ### END INIT INFO diff --git a/debian/boxbackup-server.install b/debian/boxbackup-server.install index f261dc83..459a1f35 100644 --- a/debian/boxbackup-server.install +++ b/debian/boxbackup-server.install @@ -1,8 +1,8 @@ -parcels/boxbackup-0.11rc1-backup-server-linux-gnu/bbstoreaccounts /usr/sbin/ -parcels/boxbackup-0.11rc1-backup-server-linux-gnu/bbstored /usr/sbin/ -parcels/boxbackup-0.11rc1-backup-server-linux-gnu/bbstored-certs /usr/bin/ -parcels/boxbackup-0.11rc1-backup-server-linux-gnu/bbstored-config /usr/sbin/ -parcels/boxbackup-0.11rc1-backup-server-linux-gnu/raidfile-config /usr/sbin/ +parcels/boxbackup-0.11rc2-backup-server-linux-gnu/bbstoreaccounts /usr/sbin/ +parcels/boxbackup-0.11rc2-backup-server-linux-gnu/bbstored /usr/sbin/ +parcels/boxbackup-0.11rc2-backup-server-linux-gnu/bbstored-certs /usr/bin/ +parcels/boxbackup-0.11rc2-backup-server-linux-gnu/bbstored-config /usr/sbin/ +parcels/boxbackup-0.11rc2-backup-server-linux-gnu/raidfile-config /usr/sbin/ debian/tmp/etc/logcheck/ignore.d.workstation/boxbackup-server /etc/logcheck/ignore.d.workstation debian/tmp/etc/logcheck/ignore.d.server/boxbackup-server /etc/logcheck/ignore.d.server diff --git a/debian/changelog b/debian/changelog index 2bae9728..f962f2b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -boxbackup (0.11~rc2-1) experimental; urgency=low +boxbackup (0.11~rc2-1) unstable; urgency=low * new upstream release. + * update watch file. + * bump standards version to 3.7.3 (No changes needed) + * update frensh debconf template translations. Thanks to + Christian Perrier (Closes: #476090) - -- Reinhard Tartler Tue, 05 Feb 2008 22:56:40 +0100 + -- Reinhard Tartler Sun, 20 Apr 2008 14:01:27 +0200 boxbackup (0.11~rc1-1) experimental; urgency=low @@ -24,8 +28,50 @@ boxbackup (0.10+really0.10-2) unstable; urgency=low * use rather 'nocheck' instead of 'notest'. Thanks to Michael Banck for notifying me about this. + * Ack NMUs. Thanks Amaya for handling these! (Closes: #470060, #467628). + * Merge Ubuntu changes, fixing installations without tty. (Closes: #474587). + * build against libdb4.6 (Closes: #442640) - -- Reinhard Tartler Thu, 05 Jul 2007 09:04:50 +0200 + -- Reinhard Tartler Sat, 12 Apr 2008 23:31:49 +0200 + +boxbackup (0.10+really0.10-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS introduced by my previous NMU. Apply patch from Cyril Brulebois + (Closes: #454862). + * Added debian debconf translation by Kai Wasserbäch (Closes: #467628). + + -- Amaya Rodrigo Sastre Sat, 05 Apr 2008 12:37:16 +0200 + +boxbackup (0.10+really0.10-1.1) unstable; urgency=low + + * Non-maintainer upload. + * iFix LSB header in init.d script (Closes: #470060). + + -- Amaya Rodrigo Sastre Mon, 31 Mar 2008 18:43:40 +0200 + +boxbackup (0.10+really0.10-1ubuntu3) hardy; urgency=low + + * Don't redirect ucf calls. This was forgotten in the previous upload, + but should have been there. + + -- Tollef Fog Heen Thu, 06 Mar 2008 07:17:35 +0100 + +boxbackup (0.10+really0.10-1ubuntu2) hardy; urgency=low + + * Fix up postinst so we don't call db_stop too early, and use + --debconf-ok to ucf. (No versioned dependency since even oldstable + has a new enough ucf.) Use db_stop near the end to make sure we don't + hang after starting the daemon though. + + -- Tollef Fog Heen Wed, 05 Mar 2008 22:33:57 +0100 + +boxbackup (0.10+really0.10-1ubuntu1) hardy; urgency=low + + * Rebuild for libdb4.3 -> libdb4.6 migration. + * Set MOTU to maintainer. + + -- Chuck Short Mon, 03 Mar 2008 12:37:35 -0500 boxbackup (0.10+really0.10-1) unstable; urgency=low diff --git a/debian/control b/debian/control index bca1abbb..188589fa 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: boxbackup Section: utils Priority: optional Maintainer: Reinhard Tartler -Build-Depends: debhelper (>> 5.0.0), libedit-dev, libdb4.6-dev, libssl-dev, zlib1g-dev -Standards-Version: 3.7.2 +Build-Depends: debhelper (>> 5.0.0), libedit-dev, libdb-dev, libssl-dev, zlib1g-dev +Standards-Version: 3.7.3 XS-Vcs-bzr: http://bazaar.launchpad.net/~siretart/boxbackup/boxbackup.debian XS-Vcs-Browser: http://codebrowse.launchpad.net/~siretart/boxbackup/boxbackup.debian/files diff --git a/debian/copyright b/debian/copyright index 42482124..948c8342 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -This package was debianized by Jrme Schell on +This package was debianized by Jérôme Schell on Tue, 1 Jun 2004 07:51:24 +0000. It was downloaded from http://www.fluffy.co.uk/boxbackup/ @@ -45,4 +45,4 @@ Commentary This license is based on a standard BSD license. Some minor changes in wording have been made to fit in with English law. - Ben Summers, 2003, 2004 +© Ben Summers, 2003, 2004 diff --git a/debian/po/cs.po b/debian/po/cs.po index 4c9ea057..24650cf4 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: boxbackup\n" -"Report-Msgid-Bugs-To: siretart@tauware.de\n" -"POT-Creation-Date: 2007-06-23 03:05+0200\n" +"Report-Msgid-Bugs-To: boxbackup@packages.debian.org\n" +"POT-Creation-Date: 2008-04-20 13:41+0200\n" "PO-Revision-Date: 2007-07-02 21:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -48,8 +48,8 @@ msgid "" "Please read the /usr/share/doc/boxbackup-client/README.Debian for details " "about the configuration of the BoxBackup client." msgstr "" -"Podrobnosti o nastavení klienta BoxBackupu naleznete v souboru " -"/usr/share/doc/boxbackup-client/README.Debian." +"Podrobnosti o nastavení klienta BoxBackupu naleznete v souboru /usr/share/" +"doc/boxbackup-client/README.Debian." #. Type: select #. Description @@ -85,9 +85,9 @@ msgid "" "intervals. A cron file (/etc/cron.d/boxbackup-client) is provided with the " "package and should be adapted to suit your needs." msgstr "" -"Ve „snímkovém“ režimu se bude zálohování spouštět v pravidelných intervalech. " -"S balíkem se dodává cronový soubor /etc/cron.d/boxbackup-client, který byste " -"měli upravit dle svých potřeb." +"Ve „snímkovém“ režimu se bude zálohování spouštět v pravidelných " +"intervalech. S balíkem se dodává cronový soubor /etc/cron.d/boxbackup-" +"client, který byste měli upravit dle svých potřeb." #. Type: string #. Description @@ -141,8 +141,8 @@ msgid "" "Please enter the fully qualified domain name of the BoxBackup server which " "your client will use." msgstr "" -"Zadejte prosím plně kvalifikované doménové jméno BoxBackup serveru, který " -"má tento klient používat." +"Zadejte prosím plně kvalifikované doménové jméno BoxBackup serveru, který má " +"tento klient používat." #. Type: string #. Description @@ -163,8 +163,8 @@ msgid "" "Please give a space-separated list of directories to be backed up onto the " "remote server." msgstr "" -"Zadejte prosím mezerami oddělený seznam adresářů, které se mají zálohovat " -"na vzdálený server." +"Zadejte prosím mezerami oddělený seznam adresářů, které se mají zálohovat na " +"vzdálený server." #. Type: string #. Description @@ -240,8 +240,8 @@ msgid "" "Low interval values will trigger frequent uploads to the server and more " "revisions being created with older revisions being removed earlier." msgstr "" -"Nízké hodnoty způsobí častější nahrávání na server, vytváření více revizí " -"a rychlejší rušení starých revizí." +"Nízké hodnoty způsobí častější nahrávání na server, vytváření více revizí a " +"rychlejší rušení starých revizí." #. Type: string #. Description @@ -294,8 +294,8 @@ msgid "" "The BoxBackup client sends alert notifications when a problem occurs during " "the backup." msgstr "" -"Jestliže se během zálohy vyskytne problém, klient BoxBackupu posílá výstražné " -"upozornění." +"Jestliže se během zálohy vyskytne problém, klient BoxBackupu posílá " +"výstražné upozornění." #. Type: string #. Description @@ -320,8 +320,8 @@ msgid "" "The BoxBackup client needs an RSA private key and the corresponding X.509 " "certificate to authenticate itself with the server." msgstr "" -"Klient BoxBackupu vyžaduje privátní RSA klíč a odpovídající certifikát X.509, " -"aby se mohl autentizovat vůči serveru." +"Klient BoxBackupu vyžaduje privátní RSA klíč a odpovídající certifikát " +"X.509, aby se mohl autentizovat vůči serveru." #. Type: boolean #. Description @@ -404,8 +404,8 @@ msgid "" "raid/0.0 /raid/0.1 /raid/0.2')." msgstr "" "Pro povolení RAIDu zadejte mezerami oddělený seznam tří oblastí, kde každá " -"by měla ležet na jiném fyzickém disku (například: „/raid/0.0 /raid/0.1 " -"/raid/0.2“)." +"by měla ležet na jiném fyzickém disku (například: „/raid/0.0 /raid/0.1 /" +"raid/0.2“)." #. Type: string #. Description @@ -494,9 +494,9 @@ msgid "" "certificate and the root CA certificate in the configuration folder." msgstr "" "Oba se mohou vytvořit automaticky. Certifikát budete muset podepsat svou " -"kořenovou certifikační autoritou (viz balík boxbackup-utils) a podepsaný " -"jej umístit společně s kořenovým certifikátem certifikační autority do " -"složky s konfigurací." +"kořenovou certifikační autoritou (viz balík boxbackup-utils) a podepsaný jej " +"umístit společně s kořenovým certifikátem certifikační autority do složky s " +"konfigurací." #. Type: error #. Description diff --git a/debian/po/de.po b/debian/po/de.po new file mode 100644 index 00000000..10eb1c17 --- /dev/null +++ b/debian/po/de.po @@ -0,0 +1,522 @@ +# Translation of the boxbackup debconf template. +# Copyright (C) 2008 Kai Wasserbäch +# This file is distributed under the same license as boxbackup package. +# +msgid "" +msgstr "" +"Project-Id-Version: boxbackup 0.10+really0.10-1\n" +"Report-Msgid-Bugs-To: boxbackup@packages.debian.org\n" +"POT-Creation-Date: 2007-07-06 04:31+0200\n" +"PO-Revision-Date: 2008-02-13 22:06+0100\n" +"Last-Translator: Kai Wasserbäch \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../boxbackup-client.templates:2001 +msgid "Should the BoxBackup client be configured automatically?" +msgstr "Soll der BoxBackup-Client automatisch konfiguriert werden?" + +#. Type: boolean +#. Description +#: ../boxbackup-client.templates:2001 +msgid "" +"The package configuration scripts can create the configuration files for the " +"BoxBackup client." +msgstr "" +"Die Paket-Konfigurations-Skripte können die Konfigurationsdateien für den " +"BoxBackup-Client erstellen." + +#. Type: boolean +#. Description +#: ../boxbackup-client.templates:2001 +msgid "" +"You should choose this option if you are not familiar with BoxBackup's " +"configuration options." +msgstr "" +"Sie sollten diese Option wählen, falls Sie nicht mit den Konfigurationsoptionen " +"von BoxBackup vertraut sind." + +#. Type: boolean +#. Description +#: ../boxbackup-client.templates:2001 +msgid "" +"Please read the /usr/share/doc/boxbackup-client/README.Debian for details " +"about the configuration of the BoxBackup client." +msgstr "" +"Bitte lesen Sie für detaillierte Informationen zur Konfiguration des BoxBackup-" +"Clients die Datei /usr/share/doc/boxbackup-client/README.Debian." + +#. Type: select +#. Description +#: ../boxbackup-client.templates:3001 +msgid "Run mode for the BoxBackup client:" +msgstr "Betriebsmodus für den BoxBackup-Client:" + +#. Type: select +#. Description +#: ../boxbackup-client.templates:3001 +msgid "The BoxBackup client supports two modes of backup:" +msgstr "Der BoxBackup-Client unterstützt zwei Backup-Modi:" + +#. Type: select +#. Description +#. Translators, please keep reference to 'lazy' and 'snapshot' as +#. these options are written as is in the software documentation +#: ../boxbackup-client.templates:3001 +msgid "" +"In the 'lazy' mode, the backup daemon will regularly scan the file system " +"searching for modified files. It will then upload the files older than a " +"specified age to the backup server." +msgstr "" +"Im »lazy«-Modus prüft der Sicherungsdienst das Dateisystem regelmäßig, " +"um veränderte Dateien zu finden. Dateien, die ein zuvor festgelegtes " +"Alter überschritten haben, werden auf den Sicherungsserver überspielt." + +#. Type: select +#. Description +#: ../boxbackup-client.templates:3001 +msgid "" +"In the 'snapshot' mode the backup will be explicitly run at regular " +"intervals. A cron file (/etc/cron.d/boxbackup-client) is provided with the " +"package and should be adapted to suit your needs." +msgstr "" +"Im »snapshot«-Modus wird die Sicherung in zuvor festgelegten Abständen " +"durchgeführt. Eine Cron-Datei (/etc/cron.d/backup-client) wird mit diesem " +"Paket ausgeliefert und sollte an die eigenen Anforderungen angepasst werden." + +#. Type: string +#. Description +#: ../boxbackup-client.templates:4001 +msgid "Account number for this node on the backup server:" +msgstr "Kontennummer für diesen Knoten auf dem Sicherungsserver:" + +#. Type: string +#. Description +#: ../boxbackup-client.templates:4001 +msgid "" +"The administrator of the BoxBackup server should have assigned this client a " +"hexadecimal account number." +msgstr "" +"Der Administrator des BoxBackup-Servers sollte diesem Client eine hexadezimale " +"Kontennummer zugewiesen haben." + +#. Type: string +#. Description +#: ../boxbackup-client.templates:4001 +msgid "" +"If no account number has been assigned yet, leave this field blank and " +"configure it later by running 'dpkg-reconfigure boxbackup-client' as root." +msgstr "" +"Falls bislang noch keine Kontennummer zugewiesen wurde, lassen Sie dieses " +"Feld frei und konfigurieren Sie die Option später durch Ausführen des " +"Befehls »dpkg-reconfigure boxbackup-client« als root." + +#. Type: error +#. Description +#: ../boxbackup-client.templates:5001 +msgid "Invalid account number" +msgstr "Ungültige Kontennummer" + +#. Type: error +#. Description +#: ../boxbackup-client.templates:5001 +msgid "The account number must be a hexadecimal number (such as 1F04 or 4500)." +msgstr "Die Kontennummer muss hexadezimal sein (wie zum Beispiel 1F04 oder 4500)." + +#. Type: string +#. Description +#: ../boxbackup-client.templates:6001 +msgid "Fully qualified domain name of the backup server:" +msgstr "Vollständiger Domainname des Sicherungsservers:" + +#. Type: string +#. Description +#: ../boxbackup-client.templates:6001 +msgid "" +"Please enter the fully qualified domain name of the BoxBackup server which " +"your client will use." +msgstr "" +"Bitte geben Sie den durch Ihren Client zu verwendenden vollständigen " +"Domainnamen des BoxBackup-Servers an." + +#. Type: string +#. Description +#: ../boxbackup-client.templates:6001 +msgid "The client will connect to the server on TCP port 2201." +msgstr "Der Client wird sich mit dem Server auf dem TCP-Port 2201 verbinden." + +#. Type: string +#. Description +#: ../boxbackup-client.templates:7001 +msgid "List of directories to backup:" +msgstr "Liste der zu sichernden Verzeichnisse:" + +#. Type: string +#. Description +#: ../boxbackup-client.templates:7001 +msgid "" +"Please give a space-separated list of directories to be backed up onto the " +"remote server." +msgstr "" +"Bitte geben Sie die auf den entfernten Server zu sichernden Verzeichnisse als " +"durch Leerzeichen getrennte Liste ein." + +#. Type: string +#. Description +#: ../boxbackup-client.templates:7001 +msgid "" +"Those directories should not contain mounted file systems at any level in " +"their subdirectories." +msgstr "" +"Diese Verzeichnisse sollten in keinem Unterverzeichnis ein eingebundenes " +"Dateisystem enthalten." + +#. Type: error +#. Description +#: ../boxbackup-client.templates:8001 +msgid "Invalid path name" +msgstr "Ungültige Pfadangabe" + +#. Type: error +#. Description +#: ../boxbackup-client.templates:8001 ../boxbackup-server.templates:4001 +msgid "" +"The path names to the directories must be absolute path names, separated by " +"spaces." +msgstr "" +"Die Pfade zu den Verzeichnissen müssen absolut sein und durch Leerzeichen " +"getrennt angegeben werden." + +#. Type: error +#. Description +#: ../boxbackup-client.templates:8001 +msgid "For example: /home/myaccount /etc/" +msgstr "Zum Beispiel: /home/meinkonto /etc/" + +#. Type: string +#. Description +#: ../boxbackup-client.templates:9001 +msgid "Interval (in seconds) between directory scans:" +msgstr "Intervall (in Sekunden) zwischen Verzeichnisüberprüfungen:" + +#. Type: string +#. Description +#: ../boxbackup-client.templates:9001 +msgid "" +"BoxBackup regularly scans the selected directories, looking for modified " +"files." +msgstr "" +"BoxBackup überprüft die ausgewählten Verzeichnisse von Zeit zu Zeit auf " +"modifizierte Dateien." + +#. Type: string +#. Description +#: ../boxbackup-client.templates:9001 +msgid "Please choose the scan interval in seconds." +msgstr "Bitte wählen Sie das Überprüfungsintervall in Sekunden." + +#. Type: string +#. Description +#: ../boxbackup-client.templates:10001 +msgid "Minimum time to wait (in seconds) before uploading a file:" +msgstr "Mindestwartezeit (in Sekunden) vor dem Hochladen einer Datei:" + +#. Type: string +#. Description +#: ../boxbackup-client.templates:10001 +msgid "" +"A file will be uploaded to the server only after a certain time after its " +"last modification." +msgstr "" +"Eine Datei wird erst eine bestimmte Zeit nach der letzten Modifikation " +"auf den Server übertragen." + +#. Type: string +#. Description +#: ../boxbackup-client.templates:10001 +msgid "" +"Low interval values will trigger frequent uploads to the server and more " +"revisions being created with older revisions being removed earlier." +msgstr "" +"Kleine Intervalle resultieren in häufigeren Uploads auf den Server. " +"Dabei werden mehr Revisionen angelegt und alte früher gelöscht." + +#. Type: string +#. Description +#: ../boxbackup-client.templates:11001 +msgid "Maximum time to wait (in seconds) before uploading a file:" +msgstr "Maximale Wartezeit (in Sekunden) bevor eine Datei hochgeladen wird:" + +#. Type: string +#. Description +#: ../boxbackup-client.templates:11001 +msgid "" +"Frequently modified files are likely to never get uploaded if they never " +"reach the minimum wait time." +msgstr "" +"Häufig modifizierte Dateien werden wahrscheinlich nie auf den Server übertragen, " +"falls sie die minimale Wartezeit nicht erreichen." + +#. Type: string +#. Description +#: ../boxbackup-client.templates:11001 +msgid "" +"Please enter the maximum time to reach before the upload of a modified file " +"to the server is enforced." +msgstr "" +"Bitte geben sie die Zeit ein, die maximal erreicht werden darf, bevor das Hochladen " +"einer Datei erzwungen wird." + +#. Type: error +#. Description +#: ../boxbackup-client.templates:12001 +msgid "Invalid time entered" +msgstr "Ungültige Zeit eingegeben" + +#. Type: error +#. Description +#: ../boxbackup-client.templates:12001 +msgid "Please enter a non null integer value." +msgstr "Bitte geben Sie einen ganzzahligen Wert größer Null ein." + +#. Type: string +#. Description +#: ../boxbackup-client.templates:13001 +msgid "Recipient for alert notifications:" +msgstr "Empfänger für Alarmmeldungen:" + +#. Type: string +#. Description +#: ../boxbackup-client.templates:13001 +msgid "" +"The BoxBackup client sends alert notifications when a problem occurs during " +"the backup." +msgstr "" +"Der BoxBackup-Client versendet Alarmmeldungen, wenn während des Sicherns ein " +"Problem auftritt." + +#. Type: string +#. Description +#: ../boxbackup-client.templates:13001 +msgid "" +"Please enter either a local user name (for example 'root') or an email " +"address (for example 'admin@example.org')." +msgstr "" +"Bitte geben Sie entweder einen lokalen Benutzernamen (zum Beispiel »root«) " +"oder eine E-Mail-Adresse (zum Beispiel »admin@example.org«) ein." + +#. Type: boolean +#. Description +#: ../boxbackup-client.templates:14001 +msgid "Generate the client private key and X.509 certificate request?" +msgstr "" +"Soll der private Schlüssel für den Client und der X.509-Zertifikat-Anfrage " +"erzeugt werden?" + +#. Type: boolean +#. Description +#: ../boxbackup-client.templates:14001 +msgid "" +"The BoxBackup client needs an RSA private key and the corresponding X.509 " +"certificate to authenticate itself with the server." +msgstr "" +"Der BoxBackup-Client benötigt einen privaten RSA-Schlüssel und das zugehörige " +"X.509-Zertifikat, um sich gegenüber dem Server authentifizieren zu können." + +#. Type: boolean +#. Description +#: ../boxbackup-client.templates:14001 +msgid "" +"Both can be generated automatically. You will need to send the certificate " +"request to the BoxBackup server administrator who will sign it and send it " +"back to you along with the server's Certification Authority certificate." +msgstr "" +"Beides kann automatisch erzeugt werden. Sie müssen die Zertifikatanfrage " +"an den Administrator des BoxBackup-Servers senden, der dieses dann signieren " +"und Ihnen zusammen mit dem Certification-Authority-Zertifikat des " +"Servers zurücksenden wird." + +#. Type: boolean +#. Description +#: ../boxbackup-client.templates:14001 +msgid "" +"These files should be copied into BoxBackup's configuration directory. The " +"file names to use are given in the /etc/boxbackup/bbackupd.conf file." +msgstr "" +"Diese Dateien sollten in das Konfigurationsverzeichnis von BoxBackup kopiert " +"werden. Die zu verwendenden Dateinamen werden in /etc/boxbackup/bbacupd.conf " +"angegeben." + +#. Type: boolean +#. Description +#: ../boxbackup-server.templates:2001 +msgid "Should BoxBackup be configured automatically?" +msgstr "Soll BoxBackup automatisch konfiguriert werden?" + +#. Type: boolean +#. Description +#: ../boxbackup-server.templates:2001 +msgid "" +"The package configuration scripts can create the configuration files for the " +"BoxBackup server." +msgstr "" +"Die im Paket enthaltenen Konfigurationskripte können die Konfiguration für den " +"BoxBackup-Server erzeugen." + +#. Type: boolean +#. Description +#: ../boxbackup-server.templates:2001 +msgid "" +"You should choose this option if you are not familiar with BoxBackup's " +"configuration options. The configuration can be done manually with the " +"'raidfile-config' and 'bbstored-config' scripts." +msgstr "" +"Sie sollten diese Option wählen, falls Sie nicht mit den Konfigurationsoptionen " +"von BoxBackup vertraut sind. Die Konfiguration kann mit Hilfe der Skripte " +"»raidfile-config« und »bbstored-config« manuell vorgenommen werden." + +#. Type: boolean +#. Description +#: ../boxbackup-server.templates:2001 +msgid "" +"The server will not start if it is not configured. In all cases, reading " +"the /usr/share/doc/boxbackup-server/README.Debian is recommended." +msgstr "" +"Der Server wird nicht starten, falls er nicht konfiguriert wurde. In jedem " +"Fall wird empfohlen, /usr/share/doc/boxbackup-server/README.Debian zu lesen." + +#. Type: string +#. Description +#: ../boxbackup-server.templates:3001 +msgid "Location of the RAID directories:" +msgstr "Ort der RAID-Verzeichnisse:" + +#. Type: string +#. Description +#: ../boxbackup-server.templates:3001 +msgid "Please choose the location for the three RAID file directories." +msgstr "Bitte wählen Sie den Ort für die drei RAID-Datei-Verzeichnisse aus." + +#. Type: string +#. Description +#: ../boxbackup-server.templates:3001 +msgid "" +"To enable RAID, the directory names should be a space-separated list of " +"three partitions, each on different physical hard drives (for example: '/" +"raid/0.0 /raid/0.1 /raid/0.2')." +msgstr "" +"Um die RAID-Funktion zu aktivieren, sollte eine durch Leerzeichen getrennte " +"Liste dreier Partitionen eingegeben werden. Jede dieser Partitionen sollten " +"auf einem anderen physischen Laufwerk sein (zum Beispiel »/raid/0.0 /raid/" +"0.1 /raid/0.2«)." + +#. Type: string +#. Description +#: ../boxbackup-server.templates:3001 +msgid "" +"If you don't want to enable RAID, just specify the path to one directory " +"where the backups will be stored (for example, /usr/local/lib/boxbackup)." +msgstr "" +"Falls Sie die RAID-Funktion nicht aktivieren wollen, geben Sie einfach einen " +"Pfad zu einem Verzeichnis an, in dem die Sicherungskopien gespeichert werden " +"sollen (zum Beispiel /usr/local/lib/boxbackup)." + +#. Type: string +#. Description +#: ../boxbackup-server.templates:3001 +msgid "These directories will be created if they do not exist." +msgstr "Diese Verzeichnisse werden angelegt, sollten sie nicht existieren." + +#. Type: error +#. Description +#: ../boxbackup-server.templates:4001 +msgid "Invalid path names" +msgstr "Ungültige Pfadnamen" + +#. Type: error +#. Description +#: ../boxbackup-server.templates:4001 +msgid "For example: /raid/0.0 /raid/0.1 /raid/0.2" +msgstr "Zum Beispiel: /raid/0.0 /raid/0.1 /raid/0.2" + +#. Type: string +#. Description +#: ../boxbackup-server.templates:5001 +msgid "Block size for the userland RAID system:" +msgstr "Blockgröße für das im Benutzerbereich angesiedelte RAID-System:" + +#. Type: string +#. Description +#: ../boxbackup-server.templates:5001 +msgid "BoxBackup uses userland RAID techniques." +msgstr "BoxBackup verwendet RAID-Techniken für den Benutzerbereich." + +#. Type: string +#. Description +#: ../boxbackup-server.templates:5001 +msgid "" +"Please choose the block size to use for the storage. For maximum efficiency, " +"you should choose the block size of the underlying file system (which can be " +"displayed with the 'tune2fs -l' command)." +msgstr "" +"Bitte wählen Sie die zu verwendende Blockgröße zur Speicherung. Um maximale " +"Effizienz zu erreichen, sollten Sie die Blockgröße des darunterliegenden " +"Dateisystems wählen. Diese kann für Ext-Dateisysteme mit dem Befehl " +"»tune2fs -l« angezeigt werden." + +#. Type: string +#. Description +#: ../boxbackup-server.templates:5001 +msgid "This value should be set even if you don't plan to use RAID." +msgstr "" +"Dieser Wert sollte auch dann angegeben werden, falls Sie kein RAID " +"verwenden wollen." + +#. Type: boolean +#. Description +#: ../boxbackup-server.templates:6001 +msgid "Generate a server private key and X.509 certificate request?" +msgstr "" +"Soll ein privater Server-Schlüssel und eine X.509-Zertifikatanfrage " +"erzeugt werden?" + +#. Type: boolean +#. Description +#: ../boxbackup-server.templates:6001 +msgid "" +"The BoxBackup server needs an RSA private key and the corresponding X.509 " +"certificate to perform client-server authentication and communication " +"encryption." +msgstr "" +"Der BoxBackup-Server benötigt einen privaten RSA-Schlüssel und ein zugehöriges " +"X.509-Zertifikat, um die Client-Server-Authentifizierung durchführen zu können " +"und die Kommunikation zu verschlüsseln." + +#. Type: boolean +#. Description +#: ../boxbackup-server.templates:6001 +msgid "" +"Both can be generated automatically. You will need to sign the certificate " +"with your root CA (see the boxbackup-utils package) and put this signed " +"certificate and the root CA certificate in the configuration folder." +msgstr "" +"Beides kann automatisch erzeugt werden. Sie müssen das Zertifikat mit Ihrem " +"Wurzel-CA-Zertifikat signieren (siehe das Paket »boxbackup-utils«) und " +"das signierte Zertifikat sowie das Wurzel-CA-Zertifikat in Ihrem " +"Konfigurationsordner ablegen." + +#. Type: error +#. Description +#: ../boxbackup-server.templates:7001 +msgid "Invalid block size" +msgstr "Ungültige Blockgröße." + +#. Type: error +#. Description +#: ../boxbackup-server.templates:7001 +msgid "The block size must be a power of two (e.g. 1024 or 4096)." +msgstr "Die Blockgröße muss eine Potenz von Zwei sein (z.B. 1024 oder 4096)." diff --git a/debian/po/fr.po b/debian/po/fr.po index 305353aa..9c6c15d0 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -1,12 +1,12 @@ # Copyright (C) 2007, Vincent Bernat # This file is distributed under the same license as the boxbackup package. -# +# # msgid "" msgstr "" "Project-Id-Version: boxbackup_0.10-1\n" -"Report-Msgid-Bugs-To: siretart@tauware.de\n" -"POT-Creation-Date: 2007-06-23 03:05+0200\n" +"Report-Msgid-Bugs-To: boxbackup@packages.debian.org\n" +"POT-Creation-Date: 2008-04-20 13:41+0200\n" "PO-Revision-Date: 2007-06-26 07:42+0200\n" "Last-Translator: Vincent Bernat \n" "Language-Team: French \n" @@ -283,6 +283,8 @@ msgstr "Délai non valable" #. Type: error #. Description #: ../boxbackup-client.templates:12001 +#, fuzzy +#| msgid "Please enter an integer value greater null." msgid "Please enter a non null integer value." msgstr "Veuillez indiquer un entier strictement positif." @@ -460,6 +462,11 @@ msgstr "BoxBackup utilise un système de RAID en espace utilisateur." #. Type: string #. Description #: ../boxbackup-server.templates:5001 +#, fuzzy +#| msgid "" +#| "Please choose the block size to use for the storage. For maximum " +#| "efficiency, you should choose the block size of the underlying file " +#| "system (which can be displayed with the 'tune2fs -l' command)." msgid "" "Please choose the block size to use for the storage. For maximum efficiency, " "you should choose the block size of the underlying file system (which can be " @@ -467,8 +474,8 @@ msgid "" msgstr "" "Veuillez choisir une taille de blocs pour le stockage. Pour une efficacité " "maximale, vous devriez choisir la même taille de blocs que le système de " -"fichiers sous-jacent (que vous pouvez obtenir avec la commande « tune2fs -" -"l »)." +"fichiers sous-jacent (que vous pouvez obtenir, pour les systèmes de fichiers " +"ext2 et ext3, avec la commande « tune2fs -l »)." #. Type: string #. Description diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 68a153cf..7d26389e 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: siretart@tauware.de\n" -"POT-Creation-Date: 2007-04-15 18:32+0200\n" +"Report-Msgid-Bugs-To: boxbackup@packages.debian.org\n" +"POT-Creation-Date: 2008-04-20 13:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,399 +18,428 @@ msgstr "" #. Type: boolean #. Description -#: ../boxbackup-client.templates:1001 -msgid "Do you want to handle the boxbackup client configuration with debconf?" +#: ../boxbackup-client.templates:2001 +msgid "Should the BoxBackup client be configured automatically?" msgstr "" #. Type: boolean #. Description -#: ../boxbackup-client.templates:1001 +#: ../boxbackup-client.templates:2001 msgid "" -"Debconf can create the configuration files for boxbackup client. If you " -"prefer to do this by yourself you will need to use the script bbackupd-" -"config provided by this package." +"The package configuration scripts can create the configuration files for the " +"BoxBackup client." msgstr "" #. Type: boolean #. Description -#: ../boxbackup-client.templates:1001 ../boxbackup-server.templates:1001 -msgid "The server won't start if it isn't configured." +#: ../boxbackup-client.templates:2001 +msgid "" +"You should choose this option if you are not familiar with BoxBackup's " +"configuration options." msgstr "" #. Type: boolean #. Description -#: ../boxbackup-client.templates:1001 +#: ../boxbackup-client.templates:2001 msgid "" -"Whatever you choose here, you will need to read the README.Debian file in /" -"usr/share/doc/boxbackup-client." +"Please read the /usr/share/doc/boxbackup-client/README.Debian for details " +"about the configuration of the BoxBackup client." msgstr "" #. Type: select #. Description -#: ../boxbackup-client.templates:2001 -msgid "Run boxbackup client in lazy or snapshot mode:" +#: ../boxbackup-client.templates:3001 +msgid "Run mode for the BoxBackup client:" msgstr "" #. Type: select #. Description -#: ../boxbackup-client.templates:2001 -msgid "Boxbackup client supports two modes of backup:" +#: ../boxbackup-client.templates:3001 +msgid "The BoxBackup client supports two modes of backup:" msgstr "" #. Type: select #. Description -#: ../boxbackup-client.templates:2001 +#. Translators, please keep reference to 'lazy' and 'snapshot' as +#. these options are written as is in the software documentation +#: ../boxbackup-client.templates:3001 msgid "" -"In the lazy mode, the backup daemon will regularly scan your filesystem " -"searching for modified files. It will then upload the files over a specified " -"age to the backup server." +"In the 'lazy' mode, the backup daemon will regularly scan the file system " +"searching for modified files. It will then upload the files older than a " +"specified age to the backup server." msgstr "" #. Type: select #. Description -#: ../boxbackup-client.templates:2001 +#: ../boxbackup-client.templates:3001 msgid "" -"In snapshot mode the backup will be explicitly run at given time set in a " -"cron entry. The cron file is provided with this package, you will have to " -"set the time you wish the backup to occur (/etc/cron.d/boxbackup-client)." +"In the 'snapshot' mode the backup will be explicitly run at regular " +"intervals. A cron file (/etc/cron.d/boxbackup-client) is provided with the " +"package and should be adapted to suit your needs." msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:3001 +#: ../boxbackup-client.templates:4001 msgid "Account number for this node on the backup server:" msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:3001 +#: ../boxbackup-client.templates:4001 msgid "" -"The administrator of the boxbackup server (perhaps you) should have provided " -"you an account number. It consits in an hexadecimal number." +"The administrator of the BoxBackup server should have assigned this client a " +"hexadecimal account number." msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:3001 +#: ../boxbackup-client.templates:4001 msgid "" -"If you don't already have one, leave that field blank. You will be able to " -"configure it later by running dpkg-reconfigure boxbackup-client as root." +"If no account number has been assigned yet, leave this field blank and " +"configure it later by running 'dpkg-reconfigure boxbackup-client' as root." msgstr "" -#. Type: note +#. Type: error #. Description -#: ../boxbackup-client.templates:4001 -msgid "Please enter an hexadecimal number" +#: ../boxbackup-client.templates:5001 +msgid "Invalid account number" msgstr "" -#. Type: note +#. Type: error #. Description -#: ../boxbackup-client.templates:4001 -msgid "The account number must be an hexadecimal number (e.g. 1E04 or 4500)." +#: ../boxbackup-client.templates:5001 +msgid "The account number must be a hexadecimal number (such as 1F04 or 4500)." msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:5001 -msgid "Full qualified domain name of the backup server:" +#: ../boxbackup-client.templates:6001 +msgid "Fully qualified domain name of the backup server:" msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:5001 +#: ../boxbackup-client.templates:6001 msgid "" -"The server name is the computer running an instance of Boxbackup server your " -"client will connect to. It must be the fully qualified domain name of that " -"machine (that can be resolve to an IP address). If you are behind a " -"firewall, you must allow outgoing connexion to tcp port 2201 to be able to " -"reach the server." +"Please enter the fully qualified domain name of the BoxBackup server which " +"your client will use." msgstr "" #. Type: string #. Description #: ../boxbackup-client.templates:6001 +msgid "The client will connect to the server on TCP port 2201." +msgstr "" + +#. Type: string +#. Description +#: ../boxbackup-client.templates:7001 msgid "List of directories to backup:" msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:6001 +#: ../boxbackup-client.templates:7001 msgid "" -"You must tell boxbackup which directories you would like to backup to the " +"Please give a space-separated list of directories to be backed up onto the " "remote server." msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:6001 +#: ../boxbackup-client.templates:7001 msgid "" -"You must enter this directories as a space separated list of absolute path " -"names. Be careful that those directories do NOT contain other mounted file " -"systems within them at any depth or you will have problems." +"Those directories should not contain mounted file systems at any level in " +"their subdirectories." msgstr "" -#. Type: note +#. Type: error #. Description -#: ../boxbackup-client.templates:7001 ../boxbackup-server.templates:3001 -msgid "Please enter correct path names" +#: ../boxbackup-client.templates:8001 +msgid "Invalid path name" msgstr "" -#. Type: note +#. Type: error #. Description -#: ../boxbackup-client.templates:7001 ../boxbackup-server.templates:3001 +#: ../boxbackup-client.templates:8001 ../boxbackup-server.templates:4001 msgid "" -"The path names to the directories must be absolute path names separated by " +"The path names to the directories must be absolute path names, separated by " "spaces." msgstr "" -#. Type: note +#. Type: error #. Description -#: ../boxbackup-client.templates:7001 +#: ../boxbackup-client.templates:8001 msgid "For example: /home/myaccount /etc/" msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:8001 -msgid "Interval in seconds between scan of directories:" +#: ../boxbackup-client.templates:9001 +msgid "Interval (in seconds) between directory scans:" msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:8001 +#: ../boxbackup-client.templates:9001 msgid "" -"Boxbackup scans the directories you have selected looking for modified " -"files. This scans occurs at regular interval that you can customize." +"BoxBackup regularly scans the selected directories, looking for modified " +"files." msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:8001 -msgid "The default value is 3600s (one hour)." +#: ../boxbackup-client.templates:9001 +msgid "Please choose the scan interval in seconds." msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:9001 -msgid "Time to wait after a file modification before uploading it:" +#: ../boxbackup-client.templates:10001 +msgid "Minimum time to wait (in seconds) before uploading a file:" msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:9001 +#: ../boxbackup-client.templates:10001 msgid "" "A file will be uploaded to the server only after a certain time after its " -"last modification. Reducing this value results in often modfied files being " -"uploaded more often to the server. This means that more revisions will be " -"created on the server and therefore the quota limit will be reached faster " -"(thus removing older revisions of the files sooner)." +"last modification." msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:9001 -msgid "The default value is 21600 seconds (six hours)." +#: ../boxbackup-client.templates:10001 +msgid "" +"Low interval values will trigger frequent uploads to the server and more " +"revisions being created with older revisions being removed earlier." msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:10001 -msgid "Maximum time to wait before uploading a frequently modified file:" +#: ../boxbackup-client.templates:11001 +msgid "Maximum time to wait (in seconds) before uploading a file:" msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:10001 +#: ../boxbackup-client.templates:11001 msgid "" -"As a file is not uploaded before a certain time after its last modification, " -"if it is frequently modified, it would never get uploaded. So this parameter " -"defines the maximum time to wait since the first modification noticed before " -"uploading a file." +"Frequently modified files are likely to never get uploaded if they never " +"reach the minimum wait time." msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:10001 -msgid "The default value is 86400 seconds (1 day)." +#: ../boxbackup-client.templates:11001 +msgid "" +"Please enter the maximum time to reach before the upload of a modified file " +"to the server is enforced." msgstr "" -#. Type: note +#. Type: error #. Description -#: ../boxbackup-client.templates:11001 -msgid "Please enter a correct number of seconds" +#: ../boxbackup-client.templates:12001 +msgid "Invalid time entered" msgstr "" -#. Type: note +#. Type: error #. Description -#: ../boxbackup-client.templates:11001 -msgid "This parameter must be a number." +#: ../boxbackup-client.templates:12001 +msgid "Please enter a non null integer value." msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:12001 -msgid "User name or email address to send notification to:" +#: ../boxbackup-client.templates:13001 +msgid "Recipient for alert notifications:" msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:12001 +#: ../boxbackup-client.templates:13001 msgid "" -"Boxbackup client must know the user name or email address of the person who " -"will receive alert notifications. Such notifications are sent when a problem " -"occurs during the backup (the store is full or some files were not readable)." +"The BoxBackup client sends alert notifications when a problem occurs during " +"the backup." msgstr "" #. Type: string #. Description -#: ../boxbackup-client.templates:12001 +#: ../boxbackup-client.templates:13001 msgid "" -"Enter either a user name (e.g. root) or an email address (e.g. " -"admin@mydomain.org)" +"Please enter either a local user name (for example 'root') or an email " +"address (for example 'admin@example.org')." msgstr "" #. Type: boolean #. Description -#: ../boxbackup-client.templates:13001 -msgid "Generate the client private key and x509 certificate request?" +#: ../boxbackup-client.templates:14001 +msgid "Generate the client private key and X.509 certificate request?" msgstr "" #. Type: boolean #. Description -#: ../boxbackup-client.templates:13001 +#: ../boxbackup-client.templates:14001 msgid "" -"The boxbackup client needs a RSA private key and the corresponding x509 " -"certificate to authenticate itself to the server." +"The BoxBackup client needs an RSA private key and the corresponding X.509 " +"certificate to authenticate itself with the server." msgstr "" #. Type: boolean #. Description -#: ../boxbackup-client.templates:13001 +#: ../boxbackup-client.templates:14001 msgid "" -"Debconf can generate for you the private key and a x509 certificate sign " -"request. You will need to send the certificate request to the administrator " -"of the Boxbackup server and this one will sign it and send it back to you " -"along with the server Certification Authority certificate. You will need to " -"put these files in your boxbackup configuration directory (see /etc/" -"boxbackup/bbackupd.conf file for the exact name to give to these files)." +"Both can be generated automatically. You will need to send the certificate " +"request to the BoxBackup server administrator who will sign it and send it " +"back to you along with the server's Certification Authority certificate." msgstr "" #. Type: boolean #. Description -#: ../boxbackup-client.templates:13001 ../boxbackup-server.templates:5001 -msgid "If you prefer to manage this by yourself, say No here." +#: ../boxbackup-client.templates:14001 +msgid "" +"These files should be copied into BoxBackup's configuration directory. The " +"file names to use are given in the /etc/boxbackup/bbackupd.conf file." msgstr "" #. Type: boolean #. Description -#: ../boxbackup-server.templates:1001 -msgid "Should Debconf handle your boxbackup config?" +#: ../boxbackup-server.templates:2001 +msgid "Should BoxBackup be configured automatically?" msgstr "" #. Type: boolean #. Description -#: ../boxbackup-server.templates:1001 +#: ../boxbackup-server.templates:2001 msgid "" -"Debconf can create the configuration files for boxbackup server. Select this " -"option if you are familiar with boxbackup's configuration options. If you " -"prefer to do this by yourself you will need to use the scripts raidfile-" -"config and bbstored-config provided by this package." +"The package configuration scripts can create the configuration files for the " +"BoxBackup server." msgstr "" #. Type: boolean #. Description -#: ../boxbackup-server.templates:1001 +#: ../boxbackup-server.templates:2001 msgid "" -"Whatever you choose here, you will need to read the README.Debian file in /" -"usr/share/doc/boxbackup-server." +"You should choose this option if you are not familiar with BoxBackup's " +"configuration options. The configuration can be done manually with the " +"'raidfile-config' and 'bbstored-config' scripts." msgstr "" -#. Type: string +#. Type: boolean #. Description #: ../boxbackup-server.templates:2001 +msgid "" +"The server will not start if it is not configured. In all cases, reading " +"the /usr/share/doc/boxbackup-server/README.Debian is recommended." +msgstr "" + +#. Type: string +#. Description +#: ../boxbackup-server.templates:3001 msgid "Location of the RAID directories:" msgstr "" #. Type: string #. Description -#: ../boxbackup-server.templates:2001 -msgid "" -"You have to choose the location for the 3 RAID file directories. To enable " -"RAID, it must be 3 directories path names separated by spaces and those path " -"names should point to 3 partitions on 3 differents physical hard drives. For " -"example: /raid/0.0 /raid/0.1 /raid/0.2" +#: ../boxbackup-server.templates:3001 +msgid "Please choose the location for the three RAID file directories." msgstr "" #. Type: string #. Description -#: ../boxbackup-server.templates:2001 +#: ../boxbackup-server.templates:3001 msgid "" -"If you don't want to enable RAID, just specify the path to one directory " -"where the backups will be stored in (e.g. /usr/local/lib/boxbackup)." +"To enable RAID, the directory names should be a space-separated list of " +"three partitions, each on different physical hard drives (for example: '/" +"raid/0.0 /raid/0.1 /raid/0.2')." msgstr "" #. Type: string #. Description -#: ../boxbackup-server.templates:2001 +#: ../boxbackup-server.templates:3001 msgid "" -"If they don't allready exist, these directories will be created for you." +"If you don't want to enable RAID, just specify the path to one directory " +"where the backups will be stored (for example, /usr/local/lib/boxbackup)." msgstr "" -#. Type: note +#. Type: string #. Description #: ../boxbackup-server.templates:3001 +msgid "These directories will be created if they do not exist." +msgstr "" + +#. Type: error +#. Description +#: ../boxbackup-server.templates:4001 +msgid "Invalid path names" +msgstr "" + +#. Type: error +#. Description +#: ../boxbackup-server.templates:4001 msgid "For example: /raid/0.0 /raid/0.1 /raid/0.2" msgstr "" #. Type: string #. Description -#: ../boxbackup-server.templates:4001 +#: ../boxbackup-server.templates:5001 msgid "Block size for the userland RAID system:" msgstr "" #. Type: string #. Description -#: ../boxbackup-server.templates:4001 +#: ../boxbackup-server.templates:5001 +msgid "BoxBackup uses userland RAID techniques." +msgstr "" + +#. Type: string +#. Description +#: ../boxbackup-server.templates:5001 msgid "" -"BoxBackup uses userland RAID techniques. You have to choose the block size " -"to use for the storage. For maximum efficiency, set it to the block size of " -"the underlying filesystem (see tune2fs -l /dev/... to find your block size). " -"Even if you don't plan to use RAID, you have to set that value." +"Please choose the block size to use for the storage. For maximum efficiency, " +"you should choose the block size of the underlying file system (which can be " +"displayed with the 'tune2fs -l' command)." msgstr "" -#. Type: boolean +#. Type: string #. Description #: ../boxbackup-server.templates:5001 -msgid "Generate a the server private key and x509 certificate request?" +msgid "This value should be set even if you don't plan to use RAID." msgstr "" #. Type: boolean #. Description -#: ../boxbackup-server.templates:5001 +#: ../boxbackup-server.templates:6001 +msgid "Generate a server private key and X.509 certificate request?" +msgstr "" + +#. Type: boolean +#. Description +#: ../boxbackup-server.templates:6001 msgid "" -"The boxbackup server needs a RSA private key and the corresponding x509 " +"The BoxBackup server needs an RSA private key and the corresponding X.509 " "certificate to perform client-server authentication and communication " "encryption." msgstr "" #. Type: boolean #. Description -#: ../boxbackup-server.templates:5001 +#: ../boxbackup-server.templates:6001 msgid "" -"Debconf can generate for you the private key and a x509 certificate sign " -"request. You will need to sign the certificate with your root CA (see the " -"boxbackup-utils package) and put this signed certificate and the root CA " -"certificate in your configuration folder." +"Both can be generated automatically. You will need to sign the certificate " +"with your root CA (see the boxbackup-utils package) and put this signed " +"certificate and the root CA certificate in the configuration folder." msgstr "" -#. Type: note +#. Type: error #. Description -#: ../boxbackup-server.templates:6001 -msgid "Please enter a power of two number" +#: ../boxbackup-server.templates:7001 +msgid "Invalid block size" msgstr "" -#. Type: note +#. Type: error #. Description -#: ../boxbackup-server.templates:6001 -msgid "The block size must be a power of two number (e.g. 1024 or 4096)." +#: ../boxbackup-server.templates:7001 +msgid "The block size must be a power of two (e.g. 1024 or 4096)." msgstr "" diff --git a/debian/po/vi.po b/debian/po/vi.po index a0f4320b..547e534a 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -3,10 +3,10 @@ # Clytie Siddall , 2007 # msgid "" -"" -msgstr "Project-Id-Version: boxbackup\n" -"Report-Msgid-Bugs-To: siretart@tauware.de\n" -"POT-Creation-Date: 2007-06-23 03:05+0200\n" +msgstr "" +"Project-Id-Version: boxbackup\n" +"Report-Msgid-Bugs-To: boxbackup@packages.debian.org\n" +"POT-Creation-Date: 2008-04-20 13:41+0200\n" "PO-Revision-Date: 2007-06-25 20:45+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -16,402 +16,497 @@ msgstr "Project-Id-Version: boxbackup\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.6.4a3\n" -#: ../boxbackup-client.templates:2001 #. Type: boolean #. Description +#: ../boxbackup-client.templates:2001 msgid "Should the BoxBackup client be configured automatically?" msgstr "Có nên tự động cấu hình ứng dụng khách BoxBackup không?" -#: ../boxbackup-client.templates:2001 #. Type: boolean #. Description -msgid "The package configuration scripts can create the configuration files for the " +#: ../boxbackup-client.templates:2001 +msgid "" +"The package configuration scripts can create the configuration files for the " "BoxBackup client." -msgstr "Các văn lệnh cấu hình gói có thể tạo những tập tin cấu hình cho ứng dụng khách BoxBackup." +msgstr "" +"Các văn lệnh cấu hình gói có thể tạo những tập tin cấu hình cho ứng dụng " +"khách BoxBackup." -#: ../boxbackup-client.templates:2001 #. Type: boolean #. Description -msgid "You should choose this option if you are not familiar with BoxBackup's " +#: ../boxbackup-client.templates:2001 +msgid "" +"You should choose this option if you are not familiar with BoxBackup's " "configuration options." -msgstr "Bạn nên bật tùy chọn này nếu bạn chưa quen với các tùy chọn cấu hình của BoxBackup." +msgstr "" +"Bạn nên bật tùy chọn này nếu bạn chưa quen với các tùy chọn cấu hình của " +"BoxBackup." -#: ../boxbackup-client.templates:2001 #. Type: boolean #. Description -msgid "Please read the /usr/share/doc/boxbackup-client/README.Debian for details " +#: ../boxbackup-client.templates:2001 +msgid "" +"Please read the /usr/share/doc/boxbackup-client/README.Debian for details " "about the configuration of the BoxBackup client." -msgstr "Hãy đọc tài liệu Đọc Đi « /usr/share/doc/boxbackup-client/README.Debian » để tìm chi tiết về cấu hình của ứng dụng khách BoxBackup." +msgstr "" +"Hãy đọc tài liệu Đọc Đi « /usr/share/doc/boxbackup-client/README.Debian » để " +"tìm chi tiết về cấu hình của ứng dụng khách BoxBackup." -#: ../boxbackup-client.templates:3001 #. Type: select #. Description +#: ../boxbackup-client.templates:3001 msgid "Run mode for the BoxBackup client:" msgstr "Chế độ chạy cho ứng dụng khách BoxBackup:" -#: ../boxbackup-client.templates:3001 #. Type: select #. Description +#: ../boxbackup-client.templates:3001 msgid "The BoxBackup client supports two modes of backup:" msgstr "Ứng dụng khách BoxBackup hỗ trợ hai chế độ sao lưu :" -#: ../boxbackup-client.templates:3001 #. Type: select #. Description #. Translators, please keep reference to 'lazy' and 'snapshot' as #. these options are written as is in the software documentation -msgid "In the 'lazy' mode, the backup daemon will regularly scan the file system " +#: ../boxbackup-client.templates:3001 +msgid "" +"In the 'lazy' mode, the backup daemon will regularly scan the file system " "searching for modified files. It will then upload the files older than a " "specified age to the backup server." -msgstr "Trong chế độ « làm biếng », trình nền sao lưu sẽ quét đều đặn hệ thống tập tin tìm tập tin bị sửa đổi. Nó sẽ cũng tải lên máy phục vụ sao lưu mỗi tập tin cũ hơn thời gian đã xác định." +msgstr "" +"Trong chế độ « làm biếng », trình nền sao lưu sẽ quét đều đặn hệ thống tập " +"tin tìm tập tin bị sửa đổi. Nó sẽ cũng tải lên máy phục vụ sao lưu mỗi tập " +"tin cũ hơn thời gian đã xác định." -#: ../boxbackup-client.templates:3001 #. Type: select #. Description -msgid "In the 'snapshot' mode the backup will be explicitly run at regular " +#: ../boxbackup-client.templates:3001 +msgid "" +"In the 'snapshot' mode the backup will be explicitly run at regular " "intervals. A cron file (/etc/cron.d/boxbackup-client) is provided with the " "package and should be adapted to suit your needs." -msgstr "Trong chế độ « chụp hiện trạng », việc sao lưu sẽ được chạy dứt khoát theo mỗi khoảng đều đặn. Một tập tin định kỳ cron (/etc/cron.d/boxbackup-client) có sẵn với gói này và nên được sửa đổi để thích hợp với như cầu của bạn." +msgstr "" +"Trong chế độ « chụp hiện trạng », việc sao lưu sẽ được chạy dứt khoát theo " +"mỗi khoảng đều đặn. Một tập tin định kỳ cron (/etc/cron.d/boxbackup-client) " +"có sẵn với gói này và nên được sửa đổi để thích hợp với như cầu của bạn." -#: ../boxbackup-client.templates:4001 #. Type: string #. Description +#: ../boxbackup-client.templates:4001 msgid "Account number for this node on the backup server:" msgstr "Số tài khoản cho nút này trên máy phục vụ sao lưu :" -#: ../boxbackup-client.templates:4001 #. Type: string #. Description -msgid "The administrator of the BoxBackup server should have assigned this client a " +#: ../boxbackup-client.templates:4001 +msgid "" +"The administrator of the BoxBackup server should have assigned this client a " "hexadecimal account number." -msgstr "Quản trị của máy phục vụ sao lưu nên đã gán cho ứng dụng khách này một số hiệu tài khoản kiểu thập lục." +msgstr "" +"Quản trị của máy phục vụ sao lưu nên đã gán cho ứng dụng khách này một số " +"hiệu tài khoản kiểu thập lục." -#: ../boxbackup-client.templates:4001 #. Type: string #. Description -msgid "If no account number has been assigned yet, leave this field blank and " +#: ../boxbackup-client.templates:4001 +msgid "" +"If no account number has been assigned yet, leave this field blank and " "configure it later by running 'dpkg-reconfigure boxbackup-client' as root." -msgstr "Chưa gán số hiệu tài khoản thì bỏ rỗng trường này và cấu hình sau bằng cách chạy lệnh « dpkg-reconfigure boxbackup-client » với quyền người chủ." +msgstr "" +"Chưa gán số hiệu tài khoản thì bỏ rỗng trường này và cấu hình sau bằng cách " +"chạy lệnh « dpkg-reconfigure boxbackup-client » với quyền người chủ." -#: ../boxbackup-client.templates:5001 #. Type: error #. Description +#: ../boxbackup-client.templates:5001 msgid "Invalid account number" msgstr "Số hiệu tài khoản không hợp lệ" -#: ../boxbackup-client.templates:5001 #. Type: error #. Description +#: ../boxbackup-client.templates:5001 msgid "The account number must be a hexadecimal number (such as 1F04 or 4500)." msgstr "Số hiệu tài khoản phải là con số thập lục (v.d. 1F04 hay 4500)." -#: ../boxbackup-client.templates:6001 #. Type: string #. Description +#: ../boxbackup-client.templates:6001 msgid "Fully qualified domain name of the backup server:" msgstr "Tên miền có khả năng đầy đủ của máy phục vụ sao lưu :" -#: ../boxbackup-client.templates:6001 #. Type: string #. Description -msgid "Please enter the fully qualified domain name of the BoxBackup server which " +#: ../boxbackup-client.templates:6001 +msgid "" +"Please enter the fully qualified domain name of the BoxBackup server which " "your client will use." -msgstr "Hãy nhập vào tên miền có khả năng đầy đủ (FQDN) của máy phục vụ Boxbackup cần sử dụng." +msgstr "" +"Hãy nhập vào tên miền có khả năng đầy đủ (FQDN) của máy phục vụ Boxbackup " +"cần sử dụng." -#: ../boxbackup-client.templates:6001 #. Type: string #. Description +#: ../boxbackup-client.templates:6001 msgid "The client will connect to the server on TCP port 2201." msgstr "Ứng dụng khách sẽ kết nối tới máy phục vụ trên cổng TCP 2201." -#: ../boxbackup-client.templates:7001 #. Type: string #. Description +#: ../boxbackup-client.templates:7001 msgid "List of directories to backup:" msgstr "Danh sách thư mục cần sao lưu :" -#: ../boxbackup-client.templates:7001 #. Type: string #. Description -msgid "Please give a space-separated list of directories to be backed up onto the " +#: ../boxbackup-client.templates:7001 +msgid "" +"Please give a space-separated list of directories to be backed up onto the " "remote server." -msgstr "Hãy đưa ra một danh sách định giới bằng dấu cách chứa những thư mục cần sao lưu vào máy phục vụ từ xa." +msgstr "" +"Hãy đưa ra một danh sách định giới bằng dấu cách chứa những thư mục cần sao " +"lưu vào máy phục vụ từ xa." -#: ../boxbackup-client.templates:7001 #. Type: string #. Description -msgid "Those directories should not contain mounted file systems at any level in " +#: ../boxbackup-client.templates:7001 +msgid "" +"Those directories should not contain mounted file systems at any level in " "their subdirectories." -msgstr "Những thư mục này không nên chứa hệ thống tập tin đã lắp ở cấp nào trong thư mục con." +msgstr "" +"Những thư mục này không nên chứa hệ thống tập tin đã lắp ở cấp nào trong thư " +"mục con." -#: ../boxbackup-client.templates:8001 #. Type: error #. Description +#: ../boxbackup-client.templates:8001 msgid "Invalid path name" msgstr "Tên đường dẫn không hợp lệ" -#: ../boxbackup-client.templates:8001 -#: ../boxbackup-server.templates:4001 #. Type: error #. Description -msgid "The path names to the directories must be absolute path names, separated by " +#: ../boxbackup-client.templates:8001 ../boxbackup-server.templates:4001 +msgid "" +"The path names to the directories must be absolute path names, separated by " "spaces." -msgstr "Mỗi tên đường dẫn tới thư mục phải là tên đường dẫn tuyệt đối, định giới bằng dấu cách." +msgstr "" +"Mỗi tên đường dẫn tới thư mục phải là tên đường dẫn tuyệt đối, định giới " +"bằng dấu cách." -#: ../boxbackup-client.templates:8001 #. Type: error #. Description +#: ../boxbackup-client.templates:8001 msgid "For example: /home/myaccount /etc/" msgstr "Thí dụ : /home/tài_khoản_tôi /etc/" -#: ../boxbackup-client.templates:9001 #. Type: string #. Description +#: ../boxbackup-client.templates:9001 msgid "Interval (in seconds) between directory scans:" msgstr "Khoảng (theo giây) giữa hai lần quét thư mục:" -#: ../boxbackup-client.templates:9001 #. Type: string #. Description -msgid "BoxBackup regularly scans the selected directories, looking for modified " +#: ../boxbackup-client.templates:9001 +msgid "" +"BoxBackup regularly scans the selected directories, looking for modified " "files." -msgstr "Trình BoxBackup quét đều đặn các thư mục đã chọn, tìm tập tin bị sửa đổi." +msgstr "" +"Trình BoxBackup quét đều đặn các thư mục đã chọn, tìm tập tin bị sửa đổi." -#: ../boxbackup-client.templates:9001 #. Type: string #. Description +#: ../boxbackup-client.templates:9001 msgid "Please choose the scan interval in seconds." msgstr "Hãy chọn khoảng quét theo giây." -#: ../boxbackup-client.templates:10001 #. Type: string #. Description +#: ../boxbackup-client.templates:10001 msgid "Minimum time to wait (in seconds) before uploading a file:" msgstr "Thời gian tối thiểu (theo giây) cần đợi trước khi tải lên tập tin:" -#: ../boxbackup-client.templates:10001 #. Type: string #. Description -msgid "A file will be uploaded to the server only after a certain time after its " +#: ../boxbackup-client.templates:10001 +msgid "" +"A file will be uploaded to the server only after a certain time after its " "last modification." -msgstr "Một tập tin sẽ được tải lên máy phục vụ chỉ sau một thời gian nào đó sau lần cuối cùng sửa đổi nó." +msgstr "" +"Một tập tin sẽ được tải lên máy phục vụ chỉ sau một thời gian nào đó sau lần " +"cuối cùng sửa đổi nó." -#: ../boxbackup-client.templates:10001 #. Type: string #. Description -msgid "Low interval values will trigger frequent uploads to the server and more " +#: ../boxbackup-client.templates:10001 +msgid "" +"Low interval values will trigger frequent uploads to the server and more " "revisions being created with older revisions being removed earlier." -msgstr "Giá trị khoảng thấp sẽ gây ra nhiều việc tải lên máy phục vụ hơn thì nhiều bản sửa đổi được tạo hơn, và các bản sửa đổi bị gỡ bỏ trước." +msgstr "" +"Giá trị khoảng thấp sẽ gây ra nhiều việc tải lên máy phục vụ hơn thì nhiều " +"bản sửa đổi được tạo hơn, và các bản sửa đổi bị gỡ bỏ trước." -#: ../boxbackup-client.templates:11001 #. Type: string #. Description +#: ../boxbackup-client.templates:11001 msgid "Maximum time to wait (in seconds) before uploading a file:" msgstr "Thời gian tối đa (theo giây) cần đợi trước khi tải lên tập tin:" -#: ../boxbackup-client.templates:11001 #. Type: string #. Description -msgid "Frequently modified files are likely to never get uploaded if they never " +#: ../boxbackup-client.templates:11001 +msgid "" +"Frequently modified files are likely to never get uploaded if they never " "reach the minimum wait time." -msgstr "Tập tin thường bị sửa đổi thì sẽ không được tải lên nếu chưa tới thời gian đợi tối thiểu." +msgstr "" +"Tập tin thường bị sửa đổi thì sẽ không được tải lên nếu chưa tới thời gian " +"đợi tối thiểu." -#: ../boxbackup-client.templates:11001 #. Type: string #. Description -msgid "Please enter the maximum time to reach before the upload of a modified file " +#: ../boxbackup-client.templates:11001 +msgid "" +"Please enter the maximum time to reach before the upload of a modified file " "to the server is enforced." -msgstr "Hãy nhập vào thời gian tối đa cần tới trước khi ép buộc việc tải lên máy phục vụ tập tin bị sửa đổi." +msgstr "" +"Hãy nhập vào thời gian tối đa cần tới trước khi ép buộc việc tải lên máy " +"phục vụ tập tin bị sửa đổi." -#: ../boxbackup-client.templates:12001 #. Type: error #. Description +#: ../boxbackup-client.templates:12001 msgid "Invalid time entered" msgstr "Bạn đã nhập một thời gian không hợp lệ." -#: ../boxbackup-client.templates:12001 #. Type: error #. Description +#: ../boxbackup-client.templates:12001 msgid "Please enter a non null integer value." msgstr "Hãy nhập vào một giá trị số nguyên khác rỗng." -#: ../boxbackup-client.templates:13001 #. Type: string #. Description +#: ../boxbackup-client.templates:13001 msgid "Recipient for alert notifications:" msgstr "Người nhận thông báo cảnh giác:" -#: ../boxbackup-client.templates:13001 #. Type: string #. Description -msgid "The BoxBackup client sends alert notifications when a problem occurs during " +#: ../boxbackup-client.templates:13001 +msgid "" +"The BoxBackup client sends alert notifications when a problem occurs during " "the backup." -msgstr "Ứng dụng khách BoxBackup gửi thông báo cảnh giác khi gặp lỗi trong khi sao lưu." +msgstr "" +"Ứng dụng khách BoxBackup gửi thông báo cảnh giác khi gặp lỗi trong khi sao " +"lưu." -#: ../boxbackup-client.templates:13001 #. Type: string #. Description -msgid "Please enter either a local user name (for example 'root') or an email " +#: ../boxbackup-client.templates:13001 +msgid "" +"Please enter either a local user name (for example 'root') or an email " "address (for example 'admin@example.org')." -msgstr "Hãy nhập vào hoặc một tên người dùng cục bộ (v.d. « root »), hoặc một địa chỉ thư điện tử (v.d. « admin@thí_dụ.org »)." +msgstr "" +"Hãy nhập vào hoặc một tên người dùng cục bộ (v.d. « root »), hoặc một địa chỉ " +"thư điện tử (v.d. « admin@thí_dụ.org »)." -#: ../boxbackup-client.templates:14001 #. Type: boolean #. Description +#: ../boxbackup-client.templates:14001 msgid "Generate the client private key and X.509 certificate request?" msgstr "Tạo ra khoá riêng ứng dụng khách và yêu cầu chứng nhận X.509 không?" -#: ../boxbackup-client.templates:14001 #. Type: boolean #. Description -msgid "The BoxBackup client needs an RSA private key and the corresponding X.509 " +#: ../boxbackup-client.templates:14001 +msgid "" +"The BoxBackup client needs an RSA private key and the corresponding X.509 " "certificate to authenticate itself with the server." -msgstr "Ứng dụng khách BoxBackup cần thiết một khoá riêng kiểu RSA, và chứng nhận X.509 tương ứng, để xác thực với máy phục vụ." +msgstr "" +"Ứng dụng khách BoxBackup cần thiết một khoá riêng kiểu RSA, và chứng nhận " +"X.509 tương ứng, để xác thực với máy phục vụ." -#: ../boxbackup-client.templates:14001 #. Type: boolean #. Description -msgid "Both can be generated automatically. You will need to send the certificate " +#: ../boxbackup-client.templates:14001 +msgid "" +"Both can be generated automatically. You will need to send the certificate " "request to the BoxBackup server administrator who will sign it and send it " "back to you along with the server's Certification Authority certificate." -msgstr "Có thể tự động tạo ra cả hai. Bạn cần phải gửi yêu cầu chứng nhận cho quản trị máy phục vụ BoxBackup, để họ ký nó và gửi về bạn cùng với chứng nhận Nhà Cầm quyền Chứng nhận (CA) của máy phục vụ." +msgstr "" +"Có thể tự động tạo ra cả hai. Bạn cần phải gửi yêu cầu chứng nhận cho quản " +"trị máy phục vụ BoxBackup, để họ ký nó và gửi về bạn cùng với chứng nhận Nhà " +"Cầm quyền Chứng nhận (CA) của máy phục vụ." -#: ../boxbackup-client.templates:14001 #. Type: boolean #. Description -msgid "These files should be copied into BoxBackup's configuration directory. The " +#: ../boxbackup-client.templates:14001 +msgid "" +"These files should be copied into BoxBackup's configuration directory. The " "file names to use are given in the /etc/boxbackup/bbackupd.conf file." -msgstr "Những tập tin này nên được sao chép vào thư mục cấu hình của BoxBackup. Các tên tập tin cần dùng được đưa ra trong tập tin cấu hình « /etc/boxbackup/bbackupd.conf file »." +msgstr "" +"Những tập tin này nên được sao chép vào thư mục cấu hình của BoxBackup. Các " +"tên tập tin cần dùng được đưa ra trong tập tin cấu hình « /etc/boxbackup/" +"bbackupd.conf file »." -#: ../boxbackup-server.templates:2001 #. Type: boolean #. Description +#: ../boxbackup-server.templates:2001 msgid "Should BoxBackup be configured automatically?" msgstr "Có nên tự động cấu hình BoxBackup không?" -#: ../boxbackup-server.templates:2001 #. Type: boolean #. Description -msgid "The package configuration scripts can create the configuration files for the " +#: ../boxbackup-server.templates:2001 +msgid "" +"The package configuration scripts can create the configuration files for the " "BoxBackup server." -msgstr "Các văn lệnh cấu hình gói có thể tạo những tập tin cấu hình cho trình phục vụ BoxBackup." +msgstr "" +"Các văn lệnh cấu hình gói có thể tạo những tập tin cấu hình cho trình phục " +"vụ BoxBackup." -#: ../boxbackup-server.templates:2001 #. Type: boolean #. Description -msgid "You should choose this option if you are not familiar with BoxBackup's " +#: ../boxbackup-server.templates:2001 +msgid "" +"You should choose this option if you are not familiar with BoxBackup's " "configuration options. The configuration can be done manually with the " "'raidfile-config' and 'bbstored-config' scripts." -msgstr "Bạn nên bật tùy chọn này nếu bạn chưa quen với các tùy chọn cấu hình của BoxBackup. Bạn cũng có thể tự cấu hình bằng văn lệnh « raidfile-config » va « bbstored-config »." +msgstr "" +"Bạn nên bật tùy chọn này nếu bạn chưa quen với các tùy chọn cấu hình của " +"BoxBackup. Bạn cũng có thể tự cấu hình bằng văn lệnh « raidfile-config » va « " +"bbstored-config »." -#: ../boxbackup-server.templates:2001 #. Type: boolean #. Description -msgid "The server will not start if it is not configured. In all cases, reading " +#: ../boxbackup-server.templates:2001 +msgid "" +"The server will not start if it is not configured. In all cases, reading " "the /usr/share/doc/boxbackup-server/README.Debian is recommended." -msgstr "Chưa cấu hình nên trình phục vụ không khởi chạy. Trong mọi trường hợp, khuyên bạn đọc tài liệu Đọc Đi « /usr/share/doc/boxbackup-server/README.Debian »." +msgstr "" +"Chưa cấu hình nên trình phục vụ không khởi chạy. Trong mọi trường hợp, " +"khuyên bạn đọc tài liệu Đọc Đi « /usr/share/doc/boxbackup-server/README." +"Debian »." -#: ../boxbackup-server.templates:3001 #. Type: string #. Description +#: ../boxbackup-server.templates:3001 msgid "Location of the RAID directories:" msgstr "Địa điểm của thư mục RAID:" -#: ../boxbackup-server.templates:3001 #. Type: string #. Description +#: ../boxbackup-server.templates:3001 msgid "Please choose the location for the three RAID file directories." msgstr "Hãy chọn địa điểm cho ba thư mục RAID." -#: ../boxbackup-server.templates:3001 #. Type: string #. Description -msgid "To enable RAID, the directory names should be a space-separated list of " +#: ../boxbackup-server.templates:3001 +msgid "" +"To enable RAID, the directory names should be a space-separated list of " "three partitions, each on different physical hard drives (for example: '/" "raid/0.0 /raid/0.1 /raid/0.2')." -msgstr "Để hiệu lực khả năng RAID, những tên thư mục nên làm một danh sách định giới bằng dấu cách chứa ba phân vùng, mỗi điều trên ổ đĩa cứng vật lý riêng (v.d. « /raid/0.0 /raid/0.1 /raid/0.2 »)." +msgstr "" +"Để hiệu lực khả năng RAID, những tên thư mục nên làm một danh sách định giới " +"bằng dấu cách chứa ba phân vùng, mỗi điều trên ổ đĩa cứng vật lý riêng (v.d. " +"« /raid/0.0 /raid/0.1 /raid/0.2 »)." -#: ../boxbackup-server.templates:3001 #. Type: string #. Description -msgid "If you don't want to enable RAID, just specify the path to one directory " +#: ../boxbackup-server.templates:3001 +msgid "" +"If you don't want to enable RAID, just specify the path to one directory " "where the backups will be stored (for example, /usr/local/lib/boxbackup)." -msgstr "Không muốn hiệu lực RAID thì chỉ xác định đường dẫn tới một thư mục trong đó cần cất giữ các bản sao lưu (v.d. « /usr/local/lib/boxbackup »)." +msgstr "" +"Không muốn hiệu lực RAID thì chỉ xác định đường dẫn tới một thư mục trong đó " +"cần cất giữ các bản sao lưu (v.d. « /usr/local/lib/boxbackup »)." -#: ../boxbackup-server.templates:3001 #. Type: string #. Description +#: ../boxbackup-server.templates:3001 msgid "These directories will be created if they do not exist." msgstr "Chưa tồn tại nên những thư mục này được tạo." -#: ../boxbackup-server.templates:4001 #. Type: error #. Description +#: ../boxbackup-server.templates:4001 msgid "Invalid path names" msgstr "Tên đường dẫn không hợp lệ" -#: ../boxbackup-server.templates:4001 #. Type: error #. Description +#: ../boxbackup-server.templates:4001 msgid "For example: /raid/0.0 /raid/0.1 /raid/0.2" msgstr "Thí dụ : /raid/0.0 /raid/0.1 /raid/0.2" -#: ../boxbackup-server.templates:5001 #. Type: string #. Description +#: ../boxbackup-server.templates:5001 msgid "Block size for the userland RAID system:" msgstr "Cỡ khối cho hệ thống RAID vùng người dùng:" -#: ../boxbackup-server.templates:5001 #. Type: string #. Description +#: ../boxbackup-server.templates:5001 msgid "BoxBackup uses userland RAID techniques." msgstr "BoxBackup sử dụng kỹ thuật RAID kiểu vùng người dùng." -#: ../boxbackup-server.templates:5001 #. Type: string #. Description -msgid "Please choose the block size to use for the storage. For maximum efficiency, " +#: ../boxbackup-server.templates:5001 +msgid "" +"Please choose the block size to use for the storage. For maximum efficiency, " "you should choose the block size of the underlying file system (which can be " "displayed with the 'tune2fs -l' command)." -msgstr "Hãy chọn kích cỡ khối cần dùng cho sức chứa. Để hữu hiệu nhất, bạn nên chọn kích cỡ khối của hệ thống tập tin bên dưới (hiển thị nó bằng lệnh « tune2fs -l »)." +msgstr "" +"Hãy chọn kích cỡ khối cần dùng cho sức chứa. Để hữu hiệu nhất, bạn nên chọn " +"kích cỡ khối của hệ thống tập tin bên dưới (hiển thị nó bằng lệnh « tune2fs -" +"l »)." -#: ../boxbackup-server.templates:5001 #. Type: string #. Description +#: ../boxbackup-server.templates:5001 msgid "This value should be set even if you don't plan to use RAID." msgstr "Giá trị này nên được đặt thậm chí nếu bạn không định sử dụng RAID." -#: ../boxbackup-server.templates:6001 #. Type: boolean #. Description +#: ../boxbackup-server.templates:6001 msgid "Generate a server private key and X.509 certificate request?" msgstr "Tạo ra một khoá riêng máy phục vụ và yêu cầu chứng nhận X.509 không?" -#: ../boxbackup-server.templates:6001 #. Type: boolean #. Description -msgid "The BoxBackup server needs an RSA private key and the corresponding X.509 " +#: ../boxbackup-server.templates:6001 +msgid "" +"The BoxBackup server needs an RSA private key and the corresponding X.509 " "certificate to perform client-server authentication and communication " "encryption." -msgstr "Trình phục vụ BoxBackup cần thiết một khoá riêng kiểu RSA, và chứng nhận X.509 tương ứng, để thực hiện tiến trình xác thực giữa ứng dụng khách và trình phục vụ, và để mật mã giao thông." +msgstr "" +"Trình phục vụ BoxBackup cần thiết một khoá riêng kiểu RSA, và chứng nhận " +"X.509 tương ứng, để thực hiện tiến trình xác thực giữa ứng dụng khách và " +"trình phục vụ, và để mật mã giao thông." -#: ../boxbackup-server.templates:6001 #. Type: boolean #. Description -msgid "Both can be generated automatically. You will need to sign the certificate " +#: ../boxbackup-server.templates:6001 +msgid "" +"Both can be generated automatically. You will need to sign the certificate " "with your root CA (see the boxbackup-utils package) and put this signed " "certificate and the root CA certificate in the configuration folder." -msgstr "Có thể tự động tạo ra cả hai. Bạn cần phải ký chứng nhận bằng Nhà Cầm quyền Chứng nhận (CA) gốc (xem gói « boxbackup-utils ») và để chứng nhận đã ký này và chứng nhận CA gốc vào thư mục cấu hình." +msgstr "" +"Có thể tự động tạo ra cả hai. Bạn cần phải ký chứng nhận bằng Nhà Cầm quyền " +"Chứng nhận (CA) gốc (xem gói « boxbackup-utils ») và để chứng nhận đã ký này " +"và chứng nhận CA gốc vào thư mục cấu hình." -#: ../boxbackup-server.templates:7001 #. Type: error #. Description +#: ../boxbackup-server.templates:7001 msgid "Invalid block size" msgstr "Cỡ khối không hợp lệ" -#: ../boxbackup-server.templates:7001 #. Type: error #. Description +#: ../boxbackup-server.templates:7001 msgid "The block size must be a power of two (e.g. 1024 or 4096)." msgstr "Kích cỡ khối phải là hai lũy thừa (v.d. 1024 hay 4096)." diff --git a/debian/watch b/debian/watch index 42a96c6d..5ec27736 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,4 @@ version=3 -http://sf.net/boxbackup/ boxbackup-(.*)\.tgz +# release candidates are not on sf +# http://sf.net/boxbackup/ boxbackup-(.*)\.tgz +http://boxbackup.org/svn/box/packages/ boxbackup-(.*)\.tgz diff --git a/documentation/adminguide.xml b/documentation/adminguide.xml index 4a6180ad..d3552725 100644 --- a/documentation/adminguide.xml +++ b/documentation/adminguide.xml @@ -286,12 +286,6 @@ local5.info /var/log/raidfile Note: Separators must be tabs, otherwise these entries will be ignored. - Note2: The packaged - debian and ubuntu versions of boxbackup do not log to local6, - but to the more standard 'daemon' facility. This means you - should not have anything to do to your syslog configuration, - since it is configured to be logged by default. - touch /var/log/box touch /var/log/raidfile diff --git a/lib/backupclient/BackupClientFileAttributes.cpp b/lib/backupclient/BackupClientFileAttributes.cpp index c2ba680f..1aefb4b4 100644 --- a/lib/backupclient/BackupClientFileAttributes.cpp +++ b/lib/backupclient/BackupClientFileAttributes.cpp @@ -64,6 +64,8 @@ #include #endif +#include + #include "BackupClientFileAttributes.h" #include "CommonException.h" #include "FileModificationTime.h" diff --git a/lib/backupclient/BackupStoreFile.h b/lib/backupclient/BackupStoreFile.h index 308667c7..5c84df71 100644 --- a/lib/backupclient/BackupStoreFile.h +++ b/lib/backupclient/BackupStoreFile.h @@ -54,6 +54,7 @@ #include "BackupStoreFilename.h" #include +#include typedef struct { diff --git a/lib/backupclient/BackupStoreFileDiff.cpp b/lib/backupclient/BackupStoreFileDiff.cpp index 95e2bf1d..86747589 100644 --- a/lib/backupclient/BackupStoreFileDiff.cpp +++ b/lib/backupclient/BackupStoreFileDiff.cpp @@ -72,6 +72,8 @@ #include "MemLeakFindOn.h" +#include + using namespace BackupStoreFileCryptVar; using namespace BackupStoreFileCreation; diff --git a/lib/backupclient/BackupStoreFileEncodeStream.cpp b/lib/backupclient/BackupStoreFileEncodeStream.cpp index f6d68181..87caca6d 100644 --- a/lib/backupclient/BackupStoreFileEncodeStream.cpp +++ b/lib/backupclient/BackupStoreFileEncodeStream.cpp @@ -63,6 +63,8 @@ #include "MemLeakFindOn.h" +#include + using namespace BackupStoreFileCryptVar; diff --git a/lib/common/BoxPortsAndFiles.h b/lib/common/BoxPortsAndFiles.h index ffd353bf..f982e675 100755 --- a/lib/common/BoxPortsAndFiles.h +++ b/lib/common/BoxPortsAndFiles.h @@ -70,9 +70,9 @@ #define BOX_GET_DEFAULT_BBSTORED_CONFIG_FILE \ GetDefaultConfigFilePath("bbstored.conf").c_str() #else -#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "/etc/boxbackup/bbackupd.conf" -#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "/etc/boxbackup/raidfile.conf" -#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "/etc/boxbackup/bbstored.conf" +#define BOX_FILE_BBACKUPD_DEFAULT_CONFIG "/etc/boxbackup/bbackupd.conf" +#define BOX_FILE_RAIDFILE_DEFAULT_CONFIG "/etc/boxbackup/raidfile.conf" +#define BOX_FILE_BBSTORED_DEFAULT_CONFIG "/etc/boxbackup/bbstored.conf" #endif #endif // BOXPORTSANDFILES__H diff --git a/lib/common/Configuration.cpp b/lib/common/Configuration.cpp index 66702d55..ba84ea48 100644 --- a/lib/common/Configuration.cpp +++ b/lib/common/Configuration.cpp @@ -58,6 +58,8 @@ #include "MemLeakFindOn.h" +#include + // utility whitespace function inline bool iw(int c) { diff --git a/lib/common/WaitForEvent.h b/lib/common/WaitForEvent.h index cb62b8a9..63a33b92 100644 --- a/lib/common/WaitForEvent.h +++ b/lib/common/WaitForEvent.h @@ -63,6 +63,8 @@ #include "MemLeakFindOn.h" +#include + class WaitForEvent { public: diff --git a/lib/raidfile/RaidFileRead.cpp b/lib/raidfile/RaidFileRead.cpp index 3e969188..8e6dd46b 100644 --- a/lib/raidfile/RaidFileRead.cpp +++ b/lib/raidfile/RaidFileRead.cpp @@ -76,6 +76,8 @@ #include "MemLeakFindOn.h" +#include + #define READ_NUMBER_DISCS_REQUIRED 3 #define READV_MAX_BLOCKS 64 diff --git a/lib/raidfile/raidfile-config.in b/lib/raidfile/raidfile-config.in index 76b65ace..b8ea73a5 100755 --- a/lib/raidfile/raidfile-config.in +++ b/lib/raidfile/raidfile-config.in @@ -19,7 +19,7 @@ Usage: raidfile-config config-dir block-size dir0 [dir1 dir2] Parameters: - config-dir is usually @sysconfdir_expanded@/box + config-dir is usually @sysconfdir_expanded@/boxbackup block-size must be a power of two, and usually the block or fragment size of your file system dir0, dir1, dir2 are the directories used as the root of the raid -- cgit v1.2.3