[debian-edu-commits] debian-edu/slbackup-php.git (#32) - edu-wheezy (branch) updated: debian/0.3-3-7-g2c43756
Mike Gabriel
sunweaver at alioth.debian.org
Fri Aug 9 10:05:52 UTC 2013
The branch, edu-wheezy has been updated
via 2c437560e5db352fa63cf203ea2d732e29f03f8e (commit)
via 538079e60787e01d9242bb1ccf767a3852d5fc8f (commit)
via 4f24c2d657b5ad7ffe479386eee60459e7214a93 (commit)
via 90d69abfb1bc6695aeb329c436614743234cebd9 (commit)
via 076f534078306927b96a59f21e2d88af90b16ea0 (commit)
via 5c3763cf8b83c0b5595e37d895acb6050bc08171 (commit)
from 43b8b7bb30dde14aa3ee9c4dbab4fa6d4c4c0cce (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 45 ++++++-
Makefile | 9 +-
debian/changelog | 9 +-
debian/compat | 2 +-
debian/control | 12 +-
debian/po/sv.po | 4 +-
debian/rules | 9 +-
debian/source/format | 2 +-
po/{sv.po => de.po} | 334 +++++++++++++++++++++++++------------------------
po/es.po | 230 ++++++++++++++++++----------------
po/{sv.po => fr.po} | 334 +++++++++++++++++++++++++------------------------
po/nb_NO.po | 224 +++++++++++++++++----------------
po/slbackup-php.pot | 215 +++++++++++++++----------------
po/sv.po | 250 ++++++++++++++++++------------------
src/functions.php | 69 ++++++----
src/index.php | 63 +++++++---
templates/login.tpl | 4 +-
templates/maint.tpl | 2 +-
templates/restore.tpl | 18 +--
templates/status.tpl | 10 +-
20 files changed, 991 insertions(+), 854 deletions(-)
copy po/{sv.po => de.po} (58%)
copy po/{sv.po => fr.po} (54%)
The diff of changes is:
diff --git a/ChangeLog b/ChangeLog
index 1815842..2f301cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+Thu, 12 Jul 2012 Mike Gabriel
+
+ * Release 0.4.3:
+ - Add changes of 0.4.2 to this file, the ChangeLog
+ maintenance had been forgotten for 0.4.2.
+
+Thu, 12 Jul 2012 Mike Gabriel
+
+ * Release 0.4.2:
+ - Avoid empty $bindir directory.
+ - Fix building of .mo files.
+ - Fix nonhttps URL parameter.
+ * Pick packaging files from debian/0.4.1-1 (prep. uploaded to
+ mentors.debian.net).
+
+Sun, 08 Jul 2012 Mike Gabriel
+
+ * Release 0.4.1:
+ - Stop shipping smarty-gettext-like code.
+ - Do not update .po files on normal build/install.
+ - po/sv.po got lost, re-created the file from an earlier version.
+ * Drop smarty-gettext build-dependency.
+
+Sun, 01 Jul 2012 Mike Gabriel
+
+ * Release 0.4.0:
+ - Accept patch slbackup-php_cookie+request-merge.patch from Debian.
+ - Accept patch slbackup-php_restore-paths-with-blanks.patch from Debian.
+ - Accept patch slbackup-php_fix-failed-in-status-template.patch from Debian.
+ - Accept patch slbackup-php_translate-status-for.patch from Debian.
+ - Accept patch slbackup-php_i18n-pot-po-update.patch from Debian.
+ - Accept patch slbackup-php_fix-language-detection.patch from Debian.
+ - Accept patch slbackup-php_i18n-de.patch from Debian.
+ - Accept patch slbackup-php_chmod-cron-file.patch from Debian.
+ - Accept patch slbackup-php_i18n-fr.patch from Debian.
+ - Use smarty3.
+ - Split up smarty3-gettext code from functions.php.
+ * Use packaging files from latest Debian package (0.3-3).
+
+Wed, 16 Jan 2007 Patrick Winnertz
+
+ * Add --language=PHP to the xgettext options
+
Wed, 25 Apr 2007 Finn-Arne Johansen
* Release 0.2
@@ -19,6 +62,6 @@ Fri, 13 Apr 2007 Finn-Arne Johansen
* Release 0.0.1
* First version reelased in public
- Copyright 2007 by Finn-Arne Johansen, BzzWare AS, Norway
+ Copyright 2007 by Finn-Arne Johansen, BzzWare AS, Norway
See the accompanying file "COPYRIGHT" for details.
THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
diff --git a/Makefile b/Makefile
index 68e6a82..415685f 100644
--- a/Makefile
+++ b/Makefile
@@ -39,8 +39,8 @@ po/*.po: po/slbackup-php.pot
cp $@ $@.bak ; \
msgmerge $@.bak $^ > $@
-locales/mo-stamp: po/*.po
- for po in $^ ; do \
+locales/mo-stamp:
+ for po in po/*.po ; do \
locale=$$(basename $$po .po) ; \
echo $$locale ; \
mkdir -p locales/$$locale/LC_MESSAGES ; \
@@ -52,9 +52,10 @@ mo-files: locales/mo-stamp
po/slbackup-php.pot: src/*.php templates/*.tpl
tsmarty2c.php templates | \
- xgettext --add-comments --default-domain=slbackup-php \
+ xgettext --add-comments --language=PHP --default-domain=slbackup-php \
- src/*.php --output po/slbackup-php.pot
+po-files: po/*.po
install: all
install -d $(DESTDIR)$(sharedir)
@@ -66,7 +67,7 @@ install: all
install -d $(DESTDIR)$(scriptdir)
install -d $(DESTDIR)$(templatedir)
install -d $(DESTDIR)$(localedir)
- install -d $(DESTDIR)$(bindir)
+ #install -d $(DESTDIR)$(bindir)
for locale in $$(find locales -type f -name $(PACKAGE).mo -printf "%P ") ; do \
diff --git a/debian/changelog b/debian/changelog
index 0f16097..ee9e07d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -87,14 +87,7 @@ slbackup-php (0.3-2) unstable; urgency=low
* Make the list of snapshots sorted
[ Patrick Winnertz ]
- * Changed my maintainer address to winnie at debian.org.
- * Added debian/po/nl.po . Thanks to Bart Cornelis (Closes: #450972)
- * Added debian/po/fi.po . Thanks to Esko Arajärvi (Closes: #468844)
- * Added smarty-gettext as build-dep (Closes: #452769)
- * Bumped Standards-Version to 3.7.3 no other changes needed.
- * Fixed some lintian errors:
- - don't ignore errors of make clean in clean target
- - call dh_desktop in rules
+ * Added debian/po/nl.po . Thanks to Bart Cornelis
-- Patrick Winnertz <winnie at debian.org> Mon, 17 Dec 2007 09:10:29 +0100
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index f1a4e9b..6eb912f 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,15 @@ Build-Depends: debhelper (>= 5), po-debconf, smarty-gettext, php5-cli, quilt (>=
Package: slbackup-php
Architecture: all
-Depends: ${misc:Depends}, libapache2-mod-php5, apache2, smarty, ssh, php5-cli, smarty-gettext
-Description: web-based administration tool for slbackup
+Depends:
+ ${misc:Depends},
+ libapache2-mod-php5,
+ apache2,
+ smarty3,
+ ssh,
+ php5-cli,
+ smarty-gettext (>= 1.0b1-7)
+Description: Web-based administration tool for slbackup
Slbackup-php provides the necessary functions to maintain a slbackup
repository.
.
@@ -22,3 +29,4 @@ Description: web-based administration tool for slbackup
- verifying SSH keys and successful backups;
- restoring from backups;
- removing old backups from the repository.
+
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 03be800..dca18c2 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -1,5 +1,5 @@
-# Swedish translation of slbackup-php debconf template.
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Swedish translation for slbackup-php.
+# Copyright (C) 2007 Free Software Foundation, Inc.
# This file is distributed under the same license as the slbackup-php package.
# Daniel Nylander <po at danielnylander.se>, 2007.
#
diff --git a/debian/rules b/debian/rules
index 0fe30b7..e515c99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,13 @@
# -*- makefile -*-
-build: build-stamp
+build: build-stamp build-arch build-indep
+
+build-arch:
+# nothing to be done here
+
+build-indep:
+ debconf-updatepo
build-stamp:
dh_testdir
@@ -16,7 +22,6 @@ clean:
[ ! -f Makefile ] || $(MAKE) clean
dh_quilt_unpatch
dh_clean
- debconf-updatepo
install: build
dh_testdir
diff --git a/debian/source/format b/debian/source/format
index d3827e7..89ae9db 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (native)
diff --git a/po/sv.po b/po/de.po
similarity index 58%
copy from po/sv.po
copy to po/de.po
index 962b470..4b28ba0 100644
--- a/po/sv.po
+++ b/po/de.po
@@ -1,284 +1,290 @@
-# Swedish translation for slbackup-php.
-# Copyright (C) 2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the slbackup-php package.
-# Daniel Nylander <po at danielnylander.se>, 2007.
+# translation of de.po to
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
msgid ""
msgstr ""
-"Project-Id-Version: slbackup-php\n"
+"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-25 10:31+0200\n"
-"PO-Revision-Date: 2007-05-22 00:22+0100\n"
-"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
-"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
+"POT-Creation-Date: 2012-01-17 20:54+0100\n"
+"PO-Revision-Date: 2012-01-17 20:55+0100\n"
+"Last-Translator: Mike Gabriel <m.gabriel at das-netzwerkteam.de>\n"
+"Language-Team: <debian-edu at lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-
-#. templates/maint.tpl
-#. templates/header.tpl
-#: standard input:2
-#: standard input:26
-msgid "Maintenance"
-msgstr "Underhåll"
-
-#. templates/maint.tpl
-#. templates/config.tpl
-#. templates/restore.tpl
-#: standard input:5
-#: standard input:74
-#: standard input:110
-msgid "Choose"
-msgstr "Välj"
-
-#. templates/maint.tpl
-#: standard input:8
-msgid "Oldest snapshot to keep:"
-msgstr "Äldsta ögonblicksbild att spara:"
-
-#. templates/maint.tpl
-#: standard input:11
-msgid "Delete older"
-msgstr "Ta bort äldre"
-
-#. templates/header.tpl
-#: standard input:14
-msgid "SLBackup Configuration"
-msgstr "Konfiguration av SLBackup"
-
-#. templates/header.tpl
-#: standard input:17
-msgid "Status"
-msgstr "Status"
-
-#. templates/header.tpl
-#: standard input:20
-msgid "Config"
-msgstr "Konfiguration"
-
-#. templates/header.tpl
-#: standard input:23
-msgid "Restore"
-msgstr "Återskapa"
-
-#. templates/header.tpl
-#: standard input:29
-msgid "Logout"
-msgstr "Logga ut"
+"X-Generator: KBabel 1.11.1\n"
#. templates/config.tpl
-#: standard input:32
+#: standard input:2
msgid "Server scheduler"
-msgstr "Schemaläggare"
+msgstr "Datensicherung planen"
#. templates/config.tpl
-#: standard input:35
+#: standard input:5
msgid "Backup enabled"
-msgstr "Säkerhetskopiering aktiverad"
+msgstr "Backups aktiviert"
#. templates/config.tpl
-#: standard input:38
+#: standard input:8
msgid "Run backup at"
-msgstr "Kör säkerhetskopiering klockan"
+msgstr "Datensicherung ausführen um"
#. templates/config.tpl
-#: standard input:41
-#: standard input:62
-#: src/index.php:924
+#: standard input:11
+#: input:32
+#: src/index.php:938
msgid "Update"
-msgstr "Uppdatera"
+msgstr "Aktualisieren"
#. templates/config.tpl
#. templates/login.tpl
-#: standard input:44
-#: standard input:65
-#: standard input:95
-#: standard input:170
+#: standard input:14
+#: input:35
+#: input:65
+#: input:161
msgid "Reset"
-msgstr "Nollställ"
+msgstr "Zurücksetzen"
#. templates/config.tpl
-#: standard input:47
+#: standard input:17
msgid "Server config"
-msgstr "Serverkonfiguration"
+msgstr "Server-Konfiguration"
#. templates/config.tpl
-#: standard input:50
-#: standard input:83
+#: standard input:20
+#: input:53
msgid "Address"
-msgstr "Adress"
+msgstr "Adresse"
#. templates/config.tpl
-#: standard input:53
+#: standard input:23
msgid "Destdir"
-msgstr "Målkatalog"
+msgstr "Zielverzeichnis"
#. templates/config.tpl
-#: standard input:56
+#: standard input:26
msgid "Servertype"
-msgstr "Servertyp"
+msgstr "Server-Typ"
#. templates/config.tpl
-#: standard input:59
-#: standard input:92
+#: standard input:29
+#: input:62
msgid "User"
-msgstr "Användare"
+msgstr "Benutzer"
#. templates/config.tpl
-#: standard input:68
+#: standard input:38
msgid "Client config"
-msgstr "Klientkonfiguration"
+msgstr "Client-Konfiguration"
#. templates/config.tpl
-#: standard input:71
+#: standard input:41
msgid "Client:"
-msgstr "Klient:"
+msgstr "Client-System:"
#. templates/config.tpl
-#: standard input:77
+#. templates/restore.tpl
+#. templates/maint.tpl
+#: standard input:44
+#: input:113
+#: input:167
+msgid "Choose"
+msgstr "Auswählen"
+
+#. templates/config.tpl
+#: standard input:47
msgid "New"
-msgstr "Ny"
+msgstr "Neu"
#. templates/config.tpl
-#: standard input:80
+#: standard input:50
msgid "Remove"
-msgstr "Ta bort"
+msgstr "Entfernen"
#. templates/config.tpl
-#: standard input:86
+#: standard input:56
msgid "Backup Age"
-msgstr "Ålder för säkerhetskopior"
+msgstr "Backup-Alter"
#. templates/config.tpl
-#: standard input:89
+#: standard input:59
msgid "Clienttype"
-msgstr "Klienttyp"
+msgstr "Client-Typ"
#. templates/config.tpl
#. templates/restore.tpl
-#: standard input:98
-#: standard input:113
+#: standard input:68
+#: input:116
msgid "Locations:"
-msgstr "Platser:"
+msgstr "Speicherorte:"
#. templates/config.tpl
-#: standard input:101
-#: src/index.php:922
+#: standard input:71
+#: src/index.php:936
msgid "Add"
-msgstr "Lägg till"
+msgstr "Hinzufügen"
#. templates/config.tpl
-#: standard input:104
+#: standard input:74
msgid "Delete"
-msgstr "Ta bort"
-
-#. templates/restore.tpl
-#: standard input:107
-msgid "Client to restore"
-msgstr "Klient att återskapa"
-
-#. templates/restore.tpl
-#: standard input:116
-msgid "Browse"
-msgstr "Bläddra"
-
-#. templates/restore.tpl
-#: standard input:119
-msgid "Restore of %1"
-msgstr "Återskapandet av %1"
-
-#. templates/restore.tpl
-#: standard input:122
-msgid "Deleted"
-msgstr "Borttaget"
+msgstr "Löschen"
#. templates/status.tpl
-#: standard input:125
+#: standard input:77
msgid "Clients"
-msgstr "Klienter"
+msgstr "Client-Systeme"
#. templates/status.tpl
-#: standard input:128
+#: standard input:80
+msgid "Status for %1"
+msgstr "Status für %1"
+
+#. templates/status.tpl
+#: standard input:83
msgid "OK at %1"
-msgstr "OK %1"
+msgstr "Erfolgreich ausgeführt um %1"
#. templates/status.tpl
-#: standard input:131
+#: standard input:86
msgid "Failed at %1"
-msgstr "Misslyckades %1"
+msgstr "Fehlgeschlagen um %1"
#. templates/status.tpl
-#: standard input:134
+#: standard input:89
msgid "Client never backed up"
-msgstr "Klienten har aldrig säkerhetskopierats"
+msgstr "Client-System wurde noch nie gesichert"
#. templates/status.tpl
-#: standard input:137
+#: standard input:92
msgid "ssh-keys are working"
-msgstr "ssh-nycklarna är rätt konfigurerade"
+msgstr "SSH-Schlüssel sind einsatzbereit"
#. templates/status.tpl
-#: standard input:140
+#: standard input:95
msgid "rdiff-backup-versions differ"
-msgstr "rdiff-backup-versionerna stämmer inte överens"
+msgstr "rdiff-Backup Versionen sind unterschiedlich"
#. templates/status.tpl
-#: standard input:143
+#: standard input:98
msgid "ssh-keys are not working"
-msgstr "ssh-nycklarna är felkonfigurerade"
+msgstr "SSH-Schlüssel funktionieren nicht"
#. templates/status.tpl
-#: standard input:146
+#: standard input:101
msgid "Backup status"
-msgstr "Status för säkerhetskopiering"
+msgstr "Backup-Status"
#. templates/status.tpl
-#: standard input:149
+#: standard input:104
msgid "Backup last finished at %1"
-msgstr "Säkerhetskopieringen färdigställdes %1"
+msgstr "Letzte Datensicherung beendet um %1"
#. templates/status.tpl
-#: standard input:152
+#: standard input:107
msgid "A new backup started at %1"
-msgstr "En ny säkerhetskopiering startades %1"
+msgstr "Eine neue Sicherung wurde um %1 gestartet"
+
+#. templates/restore.tpl
+#: standard input:110
+msgid "Client to restore"
+msgstr "Wiederherzustellendes Client-System auswählen"
+
+#. templates/restore.tpl
+#: standard input:119
+msgid "Browse"
+msgstr "Durchsuchen"
+
+#. templates/restore.tpl
+#: standard input:122
+msgid "Restore of %1"
+msgstr "Wiederherstellung von %1"
+
+#. templates/restore.tpl
+#: standard input:125
+msgid "Deleted"
+msgstr "Gelöscht"
+
+#. templates/header.tpl
+#: standard input:128
+msgid "SLBackup Configuration"
+msgstr "SL-Backup Konfiguration"
+
+#. templates/header.tpl
+#: standard input:131
+msgid "Status"
+msgstr "Status"
+
+#. templates/header.tpl
+#: standard input:134
+msgid "Config"
+msgstr "Konfiguration"
+
+#. templates/header.tpl
+#: standard input:137
+msgid "Restore"
+msgstr "Wiederherstellen"
+
+#. templates/header.tpl
+#. templates/maint.tpl
+#: standard input:140
+#: input:164
+msgid "Maintenance"
+msgstr "Wartung"
+
+#. templates/header.tpl
+#: standard input:143
+msgid "Logout"
+msgstr "Abmelden"
#. templates/login.tpl
-#: standard input:155
+#: standard input:146
msgid "To read the configuration, you must log in as %1 on %2."
-msgstr "För att läsa konfiguration måste du logga in som %1 på %2."
+msgstr "Um die Konfiguration einzusehen, müssen Sie sich als %1 auf %2 anmelden."
#. templates/login.tpl
-#: standard input:158
+#: standard input:149
msgid "Please enter the password for the %1 account on %2:"
-msgstr "Ange lösenordet för %1-kontot på %2:"
+msgstr "Bitte das Kennwort für das Konto %1 auf %2 eingeben:"
#. templates/login.tpl
-#: standard input:161
+#: standard input:152
msgid "WARNING: you are about to send you password over an unencrypted link, please ask your administrator to enable https"
-msgstr "VARNING: du är på väg att skicka ditt lösenord över en okrypterad förbindelse, be din administratör att aktivera https"
+msgstr "WARNUNG: Sie sind kurz davor, Ihr Kennwort über eine nicht-verschlüsselte Verbindung zu schicken. Bitten Sie Ihren System-Administrator darum, Verschlüsselung für die SL-Backup Seite zu aktivieren."
#. templates/login.tpl
-#: standard input:164
+#: standard input:155
msgid "Login to this application is denied without the use of https. Please ask your administrator to enable https"
-msgstr "Inloggning till det här programmet nekas därför att https inte används. Be din administratör att aktivera https"
+msgstr "Anmeldung an dieser Anwendung wird verweigert, wenn Webseiten-Verschlüsselung (https) deaktiviert ist. Bitten Sie Ihren System-Administrator darum, Verschlüsselung für die SL-Backup Seite zu aktivieren."
#. templates/login.tpl
-#: standard input:167
+#: standard input:158
msgid "Login"
-msgstr "Logga in"
+msgstr "Anmeldung"
+
+#. templates/maint.tpl
+#: standard input:170
+msgid "Oldest snapshot to keep:"
+msgstr "Älteste Sicherungskopie, die aufbewahrt werden soll:"
+
+#. templates/maint.tpl
+#: standard input:173
+msgid "Delete older"
+msgstr "Ältere löschen"
-#: src/index.php:735
+#: src/index.php:749
#, php-format
msgid "No client specified :("
-msgstr "Ingen klient angiven :("
+msgstr "Kein Client-System ausgewählt :("
-#: src/index.php:740
+#: src/index.php:754
#, php-format
msgid "Unable to find %s in the list of clients."
-msgstr "Kunde inte hitta %s i listan över klienter."
+msgstr "Kann %s nicht in der Liste der Client-Systeme finden."
-#: src/index.php:774
+#: src/index.php:788
#, php-format
msgid "Unable to find %s in the locations of %s."
-msgstr "Kunde inte hitta %s i platserna för %s."
+msgstr "Kann %s nicht unter den gesicherten Verzeichnissen von %s finden."
diff --git a/po/es.po b/po/es.po
index b0ad27f..e196a16 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,271 +7,279 @@ msgid ""
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-25 10:31+0200\n"
-"PO-Revision-Date: 2007-05-22 15:56+0000\n"
-"Last-Translator: José L. Redrejo Rodríguez\n"
+"POT-Creation-Date: 2012-01-17 20:55+0100\n"
+"PO-Revision-Date: 2012-01-17 20:44+0100\n"
+"Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
"Language-Team: <es at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.1\n"
-#. templates/maint.tpl
-#. templates/header.tpl
-#: standard input:2 standard input:26
-msgid "Maintenance"
-msgstr "Mantenimiento"
-
-#. templates/maint.tpl
-#. templates/config.tpl
-#. templates/restore.tpl
-#: standard input:5 standard input:74 standard input:110
-msgid "Choose"
-msgstr "Elija"
-
-#. templates/maint.tpl
-#: standard input:8
-msgid "Oldest snapshot to keep:"
-msgstr "La copia más antigua a mantener:"
-
-#. templates/maint.tpl
-#: standard input:11
-msgid "Delete older"
-msgstr "Borrar lo más viejo"
-
-#. templates/header.tpl
-#: standard input:14
-msgid "SLBackup Configuration"
-msgstr "Configuración de SLBackup"
-
-#. templates/header.tpl
-#: standard input:17
-msgid "Status"
-msgstr "Estado"
-
-#. templates/header.tpl
-#: standard input:20
-msgid "Config"
-msgstr "Configuración"
-
-#. templates/header.tpl
-#: standard input:23
-msgid "Restore"
-msgstr "Restaurar"
-
-#. templates/header.tpl
-#: standard input:29
-msgid "Logout"
-msgstr "Salir"
-
#. templates/config.tpl
-#: standard input:32
+#: standard input:2
msgid "Server scheduler"
msgstr "Programar el servidor"
#. templates/config.tpl
-#: standard input:35
+#: standard input:5
msgid "Backup enabled"
msgstr "Copia de seguridad habilitada"
#. templates/config.tpl
-#: standard input:38
+#: standard input:8
msgid "Run backup at"
msgstr "Ejecutar la copia de seguridad a las"
#. templates/config.tpl
-#: standard input:41 standard input:62 src/index.php:924
+#: standard input:11 input:32 src/index.php:938
msgid "Update"
msgstr "Actualizar"
#. templates/config.tpl
#. templates/login.tpl
-#: standard input:44 standard input:65 standard input:95 standard input:170
+#: standard input:14 input:35 input:65 input:161
msgid "Reset"
msgstr "Reiniciar"
#. templates/config.tpl
-#: standard input:47
+#: standard input:17
msgid "Server config"
msgstr "Configuración del servidor"
#. templates/config.tpl
-#: standard input:50 standard input:83
+#: standard input:20 input:53
msgid "Address"
msgstr "Dirección"
#. templates/config.tpl
-#: standard input:53
+#: standard input:23
msgid "Destdir"
msgstr "DirecciónFinal"
#. templates/config.tpl
-#: standard input:56
+#: standard input:26
msgid "Servertype"
msgstr "TipoServidor"
#. templates/config.tpl
-#: standard input:59 standard input:92
+#: standard input:29 input:62
msgid "User"
msgstr "Usuario"
#. templates/config.tpl
-#: standard input:68
+#: standard input:38
msgid "Client config"
msgstr "Configuración del cliente"
#. templates/config.tpl
-#: standard input:71
+#: standard input:41
msgid "Client:"
msgstr "Cliente:"
#. templates/config.tpl
-#: standard input:77
+#. templates/restore.tpl
+#. templates/maint.tpl
+#: standard input:44 input:113 input:167
+msgid "Choose"
+msgstr "Elija"
+
+#. templates/config.tpl
+#: standard input:47
msgid "New"
msgstr "Nuevo"
#. templates/config.tpl
-#: standard input:80
+#: standard input:50
msgid "Remove"
msgstr "Eliminar"
#. templates/config.tpl
-#: standard input:86
+#: standard input:56
msgid "Backup Age"
msgstr "Antiguedad de la copia"
#. templates/config.tpl
-#: standard input:89
+#: standard input:59
msgid "Clienttype"
msgstr "TipoCliente"
#. templates/config.tpl
#. templates/restore.tpl
-#: standard input:98 standard input:113
+#: standard input:68 input:116
msgid "Locations:"
msgstr "Lugares:"
#. templates/config.tpl
-#: standard input:101 src/index.php:922
+#: standard input:71 src/index.php:936
msgid "Add"
msgstr "Añadir"
#. templates/config.tpl
-#: standard input:104
+#: standard input:74
msgid "Delete"
msgstr "Borrar"
-#. templates/restore.tpl
-#: standard input:107
-msgid "Client to restore"
-msgstr "Cliente a restaurar"
-
-#. templates/restore.tpl
-#: standard input:116
-msgid "Browse"
-msgstr "Explorar"
-
-#. templates/restore.tpl
-#: standard input:119
-msgid "Restore of %1"
-msgstr "Restauración de %1"
-
-#. templates/restore.tpl
-#: standard input:122
-msgid "Deleted"
-msgstr "Borrado"
-
#. templates/status.tpl
-#: standard input:125
+#: standard input:77
msgid "Clients"
msgstr "Clientes"
#. templates/status.tpl
-#: standard input:128
+#: standard input:80
+msgid "Status for %1"
+msgstr "Estado para %1"
+
+#. templates/status.tpl
+#: standard input:83
msgid "OK at %1"
msgstr "OK en %1"
#. templates/status.tpl
-#: standard input:131
+#: standard input:86
msgid "Failed at %1"
msgstr "Falló en %1"
#. templates/status.tpl
-#: standard input:134
+#: standard input:89
msgid "Client never backed up"
msgstr "Nunca se ha hecho copia de ese cliente"
#. templates/status.tpl
-#: standard input:137
+#: standard input:92
msgid "ssh-keys are working"
msgstr "las claves de ssh funcionan"
#. templates/status.tpl
-#: standard input:140
+#: standard input:95
msgid "rdiff-backup-versions differ"
msgstr "las versiones de diferencia de copias no son iguales"
#. templates/status.tpl
-#: standard input:143
+#: standard input:98
msgid "ssh-keys are not working"
msgstr "las claves de ssh no funcionan"
#. templates/status.tpl
-#: standard input:146
+#: standard input:101
msgid "Backup status"
msgstr "Estado de la copia"
#. templates/status.tpl
-#: standard input:149
+#: standard input:104
msgid "Backup last finished at %1"
msgstr "La última copia de seguridad acabó a las %1"
#. templates/status.tpl
-#: standard input:152
+#: standard input:107
msgid "A new backup started at %1"
msgstr "Una nueva copia de seguridad comenzó a las %1"
+#. templates/restore.tpl
+#: standard input:110
+msgid "Client to restore"
+msgstr "Cliente a restaurar"
+
+#. templates/restore.tpl
+#: standard input:119
+msgid "Browse"
+msgstr "Explorar"
+
+#. templates/restore.tpl
+#: standard input:122
+msgid "Restore of %1"
+msgstr "Restauración de %1"
+
+#. templates/restore.tpl
+#: standard input:125
+msgid "Deleted"
+msgstr "Borrado"
+
+#. templates/header.tpl
+#: standard input:128
+msgid "SLBackup Configuration"
+msgstr "Configuración de SLBackup"
+
+#. templates/header.tpl
+#: standard input:131
+msgid "Status"
+msgstr "Estado"
+
+#. templates/header.tpl
+#: standard input:134
+msgid "Config"
+msgstr "Configuración"
+
+#. templates/header.tpl
+#: standard input:137
+msgid "Restore"
+msgstr "Restaurar"
+
+#. templates/header.tpl
+#. templates/maint.tpl
+#: standard input:140 input:164
+msgid "Maintenance"
+msgstr "Mantenimiento"
+
+#. templates/header.tpl
+#: standard input:143
+msgid "Logout"
+msgstr "Salir"
+
#. templates/login.tpl
-#: standard input:155
+#: standard input:146
msgid "To read the configuration, you must log in as %1 on %2."
msgstr "Para leer la configuración, debe entrar como %1 en %2."
#. templates/login.tpl
-#: standard input:158
+#: standard input:149
msgid "Please enter the password for the %1 account on %2:"
msgstr "Introduzca la contraseña para la cuenta %1 en %2:"
#. templates/login.tpl
-#: standard input:161
+#: standard input:152
msgid ""
"WARNING: you are about to send you password over an unencrypted link, please "
"ask your administrator to enable https"
-msgstr "AVISO: Está a punto de enviar su contraseña por un enlace sin encriptar, solicite a su administrador que habilite https"
+msgstr ""
+"AVISO: Está a punto de enviar su contraseña por un enlace sin encriptar, "
+"solicite a su administrador que habilite https"
#. templates/login.tpl
-#: standard input:164
+#: standard input:155
msgid ""
"Login to this application is denied without the use of https. Please ask "
"your administrator to enable https"
-msgstr "No está autorizado entrar en esta aplicación sin usar https. Solicite a su administrador que habilite https"
+msgstr ""
+"No está autorizado entrar en esta aplicación sin usar https. Solicite a su "
+"administrador que habilite https"
#. templates/login.tpl
-#: standard input:167
+#: standard input:158
msgid "Login"
msgstr "Entrar"
-#: src/index.php:735
+#. templates/maint.tpl
+#: standard input:170
+msgid "Oldest snapshot to keep:"
+msgstr "La copia más antigua a mantener:"
+
+#. templates/maint.tpl
+#: standard input:173
+msgid "Delete older"
+msgstr "Borrar lo más viejo"
+
+#: src/index.php:749
#, php-format
msgid "No client specified :("
msgstr "No se ha especificado un cliente :("
-#: src/index.php:740
+#: src/index.php:754
#, php-format
msgid "Unable to find %s in the list of clients."
msgstr "No se ha podido encontrar a %s en la lista de clientes."
-#: src/index.php:774
+#: src/index.php:788
#, php-format
msgid "Unable to find %s in the locations of %s."
msgstr "No se ha podido encontrar a %s en los lugares de %s."
-
diff --git a/po/sv.po b/po/fr.po
similarity index 54%
copy from po/sv.po
copy to po/fr.po
index 962b470..9b99737 100644
--- a/po/sv.po
+++ b/po/fr.po
@@ -1,284 +1,288 @@
-# Swedish translation for slbackup-php.
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Translation of slbackup-php to French
+# Copyright (C) 2012 Debian French l10n team <debian-l10n-french at lists.debian.org>
# This file is distributed under the same license as the slbackup-php package.
-# Daniel Nylander <po at danielnylander.se>, 2007.
#
+# David Prévot <david at tilapin.org>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: slbackup-php\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-25 10:31+0200\n"
-"PO-Revision-Date: 2007-05-22 00:22+0100\n"
-"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
-"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
+"POT-Creation-Date: 2012-01-17 20:55+0100\n"
+"PO-Revision-Date: 2012-03-18 21:58-0400\n"
+"Last-Translator: David Prévot <david at tilapin.org>\n"
+"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#. templates/maint.tpl
-#. templates/header.tpl
-#: standard input:2
-#: standard input:26
-msgid "Maintenance"
-msgstr "Underhåll"
-
-#. templates/maint.tpl
#. templates/config.tpl
-#. templates/restore.tpl
-#: standard input:5
-#: standard input:74
-#: standard input:110
-msgid "Choose"
-msgstr "Välj"
-
-#. templates/maint.tpl
-#: standard input:8
-msgid "Oldest snapshot to keep:"
-msgstr "Äldsta ögonblicksbild att spara:"
-
-#. templates/maint.tpl
-#: standard input:11
-msgid "Delete older"
-msgstr "Ta bort äldre"
-
-#. templates/header.tpl
-#: standard input:14
-msgid "SLBackup Configuration"
-msgstr "Konfiguration av SLBackup"
-
-#. templates/header.tpl
-#: standard input:17
-msgid "Status"
-msgstr "Status"
-
-#. templates/header.tpl
-#: standard input:20
-msgid "Config"
-msgstr "Konfiguration"
-
-#. templates/header.tpl
-#: standard input:23
-msgid "Restore"
-msgstr "Återskapa"
-
-#. templates/header.tpl
-#: standard input:29
-msgid "Logout"
-msgstr "Logga ut"
-
-#. templates/config.tpl
-#: standard input:32
+#: standard input:2
msgid "Server scheduler"
-msgstr "Schemaläggare"
+msgstr "Programmation du serveur"
#. templates/config.tpl
-#: standard input:35
+#: standard input:5
msgid "Backup enabled"
-msgstr "Säkerhetskopiering aktiverad"
+msgstr "Sauvegarde activée"
#. templates/config.tpl
-#: standard input:38
+#: standard input:8
msgid "Run backup at"
-msgstr "Kör säkerhetskopiering klockan"
+msgstr "Démarrer la sauvegarde à"
#. templates/config.tpl
-#: standard input:41
-#: standard input:62
-#: src/index.php:924
+#: standard input:11 input:32 src/index.php:938
msgid "Update"
-msgstr "Uppdatera"
+msgstr "Mettre à jour"
#. templates/config.tpl
#. templates/login.tpl
-#: standard input:44
-#: standard input:65
-#: standard input:95
-#: standard input:170
+#: standard input:14 input:35 input:65 input:161
msgid "Reset"
-msgstr "Nollställ"
+msgstr "Réinitialiser"
#. templates/config.tpl
-#: standard input:47
+#: standard input:17
msgid "Server config"
-msgstr "Serverkonfiguration"
+msgstr "Configuration du serveur"
#. templates/config.tpl
-#: standard input:50
-#: standard input:83
+#: standard input:20 input:53
msgid "Address"
-msgstr "Adress"
+msgstr "Adresse"
#. templates/config.tpl
-#: standard input:53
+#: standard input:23
msgid "Destdir"
-msgstr "Målkatalog"
+msgstr "Rép. dest."
#. templates/config.tpl
-#: standard input:56
+#: standard input:26
msgid "Servertype"
-msgstr "Servertyp"
+msgstr "Type serveur"
#. templates/config.tpl
-#: standard input:59
-#: standard input:92
+#: standard input:29 input:62
msgid "User"
-msgstr "Användare"
+msgstr "Utilisateur"
#. templates/config.tpl
-#: standard input:68
+#: standard input:38
msgid "Client config"
-msgstr "Klientkonfiguration"
+msgstr "Configuration du client"
#. templates/config.tpl
-#: standard input:71
+#: standard input:41
msgid "Client:"
-msgstr "Klient:"
+msgstr "Client :"
#. templates/config.tpl
-#: standard input:77
+#. templates/restore.tpl
+#. templates/maint.tpl
+#: standard input:44 input:113 input:167
+msgid "Choose"
+msgstr "Choisir"
+
+#. templates/config.tpl
+#: standard input:47
msgid "New"
-msgstr "Ny"
+msgstr "Nouveau"
#. templates/config.tpl
-#: standard input:80
+#: standard input:50
msgid "Remove"
-msgstr "Ta bort"
+msgstr "Retirer"
#. templates/config.tpl
-#: standard input:86
+#: standard input:56
msgid "Backup Age"
-msgstr "Ålder för säkerhetskopior"
+msgstr "Âge de la sauvegarde"
#. templates/config.tpl
-#: standard input:89
+#: standard input:59
msgid "Clienttype"
-msgstr "Klienttyp"
+msgstr "Type client"
#. templates/config.tpl
#. templates/restore.tpl
-#: standard input:98
-#: standard input:113
+#: standard input:68 input:116
msgid "Locations:"
-msgstr "Platser:"
+msgstr "Emplacements :"
#. templates/config.tpl
-#: standard input:101
-#: src/index.php:922
+#: standard input:71 src/index.php:936
msgid "Add"
-msgstr "Lägg till"
+msgstr "Ajouter"
#. templates/config.tpl
-#: standard input:104
+#: standard input:74
msgid "Delete"
-msgstr "Ta bort"
-
-#. templates/restore.tpl
-#: standard input:107
-msgid "Client to restore"
-msgstr "Klient att återskapa"
-
-#. templates/restore.tpl
-#: standard input:116
-msgid "Browse"
-msgstr "Bläddra"
-
-#. templates/restore.tpl
-#: standard input:119
-msgid "Restore of %1"
-msgstr "Återskapandet av %1"
-
-#. templates/restore.tpl
-#: standard input:122
-msgid "Deleted"
-msgstr "Borttaget"
+msgstr "Supprimer"
#. templates/status.tpl
-#: standard input:125
+#: standard input:77
msgid "Clients"
-msgstr "Klienter"
+msgstr "Clients"
#. templates/status.tpl
-#: standard input:128
+#: standard input:80
+msgid "Status for %1"
+msgstr "État de %1"
+
+#. templates/status.tpl
+#: standard input:83
msgid "OK at %1"
-msgstr "OK %1"
+msgstr "Bon à %1"
#. templates/status.tpl
-#: standard input:131
+#: standard input:86
msgid "Failed at %1"
-msgstr "Misslyckades %1"
+msgstr "Échoué à %1"
#. templates/status.tpl
-#: standard input:134
+#: standard input:89
msgid "Client never backed up"
-msgstr "Klienten har aldrig säkerhetskopierats"
+msgstr "Client jamais sauvegardé"
#. templates/status.tpl
-#: standard input:137
+#: standard input:92
msgid "ssh-keys are working"
-msgstr "ssh-nycklarna är rätt konfigurerade"
+msgstr "Les clefs SSH fonctionnent"
#. templates/status.tpl
-#: standard input:140
+#: standard input:95
msgid "rdiff-backup-versions differ"
-msgstr "rdiff-backup-versionerna stämmer inte överens"
+msgstr "Les versions de rdiff-backup sont différentes"
#. templates/status.tpl
-#: standard input:143
+#: standard input:98
msgid "ssh-keys are not working"
-msgstr "ssh-nycklarna är felkonfigurerade"
+msgstr "Les clefs SSH ne fonctionnent pas"
#. templates/status.tpl
-#: standard input:146
+#: standard input:101
msgid "Backup status"
-msgstr "Status för säkerhetskopiering"
+msgstr "État de sauvegarde"
#. templates/status.tpl
-#: standard input:149
+#: standard input:104
msgid "Backup last finished at %1"
-msgstr "Säkerhetskopieringen färdigställdes %1"
+msgstr "La dernière sauvegarde s'est terminée à %1"
#. templates/status.tpl
-#: standard input:152
+#: standard input:107
msgid "A new backup started at %1"
-msgstr "En ny säkerhetskopiering startades %1"
+msgstr "Une nouvelle sauvegarde a commencé à %1"
+
+#. templates/restore.tpl
+#: standard input:110
+msgid "Client to restore"
+msgstr "Client à restaurer"
+
+#. templates/restore.tpl
+#: standard input:119
+msgid "Browse"
+msgstr "Parcourir"
+
+#. templates/restore.tpl
+#: standard input:122
+msgid "Restore of %1"
+msgstr "Restauration de %1"
+
+#. templates/restore.tpl
+#: standard input:125
+msgid "Deleted"
+msgstr "Supprimé"
+
+#. templates/header.tpl
+#: standard input:128
+msgid "SLBackup Configuration"
+msgstr "Configuration de SLBackup"
+
+#. templates/header.tpl
+#: standard input:131
+msgid "Status"
+msgstr "État"
+
+#. templates/header.tpl
+#: standard input:134
+msgid "Config"
+msgstr "Configuration"
+
+#. templates/header.tpl
+#: standard input:137
+msgid "Restore"
+msgstr "Restaurer"
+
+#. templates/header.tpl
+#. templates/maint.tpl
+#: standard input:140 input:164
+msgid "Maintenance"
+msgstr "Maintenance"
+
+#. templates/header.tpl
+#: standard input:143
+msgid "Logout"
+msgstr "Déconnexion"
#. templates/login.tpl
-#: standard input:155
+#: standard input:146
msgid "To read the configuration, you must log in as %1 on %2."
-msgstr "För att läsa konfiguration måste du logga in som %1 på %2."
+msgstr ""
+"Pour lire la configuration, vous devez vous connecter en tant que %1 sur %2."
#. templates/login.tpl
-#: standard input:158
+#: standard input:149
msgid "Please enter the password for the %1 account on %2:"
-msgstr "Ange lösenordet för %1-kontot på %2:"
+msgstr "Veuillez entrer le mot de passe du compte %1 sur %2 :"
#. templates/login.tpl
-#: standard input:161
-msgid "WARNING: you are about to send you password over an unencrypted link, please ask your administrator to enable https"
-msgstr "VARNING: du är på väg att skicka ditt lösenord över en okrypterad förbindelse, be din administratör att aktivera https"
+#: standard input:152
+msgid ""
+"WARNING: you are about to send you password over an unencrypted link, please "
+"ask your administrator to enable https"
+msgstr ""
+"Attention : vous allez envoyer votre mot de passe sur un lien non chiffré, "
+"veuillez demander à l'administrateur d'activer HTTPS."
#. templates/login.tpl
-#: standard input:164
-msgid "Login to this application is denied without the use of https. Please ask your administrator to enable https"
-msgstr "Inloggning till det här programmet nekas därför att https inte används. Be din administratör att aktivera https"
+#: standard input:155
+msgid ""
+"Login to this application is denied without the use of https. Please ask "
+"your administrator to enable https"
+msgstr ""
+"La connexion à cette application n'est pas permise sans HTTPS. Veuillez "
+"demander à l'administrateur d'activer HTTPS."
#. templates/login.tpl
-#: standard input:167
+#: standard input:158
msgid "Login"
-msgstr "Logga in"
+msgstr "Connexion"
+
+#. templates/maint.tpl
+#: standard input:170
+msgid "Oldest snapshot to keep:"
+msgstr "Plus vieil instantané à garder :"
-#: src/index.php:735
+#. templates/maint.tpl
+#: standard input:173
+msgid "Delete older"
+msgstr "Effacer les plus anciens"
+
+#: src/index.php:749
#, php-format
msgid "No client specified :("
-msgstr "Ingen klient angiven :("
+msgstr "Pas de client indiqué"
-#: src/index.php:740
+#: src/index.php:754
#, php-format
msgid "Unable to find %s in the list of clients."
-msgstr "Kunde inte hitta %s i listan över klienter."
+msgstr "Impossible de trouver %s dans la liste des clients."
-#: src/index.php:774
+#: src/index.php:788
#, php-format
msgid "Unable to find %s in the locations of %s."
-msgstr "Kunde inte hitta %s i platserna för %s."
-
+msgstr "Impossible de trouver %s dans les emplacements de %s."
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 1c43dcc..f40d030 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,242 +7,237 @@ msgid ""
msgstr ""
"Project-Id-Version: slbackup 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-25 10:31+0200\n"
-"PO-Revision-Date: 2007-04-25 10:34+0200\n"
-"Last-Translator: Finn-Arne Johansen<faj at bzz.no>\n"
+"POT-Creation-Date: 2012-01-17 20:55+0100\n"
+"PO-Revision-Date: 2012-01-17 20:47+0100\n"
+"Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
"Language-Team: Norsk bokmål\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. templates/maint.tpl
-#. templates/header.tpl
-#: standard input:2 input:26
-msgid "Maintenance"
-msgstr "Vedlikehold"
-
-#. templates/maint.tpl
#. templates/config.tpl
-#. templates/restore.tpl
-#: standard input:5 input:74 input:110
-msgid "Choose"
-msgstr "Velg"
-
-#. templates/maint.tpl
-#: standard input:8
-msgid "Oldest snapshot to keep:"
-msgstr "Eldste kopi som skal beholdes:"
-
-#. templates/maint.tpl
-#: standard input:11
-msgid "Delete older"
-msgstr "Slett eldre"
-
-#. templates/header.tpl
-#: standard input:14
-msgid "SLBackup Configuration"
-msgstr "SLBackup Konfigurasjon"
-
-#. templates/header.tpl
-#: standard input:17
-msgid "Status"
-msgstr "Status"
-
-#. templates/header.tpl
-#: standard input:20
-msgid "Config"
-msgstr "Konfigurasjon"
-
-#. templates/header.tpl
-#: standard input:23
-msgid "Restore"
-msgstr "Gjennopprett"
-
-#. templates/header.tpl
-#: standard input:29
-msgid "Logout"
-msgstr "Logg ut"
-
-#. templates/config.tpl
-#: standard input:32
+#: standard input:2
msgid "Server scheduler"
msgstr "Tidsplanlegging"
#. templates/config.tpl
-#: standard input:35
+#: standard input:5
msgid "Backup enabled"
msgstr "Sikkerhetskopiering aktivert"
#. templates/config.tpl
-#: standard input:38
+#: standard input:8
msgid "Run backup at"
msgstr "Kjør sikkerhetskopiering klokken"
#. templates/config.tpl
-#: standard input:41 input:62 src/index.php:924
+#: standard input:11 input:32 src/index.php:938
msgid "Update"
msgstr "Oppdater"
#. templates/config.tpl
#. templates/login.tpl
-#: standard input:44 input:65 input:95 input:170
+#: standard input:14 input:35 input:65 input:161
msgid "Reset"
msgstr "Tilbakestill"
#. templates/config.tpl
-#: standard input:47
+#: standard input:17
msgid "Server config"
msgstr "Konfigurasjon for tjener"
#. templates/config.tpl
-#: standard input:50 input:83
+#: standard input:20 input:53
msgid "Address"
msgstr "Adresse"
#. templates/config.tpl
-#: standard input:53
+#: standard input:23
msgid "Destdir"
msgstr "Målkatalog"
#. templates/config.tpl
-#: standard input:56
+#: standard input:26
msgid "Servertype"
msgstr "Type"
#. templates/config.tpl
-#: standard input:59 input:92
+#: standard input:29 input:62
msgid "User"
msgstr "Bruker"
#. templates/config.tpl
-#: standard input:68
+#: standard input:38
msgid "Client config"
msgstr "Konfigurasjon av klienter"
#. templates/config.tpl
-#: standard input:71
+#: standard input:41
msgid "Client:"
msgstr "Klient:"
#. templates/config.tpl
-#: standard input:77
+#. templates/restore.tpl
+#. templates/maint.tpl
+#: standard input:44 input:113 input:167
+msgid "Choose"
+msgstr "Velg"
+
+#. templates/config.tpl
+#: standard input:47
msgid "New"
msgstr "Ny"
#. templates/config.tpl
-#: standard input:80
+#: standard input:50
msgid "Remove"
msgstr "Slett"
#. templates/config.tpl
-#: standard input:86
+#: standard input:56
msgid "Backup Age"
msgstr "Alder på backup"
#. templates/config.tpl
-#: standard input:89
+#: standard input:59
msgid "Clienttype"
msgstr "Type"
#. templates/config.tpl
#. templates/restore.tpl
-#: standard input:98 input:113
+#: standard input:68 input:116
msgid "Locations:"
msgstr "Kataloger:"
#. templates/config.tpl
-#: standard input:101 src/index.php:922
+#: standard input:71 src/index.php:936
msgid "Add"
msgstr "Legg til"
#. templates/config.tpl
-#: standard input:104
+#: standard input:74
msgid "Delete"
msgstr "Slett"
-#. templates/restore.tpl
-#: standard input:107
-msgid "Client to restore"
-msgstr "Klient som skal gjenskapes"
-
-#. templates/restore.tpl
-#: standard input:116
-msgid "Browse"
-msgstr "Bla"
-
-#. templates/restore.tpl
-#: standard input:119
-msgid "Restore of %1"
-msgstr "Gjennoppretting av %1"
-
-#. templates/restore.tpl
-#: standard input:122
-msgid "Deleted"
-msgstr "Slettet"
-
#. templates/status.tpl
-#: standard input:125
+#: standard input:77
msgid "Clients"
msgstr "Klient"
#. templates/status.tpl
-#: standard input:128
+#: standard input:80
+msgid "Status for %1"
+msgstr "Status for %1"
+
+#. templates/status.tpl
+#: standard input:83
msgid "OK at %1"
msgstr "OK %1"
#. templates/status.tpl
-#: standard input:131
+#: standard input:86
msgid "Failed at %1"
msgstr "Feiler %1"
#. templates/status.tpl
-#: standard input:134
+#: standard input:89
msgid "Client never backed up"
msgstr "Det er aldri tatt sikkerhetskopi av klienten"
#. templates/status.tpl
-#: standard input:137
+#: standard input:92
msgid "ssh-keys are working"
msgstr "sshnøkler er satt rett opp"
#. templates/status.tpl
-#: standard input:140
+#: standard input:95
msgid "rdiff-backup-versions differ"
msgstr "Det er forskjellig versjon av rdiff-backup"
#. templates/status.tpl
-#: standard input:143
+#: standard input:98
msgid "ssh-keys are not working"
msgstr "sshnøkler er ikke satt korrekt opp"
#. templates/status.tpl
-#: standard input:146
+#: standard input:101
msgid "Backup status"
msgstr "Status for Sikkerhetskopiering"
#. templates/status.tpl
-#: standard input:149
+#: standard input:104
msgid "Backup last finished at %1"
msgstr "Sikkerhetskopiering ble fullført %1"
#. templates/status.tpl
-#: standard input:152
+#: standard input:107
msgid "A new backup started at %1"
msgstr "En ny sikkerhetskopieringsjobb ble startet %1"
+#. templates/restore.tpl
+#: standard input:110
+msgid "Client to restore"
+msgstr "Klient som skal gjenskapes"
+
+#. templates/restore.tpl
+#: standard input:119
+msgid "Browse"
+msgstr "Bla"
+
+#. templates/restore.tpl
+#: standard input:122
+msgid "Restore of %1"
+msgstr "Gjennoppretting av %1"
+
+#. templates/restore.tpl
+#: standard input:125
+msgid "Deleted"
+msgstr "Slettet"
+
+#. templates/header.tpl
+#: standard input:128
+msgid "SLBackup Configuration"
+msgstr "SLBackup Konfigurasjon"
+
+#. templates/header.tpl
+#: standard input:131
+msgid "Status"
+msgstr "Status"
+
+#. templates/header.tpl
+#: standard input:134
+msgid "Config"
+msgstr "Konfigurasjon"
+
+#. templates/header.tpl
+#: standard input:137
+msgid "Restore"
+msgstr "Gjennopprett"
+
+#. templates/header.tpl
+#. templates/maint.tpl
+#: standard input:140 input:164
+msgid "Maintenance"
+msgstr "Vedlikehold"
+
+#. templates/header.tpl
+#: standard input:143
+msgid "Logout"
+msgstr "Logg ut"
+
#. templates/login.tpl
-#: standard input:155
+#: standard input:146
msgid "To read the configuration, you must log in as %1 on %2."
msgstr ""
"For å se på konfigurasjonen, må du logge inn som bruker %1 på maskinen %2"
#. templates/login.tpl
-#: standard input:158
+#: standard input:149
msgid "Please enter the password for the %1 account on %2:"
msgstr "Legg inn passordet for bruker %1 på %2:"
#. templates/login.tpl
-#: standard input:161
+#: standard input:152
msgid ""
"WARNING: you are about to send you password over an unencrypted link, please "
"ask your administrator to enable https"
@@ -252,29 +247,40 @@ msgstr ""
"for denne applikasjonen"
#. templates/login.tpl
-#: standard input:164
+#: standard input:155
msgid ""
"Login to this application is denied without the use of https. Please ask "
"your administrator to enable https"
msgstr ""
-"Det er ikke mulig å logge inn uten bruk av https. Be din administrator om å sette opp bruken av https"
+"Det er ikke mulig å logge inn uten bruk av https. Be din administrator om å "
+"sette opp bruken av https"
#. templates/login.tpl
-#: standard input:167
+#: standard input:158
msgid "Login"
msgstr "Logg inn"
-#: src/index.php:735
+#. templates/maint.tpl
+#: standard input:170
+msgid "Oldest snapshot to keep:"
+msgstr "Eldste kopi som skal beholdes:"
+
+#. templates/maint.tpl
+#: standard input:173
+msgid "Delete older"
+msgstr "Slett eldre"
+
+#: src/index.php:749
#, php-format
msgid "No client specified :("
msgstr "Ingen klient ble valgt å slette"
-#: src/index.php:740
+#: src/index.php:754
#, php-format
msgid "Unable to find %s in the list of clients."
msgstr "Fant ikke klienten %s i listen."
-#: src/index.php:774
+#: src/index.php:788
#, php-format
msgid "Unable to find %s in the locations of %s."
msgstr "Finner ikke %s i listen av kataloger."
diff --git a/po/slbackup-php.pot b/po/slbackup-php.pot
index 01805e8..d6864f8 100644
--- a/po/slbackup-php.pot
+++ b/po/slbackup-php.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-25 10:31+0200\n"
+"POT-Creation-Date: 2012-01-17 20:55+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,261 +16,266 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. templates/maint.tpl
-#. templates/header.tpl
-#: standard input:2 standard input:26
-msgid "Maintenance"
-msgstr ""
-
-#. templates/maint.tpl
#. templates/config.tpl
-#. templates/restore.tpl
-#: standard input:5 standard input:74 standard input:110
-msgid "Choose"
-msgstr ""
-
-#. templates/maint.tpl
-#: standard input:8
-msgid "Oldest snapshot to keep:"
-msgstr ""
-
-#. templates/maint.tpl
-#: standard input:11
-msgid "Delete older"
-msgstr ""
-
-#. templates/header.tpl
-#: standard input:14
-msgid "SLBackup Configuration"
-msgstr ""
-
-#. templates/header.tpl
-#: standard input:17
-msgid "Status"
-msgstr ""
-
-#. templates/header.tpl
-#: standard input:20
-msgid "Config"
-msgstr ""
-
-#. templates/header.tpl
-#: standard input:23
-msgid "Restore"
-msgstr ""
-
-#. templates/header.tpl
-#: standard input:29
-msgid "Logout"
-msgstr ""
-
-#. templates/config.tpl
-#: standard input:32
+#: standard input:2
msgid "Server scheduler"
msgstr ""
#. templates/config.tpl
-#: standard input:35
+#: standard input:5
msgid "Backup enabled"
msgstr ""
#. templates/config.tpl
-#: standard input:38
+#: standard input:8
msgid "Run backup at"
msgstr ""
#. templates/config.tpl
-#: standard input:41 standard input:62 src/index.php:924
+#: standard input:11 standard input:32 src/index.php:938
msgid "Update"
msgstr ""
#. templates/config.tpl
#. templates/login.tpl
-#: standard input:44 standard input:65 standard input:95 standard input:170
+#: standard input:14 standard input:35 standard input:65 standard input:161
msgid "Reset"
msgstr ""
#. templates/config.tpl
-#: standard input:47
+#: standard input:17
msgid "Server config"
msgstr ""
#. templates/config.tpl
-#: standard input:50 standard input:83
+#: standard input:20 standard input:53
msgid "Address"
msgstr ""
#. templates/config.tpl
-#: standard input:53
+#: standard input:23
msgid "Destdir"
msgstr ""
#. templates/config.tpl
-#: standard input:56
+#: standard input:26
msgid "Servertype"
msgstr ""
#. templates/config.tpl
-#: standard input:59 standard input:92
+#: standard input:29 standard input:62
msgid "User"
msgstr ""
#. templates/config.tpl
-#: standard input:68
+#: standard input:38
msgid "Client config"
msgstr ""
#. templates/config.tpl
-#: standard input:71
+#: standard input:41
msgid "Client:"
msgstr ""
#. templates/config.tpl
-#: standard input:77
+#. templates/restore.tpl
+#. templates/maint.tpl
+#: standard input:44 standard input:113 standard input:167
+msgid "Choose"
+msgstr ""
+
+#. templates/config.tpl
+#: standard input:47
msgid "New"
msgstr ""
#. templates/config.tpl
-#: standard input:80
+#: standard input:50
msgid "Remove"
msgstr ""
#. templates/config.tpl
-#: standard input:86
+#: standard input:56
msgid "Backup Age"
msgstr ""
#. templates/config.tpl
-#: standard input:89
+#: standard input:59
msgid "Clienttype"
msgstr ""
#. templates/config.tpl
#. templates/restore.tpl
-#: standard input:98 standard input:113
+#: standard input:68 standard input:116
msgid "Locations:"
msgstr ""
#. templates/config.tpl
-#: standard input:101 src/index.php:922
+#: standard input:71 src/index.php:936
msgid "Add"
msgstr ""
#. templates/config.tpl
-#: standard input:104
+#: standard input:74
msgid "Delete"
msgstr ""
-#. templates/restore.tpl
-#: standard input:107
-msgid "Client to restore"
-msgstr ""
-
-#. templates/restore.tpl
-#: standard input:116
-msgid "Browse"
-msgstr ""
-
-#. templates/restore.tpl
-#: standard input:119
-msgid "Restore of %1"
-msgstr ""
-
-#. templates/restore.tpl
-#: standard input:122
-msgid "Deleted"
+#. templates/status.tpl
+#: standard input:77
+msgid "Clients"
msgstr ""
#. templates/status.tpl
-#: standard input:125
-msgid "Clients"
+#: standard input:80
+msgid "Status for %1"
msgstr ""
#. templates/status.tpl
-#: standard input:128
+#: standard input:83
msgid "OK at %1"
msgstr ""
#. templates/status.tpl
-#: standard input:131
+#: standard input:86
msgid "Failed at %1"
msgstr ""
#. templates/status.tpl
-#: standard input:134
+#: standard input:89
msgid "Client never backed up"
msgstr ""
#. templates/status.tpl
-#: standard input:137
+#: standard input:92
msgid "ssh-keys are working"
msgstr ""
#. templates/status.tpl
-#: standard input:140
+#: standard input:95
msgid "rdiff-backup-versions differ"
msgstr ""
#. templates/status.tpl
-#: standard input:143
+#: standard input:98
msgid "ssh-keys are not working"
msgstr ""
#. templates/status.tpl
-#: standard input:146
+#: standard input:101
msgid "Backup status"
msgstr ""
#. templates/status.tpl
-#: standard input:149
+#: standard input:104
msgid "Backup last finished at %1"
msgstr ""
#. templates/status.tpl
-#: standard input:152
+#: standard input:107
msgid "A new backup started at %1"
msgstr ""
+#. templates/restore.tpl
+#: standard input:110
+msgid "Client to restore"
+msgstr ""
+
+#. templates/restore.tpl
+#: standard input:119
+msgid "Browse"
+msgstr ""
+
+#. templates/restore.tpl
+#: standard input:122
+msgid "Restore of %1"
+msgstr ""
+
+#. templates/restore.tpl
+#: standard input:125
+msgid "Deleted"
+msgstr ""
+
+#. templates/header.tpl
+#: standard input:128
+msgid "SLBackup Configuration"
+msgstr ""
+
+#. templates/header.tpl
+#: standard input:131
+msgid "Status"
+msgstr ""
+
+#. templates/header.tpl
+#: standard input:134
+msgid "Config"
+msgstr ""
+
+#. templates/header.tpl
+#: standard input:137
+msgid "Restore"
+msgstr ""
+
+#. templates/header.tpl
+#. templates/maint.tpl
+#: standard input:140 standard input:164
+msgid "Maintenance"
+msgstr ""
+
+#. templates/header.tpl
+#: standard input:143
+msgid "Logout"
+msgstr ""
+
#. templates/login.tpl
-#: standard input:155
+#: standard input:146
msgid "To read the configuration, you must log in as %1 on %2."
msgstr ""
#. templates/login.tpl
-#: standard input:158
+#: standard input:149
msgid "Please enter the password for the %1 account on %2:"
msgstr ""
#. templates/login.tpl
-#: standard input:161
+#: standard input:152
msgid ""
"WARNING: you are about to send you password over an unencrypted link, please "
"ask your administrator to enable https"
msgstr ""
#. templates/login.tpl
-#: standard input:164
+#: standard input:155
msgid ""
"Login to this application is denied without the use of https. Please ask "
"your administrator to enable https"
msgstr ""
#. templates/login.tpl
-#: standard input:167
+#: standard input:158
msgid "Login"
msgstr ""
-#: src/index.php:735
+#. templates/maint.tpl
+#: standard input:170
+msgid "Oldest snapshot to keep:"
+msgstr ""
+
+#. templates/maint.tpl
+#: standard input:173
+msgid "Delete older"
+msgstr ""
+
+#: src/index.php:749
#, php-format
msgid "No client specified :("
msgstr ""
-#: src/index.php:740
+#: src/index.php:754
#, php-format
msgid "Unable to find %s in the list of clients."
msgstr ""
-#: src/index.php:774
+#: src/index.php:788
#, php-format
msgid "Unable to find %s in the locations of %s."
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 962b470..8689303 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,278 +7,278 @@ msgid ""
msgstr ""
"Project-Id-Version: slbackup-php\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-25 10:31+0200\n"
-"PO-Revision-Date: 2007-05-22 00:22+0100\n"
-"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
+"POT-Creation-Date: 2012-01-17 20:55+0100\n"
+"PO-Revision-Date: 2012-01-17 20:48+0100\n"
+"Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. templates/maint.tpl
-#. templates/header.tpl
-#: standard input:2
-#: standard input:26
-msgid "Maintenance"
-msgstr "Underhåll"
-
-#. templates/maint.tpl
#. templates/config.tpl
-#. templates/restore.tpl
-#: standard input:5
-#: standard input:74
-#: standard input:110
-msgid "Choose"
-msgstr "Välj"
-
-#. templates/maint.tpl
-#: standard input:8
-msgid "Oldest snapshot to keep:"
-msgstr "Äldsta ögonblicksbild att spara:"
-
-#. templates/maint.tpl
-#: standard input:11
-msgid "Delete older"
-msgstr "Ta bort äldre"
-
-#. templates/header.tpl
-#: standard input:14
-msgid "SLBackup Configuration"
-msgstr "Konfiguration av SLBackup"
-
-#. templates/header.tpl
-#: standard input:17
-msgid "Status"
-msgstr "Status"
-
-#. templates/header.tpl
-#: standard input:20
-msgid "Config"
-msgstr "Konfiguration"
-
-#. templates/header.tpl
-#: standard input:23
-msgid "Restore"
-msgstr "Återskapa"
-
-#. templates/header.tpl
-#: standard input:29
-msgid "Logout"
-msgstr "Logga ut"
-
-#. templates/config.tpl
-#: standard input:32
+#: standard input:2
msgid "Server scheduler"
msgstr "Schemaläggare"
#. templates/config.tpl
-#: standard input:35
+#: standard input:5
msgid "Backup enabled"
msgstr "Säkerhetskopiering aktiverad"
#. templates/config.tpl
-#: standard input:38
+#: standard input:8
msgid "Run backup at"
msgstr "Kör säkerhetskopiering klockan"
#. templates/config.tpl
-#: standard input:41
-#: standard input:62
-#: src/index.php:924
+#: standard input:11 input:32 src/index.php:938
msgid "Update"
msgstr "Uppdatera"
#. templates/config.tpl
#. templates/login.tpl
-#: standard input:44
-#: standard input:65
-#: standard input:95
-#: standard input:170
+#: standard input:14 input:35 input:65 input:161
msgid "Reset"
msgstr "Nollställ"
#. templates/config.tpl
-#: standard input:47
+#: standard input:17
msgid "Server config"
msgstr "Serverkonfiguration"
#. templates/config.tpl
-#: standard input:50
-#: standard input:83
+#: standard input:20 input:53
msgid "Address"
msgstr "Adress"
#. templates/config.tpl
-#: standard input:53
+#: standard input:23
msgid "Destdir"
msgstr "Målkatalog"
#. templates/config.tpl
-#: standard input:56
+#: standard input:26
msgid "Servertype"
msgstr "Servertyp"
#. templates/config.tpl
-#: standard input:59
-#: standard input:92
+#: standard input:29 input:62
msgid "User"
msgstr "Användare"
#. templates/config.tpl
-#: standard input:68
+#: standard input:38
msgid "Client config"
msgstr "Klientkonfiguration"
#. templates/config.tpl
-#: standard input:71
+#: standard input:41
msgid "Client:"
msgstr "Klient:"
#. templates/config.tpl
-#: standard input:77
+#. templates/restore.tpl
+#. templates/maint.tpl
+#: standard input:44 input:113 input:167
+msgid "Choose"
+msgstr "Välj"
+
+#. templates/config.tpl
+#: standard input:47
msgid "New"
msgstr "Ny"
#. templates/config.tpl
-#: standard input:80
+#: standard input:50
msgid "Remove"
msgstr "Ta bort"
#. templates/config.tpl
-#: standard input:86
+#: standard input:56
msgid "Backup Age"
msgstr "Ålder för säkerhetskopior"
#. templates/config.tpl
-#: standard input:89
+#: standard input:59
msgid "Clienttype"
msgstr "Klienttyp"
#. templates/config.tpl
#. templates/restore.tpl
-#: standard input:98
-#: standard input:113
+#: standard input:68 input:116
msgid "Locations:"
msgstr "Platser:"
#. templates/config.tpl
-#: standard input:101
-#: src/index.php:922
+#: standard input:71 src/index.php:936
msgid "Add"
msgstr "Lägg till"
#. templates/config.tpl
-#: standard input:104
+#: standard input:74
msgid "Delete"
msgstr "Ta bort"
-#. templates/restore.tpl
-#: standard input:107
-msgid "Client to restore"
-msgstr "Klient att återskapa"
-
-#. templates/restore.tpl
-#: standard input:116
-msgid "Browse"
-msgstr "Bläddra"
-
-#. templates/restore.tpl
-#: standard input:119
-msgid "Restore of %1"
-msgstr "Återskapandet av %1"
-
-#. templates/restore.tpl
-#: standard input:122
-msgid "Deleted"
-msgstr "Borttaget"
-
#. templates/status.tpl
-#: standard input:125
+#: standard input:77
msgid "Clients"
msgstr "Klienter"
#. templates/status.tpl
-#: standard input:128
+#: standard input:80
+msgid "Status for %1"
+msgstr "Status för %1"
+
+#. templates/status.tpl
+#: standard input:83
msgid "OK at %1"
msgstr "OK %1"
#. templates/status.tpl
-#: standard input:131
+#: standard input:86
msgid "Failed at %1"
msgstr "Misslyckades %1"
#. templates/status.tpl
-#: standard input:134
+#: standard input:89
msgid "Client never backed up"
msgstr "Klienten har aldrig säkerhetskopierats"
#. templates/status.tpl
-#: standard input:137
+#: standard input:92
msgid "ssh-keys are working"
msgstr "ssh-nycklarna är rätt konfigurerade"
#. templates/status.tpl
-#: standard input:140
+#: standard input:95
msgid "rdiff-backup-versions differ"
msgstr "rdiff-backup-versionerna stämmer inte överens"
#. templates/status.tpl
-#: standard input:143
+#: standard input:98
msgid "ssh-keys are not working"
msgstr "ssh-nycklarna är felkonfigurerade"
#. templates/status.tpl
-#: standard input:146
+#: standard input:101
msgid "Backup status"
msgstr "Status för säkerhetskopiering"
#. templates/status.tpl
-#: standard input:149
+#: standard input:104
msgid "Backup last finished at %1"
msgstr "Säkerhetskopieringen färdigställdes %1"
#. templates/status.tpl
-#: standard input:152
+#: standard input:107
msgid "A new backup started at %1"
msgstr "En ny säkerhetskopiering startades %1"
+#. templates/restore.tpl
+#: standard input:110
+msgid "Client to restore"
+msgstr "Klient att återskapa"
+
+#. templates/restore.tpl
+#: standard input:119
+msgid "Browse"
+msgstr "Bläddra"
+
+#. templates/restore.tpl
+#: standard input:122
+msgid "Restore of %1"
+msgstr "Återskapandet av %1"
+
+#. templates/restore.tpl
+#: standard input:125
+msgid "Deleted"
+msgstr "Borttaget"
+
+#. templates/header.tpl
+#: standard input:128
+msgid "SLBackup Configuration"
+msgstr "Konfiguration av SLBackup"
+
+#. templates/header.tpl
+#: standard input:131
+msgid "Status"
+msgstr "Status"
+
+#. templates/header.tpl
+#: standard input:134
+msgid "Config"
+msgstr "Konfiguration"
+
+#. templates/header.tpl
+#: standard input:137
+msgid "Restore"
+msgstr "Återskapa"
+
+#. templates/header.tpl
+#. templates/maint.tpl
+#: standard input:140 input:164
+msgid "Maintenance"
+msgstr "Underhåll"
+
+#. templates/header.tpl
+#: standard input:143
+msgid "Logout"
+msgstr "Logga ut"
+
#. templates/login.tpl
-#: standard input:155
+#: standard input:146
msgid "To read the configuration, you must log in as %1 on %2."
msgstr "För att läsa konfiguration måste du logga in som %1 på %2."
#. templates/login.tpl
-#: standard input:158
+#: standard input:149
msgid "Please enter the password for the %1 account on %2:"
msgstr "Ange lösenordet för %1-kontot på %2:"
#. templates/login.tpl
-#: standard input:161
-msgid "WARNING: you are about to send you password over an unencrypted link, please ask your administrator to enable https"
-msgstr "VARNING: du är på väg att skicka ditt lösenord över en okrypterad förbindelse, be din administratör att aktivera https"
+#: standard input:152
+msgid ""
+"WARNING: you are about to send you password over an unencrypted link, please "
+"ask your administrator to enable https"
+msgstr ""
+"VARNING: du är på väg att skicka ditt lösenord över en okrypterad "
+"förbindelse, be din administratör att aktivera https"
#. templates/login.tpl
-#: standard input:164
-msgid "Login to this application is denied without the use of https. Please ask your administrator to enable https"
-msgstr "Inloggning till det här programmet nekas därför att https inte används. Be din administratör att aktivera https"
+#: standard input:155
+msgid ""
+"Login to this application is denied without the use of https. Please ask "
+"your administrator to enable https"
+msgstr ""
+"Inloggning till det här programmet nekas därför att https inte används. Be "
+"din administratör att aktivera https"
#. templates/login.tpl
-#: standard input:167
+#: standard input:158
msgid "Login"
msgstr "Logga in"
-#: src/index.php:735
+#. templates/maint.tpl
+#: standard input:170
+msgid "Oldest snapshot to keep:"
+msgstr "Äldsta ögonblicksbild att spara:"
+
+#. templates/maint.tpl
+#: standard input:173
+msgid "Delete older"
+msgstr "Ta bort äldre"
+
+#: src/index.php:749
#, php-format
msgid "No client specified :("
msgstr "Ingen klient angiven :("
-#: src/index.php:740
+#: src/index.php:754
#, php-format
msgid "Unable to find %s in the list of clients."
msgstr "Kunde inte hitta %s i listan över klienter."
-#: src/index.php:774
+#: src/index.php:788
#, php-format
msgid "Unable to find %s in the locations of %s."
msgstr "Kunde inte hitta %s i platserna för %s."
-
diff --git a/src/functions.php b/src/functions.php
index 6df4065..3eb90c6 100644
--- a/src/functions.php
+++ b/src/functions.php
@@ -60,13 +60,15 @@ function loadConfig () {
}
function loadLocale () {
- $found_locale = $_COOKIE['locale'] ;
-
+ $found_locale = "";
+ if (array_key_exists('locale', $_COOKIE))
+ $found_locale = $_COOKIE['locale'];
+
if ($found_locale == "" && $handle = @opendir ('../locales')) {
- $all_locales = array () ;
+ $translations = array () ;
while (false !== ($file = readdir ($handle))) {
if (is_dir ('../locales/' . $file . '/LC_MESSAGES')) {
- $all_locales = array_merge ($all_locales, array ($file)) ;
+ $translations = array_merge ($translations, array ($file)) ;
}
}
closedir ($handle) ;
@@ -76,32 +78,56 @@ function loadLocale () {
$lang_accept[$i] = split(";", $lang_accept[$i]) ;
$lang_accept[$i] = $lang_accept[$i][0] ;
}
- if (!empty($lang_accept[0]))
- foreach ($lang_accept as $lang) {
- if (!isset ($locale_exact)) {
- foreach ($all_locales as $locales) {
- if ($locales == $lang)
- $locale_exact = $lang ;
- elseif (!isset ($locale_match)) {
- if (strpos ($locales, $lang) === 0)
- $locale_match = $locales ;
+
+ if (!empty($lang_accept[0])) {
+ foreach ($lang_accept as $lang) {
+ if (!isset ($locale_exact)) {
+ foreach ($translations as $translation) {
+ if ($translation == $lang)
+ $locale_exact = $lang ;
+ elseif (!isset ($locale_match)) {
+ if (strpos ($translation, $lang) === 0)
+ $locale_match = $translation ;
+ }
}
}
}
+ if (isset ($locale_exact))
+ $found_locale=$locale_exact ;
+ elseif (isset ($locale_match))
+ $found_locale=$locale_match ;
+ }
+
+ $locales = array();
+ $locales_utf8 = array();
+ if (isset($found_locale) && !empty($lang_accept[0])) {
+ $found_locale_tuple = split('_', $found_locale);
+ if (count($found_locale_tuple) > 1) {
+ $locales[] = $found_locale;
+ $locales_utf8[] = $found_locale.'.UTF-8';
+ }
+ foreach ($lang_accept as $lang) {
+ $lang_tuple = split('-',$lang);
+ if (count($lang_tuple) > 1) {
+ $language = strtolower($lang_tuple[0]);
+ $country = strtoupper($lang_tuple[1]);
+ $locales[] = $language . '_' . $country;
+ $locales_utf8[] = $language . '_' . $country . '.UTF-8';
+ }
+ }
+ $locales_all = array_merge ($locales_utf8, $locales);
+ $found_locale = setlocale (LC_ALL, $locales_all) ;
}
- if (isset ($locale_exact))
- $found_locale=$locale_exact ;
- elseif (isset ($locale_match))
- $found_locale=$locale_match ;
+
if (isset ($found_locale))
setcookie ( 'locale', $found_locale) ;
unset ($all_locales, $lang_accept, $locale_match, $locale_exact, $lang, $locales) ;
}
-
+
if (isset ($found_locale)) {
- $locale = setlocale (LC_ALL, $found_locale) ;
- if (empty($locale))
- setlocale (LC_ALL, $found_locale . ".UTF8");
+ $locale = setlocale (LC_ALL, $found_locale) ;
+ if (empty($locale))
+ $locale = setlocale (LC_ALL, $found_locale . ".UTF8");
bindtextdomain ("slbackup-php", "../locales/");
bind_textdomain_codeset ("slbackup-php", "UTF-8");
textdomain ("slbackup-php");
@@ -140,4 +166,5 @@ function debug ($mixed) {
print_r ($mixed);
echo "\n</pre>\n" ;
}
+
?>
diff --git a/src/index.php b/src/index.php
index 0af7099..af2fad9 100644
--- a/src/index.php
+++ b/src/index.php
@@ -71,7 +71,7 @@ global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
function removesnapshots ($passwd, $clientdir, $snapshot) {
global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
- $cmd = sprintf ("ssh %s %s@%s 'rdiff-backup --force --remove-older-than %s %s'",
+ $cmd = sprintf ("ssh %s %s@%s 'rdiff-backup --force --remove-older-than %s \"%s\"'",
$ssh_options, $backupuser,
$backuphost, $snapshot, $clientdir) ;
@@ -98,7 +98,7 @@ global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
function listsnapshots ($passwd, $clientdir) {
global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
- $cmd = sprintf ("ssh %s %s@%s 'find %s/rdiff-backup-data -maxdepth 1 -name \"increments.*\" -printf %s'",
+ $cmd = sprintf ("ssh %s %s@%s 'find \"%s/rdiff-backup-data\" -maxdepth 1 -name \"increments.*\" -printf %s | sort '",
$ssh_options, $backupuser,
$backuphost, $clientdir, '"%P\n"') ;
@@ -126,7 +126,7 @@ global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
function fetchfile ($passwd, $clientdir, $location, $file) {
global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
- $cmd = sprintf ("ssh %s %s@%s 'cat %s%s/%s'",
+ $cmd = sprintf ("ssh %s %s@%s 'cat \"%s%s/%s\"'",
$ssh_options, $backupuser,
$backuphost, $clientdir, $location, $file ) ;
@@ -169,7 +169,7 @@ global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
} else unset ($tempfile) ;
if (empty($tempfile))
return ;
- $cmd = sprintf ("ssh %s %s@%s 'rdiff-backup --force %s/rdiff-backup-data/increments%s/%s %s'",
+ $cmd = sprintf ("ssh %s %s@%s 'rdiff-backup --force \"%s/rdiff-backup-data/increments%s/%s %s\"'",
$ssh_options, $backupuser,
$backuphost, $clientdir, $location, $file, $tempfile ) ;
@@ -180,7 +180,7 @@ global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
fclose ($pipes[1]) ;
proc_close ($proc) ;
}
- $cmd = sprintf ("ssh %s %s@%s 'cat %s && rm %s'",
+ $cmd = sprintf ("ssh %s %s@%s 'cat \"%s\" && rm \"%s\"'",
$ssh_options, $backupuser,
$backuphost, $tempfile, $tempfile) ;
$proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ;
@@ -213,7 +213,7 @@ global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
$env = array ('SSH_ASKPASS' => $ssh_askpass,
'DISPLAY' => ':nowhere') ;
- $cmd = sprintf ("ssh %s %s@%s 'find %s%s/%s -maxdepth 1 -mindepth 1 -type f -name %s'",
+ $cmd = sprintf ("ssh %s %s@%s 'find \"%s%s/%s\" -maxdepth 1 -mindepth 1 -type f -name \"%s\"'",
$ssh_options, $backupuser,
$backuphost, $clientdir, $location, $parent, $base ) ;
$proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ;
@@ -230,7 +230,7 @@ global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
proc_close ($proc) ;
}
$baselen= strlen ($base) ;
- $cmd = sprintf ("ssh %s %s@%s 'find %s/rdiff-backup-data/increments%s/%s -maxdepth 1 -mindepth 1 -type f -name \"%s*.gz\"'",
+ $cmd = sprintf ("ssh %s %s@%s 'find \"%s/rdiff-backup-data/increments%s/%s\" -maxdepth 1 -mindepth 1 -type f -name \"%s*.gz\"'",
$ssh_options, $backupuser,
$backuphost, $clientdir, $location, $parent, $base ) ;
@@ -283,7 +283,7 @@ global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
$env = array ('SSH_ASKPASS' => $ssh_askpass,
'DISPLAY' => ':nowhere') ;
- $cmd = sprintf ("ssh %s %s@%s 'find %s%s/%s -maxdepth 1 -mindepth 1 -type d'",
+ $cmd = sprintf ("ssh %s %s@%s 'find \"%s%s/%s\" -maxdepth 1 -mindepth 1 -type d'",
$ssh_options, $backupuser,
$backuphost, $clientdir, $location, $sub ) ;
$proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ;
@@ -299,7 +299,7 @@ global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
fclose ($pipes[1]) ;
proc_close ($proc) ;
}
- $cmd = sprintf ("ssh %s %s@%s 'find %s/rdiff-backup-data/increments%s/%s -maxdepth 1 -mindepth 1 -type d'",
+ $cmd = sprintf ("ssh %s %s@%s 'find \"%s/rdiff-backup-data/increments%s/%s\" -maxdepth 1 -mindepth 1 -type d'",
$ssh_options, $backupuser,
$backuphost, $clientdir, $location, $sub ) ;
$proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ;
@@ -322,7 +322,7 @@ global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
fclose ($pipes[1]) ;
proc_close ($proc) ;
}
- $cmd = sprintf ("ssh %s %s@%s 'find %s%s/%s -maxdepth 1 -mindepth 1 -type f'",
+ $cmd = sprintf ("ssh %s %s@%s 'find \"%s%s/%s\" -maxdepth 1 -mindepth 1 -type f'",
$ssh_options, $backupuser,
$backuphost, $clientdir, $location, $sub ) ;
@@ -339,7 +339,7 @@ global $backuphost, $backupuser, $ssh_options, $ssh_askpass ;
fclose ($pipes[1]) ;
proc_close ($proc) ;
}
- $cmd = sprintf ("ssh %s %s@%s 'find %s/rdiff-backup-data/increments%s/%s -maxdepth 1 -mindepth 1 -type f -name \"*.snapshot.gz\"'",
+ $cmd = sprintf ("ssh %s %s@%s 'find \"%s/rdiff-backup-data/increments%s/%s\" -maxdepth 1 -mindepth 1 -type f -name \"*.snapshot.gz\"'",
$ssh_options, $backupuser,
$backuphost, $clientdir, $location, $sub ) ;
$proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ;
@@ -406,6 +406,8 @@ global $backuphost, $backupuser, $backupcron, $ssh_options, $ssh_askpass ;
$env = array ('SSH_ASKPASS' => $ssh_askpass,
'DISPLAY' => ':nowhere') ;
+
+ // cat crontab file on remote backup server
$proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ;
if (is_resource ($proc)) {
fprintf ($pipes[0], "%s\n", $passwd) ;
@@ -414,6 +416,19 @@ global $backuphost, $backupuser, $backupcron, $ssh_options, $ssh_askpass ;
fclose ($pipes[0]) ;
proc_close ($proc) ;
}
+
+ // chmod on the remote backup job file
+ $cmd = sprintf ("ssh %s %s@%s 'chmod 0644 %s'",
+ $ssh_options, $backupuser,
+ $backuphost, $backupcron) ;
+ $proc = proc_open ($cmd, $desc, $pipes, '/tmp', $env) ;
+ if (is_resource ($proc)) {
+ fprintf ($pipes[0], "%s\n", $passwd) ;
+ fclose ($pipes[1]) ;
+ fclose ($pipes[0]) ;
+ proc_close ($proc) ;
+ }
+
}
@@ -568,36 +583,50 @@ global $backuphost, $backupuser, $logfile, $ssh_options, $ssh_askpass ;
require_once ('functions.php') ;
loadConfig () ;
-require('/usr/share/php/smarty/libs/Smarty.class.php') ;
+require('/usr/share/php/smarty3/Smarty.class.php') ;
session_start() ;
-$authenticated = ($_COOKIE['Authenticated'] == "True") ;
loadLocale () ;
ob_start ();
$smarty = new Smarty();
$smarty->template_dir = $smarty_templ ;
$smarty->compile_dir = $smarty_compile ;
+unset ($_COOKIE['smarty_templ']);
+unset ($_COOKIE['smarty_compile']);
# fetch script to use whith passing the ssh-password
$ssh_askpass = sprintf ("%s/script/mypass.sh",
dirname (dirname ($_SERVER["SCRIPT_FILENAME"])));
+$arguments = $_REQUEST;
+
+# merge _COOKIE and _REQUEST
+$allowed_cookie_keys = array('nonhttps', 'xorstring', 'PHPSESSID', 'locale',);
+foreach ($_COOKIE as $key => $value) {
+ if ((! array_key_exists($key, $arguments)) && (in_array($key, $allowed_cookie_keys))) {
+ if (is_string($key) && is_string($value)) {
+ $arguments[$key] = $value;
+ }
+ }
+}
# Fetch arguments passed as the script is executed
-foreach ($_REQUEST as $key => $value) {
+foreach ($arguments as $key => $value) {
switch ($key) {
case "smarty_templ":
case "smarty_compile":
case "locale":
case "PHPSESSID":
break ;
+ case "nonhttps":
+ $nonhttps = $value ;
case "Passwd":
$passwd = $value ;
$submit = "status" ;
break ;
case "xorstring":
if (empty($passwd))
- $xorstring = $value ;
+ $xorstring = base64_decode($value) ;
else break ;
if (empty ($value))
break ;
@@ -640,6 +669,8 @@ foreach ($_REQUEST as $key => $value) {
}
}
+unset ($arguments);
+
if ($submit == "logout") {
unset ($passwd) ;
unset ($xorstring) ;
@@ -666,7 +697,7 @@ if (empty($encrypt) || empty ($xorstring)) {
$xorstring = xorstring ($encrypt, $passwd) ;
}
-setcookie ('xorstring', $xorstring) ;
+setcookie ('xorstring', base64_encode($xorstring)) ;
$scheduler = readcron ($passwd) ;
diff --git a/templates/login.tpl b/templates/login.tpl
index 487e104..22bf015 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -22,13 +22,13 @@
<FORM action="index.php" name=login method=POST>
{t 1=$backupuser 2=$backuphost}To read the configuration, you must log in as %1 on %2.{/t}<BR>
{t 1=$backupuser 2=$backuphost}Please enter the password for the %1 account on %2:{/t}<BR>
- {if $nonhttps == "warn" }
+ {if $nonhttps == "warn"}
<B>
{t}WARNING: you are about to send you password over an unencrypted link, please ask your administrator to enable https{/t}
<BR>
</B>
{/if}
- {if $nonhttps == "deny" }
+ {if $nonhttps == "deny"}
<B>
{t}Login to this application is denied without the use of https. Please ask your administrator to enable https{/t}
<BR>
diff --git a/templates/maint.tpl b/templates/maint.tpl
index 50489bc..41752aa 100644
--- a/templates/maint.tpl
+++ b/templates/maint.tpl
@@ -23,7 +23,7 @@
{html_options name=client values=$clients output=$clients
selected=$client}
<INPUT type=submit name=maint value="{t}Choose{/t}">
- {if $client <> "" }
+ {if $client <> ""}
<INPUT type=hidden name=selected value="{$client}">
{t}Oldest snapshot to keep:{/t}</TD>
{html_options name=snapshot values=$snapshots output=$snapshots
diff --git a/templates/restore.tpl b/templates/restore.tpl
index 2a19f78..af52faa 100644
--- a/templates/restore.tpl
+++ b/templates/restore.tpl
@@ -28,7 +28,7 @@
selected=$location}
<INPUT type=submit name=restorelocation value="{t}Browse{/t}">
<BR>
- {if $sub <> "" }
+ {if $sub <> ""}
<H3>{t 1=$sub}Restore of %1{/t}</H3>
{/if}
{foreach item=dir name=dir from=$loc}
@@ -42,13 +42,13 @@
<IMG SRC="/icons/generic.gif" alt="[ ]">
{/if}
{if $dir.type == "file"}
- <A HREF=index.php?restorefile&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name}</A>
+ <A HREF="index.php?restorefile&client={$client}&sub={$dir.sub}&location={$location}">{$dir.name}</A>
{elseif $dir.type == "delfile"}
- <A HREF=index.php?restorefile&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name}(deleted)</A>
+ <A HREF="index.php?restorefile&client={$client}&sub={$dir.sub}&location={$location}">{$dir.name}(deleted)</A>
{elseif $dir.type == deldir}
- <A HREF=index.php?restorelocation&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name} ({t}Deleted{/t})</A>
+ <A HREF="index.php?restorelocation&client={$client}&sub={$dir.sub}&location={$location}">{$dir.name} ({t}Deleted{/t})</A>
{else}
- <A HREF=index.php?restorelocation&client={$client}&sub={$dir.sub}&location={$location}>{$dir.name}</A>
+ <A HREF="index.php?restorelocation&client={$client}&sub={$dir.sub}&location={$location}">{$dir.name}</A>
{/if}
<BR>
{/foreach}
@@ -59,13 +59,13 @@
<IMG SRC="/icons/transfer.gif" alt="[ ]">
{/if}
{if $version.type == "parent"}
- <A HREF=index.php?restorelocation&client={$client}&sub={$version.sub}&location={$location}>{$version.name}</A>
+ <A HREF="index.php?restorelocation&client={$client}&sub={$version.sub}&location={$location}">{$version.name}</A>
{elseif $version.type == "currentfile"}
- <A HREF=index.php?restorefile&client={$client}&file={$version.sub}&location={$location}&revision=current>current</A>
+ <A HREF="index.php?restorefile&client={$client}&file={$version.sub}&location={$location}&revision=current">current</A>
{elseif $version.type == "diff.gz"}
- <A HREF=index.php?restorefile&client={$client}&parent={$version.parent}&location={$location}&revision={$version.revision}&name={$version.name}>{$version.ts}</A>
+ <A HREF="index.php?restorefile&client={$client}&parent={$version.parent}&location={$location}&revision={$version.revision}&name={$version.name}">{$version.ts}</A>
{elseif $version.type == "snapshot.gz"}
- <A HREF=index.php?restorefile&client={$client}&parent={$version.parent}&location={$location}&revision={$version.revision}&name={$version.name}>{$version.ts}</A>
+ <A HREF="index.php?restorefile&client={$client}&parent={$version.parent}&location={$location}&revision={$version.revision}&name={$version.name}">{$version.ts}</A>
{else}
unknown snapshot type $version.type
{/if}
diff --git a/templates/status.tpl b/templates/status.tpl
index 56448b6..12c1831 100644
--- a/templates/status.tpl
+++ b/templates/status.tpl
@@ -21,15 +21,15 @@
<H2>{t}Clients{/t}</H2>
<UL>
{foreach from=$log.clients key=client item=values}
- <LI>Status for {$client}
+ <LI>{t 1=$client}Status for %1{/t}
<BR>
- {if $values.started > $values.ok and $values.started > $values.failed }
+ {if $values.started > $values.ok and $values.started > $values.failed}
Backup started as {$values.started|date_format:"%c"}, and is still in progress<BR>
{/if}
- {if $values.ok > $values.failed }
+ {if $values.ok > $values.failed}
{t 1=$values.ok|date_format:"%c"}OK at %1{/t}
{elseif $values.failed <> ''}
- {t 1=$values.ok|date_format:"%c"}Failed at %1{/t}
+ {t 1=$values.failed|date_format:"%c"}Failed at %1{/t}
{elseif $values.started == ''}
{t}Client never backed up{/t}
{/if}
@@ -48,7 +48,7 @@
<H2>{t}Backup status{/t}</H2>
{t 1=$log.end|date_format:"%c"}Backup last finished at %1{/t}<BR>
- {if $log.start > $log.end }
+ {if $log.start > $log.end}
{t 1=$log.start|date_format:"%c"}A new backup started at %1{/t}<BR>
{/if}
</Body>
hooks/post-receive
--
slbackup-php.git (Debian package slbackup-php)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "slbackup-php.git" (Debian package slbackup-php).
More information about the debian-edu-commits
mailing list