[debian-edu-commits] debian-edu/slbackup-php.git (#3) - edu-wheezy (branch) updated: upstream/0.4.0

Fri Aug 9 10:05:47 UTC 2013

The branch, edu-wheezy has been updated
       via  076f534078306927b96a59f21e2d88af90b16ea0 (commit)
      from  5c3763cf8b83c0b5595e37d895acb6050bc08171 (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               |   22 +++-
 Makefile                |    5 +-
 debian/README.source    |   65 +++++++++
 debian/changelog        |   73 +++++++++++
 debian/compat           |    1 +
 debian/config           |    9 ++
 debian/control          |   24 ++++
 debian/copyright        |   12 ++
 debian/links            |    1 +
 debian/po/POTFILES.in   |    1 +
 debian/po/cs.po         |   43 ++++++
 debian/po/da.po         |   43 ++++++
 debian/po/de.po         |   42 ++++++
 debian/po/es.po         |   67 ++++++++++
 debian/po/eu.po         |   43 ++++++
 debian/po/fi.po         |   40 ++++++
 debian/po/fr.po         |   43 ++++++
 debian/po/gl.po         |   42 ++++++
 debian/po/ja.po         |   42 ++++++
 debian/po/nl.po         |   44 +++++++
 debian/po/pt.po         |   43 ++++++
 debian/po/ru.po         |   46 +++++++
 {po => debian/po}/sv.po |    0
 debian/po/templates.pot |   39 ++++++
 debian/po/vi.po         |   44 +++++++
 debian/postinst         |   28 ++++
 debian/postrm           |    9 ++
 debian/rules            |   58 ++++++++
 debian/slbackup.desktop |   11 ++
 debian/source/format    |    1 +
 debian/templates        |   18 +++
 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 ++++++---
 src/smarty3-gettext.php |  127 ++++++++++++++++++
 templates/login.tpl     |    4 +-
 templates/maint.tpl     |    2 +-
 templates/restore.tpl   |   18 +--
 templates/status.tpl    |   10 +-
 44 files changed, 2003 insertions(+), 836 deletions(-)
 create mode 100644 debian/README.source
 create mode 100644 debian/changelog
 create mode 100644 debian/compat
 create mode 100644 debian/config
 create mode 100644 debian/control
 create mode 100644 debian/copyright
 create mode 100644 debian/links
 create mode 100644 debian/po/POTFILES.in
 create mode 100644 debian/po/cs.po
 create mode 100644 debian/po/da.po
 create mode 100644 debian/po/de.po
 create mode 100644 debian/po/es.po
 create mode 100644 debian/po/eu.po
 create mode 100644 debian/po/fi.po
 create mode 100644 debian/po/fr.po
 create mode 100644 debian/po/gl.po
 create mode 100644 debian/po/ja.po
 create mode 100644 debian/po/nl.po
 create mode 100644 debian/po/pt.po
 create mode 100644 debian/po/ru.po
 copy {po => debian/po}/sv.po (100%)
 create mode 100644 debian/po/templates.pot
 create mode 100644 debian/po/vi.po
 create mode 100644 debian/postinst
 create mode 100644 debian/postrm
 create mode 100755 debian/rules
 create mode 100644 debian/slbackup.desktop
 create mode 100644 debian/source/format
 create mode 100644 debian/templates
 copy po/{sv.po => de.po} (58%)
 copy po/{sv.po => fr.po} (54%)
 create mode 100644 src/smarty3-gettext.php

The diff of changes is:

diff --git a/ChangeLog b/ChangeLog
index 1815842..82b1046 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+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 +39,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..e9a264d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,8 @@ PACKAGE = slbackup-php
 LIBS= \
 	index.php \
 	sl-style.css \
-	functions.php
+	functions.php \
+	smarty3-gettext.php
 
 SCRIPTS= \
 	mypass.sh
@@ -52,7 +53,7 @@ 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
 
 
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..e53b155
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,65 @@
+UPSTREAM
+--------
+slbackup and slbackup-php upstream are developed on Alioth SVN:
+http://anonscm.debian.org/viewvc/slbackup/
+
+PATCH SYSTEM
+------------
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+                break
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..359608d
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,73 @@
+slbackup-php (0.4.0-0) unstable; urgency=low
+
+  [ Mike Gabriel ]
+  * New upstream version (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.
+  * Bump standards to 3.9.3.
+  * Fix lintian warnings: debian-rules-missing-recommended-target build-arch,
+    debian-rules-missing-recommended-target build-indep.
+  * Accept more packaging files from Debian package.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 01 Jul 2012 12:06:11 +0200
+
+slbackup-php (0.3-2) unstable; urgency=low
+
+  [ Finn-Arne Johansen ]
+  * Make the list of snapshots sorted
+
+  [ Patrick Winnertz ]
+  * Added debian/po/nl.po . Thanks to Bart Cornelis
+
+ -- Patrick Winnertz <winnie at debian.org>  Mon, 17 Dec 2007 09:10:29 +0100
+
+slbackup-php (0.3-1) unstable; urgency=low
+
+  [Christian Perrier]
+  * Debconf templates and debian/control reviewed by the debian-l10n-
+    english team as part of the Smith review project. Closes: #429446
+  * Debconf translation updates:
+    - Swedish. Closes: #430447
+    - German. Closes: #430453
+    - Galician. Closes: #430483
+    - Basque. Closes: #430512
+    - Vietnamese. Closes: #430537
+    - Portuguese. Closes: #430595
+    - Czech. Closes: #431257
+    - Russian. Closes: #431307
+    - French
+
+  [Finn-Arne Johansen]
+  * Added sl-style.css (Closes: 425820)
+
+  [Patrick Winnertz]
+  * Packaging new upstream release.
+  * Merging changes from the l10n-Team into slbackup.php. 
+    Thanks to everybody who provided a translation!
+  * Added translation of slbackup-php itself. 
+    Thanks to Daniel Nylander.
+  * 
+
+ -- Patrick Winnertz <patrick.winnertz at skolelinux.org>  Fri, 13 Jul 2007 21:16:33 +0200
+
+slbackup-php (0.2-0) unstable; urgency=low
+
+  * New upstream release
+
+ -- Finn-Arne Johansen <faj at bzz.no>  Wed, 25 Apr 2007 10:23:08 +0200
+
+slbackup-php (0.1-1) unstable; urgency=low
+
+  * Initial upload (Closes: 419839)
+
+ -- Patrick Winnertz <patrick.winnertz at skolelinux.org>  Wed, 18 Apr 2007 17:25:45 +0200
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/config b/debian/config
new file mode 100644
index 0000000..1d4a812
--- /dev/null
+++ b/debian/config
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+db_input high slbackup-php/use-ssl || true
+db_go
+
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..734ab9d
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,24 @@
+Source: slbackup-php
+Section: misc
+Priority: optional
+Maintainer: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Uploaders:
+ Patrick Winnertz <winnie at debian.org>,
+ Morten Werner Olsen <werner at debian.org>,
+ Finn-Arne Johansen <faj at bzz.no>
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 5), po-debconf, smarty-gettext, php5-cli, quilt (>= 0.46-7~)
+
+Package: slbackup-php
+Architecture: all
+Depends: ${misc:Depends}, libapache2-mod-php5, apache2, smarty3, ssh, php5-cli
+Description: web-based administration tool for slbackup
+ Slbackup-php provides the necessary functions to maintain a slbackup
+ repository.
+ .
+ Features:
+  - scheduling of slbackup execution;
+  - editing of the configuration file;
+  - verifying SSH keys and successful backups;
+  - restoring from backups;
+  - removing old backups from the repository.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..5eaa689
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,12 @@
+This package was debianized by upstream author Finn-Arne Johansen
+<faj at bzz.no> on Fri, 13 Apr 2007 11:30:00 +0200.
+
+Copyright: 2007 Finn-Arne Johansen <faj at bzz.no> BzzWare AS, Norway
+
+License:
+
+You are free to distribute this software under the terms of
+the GNU General Public License version 2.
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in the file /usr/share/common-licenses/GPL-2.
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..42cd3dd
--- /dev/null
+++ b/debian/links
@@ -0,0 +1 @@
+etc/slbackup-php/apache.conf etc/apache2/conf.d/slbackup
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
new file mode 100644
index 0000000..cef83a3
--- /dev/null
+++ b/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates
diff --git a/debian/po/cs.po b/debian/po/cs.po
new file mode 100644
index 0000000..ed65e33
--- /dev/null
+++ b/debian/po/cs.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# 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\n"
+"Report-Msgid-Bugs-To: patrick.winnertz at skolelinux.org\n"
+"POT-Creation-Date: 2007-06-24 01:04+0200\n"
+"PO-Revision-Date: 2007-06-25 09:16+0200\n"
+"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Activate SSL support in slbackup-php?"
+msgstr "Aktivovat v slbackup-php podporu SSL?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please note that SSL is needed to connect to the slbackup-php server. "
+"Activating it is therefore strongly recommended."
+msgstr ""
+"ProtoÅ¾e je SSL pro pÅ™ipojenÃ k serveru slbackup-php vyÅ¾adovÃ¡no, doporuÄujeme "
+"souhlasit."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"However, SSL should also be activated in the web server which will not be "
+"done by choosing this option."
+msgstr ""
+"NicmÃ©nÄ› SSL musÃ bÃ½t aktivovÃ¡no i na webovÃ©m serveru, coÅ¾ tato moÅ¾nost "
+"nezajistÃ."
diff --git a/debian/po/da.po b/debian/po/da.po
new file mode 100644
index 0000000..8b8a4ee
--- /dev/null
+++ b/debian/po/da.po
@@ -0,0 +1,43 @@
+# Danish translation slbackup-php.
+# Copyright (C) 2010 slbackup-php & Joe Hansen.
+# This file is distributed under the same license as the slbackup-php package.
+# Joe Hansen <joedalton2 at yahoo.dk>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: slbackup-php\n"
+"Report-Msgid-Bugs-To: patrick.winnertz at skolelinux.org\n"
+"POT-Creation-Date: 2007-06-24 01:04+0200\n"
+"PO-Revision-Date: 2010-05-10 17:30+01:00\n"
+"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish at lists.debian.org> \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Activate SSL support in slbackup-php?"
+msgstr "Aktiver SSL-understÃ¸ttelse i slbackup-php?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please note that SSL is needed to connect to the slbackup-php server. "
+"Activating it is therefore strongly recommended."
+msgstr ""
+"BemÃ¦rk venligst at SSL krÃ¦ves for at forbinde til slbackup-php-serveren. "
+"Aktivering af SSL anbefales derfor stÃ¦rkt."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"However, SSL should also be activated in the web server which will not be "
+"done by choosing this option."
+msgstr ""
+"Dog skal SSL ogsÃ¥ aktiveres i internetserveren, hvilket ikke vil blive gjort "
+"ved at vÃ¦lge denne indstilling."
diff --git a/debian/po/de.po b/debian/po/de.po
new file mode 100644
index 0000000..84ea323
--- /dev/null
+++ b/debian/po/de.po
@@ -0,0 +1,42 @@
+# German translation of slbackup-php templates
+# Helge Kreutzmann <debian at helgefjell.de>, 2007.
+# This file is distributed under the same license as the slbackup-php package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: slbackup-php\n"
+"Report-Msgid-Bugs-To: patrick.winnertz at skolelinux.org\n"
+"POT-Creation-Date: 2007-06-24 01:04+0200\n"
+"PO-Revision-Date: 2007-06-24 19:55+0200\n"
+"Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
+"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Activate SSL support in slbackup-php?"
+msgstr "SSL-Unterstützung in Slbackup-php aktivieren?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please note that SSL is needed to connect to the slbackup-php server. "
+"Activating it is therefore strongly recommended."
+msgstr ""
+"Bitte beachten Sie, dass SSL zur Verbindung mit dem Slbackup-php-Server "
+"benötigt wird. Es wird daher nachdrücklich empfohlen, dieses zu aktivieren."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"However, SSL should also be activated in the web server which will not be "
+"done by choosing this option."
+msgstr ""
+"Allerdings sollte SSL auch in dem Webserver aktiviert werden. Dies erfolgt "
+"nicht durch Auswahl dieser Option."
diff --git a/debian/po/es.po b/debian/po/es.po
new file mode 100644
index 0000000..9f8db34
--- /dev/null
+++ b/debian/po/es.po
@@ -0,0 +1,67 @@
+# slbackup-php po-debconf translation to Spanish
+# Copyright (C) 2010 Software in the Public Interest
+# This file is distributed under the same license as the slbackup-php package.
+#
+# Changes:
+#   - Initial translation
+#       Omar Campagne <ocampagne at gmail.com>, 2010
+#
+#   - Updates
+#       TRANSLATOR
+#
+# Traductores, si no conocen el formato PO, merece la pena leer la
+# documentaciÃ³n de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+#       info -n '(gettext)PO Files'
+#       info -n '(gettext)Header Entry'
+#
+# Equipo de traducciÃ³n al espaÃ±ol, por favor lean antes de traducir
+# los siguientes documentos:
+#
+#   - El proyecto de traducciÃ³n de Debian al espaÃ±ol
+#     http://www.debian.org/intl/spanish/
+#     especialmente las notas y normas de traducciÃ³n en
+#     http://www.debian.org/intl/spanish/notas
+#
+#   - La guÃa de traducciÃ³n de po's de debconf:
+#     /usr/share/doc/po-debconf/README-trans
+#     o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: slbackup-php 0.3-2\n"
+"Report-Msgid-Bugs-To: patrick.winnertz at skolelinux.org\n"
+"POT-Creation-Date: 2007-06-24 01:04+0200\n"
+"PO-Revision-Date: 2010-04-07 10:36+0200\n"
+"Last-Translator: Omar Campagne <ocampagne at gmail.com>\n"
+"Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Activate SSL support in slbackup-php?"
+msgstr "Â¿Desea activar la compatibilidad de slbackup-php con SSL?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please note that SSL is needed to connect to the slbackup-php server. "
+"Activating it is therefore strongly recommended."
+msgstr ""
+"Tenga en cuenta que necesita SSL para establecer una conexiÃ³n con el "
+"servidor de slbackup-php. Por ello, se recomienda su activaciÃ³n."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"However, SSL should also be activated in the web server which will not be "
+"done by choosing this option."
+msgstr ""
+"Por otra parte, SSL se deberÃa activar tambiÃ©n en el servidor web, lo cual "
+"no ocurrirÃ¡ al escoger esta opciÃ³n."
diff --git a/debian/po/eu.po b/debian/po/eu.po
new file mode 100644
index 0000000..7b1dd67
--- /dev/null
+++ b/debian/po/eu.po
@@ -0,0 +1,43 @@
+# slbackup-php-templates
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Piarres Beobide <pi at beobide.net>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: slbackup-php-debconf\n"
+"Report-Msgid-Bugs-To: patrick.winnertz at skolelinux.org\n"
+"POT-Creation-Date: 2007-06-24 01:04+0200\n"
+"PO-Revision-Date: 2007-06-25 11:00+0200\n"
+"Last-Translator:  Piarres Beobide <pi at beobide.net>, 2007\n"
+"Language-Team: Euskara <Librezale at librezale.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Activate SSL support in slbackup-php?"
+msgstr "Slbackup-php-en SSL onarpena gaiu?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please note that SSL is needed to connect to the slbackup-php server. "
+"Activating it is therefore strongly recommended."
+msgstr ""
+"Kontutan izan SSL beharrezkoa dela slbackup-php zerbitzarira konektatu ahal "
+"izateko. Horregatik gaitzea oso gomendagarria da."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"However, SSL should also be activated in the web server which will not be "
+"done by choosing this option."
+msgstr ""
+"Hala ere, SSL web zerbitzarian ere gaitu behar da, aukera honekin ez da hori "
+"gaitzen."
diff --git a/debian/po/fi.po b/debian/po/fi.po
new file mode 100644
index 0000000..6e36b29
--- /dev/null
+++ b/debian/po/fi.po
@@ -0,0 +1,40 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: slbackup-php 0.3-1\n"
+"Report-Msgid-Bugs-To: patrick.winnertz at skolelinux.org\n"
+"POT-Creation-Date: 2007-06-24 01:04+0200\n"
+"PO-Revision-Date: 2008-03-01 22:35+0200\n"
+"Last-Translator: Esko ArajÃ¤rvi <edu at iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
+"X-Poedit-Language: Finnish\n"
+"X-Poedit-Country: FINLAND\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Activate SSL support in slbackup-php?"
+msgstr "Otetaanko SSL-tuki kÃ¤yttÃ¶Ã¶n ohjelmassa slbackup-php?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please note that SSL is needed to connect to the slbackup-php server. "
+"Activating it is therefore strongly recommended."
+msgstr ""
+"Otettaessa yhteyttÃ¤ slbackup-php-palvelimeen tarvitaan SSL:Ã¤Ã¤. Sen ottaminen "
+"kÃ¤yttÃ¶Ã¶n on siksi hyvin suositeltavaa."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"However, SSL should also be activated in the web server which will not be "
+"done by choosing this option."
+msgstr ""
+"SSL tulisi kuitenkin ottaa kÃ¤yttÃ¶Ã¶n myÃ¶s verkkopalvelimen asetuksissa, mitÃ¤ "
+"tÃ¤mÃ¤ valinta ei tee."
diff --git a/debian/po/fr.po b/debian/po/fr.po
new file mode 100644
index 0000000..8dc7739
--- /dev/null
+++ b/debian/po/fr.po
@@ -0,0 +1,43 @@
+# Translation of slbackup-php templates to French
+# Copyright (C) 2007 Hugues NAULET <hnaulet at gmail.com>
+# This file is distributed under the same license as the slbackup-php package.
+# Hugues Naulet <hnaulet at gmail.com>, 2007.
+# #
+msgid ""
+msgstr ""
+"Project-Id-Version: slbackup-php 0.2-1\n"
+"Report-Msgid-Bugs-To: patrick.winnertz at skolelinux.org\n"
+"POT-Creation-Date: 2007-06-24 01:04+0200\n"
+"PO-Revision-Date: 2007-06-30 11:30+0200\n"
+"Last-Translator: Hugues Naulet <hnaulet at gmail.com>\n"
+"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Activate SSL support in slbackup-php?"
+msgstr "Activer la gestion de SSL pour Â« slbackup-php Â» ?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please note that SSL is needed to connect to the slbackup-php server. "
+"Activating it is therefore strongly recommended."
+msgstr ""
+"Veuillez noter que SSL est nÃ©cessaire pour se connecter au serveur Â« slbackup-"
+"php Â».Son activation est donc fortement recommandÃ©e."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"However, SSL should also be activated in the web server which will not be "
+"done by choosing this option."
+msgstr ""
+"Cependant, SSL devrait Ã©galement Ãªtre activÃ© sur le serveur Web, ce qui ne "
+"sera pas fait mÃªme en choisissant cette option."
diff --git a/debian/po/gl.po b/debian/po/gl.po
new file mode 100644
index 0000000..5b726ae
--- /dev/null
+++ b/debian/po/gl.po
@@ -0,0 +1,42 @@
+# Galician translation of slbackup-php's debconf templates
+# This file is distributed under the same license as the slbackup-php package.
+# Jacobo Tarrio <jtarrio at debian.org>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: slbackup-php\n"
+"Report-Msgid-Bugs-To: patrick.winnertz at skolelinux.org\n"
+"POT-Creation-Date: 2007-06-24 01:04+0200\n"
+"PO-Revision-Date: 2007-06-25 00:41+0200\n"
+"Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
+"Language-Team: Galician <proxecto at trasno.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Activate SSL support in slbackup-php?"
+msgstr "Â¿Activar o soporte de SSL en slbackup-php?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please note that SSL is needed to connect to the slbackup-php server. "
+"Activating it is therefore strongly recommended."
+msgstr ""
+"TeÃ±a en conta que Ã© necesario SSL para se conectar ao servidor de slbackup-"
+"php. Polo tanto, recomÃ©ndase encarecidamente que o active."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"However, SSL should also be activated in the web server which will not be "
+"done by choosing this option."
+msgstr ""
+"Nembargantes, tamÃ©n se debe activar SSL no servidor web, o que non se ha "
+"facer ao escoller esta opciÃ³n."
diff --git a/debian/po/ja.po b/debian/po/ja.po
new file mode 100644
index 0000000..8cd8eef
--- /dev/null
+++ b/debian/po/ja.po
@@ -0,0 +1,42 @@
+# Copyright (C) 2009 Patrick Winnertz <winnie at debian.org>
+# This file is distributed under the same license as slbackup-php package.
+# Hideki Yamane <henrich at debian.or.jp>, 2009.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: slbackup-php 0.3-2\n"
+"Report-Msgid-Bugs-To: patrick.winnertz at skolelinux.org\n"
+"POT-Creation-Date: 2007-06-24 01:04+0200\n"
+"PO-Revision-Date: 2009-10-25 06:52+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Activate SSL support in slbackup-php?"
+msgstr "slbackup-php ã§ SSL ã®ã‚µãƒãƒ¼ãƒˆã‚’æœ‰åŠ¹ã«ã—ã¾ã™ã‹?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please note that SSL is needed to connect to the slbackup-php server. "
+"Activating it is therefore strongly recommended."
+msgstr ""
+"slbackup-php ã‚µãƒ¼ãƒã«æŽ¥ç¶šã™ã‚‹ãŸã‚ã«ã¯ SSL ãŒå¿…è¦ã§ã‚ã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•"
+"ã„ã€‚å¾“ã£ã¦ã€SSL ã‚’æœ‰åŠ¹ã«ã™ã‚‹ã®ã‚’å¼·ããŠå‹§ã‚ã—ã¾ã™ã€‚"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"However, SSL should also be activated in the web server which will not be "
+"done by choosing this option."
+msgstr ""
+"ã“ã®è¨å®šã‚’é¸ã‚“ã§ SSL ãŒæœ‰åŠ¹ã«ã•ã‚Œãªã„ã‚¦ã‚§ãƒ–ã‚µãƒ¼ãƒã§ã‚ã£ã¦ã‚‚ã€åŒæ§˜ã« SSL ã¯æœ‰"
+"åŠ¹ã«ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
diff --git a/debian/po/nl.po b/debian/po/nl.po
new file mode 100644
index 0000000..74fbe26
--- /dev/null
+++ b/debian/po/nl.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE 'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the  package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: slbackup-php\n"
+"Report-Msgid-Bugs-To: patrick.winnertz at skolelinux.org\n"
+"POT-Creation-Date: 2007-06-24 01:04+0200\n"
+"PO-Revision-Date: 2007-10-26 13:30+0100\n"
+"Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
+"Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
+"X-Poedit-Language: Dutch\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Activate SSL support in slbackup-php?"
+msgstr "Wilt u SSL-ondersteuning activeren voor slbackup-php?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please note that SSL is needed to connect to the slbackup-php server. "
+"Activating it is therefore strongly recommended."
+msgstr ""
+"SSL is nodig om verbinding te kunnen maken met de slbackup-php-server, en "
+"dit activeren is dan ook sterk aanbevolen."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"However, SSL should also be activated in the web server which will not be "
+"done by choosing this option."
+msgstr ""
+"SSL dient echter ook geactiveerd te worden in de webserver en daar zorgt "
+"deze optie niet voor."
diff --git a/debian/po/pt.po b/debian/po/pt.po
new file mode 100644
index 0000000..c0129d4
--- /dev/null
+++ b/debian/po/pt.po
@@ -0,0 +1,43 @@
+# Portuguese translation of slbackup-php's debconf messages.
+# Copyright (C) 2007
+# This file is distributed under the same license as the slbackup-php package.
+# Ricardo Silva <ardoric at gmail.com>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: slbackup-php \n"
+"Report-Msgid-Bugs-To: patrick.winnertz at skolelinux.org\n"
+"POT-Creation-Date: 2007-06-24 01:04+0200\n"
+"PO-Revision-Date: 2007-06-25 09:20+0000\n"
+"Last-Translator: Ricardo Silva <ardoric at gmail.com>\n"
+"Language-Team: Portuguese <traduz at debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Activate SSL support in slbackup-php?"
+msgstr "Activar o suporte SSL no slbackup-php?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please note that SSL is needed to connect to the slbackup-php server. "
+"Activating it is therefore strongly recommended."
+msgstr ""
+"Por favor repare que o SSL Ã© necessÃ¡rio para se ligar ao servidor do "
+"slbackup-php. ActivÃ¡-lo Ã© portanto fortemente recomendado."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"However, SSL should also be activated in the web server which will not be "
+"done by choosing this option."
+msgstr ""
+"No entanto, o SSL tambÃ©m pode ser activado no servidor web, o que nÃ£o serÃ¡ "
+"feito se escolher esta opÃ§Ã£o."
diff --git a/debian/po/ru.po b/debian/po/ru.po
new file mode 100644
index 0000000..4b3dcac
--- /dev/null
+++ b/debian/po/ru.po
@@ -0,0 +1,46 @@
+# translation of templates-1.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <kozlov.y at gmail.com>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.2-1\n"
+"Report-Msgid-Bugs-To: patrick.winnertz at skolelinux.org\n"
+"POT-Creation-Date: 2007-06-24 01:04+0200\n"
+"PO-Revision-Date: 2007-07-01 19:18+0400\n"
+"Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
+"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Activate SSL support in slbackup-php?"
+msgstr "ÐÐºÑ‚Ð¸Ð²Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÑƒ SSL Ð² slbackup-php?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please note that SSL is needed to connect to the slbackup-php server. "
+"Activating it is therefore strongly recommended."
+msgstr ""
+"Ð—Ð°Ð¼ÐµÑ‚Ð¸Ð¼, Ñ‡Ñ‚Ð¾ SSL Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº ÑÐµÑ€Ð²ÐµÑ€Ñƒ slbackup-php. ÐŸÐ¾ÑÑ‚Ð¾Ð¼Ñƒ "
+"Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ Ð½Ð°ÑÑ‚Ð¾ÑÑ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚ÑÑ."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"However, SSL should also be activated in the web server which will not be "
+"done by choosing this option."
+msgstr ""
+"ÐžÐ´Ð½Ð°ÐºÐ¾, SSL Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ð²ÐºÐ»ÑŽÑ‡Ñ‘Ð½ Ð¸ Ð½Ð° Ð²ÐµÐ±-ÑÐµÑ€Ð²ÐµÑ€Ðµ, Ð½Ð¾ ÑÑ‚Ð¾ Ð½Ðµ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÑÐµÑ‚ÑÑ "
+"Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ Ð´Ð°Ð½Ð½Ð¾Ð¹ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¾Ð¹."
diff --git a/po/sv.po b/debian/po/sv.po
similarity index 100%
copy from po/sv.po
copy to debian/po/sv.po
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
new file mode 100644
index 0000000..a2adeff
--- /dev/null
+++ b/debian/po/templates.pot
@@ -0,0 +1,39 @@
+# SOME DESCRIPTIVE TITLE.
+# 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.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: patrick.winnertz at skolelinux.org\n"
+"POT-Creation-Date: 2007-06-24 01:04+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Activate SSL support in slbackup-php?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please note that SSL is needed to connect to the slbackup-php server. "
+"Activating it is therefore strongly recommended."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"However, SSL should also be activated in the web server which will not be "
+"done by choosing this option."
+msgstr ""
diff --git a/debian/po/vi.po b/debian/po/vi.po
new file mode 100644
index 0000000..e7bd9f4
--- /dev/null
+++ b/debian/po/vi.po
@@ -0,0 +1,44 @@
+# Vietnamese translation for slbackup-php.
+# Copyright Â© 2007 Free Software Foundation, Inc.
+# Clytie Siddall <clytie at riverland.net.au>, 2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: slbackup-php\n"
+"Report-Msgid-Bugs-To: patrick.winnertz at skolelinux.org\n"
+"POT-Creation-Date: 2007-06-24 01:04+0200\n"
+"PO-Revision-Date: 2007-06-25 21:32+0930\n"
+"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.6.4a3\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Activate SSL support in slbackup-php?"
+msgstr "Báºt kháº£ nÄƒng há»— trá»£ giao thá»©c SSL trong slbackup-php khÃ´ng?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please note that SSL is needed to connect to the slbackup-php server. "
+"Activating it is therefore strongly recommended."
+msgstr ""
+"Ghi chÃº ráº±ng giao thá»©c SSL cáº§n thiáº¿t Ä‘á»ƒ káº¿t ná»‘i tá»›i mÃ¡y phá»¥c vá»¥ slbackup-"
+"php. VÃ¬ tháº¿ ráº¥t khuyÃªn báº¡n hiá»‡u lá»±c nÃ³."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"However, SSL should also be activated in the web server which will not be "
+"done by choosing this option."
+msgstr ""
+"Tuy nhiÃªn, cÅ©ng cáº§n pháº£i hiá»‡u lá»±c SSL trong trÃ¬nh phá»¥c vá»¥ Máº¡ng, má»™t cÃ´ng "
+"viá»‡c riÃªng."
diff --git a/debian/postinst b/debian/postinst
new file mode 100644
index 0000000..3735b50
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+db_get slbackup-php/use-ssl || true
+
+if [ "$RET" = "true" ]; then
+		if  [ -x /usr/sbin/a2enmod ]; then
+				a2enmod rewrite > /dev/null
+				if [ -x /usr/sbin/invoke-rc.d ] ; then
+						invoke-rc.d apache2 force-reload || :
+				else
+						[ -x /etc/init.d/apache2 ] && /etc/init.d/apache2 force-reload || :
+				fi
+		fi
+fi
+
+mkdir -p /var/spool/slbackup-php
+
+if [ -d /var/spool/slbackup-php ]; then
+	chown www-data:www-data /var/spool/slbackup-php/
+fi
+
+db_stop
+
+#DEBHELPER#
diff --git a/debian/postrm b/debian/postrm
new file mode 100644
index 0000000..6ff4525
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e 
+
+if [ -d /var/spool/slbackup-php ]; then
+    rm -rf /var/spool/slbackup-php/
+fi
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..e515c99
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,58 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+
+build: build-stamp build-arch build-indep
+
+build-arch:
+# nothing to be done here
+
+build-indep:
+	debconf-updatepo
+
+build-stamp:  
+	dh_testdir
+	$(MAKE)
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	[ ! -f Makefile ] || $(MAKE) clean
+	dh_quilt_unpatch
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_quilt_patch
+	-$(MAKE) mo-files
+	dh_installdirs
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/slbackup-php prefix=/usr
+
+
+binary-arch: 
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs ./ChangeLog 
+	#dh_installdocs 
+	mv $(CURDIR)/debian/slbackup-php/usr/share/doc/slbackup-php/ChangeLog $(CURDIR)/debian/slbackup-php/usr/share/doc/slbackup-php/changelog
+	dh_installcron
+	dh_installdebconf
+	dh_installman
+	dh_link
+	dh_compress
+	dh_fixperms 
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/slbackup.desktop b/debian/slbackup.desktop
new file mode 100644
index 0000000..718be69
--- /dev/null
+++ b/debian/slbackup.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=slbackup-php
+GenericName=SLBackup configuration tool
+Comment=Webpage for configuring slbackup
+Version=1.0
+TryExec=x-www-browser https://tjener/slbackup-php/
+Exec=x-www-browser https://tjener/slbackup-php/
+Terminal=false
+Type=Application
+Categories=Application;Network;System;Security
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..89ae9db
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/debian/templates b/debian/templates
new file mode 100644
index 0000000..a5b84b6
--- /dev/null
+++ b/debian/templates
@@ -0,0 +1,18 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# for an advice to debian-l10n-english at lists.debian.org
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: slbackup-php/use-ssl
+Type: boolean
+Default: false
+_Description: Activate SSL support in slbackup-php?
+ Please note that SSL is needed to connect to the slbackup-php server.
+ Activating it is therefore strongly recommended.
+ . 
+ However, SSL should also be activated in the web server which will not
+ be done by choosing this option.
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..41b4e8a 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) ;
+	}
+
 }
 
 
@@ -567,24 +582,38 @@ global $backuphost, $backupuser, $logfile, $ssh_options, $ssh_askpass ;
 }
 
 require_once ('functions.php') ; 
+require_once ('smarty3-gettext.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']);
+$smarty->register->block('t', 'smarty_block_t');
 
 # 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": 
@@ -597,7 +626,7 @@ foreach ($_REQUEST as $key => $value) {
             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/src/smarty3-gettext.php b/src/smarty3-gettext.php
new file mode 100644
index 0000000..492396e
--- /dev/null
+++ b/src/smarty3-gettext.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * smarty3-gettext.php - Smarty gettext block plugin
+ *
+ * ------------------------------------------------------------------------- *
+ * This library is free software; you can redistribute it and/or             *
+ * modify it under the terms of the GNU Lesser General Public                *
+ * License as published by the Free Software Foundation; either              *
+ * version 2.1 of the License, or (at your option) any later version.        *
+ *                                                                           *
+ * This library is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU         *
+ * Lesser General Public License for more details.                           *
+ *                                                                           *
+ * You should have received a copy of the GNU Lesser General Public          *
+ * License along with this library; if not, write to the Free Software       *
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA *
+ * ------------------------------------------------------------------------- *
+ *
+ * Installation: simply copy this file to the smarty plugins directory and
+ * rename to block.t.php
+ *
+ * @package	smarty3-gettext
+ * @version	$Id: block.t.php,v 1.1 2005/07/27 17:58:56 sagi Exp $
+ * @link	http://smarty-gettext.sourceforge.net/
+ * @author	Sagi Bashari <sagi at boom.org.il>
+ * @copyright	2004-2005 Sagi Bashari
+ */
+ 
+/**
+ * Replaces arguments in a string with their values.
+ * Arguments are represented by % followed by their number.
+ *
+ * @param	string	Source string
+ * @param	mixed	Arguments, can be passed in an array or through single variables.
+ * @returns	string	Modified string
+ */
+function smarty_gettext_strarg($str)
+    {
+	$tr = array();
+	$p = 0;
+
+	for ($i=1; $i < func_num_args(); $i++) {
+	    $arg = func_get_arg($i);
+
+	    if (is_array($arg)) {
+		foreach ($arg as $aarg) {
+		    $tr['%'.++$p] = $aarg;
+		}
+	    } else {
+		$tr['%'.++$p] = $arg;
+	}
+    }
+
+    return strtr($str, $tr);
+}
+
+/**
+ * Smarty block function, provides gettext support for smarty.
+ *
+ * The block content is the text that should be translated.
+ *
+ * Any parameter that is sent to the function will be represented as %n in the translation text, 
+ * where n is 1 for the first parameter. The following parameters are reserved:
+ *   - escape - sets escape mode:
+ *       - 'html' for HTML escaping, this is the default.
+ *       - 'js' for javascript escaping.
+ *       - 'url' for url escaping.
+ *       - 'no'/'off'/0 - turns off escaping
+ *   - plural - The plural version of the text (2nd parameter of ngettext())
+ *   - count - The item count for plural mode (3rd parameter of ngettext())
+ */
+function smarty_block_t($params, $text, &$smarty)
+{
+    $text = stripslashes($text);
+
+    // set escape mode
+    if (isset($params['escape'])) {
+	$escape = $params['escape'];
+	unset($params['escape']);
+    }
+
+    // set plural version
+    if (isset($params['plural'])) {
+	$plural = $params['plural'];
+	unset($params['plural']);
+
+	// set count
+	if (isset($params['count'])) {
+	    $count = $params['count'];
+	    unset($params['count']);
+	}
+    }
+
+    // use plural if required parameters are set
+    if (isset($count) && isset($plural)) {
+	$text = ngettext($text, $plural, $count);
+    } else { // use normal
+	$text = gettext($text);
+    }
+
+    // run strarg if there are parameters
+    if (count($params)) {
+	$text = smarty_gettext_strarg($text, $params);
+    }
+
+    if (!isset($escape) || $escape == 'html') { // html escape, default
+	$text = nl2br(htmlspecialchars($text));
+    } elseif (isset($escape)) {
+	switch ($escape) {
+	    case 'javascript':
+	    case 'js':
+		// javascript escape
+		$text = str_replace('\'', '\\\'', stripslashes($text));
+		break;
+	    case 'url':
+		// url escape
+		$text = urlencode($text);
+		break;
+	}
+    }
+
+    return $text;
+}
+
+?>
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).


