[debian-edu-commits] debian-edu/slbackup-php.git (#26) - edu-wheezy (branch) updated: debian/0.3-3-1-g43b8b7b
Mike Gabriel
sunweaver at alioth.debian.org
Fri Aug 9 10:05:51 UTC 2013
The branch, edu-wheezy has been updated
discards 538079e60787e01d9242bb1ccf767a3852d5fc8f (commit)
discards 4f24c2d657b5ad7ffe479386eee60459e7214a93 (commit)
discards 90d69abfb1bc6695aeb329c436614743234cebd9 (commit)
discards 076f534078306927b96a59f21e2d88af90b16ea0 (commit)
discards 5c3763cf8b83c0b5595e37d895acb6050bc08171 (commit)
via 43b8b7bb30dde14aa3ee9c4dbab4fa6d4c4c0cce (commit)
via c2b2f15c180b93adfdd283089fda737bcdea14af (commit)
via e17123b5eabae6e71e172ed9026d106466cabdaa (commit)
via ddb32c09d53265ca2d86ac9d44e60c05301b63ad (commit)
via b4fc1ab45e7b2325174cb4aaaa2741a8f5736bf2 (commit)
via fce18f6c4e9bce18349c6549577fd9b37670d0e6 (commit)
via e9832183dcf01c7a995f8ec87c1eadffc28e5762 (commit)
via a5c51d349273836949e355fa4879612f127b643f (commit)
via 2e0b78e7153bed70a5a900c000b2684141d1d7f5 (commit)
via 3b70aa65f3ae241a23d3feeca310265c00124570 (commit)
via 7f6a8ca36f0894578856a6f0233a257bfbdbdb04 (commit)
via e3e0bd07629fe65ee67a56badba34b15ad925a12 (commit)
via 23b8026285b4e02192d90872edb9a7aee3f70183 (commit)
via aa4335d7000facc21179f428f0acfd4f6f6b6871 (commit)
via 399e8e1f07db0356581fa99d6b58b947d2cb01cf (commit)
via 7e1e7e5f516668d9118e2b294b6cec19a53c2e2a (commit)
via 730316e8db53c1254e9db8430c484284e9b833ec (commit)
via ee23f46f15af9a632b6af9850617261221c8560c (commit)
via 4e2f2da9fc7944564a630c0373cfa1af7d451de2 (commit)
via 384263dddc63f8845f26a146723256b87b5acba3 (commit)
via f114e740eef2245b9a07612c9177f62f1ea98d7a (commit)
via 011f272d5c6ddfb4a74b81d7ec34446cfdb76b59 (commit)
via 58c1ece89f692f4a30d6558cc1ba6c62bcfca97d (commit)
via c02b453a62120364cc0c20f6b11a2e5918833c0f (commit)
via d43efc72d662da0af31c558e300a339a035656b8 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (538079e60787e01d9242bb1ccf767a3852d5fc8f)
\
N -- N -- N (43b8b7bb30dde14aa3ee9c4dbab4fa6d4c4c0cce)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 45 +-
Makefile | 9 +-
debian/README.source | 7 -
debian/changelog | 143 +-
debian/compat | 2 +-
debian/control | 24 +-
.../001_slbackup-php_cookie+request-merge.patch | 75 +
...02_slbackup-php_restore-paths-with-blanks.patch | 149 ++
...lbackup-php_fix-failed-in-status-template.patch | 13 +
.../004_slbackup-php_translate-status-for.patch | 13 +
.../099_slbackup-php_i18n-pot-po-update.patch | 1579 ++++++++++++++++++++
.../100_slbackup-php_fix-language-detection.patch | 98 ++
debian/patches/101_slbackup-php_i18n-de.patch | 303 ++++
debian/patches/series | 7 +
debian/po/sv.po | 4 +-
debian/rules | 11 +-
debian/source/format | 2 +-
po/de.po | 290 ----
po/es.po | 230 ++-
po/fr.po | 288 ----
po/nb_NO.po | 224 ++-
po/slbackup-php.pot | 215 ++-
po/sv.po | 250 ++--
src/functions.php | 69 +-
src/index.php | 63 +-
templates/login.tpl | 4 +-
templates/maint.tpl | 2 +-
templates/restore.tpl | 18 +-
templates/status.tpl | 10 +-
29 files changed, 2848 insertions(+), 1299 deletions(-)
create mode 100644 debian/patches/001_slbackup-php_cookie+request-merge.patch
create mode 100644 debian/patches/002_slbackup-php_restore-paths-with-blanks.patch
create mode 100644 debian/patches/003_slbackup-php_fix-failed-in-status-template.patch
create mode 100644 debian/patches/004_slbackup-php_translate-status-for.patch
create mode 100644 debian/patches/099_slbackup-php_i18n-pot-po-update.patch
create mode 100644 debian/patches/100_slbackup-php_fix-language-detection.patch
create mode 100644 debian/patches/101_slbackup-php_i18n-de.patch
create mode 100644 debian/patches/series
delete mode 100644 po/de.po
delete mode 100644 po/fr.po
The diff of changes is:
diff --git a/ChangeLog b/ChangeLog
index 2f301cb..1815842 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,46 +1,3 @@
-Thu, 12 Jul 2012 Mike Gabriel
-
- * Release 0.4.3:
- - Add changes of 0.4.2 to this file, the ChangeLog
- maintenance had been forgotten for 0.4.2.
-
-Thu, 12 Jul 2012 Mike Gabriel
-
- * Release 0.4.2:
- - Avoid empty $bindir directory.
- - Fix building of .mo files.
- - Fix nonhttps URL parameter.
- * Pick packaging files from debian/0.4.1-1 (prep. uploaded to
- mentors.debian.net).
-
-Sun, 08 Jul 2012 Mike Gabriel
-
- * Release 0.4.1:
- - Stop shipping smarty-gettext-like code.
- - Do not update .po files on normal build/install.
- - po/sv.po got lost, re-created the file from an earlier version.
- * Drop smarty-gettext build-dependency.
-
-Sun, 01 Jul 2012 Mike Gabriel
-
- * Release 0.4.0:
- - Accept patch slbackup-php_cookie+request-merge.patch from Debian.
- - Accept patch slbackup-php_restore-paths-with-blanks.patch from Debian.
- - Accept patch slbackup-php_fix-failed-in-status-template.patch from Debian.
- - Accept patch slbackup-php_translate-status-for.patch from Debian.
- - Accept patch slbackup-php_i18n-pot-po-update.patch from Debian.
- - Accept patch slbackup-php_fix-language-detection.patch from Debian.
- - Accept patch slbackup-php_i18n-de.patch from Debian.
- - Accept patch slbackup-php_chmod-cron-file.patch from Debian.
- - Accept patch slbackup-php_i18n-fr.patch from Debian.
- - Use smarty3.
- - Split up smarty3-gettext code from functions.php.
- * Use packaging files from latest Debian package (0.3-3).
-
-Wed, 16 Jan 2007 Patrick Winnertz
-
- * Add --language=PHP to the xgettext options
-
Wed, 25 Apr 2007 Finn-Arne Johansen
* Release 0.2
@@ -62,6 +19,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 415685f..68e6a82 100644
--- a/Makefile
+++ b/Makefile
@@ -39,8 +39,8 @@ po/*.po: po/slbackup-php.pot
cp $@ $@.bak ; \
msgmerge $@.bak $^ > $@
-locales/mo-stamp:
- for po in po/*.po ; do \
+locales/mo-stamp: po/*.po
+ for po in $^ ; do \
locale=$$(basename $$po .po) ; \
echo $$locale ; \
mkdir -p locales/$$locale/LC_MESSAGES ; \
@@ -52,10 +52,9 @@ mo-files: locales/mo-stamp
po/slbackup-php.pot: src/*.php templates/*.tpl
tsmarty2c.php templates | \
- xgettext --add-comments --language=PHP --default-domain=slbackup-php \
+ xgettext --add-comments --default-domain=slbackup-php \
- src/*.php --output po/slbackup-php.pot
-po-files: po/*.po
install: all
install -d $(DESTDIR)$(sharedir)
@@ -67,7 +66,7 @@ install: all
install -d $(DESTDIR)$(scriptdir)
install -d $(DESTDIR)$(templatedir)
install -d $(DESTDIR)$(localedir)
- #install -d $(DESTDIR)$(bindir)
+ install -d $(DESTDIR)$(bindir)
for locale in $$(find locales -type f -name $(PACKAGE).mo -printf "%P ") ; do \
diff --git a/debian/README.source b/debian/README.source
index e53b155..5dde0bf 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,10 +1,3 @@
-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.
diff --git a/debian/changelog b/debian/changelog
index a64d9b7..0f16097 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,55 +1,85 @@
-slbackup-php (0.4.3-0) unstable; urgency=low
-
- * Upstream version (0.4.3):
- - Formal release, upstream ChangeLog was not up-to-date for 0.4.2.
-
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Thu, 12 Jul 2012 14:36:15 +0200
-
-slbackup-php (0.4.2-0) unstable; urgency=low
-
- * New upstream version (0.4.2):
- - Avoid empty $bindir directory.
- - Fix building of .mo files.
- - Fix nonhttps URL parameter.
- * Pick packaging files from debian/0.4.1-1 (prep. uploaded to
- mentors.debian.net).
-
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Thu, 12 Jul 2012 00:10:52 +0200
-
-slbackup-php (0.4.1-0) unstable; urgency=low
-
- * New upstream version (0.4.1):
- - Drop smarty-gettext code, use the plugin provided in Debian or other
- distro.
- - Do not recreate .po files during make mo-files. Provide po-files stanza
- in Makefile for recreating .po files manually.
- * /debian/po/svn.po:
- + Replace sv.po for php GUI translations with svn.po for debconf template
- translations.
-
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sun, 08 Jul 2012 16:31:52 +0200
-
-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.4.3-1) unstable; urgency=low
+
+ * New maintainer, package becomes team-maintained: Debian Edu Packaging Team.
+ * New upstream version. (Closes: #646537, #670095)
+ * /debian/source/format:
+ + Switch to "3.0 (quilt)".
+ * /debian/rules:
+ + Run debconf-updatepo during /debian/rules build, not clean. Makes
+ slbackup-php buildable with git-buildpackage.
+ + Fix lintian warnings: debian-rules-missing-recommended-target build-arch,
+ debian-rules-missing-recommended-target build-indep.
+ + Remove dh_quilt_(un)patch calls.
+ * Lintian issues fixed:
+ + I: slbackup-php: package-contains-empty-directory usr/bin/
+ + P: slbackup-php source: unneeded-build-dep-on-quilt
+ + P: slbackup-php: no-homepage-field
+ + W: slbackup-php source: dh-clean-k-is-deprecated
+ * /debian/control:
+ + Bump Standards to 3.9.3.
+ + Add Vcs-Git and Vcs-Browser.
+ * /debian/watch (new):
+ + Provide watch file for upstream source versions.
+ * /debian/compat:
+ + Raise compat level to 7.
+ * /debian/README.Source:
+ + Add upstream Vcs-Browser location to README.Source.
+ * /debian/slbackup-php.desktop:
+ + Let URL point to http://localhost/slbackup-php.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Thu, 12 Jul 2012 14:43:54 +0200
+
+slbackup-php (0.3-3) unstable; urgency=low
+
+ * Mike Gabriel becomes Debian package maintainer.
+ * Enable quilt patch system. Bump Standards-Version from 3.7.3 to 3.9.2.
+ * Add generic README.source that explains the usage of quilt.
+ * Add patch: 001_slbackup-php_cookie+request-merge.patch. Fixes reappearing
+ login page on every click (closes: #655832).
+ * Add patch: 002_slbackup-php_restore-paths-with-blanks.patch. Allows restore
+ of files with blanks in their name. Closes: #565181.
+ Patch provided by Cyril ETCHEVERRIA <cyril.e at wanadoo.fr> -> thanks!
+ * Add patch: 003_slbackup-php_fix-failed-in-status-template.patch,
+ for last failed backup really show timestamp of the last failed backup
+ and not erroneously the timestamp of the last successful backup.
+ * Add patch: 004_slbackup-php_translate-status-for.patch, make the headline
+ of the status page template translatable.
+ * Add patch: 099_slbackup-php_i18n-pot-po-update.patch, update pot file
+ and merge po files, translate status page headline for all available
+ languages.
+ * Add patch: 100_slbackup-php_fix-language-detection.patch. Automatically
+ detect locales like de_DE.UTF-8 from a .mo files named de.po.
+ * Add patch: 101_slbackup-php_i18n-de.patch, German translation for SL-Backup
+ (WebGUI).
+ * Update patch: 100_slbackup-php_fix-language-detection.patch. Detect
+ Norwegian (nb_NO) locale and set it. (Browser still in English.)
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 18 Jan 2012 17:05:14 +0100
+
+slbackup-php (0.3-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix encoding for Danish debconf translation.
+
+ -- Christian Perrier <bubulle at debian.org> Wed, 12 Jan 2011 07:30:19 +0100
+
+slbackup-php (0.3-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Explicitly use 1.0 as source format
+ * Explicitly point to version 2 of the GPL in debian/copyright
+ * Don't hardcode path to a2enmode and invoke-rc.d in postinst script
+ * Complete copyright in debian/copyright
+ * Add ${misc:Depends} in dependencies to properly deal with
+ dependencies triggerred by debhelper utilities
+ * Drop useless call to dh_desktop in debian/rules (this command
+ does nothing now)
+ * Fix pending l10n issues. Debconf translations:
+ - Japanese (Hideki Yamane (Debian-JP)). Closes: #555695
+ - Spanish (Omar Campagne). Closes: #578139
+ - Danish (Joe Hansen). Closes: #581041
+
+ -- Christian Perrier <bubulle at debian.org> Fri, 21 May 2010 07:07:57 +0200
slbackup-php (0.3-2) unstable; urgency=low
@@ -57,7 +87,14 @@ slbackup-php (0.3-2) unstable; urgency=low
* Make the list of snapshots sorted
[ Patrick Winnertz ]
- * Added debian/po/nl.po . Thanks to Bart Cornelis
+ * Changed my maintainer address to winnie at debian.org.
+ * Added debian/po/nl.po . Thanks to Bart Cornelis (Closes: #450972)
+ * Added debian/po/fi.po . Thanks to Esko Arajärvi (Closes: #468844)
+ * Added smarty-gettext as build-dep (Closes: #452769)
+ * Bumped Standards-Version to 3.7.3 no other changes needed.
+ * Fixed some lintian errors:
+ - don't ignore errors of make clean in clean target
+ - call dh_desktop in rules
-- Patrick Winnertz <winnie at debian.org> Mon, 17 Dec 2007 09:10:29 +0100
diff --git a/debian/compat b/debian/compat
index 7f8f011..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+5
diff --git a/debian/control b/debian/control
index 566a0e9..f1a4e9b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,31 +1,18 @@
Source: slbackup-php
Section: misc
Priority: optional
-Maintainer: Debian Edu Packaging Team <debian-edu-pkg-team at lists.alioth.debian.org>
+Maintainer: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Uploaders:
- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>,
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 (>= 7.0.50~),
- po-debconf,
-Homepage: http://anonscm.debian.org/gitweb/?p=debian-edu/upstream/slbackup-php.git;a=summary
-Vcs-Git: git://git.debian.org/debian-edu/slbackup-php.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-edu/slbackup-php.git;a=summary
+Standards-Version: 3.9.2
+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,
- smarty-gettext (>= 1.0b1-7)
-Description: Web-based administration tool for slbackup
+Depends: ${misc:Depends}, libapache2-mod-php5, apache2, smarty, ssh, php5-cli, smarty-gettext
+Description: web-based administration tool for slbackup
Slbackup-php provides the necessary functions to maintain a slbackup
repository.
.
@@ -35,4 +22,3 @@ Description: Web-based administration tool for slbackup
- verifying SSH keys and successful backups;
- restoring from backups;
- removing old backups from the repository.
-
diff --git a/debian/patches/001_slbackup-php_cookie+request-merge.patch b/debian/patches/001_slbackup-php_cookie+request-merge.patch
new file mode 100644
index 0000000..4ad804d
--- /dev/null
+++ b/debian/patches/001_slbackup-php_cookie+request-merge.patch
@@ -0,0 +1,75 @@
+Description: Fix returning to the login page on every click
+ Fix returning to the login page on every click
+
+ This patch closes Debian BTS issue #655832.
+.
+ This patch is not forwarded to upstream as Debian Edu
+ seems to become upstream and package maintainer for
+ next (wheezy) release.
+Forwarded: not-needed
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+--- a/src/index.php
++++ b/src/index.php
+@@ -570,21 +570,33 @@
+ loadConfig () ;
+ require('/usr/share/php/smarty/libs/Smarty.class.php') ;
+ session_start() ;
+-$authenticated = ($_COOKIE['Authenticated'] == "True") ;
+ loadLocale () ;
+ ob_start ();
+
+ $smarty = new Smarty();
+ $smarty->template_dir = $smarty_templ ;
+ $smarty->compile_dir = $smarty_compile ;
++unset ($_COOKIE['smarty_templ']);
++unset ($_COOKIE['smarty_compile']);
+
+ # fetch script to use whith passing the ssh-password
+ $ssh_askpass = sprintf ("%s/script/mypass.sh",
+ dirname (dirname ($_SERVER["SCRIPT_FILENAME"])));
+
++$arguments = $_REQUEST;
++
++# merge _COOKIE and _REQUEST
++$allowed_cookie_keys = array('nonhttps', 'xorstring', 'PHPSESSID', 'locale',);
++foreach ($_COOKIE as $key => $value) {
++ if ((! array_key_exists($key, $arguments)) && (in_array($key, $allowed_cookie_keys))) {
++ if (is_string($key) && is_string($value)) {
++ $arguments[$key] = $value;
++ }
++ }
++}
+
+ # Fetch arguments passed as the script is executed
+-foreach ($_REQUEST as $key => $value) {
++foreach ($arguments as $key => $value) {
+ switch ($key) {
+ case "smarty_templ":
+ case "smarty_compile":
+@@ -597,7 +609,7 @@
+ break ;
+ case "xorstring":
+ if (empty($passwd))
+- $xorstring = $value ;
++ $xorstring = base64_decode($value) ;
+ else break ;
+ if (empty ($value))
+ break ;
+@@ -640,6 +652,8 @@
+ }
+ }
+
++unset ($arguments);
++
+ if ($submit == "logout") {
+ unset ($passwd) ;
+ unset ($xorstring) ;
+@@ -666,7 +680,7 @@
+ $xorstring = xorstring ($encrypt, $passwd) ;
+ }
+
+-setcookie ('xorstring', $xorstring) ;
++setcookie ('xorstring', base64_encode($xorstring)) ;
+
+ $scheduler = readcron ($passwd) ;
+
diff --git a/debian/patches/002_slbackup-php_restore-paths-with-blanks.patch b/debian/patches/002_slbackup-php_restore-paths-with-blanks.patch
new file mode 100644
index 0000000..2eb5c31
--- /dev/null
+++ b/debian/patches/002_slbackup-php_restore-paths-with-blanks.patch
@@ -0,0 +1,149 @@
+Description: Fix restoring files with blanks in their name.
+ Fix restoring files with blanks in their name.
+
+ This patch is not forwarded to upstream as Debian Edu
+ seems to become upstream and package maintainer for
+ next (wheezy) release.
+
+ This patch closes Debian BTS issue #565181.
+Forwarded: not-needed
+Author: Cyril ETCHEVERRIA <cyril.e at wanadoo.fr>
+--- a/templates/restore.tpl
++++ b/templates/restore.tpl
+@@ -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}
+--- a/src/index.php
++++ b/src/index.php
+@@ -71,7 +71,7 @@
+ 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 @@
+ 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'",
+ $ssh_options, $backupuser,
+ $backuphost, $clientdir, '"%P\n"') ;
+
+@@ -126,7 +126,7 @@
+ 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 @@
+ } 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 @@
+ 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 @@
+
+ $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 @@
+ 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 @@
+
+ $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 @@
+ 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 @@
+ 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 @@
+ 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) ;
diff --git a/debian/patches/003_slbackup-php_fix-failed-in-status-template.patch b/debian/patches/003_slbackup-php_fix-failed-in-status-template.patch
new file mode 100644
index 0000000..0939b66
--- /dev/null
+++ b/debian/patches/003_slbackup-php_fix-failed-in-status-template.patch
@@ -0,0 +1,13 @@
+Index: slbackup-php/templates/status.tpl
+===================================================================
+--- slbackup-php.orig/templates/status.tpl 2012-01-17 20:18:55.000000000 +0100
++++ slbackup-php/templates/status.tpl 2012-01-17 20:19:40.000000000 +0100
+@@ -29,7 +29,7 @@
+ {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}
diff --git a/debian/patches/004_slbackup-php_translate-status-for.patch b/debian/patches/004_slbackup-php_translate-status-for.patch
new file mode 100644
index 0000000..6e72c19
--- /dev/null
+++ b/debian/patches/004_slbackup-php_translate-status-for.patch
@@ -0,0 +1,13 @@
+Index: slbackup-php/templates/status.tpl
+===================================================================
+--- slbackup-php.orig/templates/status.tpl 2012-01-17 20:39:39.000000000 +0100
++++ slbackup-php/templates/status.tpl 2012-01-17 20:39:40.000000000 +0100
+@@ -21,7 +21,7 @@
+ <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 }
+ Backup started as {$values.started|date_format:"%c"}, and is still in progress<BR>
diff --git a/debian/patches/099_slbackup-php_i18n-pot-po-update.patch b/debian/patches/099_slbackup-php_i18n-pot-po-update.patch
new file mode 100644
index 0000000..b9ffe44
--- /dev/null
+++ b/debian/patches/099_slbackup-php_i18n-pot-po-update.patch
@@ -0,0 +1,1579 @@
+Index: slbackup-php/po/es.po
+===================================================================
+--- slbackup-php.orig/po/es.po 2012-01-17 20:41:36.000000000 +0100
++++ slbackup-php/po/es.po 2012-01-17 20:55:57.000000000 +0100
+@@ -7,271 +7,279 @@
+ 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."
+-
+Index: slbackup-php/po/nb_NO.po
+===================================================================
+--- slbackup-php.orig/po/nb_NO.po 2012-01-17 20:41:36.000000000 +0100
++++ slbackup-php/po/nb_NO.po 2012-01-17 20:55:57.000000000 +0100
+@@ -7,242 +7,237 @@
+ 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 @@
+ "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."
+Index: slbackup-php/po/slbackup-php.pot
+===================================================================
+--- slbackup-php.orig/po/slbackup-php.pot 2012-01-17 20:40:16.000000000 +0100
++++ slbackup-php/po/slbackup-php.pot 2012-01-17 20:55:57.000000000 +0100
+@@ -8,7 +8,7 @@
+ 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 @@
+ "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 ""
+Index: slbackup-php/po/sv.po
+===================================================================
+--- slbackup-php.orig/po/sv.po 2012-01-17 20:41:36.000000000 +0100
++++ slbackup-php/po/sv.po 2012-01-17 20:55:57.000000000 +0100
+@@ -7,278 +7,278 @@
+ 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/debian/patches/100_slbackup-php_fix-language-detection.patch b/debian/patches/100_slbackup-php_fix-language-detection.patch
new file mode 100644
index 0000000..0f4216e
--- /dev/null
+++ b/debian/patches/100_slbackup-php_fix-language-detection.patch
@@ -0,0 +1,98 @@
+Index: slbackup-php/src/functions.php
+===================================================================
+--- slbackup-php.orig/src/functions.php 2012-01-18 16:17:18.000000000 +0100
++++ slbackup-php/src/functions.php 2012-01-18 16:20:06.000000000 +0100
+@@ -60,13 +60,15 @@
+ }
+
+ 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 @@
+ $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 ;
+ }
+- 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 ($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");
diff --git a/debian/patches/101_slbackup-php_i18n-de.patch b/debian/patches/101_slbackup-php_i18n-de.patch
new file mode 100644
index 0000000..d269250
--- /dev/null
+++ b/debian/patches/101_slbackup-php_i18n-de.patch
@@ -0,0 +1,303 @@
+Description: German translation of the SLBackup WebGUI
+ German translation of the SLBackup WebGUI.
+
+ This patch is not forwarded to upstream as Debian Edu
+ seems to become upstream and package maintainer for
+ next (wheezy) release.
+Forwarded: not-needed
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Index: slbackup-php/po/de.po
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ slbackup-php/po/de.po 2012-01-17 20:55:10.000000000 +0100
+@@ -0,0 +1,290 @@
++# 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: de\n"
++"Report-Msgid-Bugs-To: \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-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.11.1\n"
++
++#. templates/config.tpl
++#: standard input:2
++msgid "Server scheduler"
++msgstr "Datensicherung planen"
++
++#. templates/config.tpl
++#: standard input:5
++msgid "Backup enabled"
++msgstr "Backups aktiviert"
++
++#. templates/config.tpl
++#: standard input:8
++msgid "Run backup at"
++msgstr "Datensicherung ausführen um"
++
++#. templates/config.tpl
++#: standard input:11
++#: input:32
++#: src/index.php:938
++msgid "Update"
++msgstr "Aktualisieren"
++
++#. templates/config.tpl
++#. templates/login.tpl
++#: standard input:14
++#: input:35
++#: input:65
++#: input:161
++msgid "Reset"
++msgstr "Zurücksetzen"
++
++#. templates/config.tpl
++#: standard input:17
++msgid "Server config"
++msgstr "Server-Konfiguration"
++
++#. templates/config.tpl
++#: standard input:20
++#: input:53
++msgid "Address"
++msgstr "Adresse"
++
++#. templates/config.tpl
++#: standard input:23
++msgid "Destdir"
++msgstr "Zielverzeichnis"
++
++#. templates/config.tpl
++#: standard input:26
++msgid "Servertype"
++msgstr "Server-Typ"
++
++#. templates/config.tpl
++#: standard input:29
++#: input:62
++msgid "User"
++msgstr "Benutzer"
++
++#. templates/config.tpl
++#: standard input:38
++msgid "Client config"
++msgstr "Client-Konfiguration"
++
++#. templates/config.tpl
++#: standard input:41
++msgid "Client:"
++msgstr "Client-System:"
++
++#. templates/config.tpl
++#. 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 "Neu"
++
++#. templates/config.tpl
++#: standard input:50
++msgid "Remove"
++msgstr "Entfernen"
++
++#. templates/config.tpl
++#: standard input:56
++msgid "Backup Age"
++msgstr "Backup-Alter"
++
++#. templates/config.tpl
++#: standard input:59
++msgid "Clienttype"
++msgstr "Client-Typ"
++
++#. templates/config.tpl
++#. templates/restore.tpl
++#: standard input:68
++#: input:116
++msgid "Locations:"
++msgstr "Speicherorte:"
++
++#. templates/config.tpl
++#: standard input:71
++#: src/index.php:936
++msgid "Add"
++msgstr "Hinzufügen"
++
++#. templates/config.tpl
++#: standard input:74
++msgid "Delete"
++msgstr "Löschen"
++
++#. templates/status.tpl
++#: standard input:77
++msgid "Clients"
++msgstr "Client-Systeme"
++
++#. templates/status.tpl
++#: standard input:80
++msgid "Status for %1"
++msgstr "Status für %1"
++
++#. templates/status.tpl
++#: standard input:83
++msgid "OK at %1"
++msgstr "Erfolgreich ausgeführt um %1"
++
++#. templates/status.tpl
++#: standard input:86
++msgid "Failed at %1"
++msgstr "Fehlgeschlagen um %1"
++
++#. templates/status.tpl
++#: standard input:89
++msgid "Client never backed up"
++msgstr "Client-System wurde noch nie gesichert"
++
++#. templates/status.tpl
++#: standard input:92
++msgid "ssh-keys are working"
++msgstr "SSH-Schlüssel sind einsatzbereit"
++
++#. templates/status.tpl
++#: standard input:95
++msgid "rdiff-backup-versions differ"
++msgstr "rdiff-Backup Versionen sind unterschiedlich"
++
++#. templates/status.tpl
++#: standard input:98
++msgid "ssh-keys are not working"
++msgstr "SSH-Schlüssel funktionieren nicht"
++
++#. templates/status.tpl
++#: standard input:101
++msgid "Backup status"
++msgstr "Backup-Status"
++
++#. templates/status.tpl
++#: standard input:104
++msgid "Backup last finished at %1"
++msgstr "Letzte Datensicherung beendet um %1"
++
++#. templates/status.tpl
++#: standard input:107
++msgid "A new backup started at %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:146
++msgid "To read the configuration, you must log in as %1 on %2."
++msgstr "Um die Konfiguration einzusehen, müssen Sie sich als %1 auf %2 anmelden."
++
++#. templates/login.tpl
++#: standard input:149
++msgid "Please enter the password for the %1 account on %2:"
++msgstr "Bitte das Kennwort für das Konto %1 auf %2 eingeben:"
++
++#. templates/login.tpl
++#: standard input:152
++msgid "WARNING: you are about to send you password over an unencrypted link, please ask your administrator to enable 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:155
++msgid "Login to this application is denied without the use of https. Please ask your administrator to enable 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:158
++msgid "Login"
++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:749
++#, php-format
++msgid "No client specified :("
++msgstr "Kein Client-System ausgewählt :("
++
++#: src/index.php:754
++#, php-format
++msgid "Unable to find %s in the list of clients."
++msgstr "Kann %s nicht in der Liste der Client-Systeme finden."
++
++#: src/index.php:788
++#, php-format
++msgid "Unable to find %s in the locations of %s."
++msgstr "Kann %s nicht unter den gesicherten Verzeichnissen von %s finden."
++
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ecdc4e1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+001_slbackup-php_cookie+request-merge.patch
+002_slbackup-php_restore-paths-with-blanks.patch
+003_slbackup-php_fix-failed-in-status-template.patch
+004_slbackup-php_translate-status-for.patch
+099_slbackup-php_i18n-pot-po-update.patch
+100_slbackup-php_fix-language-detection.patch
+101_slbackup-php_i18n-de.patch
diff --git a/debian/po/sv.po b/debian/po/sv.po
index dca18c2..03be800 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -1,5 +1,5 @@
-# Swedish translation for slbackup-php.
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Swedish translation of slbackup-php debconf template.
+# Copyright (C) 2007 Free Software Foundation, Inc.
# This file is distributed under the same license as the slbackup-php package.
# Daniel Nylander <po at danielnylander.se>, 2007.
#
diff --git a/debian/rules b/debian/rules
index deb9373..0fe30b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,7 @@
# -*- makefile -*-
-build: build-stamp build-arch build-indep
-
-build-arch:
-# nothing to be done here
-
-build-indep:
- debconf-updatepo
+build: build-stamp
build-stamp:
dh_testdir
@@ -22,11 +16,12 @@ clean:
[ ! -f Makefile ] || $(MAKE) clean
dh_quilt_unpatch
dh_clean
+ debconf-updatepo
install: build
dh_testdir
dh_testroot
- dh_clean
+ dh_clean -k
dh_quilt_patch
-$(MAKE) mo-files
dh_installdirs
diff --git a/debian/source/format b/debian/source/format
index 89ae9db..d3827e7 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+1.0
diff --git a/po/de.po b/po/de.po
deleted file mode 100644
index 4b28ba0..0000000
--- a/po/de.po
+++ /dev/null
@@ -1,290 +0,0 @@
-# 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: de\n"
-"Report-Msgid-Bugs-To: \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-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.1\n"
-
-#. templates/config.tpl
-#: standard input:2
-msgid "Server scheduler"
-msgstr "Datensicherung planen"
-
-#. templates/config.tpl
-#: standard input:5
-msgid "Backup enabled"
-msgstr "Backups aktiviert"
-
-#. templates/config.tpl
-#: standard input:8
-msgid "Run backup at"
-msgstr "Datensicherung ausführen um"
-
-#. templates/config.tpl
-#: standard input:11
-#: input:32
-#: src/index.php:938
-msgid "Update"
-msgstr "Aktualisieren"
-
-#. templates/config.tpl
-#. templates/login.tpl
-#: standard input:14
-#: input:35
-#: input:65
-#: input:161
-msgid "Reset"
-msgstr "Zurücksetzen"
-
-#. templates/config.tpl
-#: standard input:17
-msgid "Server config"
-msgstr "Server-Konfiguration"
-
-#. templates/config.tpl
-#: standard input:20
-#: input:53
-msgid "Address"
-msgstr "Adresse"
-
-#. templates/config.tpl
-#: standard input:23
-msgid "Destdir"
-msgstr "Zielverzeichnis"
-
-#. templates/config.tpl
-#: standard input:26
-msgid "Servertype"
-msgstr "Server-Typ"
-
-#. templates/config.tpl
-#: standard input:29
-#: input:62
-msgid "User"
-msgstr "Benutzer"
-
-#. templates/config.tpl
-#: standard input:38
-msgid "Client config"
-msgstr "Client-Konfiguration"
-
-#. templates/config.tpl
-#: standard input:41
-msgid "Client:"
-msgstr "Client-System:"
-
-#. templates/config.tpl
-#. 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 "Neu"
-
-#. templates/config.tpl
-#: standard input:50
-msgid "Remove"
-msgstr "Entfernen"
-
-#. templates/config.tpl
-#: standard input:56
-msgid "Backup Age"
-msgstr "Backup-Alter"
-
-#. templates/config.tpl
-#: standard input:59
-msgid "Clienttype"
-msgstr "Client-Typ"
-
-#. templates/config.tpl
-#. templates/restore.tpl
-#: standard input:68
-#: input:116
-msgid "Locations:"
-msgstr "Speicherorte:"
-
-#. templates/config.tpl
-#: standard input:71
-#: src/index.php:936
-msgid "Add"
-msgstr "Hinzufügen"
-
-#. templates/config.tpl
-#: standard input:74
-msgid "Delete"
-msgstr "Löschen"
-
-#. templates/status.tpl
-#: standard input:77
-msgid "Clients"
-msgstr "Client-Systeme"
-
-#. templates/status.tpl
-#: standard input:80
-msgid "Status for %1"
-msgstr "Status für %1"
-
-#. templates/status.tpl
-#: standard input:83
-msgid "OK at %1"
-msgstr "Erfolgreich ausgeführt um %1"
-
-#. templates/status.tpl
-#: standard input:86
-msgid "Failed at %1"
-msgstr "Fehlgeschlagen um %1"
-
-#. templates/status.tpl
-#: standard input:89
-msgid "Client never backed up"
-msgstr "Client-System wurde noch nie gesichert"
-
-#. templates/status.tpl
-#: standard input:92
-msgid "ssh-keys are working"
-msgstr "SSH-Schlüssel sind einsatzbereit"
-
-#. templates/status.tpl
-#: standard input:95
-msgid "rdiff-backup-versions differ"
-msgstr "rdiff-Backup Versionen sind unterschiedlich"
-
-#. templates/status.tpl
-#: standard input:98
-msgid "ssh-keys are not working"
-msgstr "SSH-Schlüssel funktionieren nicht"
-
-#. templates/status.tpl
-#: standard input:101
-msgid "Backup status"
-msgstr "Backup-Status"
-
-#. templates/status.tpl
-#: standard input:104
-msgid "Backup last finished at %1"
-msgstr "Letzte Datensicherung beendet um %1"
-
-#. templates/status.tpl
-#: standard input:107
-msgid "A new backup started at %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:146
-msgid "To read the configuration, you must log in as %1 on %2."
-msgstr "Um die Konfiguration einzusehen, müssen Sie sich als %1 auf %2 anmelden."
-
-#. templates/login.tpl
-#: standard input:149
-msgid "Please enter the password for the %1 account on %2:"
-msgstr "Bitte das Kennwort für das Konto %1 auf %2 eingeben:"
-
-#. templates/login.tpl
-#: standard input:152
-msgid "WARNING: you are about to send you password over an unencrypted link, please ask your administrator to enable 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:155
-msgid "Login to this application is denied without the use of https. Please ask your administrator to enable 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:158
-msgid "Login"
-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:749
-#, php-format
-msgid "No client specified :("
-msgstr "Kein Client-System ausgewählt :("
-
-#: src/index.php:754
-#, php-format
-msgid "Unable to find %s in the list of clients."
-msgstr "Kann %s nicht in der Liste der Client-Systeme finden."
-
-#: src/index.php:788
-#, php-format
-msgid "Unable to find %s in the locations of %s."
-msgstr "Kann %s nicht unter den gesicherten Verzeichnissen von %s finden."
-
diff --git a/po/es.po b/po/es.po
index e196a16..b0ad27f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,279 +7,271 @@ msgid ""
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \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"
+"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"
"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:2
+#: standard input:32
msgid "Server scheduler"
msgstr "Programar el servidor"
#. templates/config.tpl
-#: standard input:5
+#: standard input:35
msgid "Backup enabled"
msgstr "Copia de seguridad habilitada"
#. templates/config.tpl
-#: standard input:8
+#: standard input:38
msgid "Run backup at"
msgstr "Ejecutar la copia de seguridad a las"
#. templates/config.tpl
-#: standard input:11 input:32 src/index.php:938
+#: standard input:41 standard input:62 src/index.php:924
msgid "Update"
msgstr "Actualizar"
#. templates/config.tpl
#. templates/login.tpl
-#: standard input:14 input:35 input:65 input:161
+#: standard input:44 standard input:65 standard input:95 standard input:170
msgid "Reset"
msgstr "Reiniciar"
#. templates/config.tpl
-#: standard input:17
+#: standard input:47
msgid "Server config"
msgstr "Configuración del servidor"
#. templates/config.tpl
-#: standard input:20 input:53
+#: standard input:50 standard input:83
msgid "Address"
msgstr "Dirección"
#. templates/config.tpl
-#: standard input:23
+#: standard input:53
msgid "Destdir"
msgstr "DirecciónFinal"
#. templates/config.tpl
-#: standard input:26
+#: standard input:56
msgid "Servertype"
msgstr "TipoServidor"
#. templates/config.tpl
-#: standard input:29 input:62
+#: standard input:59 standard input:92
msgid "User"
msgstr "Usuario"
#. templates/config.tpl
-#: standard input:38
+#: standard input:68
msgid "Client config"
msgstr "Configuración del cliente"
#. templates/config.tpl
-#: standard input:41
+#: standard input:71
msgid "Client:"
msgstr "Cliente:"
#. templates/config.tpl
-#. templates/restore.tpl
-#. templates/maint.tpl
-#: standard input:44 input:113 input:167
-msgid "Choose"
-msgstr "Elija"
-
-#. templates/config.tpl
-#: standard input:47
+#: standard input:77
msgid "New"
msgstr "Nuevo"
#. templates/config.tpl
-#: standard input:50
+#: standard input:80
msgid "Remove"
msgstr "Eliminar"
#. templates/config.tpl
-#: standard input:56
+#: standard input:86
msgid "Backup Age"
msgstr "Antiguedad de la copia"
#. templates/config.tpl
-#: standard input:59
+#: standard input:89
msgid "Clienttype"
msgstr "TipoCliente"
#. templates/config.tpl
#. templates/restore.tpl
-#: standard input:68 input:116
+#: standard input:98 standard input:113
msgid "Locations:"
msgstr "Lugares:"
#. templates/config.tpl
-#: standard input:71 src/index.php:936
+#: standard input:101 src/index.php:922
msgid "Add"
msgstr "Añadir"
#. templates/config.tpl
-#: standard input:74
+#: standard input:104
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:77
+#: standard input:125
msgid "Clients"
msgstr "Clientes"
#. templates/status.tpl
-#: standard input:80
-msgid "Status for %1"
-msgstr "Estado para %1"
-
-#. templates/status.tpl
-#: standard input:83
+#: standard input:128
msgid "OK at %1"
msgstr "OK en %1"
#. templates/status.tpl
-#: standard input:86
+#: standard input:131
msgid "Failed at %1"
msgstr "Falló en %1"
#. templates/status.tpl
-#: standard input:89
+#: standard input:134
msgid "Client never backed up"
msgstr "Nunca se ha hecho copia de ese cliente"
#. templates/status.tpl
-#: standard input:92
+#: standard input:137
msgid "ssh-keys are working"
msgstr "las claves de ssh funcionan"
#. templates/status.tpl
-#: standard input:95
+#: standard input:140
msgid "rdiff-backup-versions differ"
msgstr "las versiones de diferencia de copias no son iguales"
#. templates/status.tpl
-#: standard input:98
+#: standard input:143
msgid "ssh-keys are not working"
msgstr "las claves de ssh no funcionan"
#. templates/status.tpl
-#: standard input:101
+#: standard input:146
msgid "Backup status"
msgstr "Estado de la copia"
#. templates/status.tpl
-#: standard input:104
+#: standard input:149
msgid "Backup last finished at %1"
msgstr "La última copia de seguridad acabó a las %1"
#. templates/status.tpl
-#: standard input:107
+#: standard input:152
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:146
+#: standard input:155
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:149
+#: standard input:158
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:152
+#: standard input:161
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:155
+#: standard input:164
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:158
+#: standard input:167
msgid "Login"
msgstr "Entrar"
-#. 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
+#: src/index.php:735
#, php-format
msgid "No client specified :("
msgstr "No se ha especificado un cliente :("
-#: src/index.php:754
+#: src/index.php:740
#, 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:788
+#: src/index.php:774
#, 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/fr.po b/po/fr.po
deleted file mode 100644
index 9b99737..0000000
--- a/po/fr.po
+++ /dev/null
@@ -1,288 +0,0 @@
-# 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.
-#
-# David Prévot <david at tilapin.org>, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: slbackup-php\n"
-"Report-Msgid-Bugs-To: \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-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. templates/config.tpl
-#: standard input:2
-msgid "Server scheduler"
-msgstr "Programmation du serveur"
-
-#. templates/config.tpl
-#: standard input:5
-msgid "Backup enabled"
-msgstr "Sauvegarde activée"
-
-#. templates/config.tpl
-#: standard input:8
-msgid "Run backup at"
-msgstr "Démarrer la sauvegarde à"
-
-#. templates/config.tpl
-#: standard input:11 input:32 src/index.php:938
-msgid "Update"
-msgstr "Mettre à jour"
-
-#. templates/config.tpl
-#. templates/login.tpl
-#: standard input:14 input:35 input:65 input:161
-msgid "Reset"
-msgstr "Réinitialiser"
-
-#. templates/config.tpl
-#: standard input:17
-msgid "Server config"
-msgstr "Configuration du serveur"
-
-#. templates/config.tpl
-#: standard input:20 input:53
-msgid "Address"
-msgstr "Adresse"
-
-#. templates/config.tpl
-#: standard input:23
-msgid "Destdir"
-msgstr "Rép. dest."
-
-#. templates/config.tpl
-#: standard input:26
-msgid "Servertype"
-msgstr "Type serveur"
-
-#. templates/config.tpl
-#: standard input:29 input:62
-msgid "User"
-msgstr "Utilisateur"
-
-#. templates/config.tpl
-#: standard input:38
-msgid "Client config"
-msgstr "Configuration du client"
-
-#. templates/config.tpl
-#: standard input:41
-msgid "Client:"
-msgstr "Client :"
-
-#. templates/config.tpl
-#. 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 "Nouveau"
-
-#. templates/config.tpl
-#: standard input:50
-msgid "Remove"
-msgstr "Retirer"
-
-#. templates/config.tpl
-#: standard input:56
-msgid "Backup Age"
-msgstr "Âge de la sauvegarde"
-
-#. templates/config.tpl
-#: standard input:59
-msgid "Clienttype"
-msgstr "Type client"
-
-#. templates/config.tpl
-#. templates/restore.tpl
-#: standard input:68 input:116
-msgid "Locations:"
-msgstr "Emplacements :"
-
-#. templates/config.tpl
-#: standard input:71 src/index.php:936
-msgid "Add"
-msgstr "Ajouter"
-
-#. templates/config.tpl
-#: standard input:74
-msgid "Delete"
-msgstr "Supprimer"
-
-#. templates/status.tpl
-#: standard input:77
-msgid "Clients"
-msgstr "Clients"
-
-#. templates/status.tpl
-#: standard input:80
-msgid "Status for %1"
-msgstr "État de %1"
-
-#. templates/status.tpl
-#: standard input:83
-msgid "OK at %1"
-msgstr "Bon à %1"
-
-#. templates/status.tpl
-#: standard input:86
-msgid "Failed at %1"
-msgstr "Échoué à %1"
-
-#. templates/status.tpl
-#: standard input:89
-msgid "Client never backed up"
-msgstr "Client jamais sauvegardé"
-
-#. templates/status.tpl
-#: standard input:92
-msgid "ssh-keys are working"
-msgstr "Les clefs SSH fonctionnent"
-
-#. templates/status.tpl
-#: standard input:95
-msgid "rdiff-backup-versions differ"
-msgstr "Les versions de rdiff-backup sont différentes"
-
-#. templates/status.tpl
-#: standard input:98
-msgid "ssh-keys are not working"
-msgstr "Les clefs SSH ne fonctionnent pas"
-
-#. templates/status.tpl
-#: standard input:101
-msgid "Backup status"
-msgstr "État de sauvegarde"
-
-#. templates/status.tpl
-#: standard input:104
-msgid "Backup last finished at %1"
-msgstr "La dernière sauvegarde s'est terminée à %1"
-
-#. templates/status.tpl
-#: standard input:107
-msgid "A new backup started at %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:146
-msgid "To read the configuration, you must log in as %1 on %2."
-msgstr ""
-"Pour lire la configuration, vous devez vous connecter en tant que %1 sur %2."
-
-#. templates/login.tpl
-#: standard input:149
-msgid "Please enter the password for the %1 account on %2:"
-msgstr "Veuillez entrer le mot de passe du compte %1 sur %2 :"
-
-#. templates/login.tpl
-#: 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: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:158
-msgid "Login"
-msgstr "Connexion"
-
-#. templates/maint.tpl
-#: standard input:170
-msgid "Oldest snapshot to keep:"
-msgstr "Plus vieil instantané à garder :"
-
-#. 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 "Pas de client indiqué"
-
-#: src/index.php:754
-#, php-format
-msgid "Unable to find %s in the list of clients."
-msgstr "Impossible de trouver %s dans la liste des clients."
-
-#: src/index.php:788
-#, php-format
-msgid "Unable to find %s in the locations of %s."
-msgstr "Impossible de trouver %s dans les emplacements de %s."
diff --git a/po/nb_NO.po b/po/nb_NO.po
index f40d030..1c43dcc 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,237 +7,242 @@ msgid ""
msgstr ""
"Project-Id-Version: slbackup 0.0.1\n"
"Report-Msgid-Bugs-To: \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"
+"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"
"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
-#: standard input:2
+#. 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
msgid "Server scheduler"
msgstr "Tidsplanlegging"
#. templates/config.tpl
-#: standard input:5
+#: standard input:35
msgid "Backup enabled"
msgstr "Sikkerhetskopiering aktivert"
#. templates/config.tpl
-#: standard input:8
+#: standard input:38
msgid "Run backup at"
msgstr "Kjør sikkerhetskopiering klokken"
#. templates/config.tpl
-#: standard input:11 input:32 src/index.php:938
+#: standard input:41 input:62 src/index.php:924
msgid "Update"
msgstr "Oppdater"
#. templates/config.tpl
#. templates/login.tpl
-#: standard input:14 input:35 input:65 input:161
+#: standard input:44 input:65 input:95 input:170
msgid "Reset"
msgstr "Tilbakestill"
#. templates/config.tpl
-#: standard input:17
+#: standard input:47
msgid "Server config"
msgstr "Konfigurasjon for tjener"
#. templates/config.tpl
-#: standard input:20 input:53
+#: standard input:50 input:83
msgid "Address"
msgstr "Adresse"
#. templates/config.tpl
-#: standard input:23
+#: standard input:53
msgid "Destdir"
msgstr "Målkatalog"
#. templates/config.tpl
-#: standard input:26
+#: standard input:56
msgid "Servertype"
msgstr "Type"
#. templates/config.tpl
-#: standard input:29 input:62
+#: standard input:59 input:92
msgid "User"
msgstr "Bruker"
#. templates/config.tpl
-#: standard input:38
+#: standard input:68
msgid "Client config"
msgstr "Konfigurasjon av klienter"
#. templates/config.tpl
-#: standard input:41
+#: standard input:71
msgid "Client:"
msgstr "Klient:"
#. templates/config.tpl
-#. templates/restore.tpl
-#. templates/maint.tpl
-#: standard input:44 input:113 input:167
-msgid "Choose"
-msgstr "Velg"
-
-#. templates/config.tpl
-#: standard input:47
+#: standard input:77
msgid "New"
msgstr "Ny"
#. templates/config.tpl
-#: standard input:50
+#: standard input:80
msgid "Remove"
msgstr "Slett"
#. templates/config.tpl
-#: standard input:56
+#: standard input:86
msgid "Backup Age"
msgstr "Alder på backup"
#. templates/config.tpl
-#: standard input:59
+#: standard input:89
msgid "Clienttype"
msgstr "Type"
#. templates/config.tpl
#. templates/restore.tpl
-#: standard input:68 input:116
+#: standard input:98 input:113
msgid "Locations:"
msgstr "Kataloger:"
#. templates/config.tpl
-#: standard input:71 src/index.php:936
+#: standard input:101 src/index.php:922
msgid "Add"
msgstr "Legg til"
#. templates/config.tpl
-#: standard input:74
+#: standard input:104
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:77
+#: standard input:125
msgid "Clients"
msgstr "Klient"
#. templates/status.tpl
-#: standard input:80
-msgid "Status for %1"
-msgstr "Status for %1"
-
-#. templates/status.tpl
-#: standard input:83
+#: standard input:128
msgid "OK at %1"
msgstr "OK %1"
#. templates/status.tpl
-#: standard input:86
+#: standard input:131
msgid "Failed at %1"
msgstr "Feiler %1"
#. templates/status.tpl
-#: standard input:89
+#: standard input:134
msgid "Client never backed up"
msgstr "Det er aldri tatt sikkerhetskopi av klienten"
#. templates/status.tpl
-#: standard input:92
+#: standard input:137
msgid "ssh-keys are working"
msgstr "sshnøkler er satt rett opp"
#. templates/status.tpl
-#: standard input:95
+#: standard input:140
msgid "rdiff-backup-versions differ"
msgstr "Det er forskjellig versjon av rdiff-backup"
#. templates/status.tpl
-#: standard input:98
+#: standard input:143
msgid "ssh-keys are not working"
msgstr "sshnøkler er ikke satt korrekt opp"
#. templates/status.tpl
-#: standard input:101
+#: standard input:146
msgid "Backup status"
msgstr "Status for Sikkerhetskopiering"
#. templates/status.tpl
-#: standard input:104
+#: standard input:149
msgid "Backup last finished at %1"
msgstr "Sikkerhetskopiering ble fullført %1"
#. templates/status.tpl
-#: standard input:107
+#: standard input:152
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:146
+#: standard input:155
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:149
+#: standard input:158
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:152
+#: standard input:161
msgid ""
"WARNING: you are about to send you password over an unencrypted link, please "
"ask your administrator to enable https"
@@ -247,40 +252,29 @@ msgstr ""
"for denne applikasjonen"
#. templates/login.tpl
-#: standard input:155
+#: standard input:164
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:158
+#: standard input:167
msgid "Login"
msgstr "Logg inn"
-#. 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
+#: src/index.php:735
#, php-format
msgid "No client specified :("
msgstr "Ingen klient ble valgt å slette"
-#: src/index.php:754
+#: src/index.php:740
#, php-format
msgid "Unable to find %s in the list of clients."
msgstr "Fant ikke klienten %s i listen."
-#: src/index.php:788
+#: src/index.php:774
#, 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 d6864f8..01805e8 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: 2012-01-17 20:55+0100\n"
+"POT-Creation-Date: 2007-04-25 10:31+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"
@@ -16,266 +16,261 @@ 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
-#: standard input:2
+#. 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
msgid "Server scheduler"
msgstr ""
#. templates/config.tpl
-#: standard input:5
+#: standard input:35
msgid "Backup enabled"
msgstr ""
#. templates/config.tpl
-#: standard input:8
+#: standard input:38
msgid "Run backup at"
msgstr ""
#. templates/config.tpl
-#: standard input:11 standard input:32 src/index.php:938
+#: standard input:41 standard input:62 src/index.php:924
msgid "Update"
msgstr ""
#. templates/config.tpl
#. templates/login.tpl
-#: standard input:14 standard input:35 standard input:65 standard input:161
+#: standard input:44 standard input:65 standard input:95 standard input:170
msgid "Reset"
msgstr ""
#. templates/config.tpl
-#: standard input:17
+#: standard input:47
msgid "Server config"
msgstr ""
#. templates/config.tpl
-#: standard input:20 standard input:53
+#: standard input:50 standard input:83
msgid "Address"
msgstr ""
#. templates/config.tpl
-#: standard input:23
+#: standard input:53
msgid "Destdir"
msgstr ""
#. templates/config.tpl
-#: standard input:26
+#: standard input:56
msgid "Servertype"
msgstr ""
#. templates/config.tpl
-#: standard input:29 standard input:62
+#: standard input:59 standard input:92
msgid "User"
msgstr ""
#. templates/config.tpl
-#: standard input:38
+#: standard input:68
msgid "Client config"
msgstr ""
#. templates/config.tpl
-#: standard input:41
+#: standard input:71
msgid "Client:"
msgstr ""
#. templates/config.tpl
-#. templates/restore.tpl
-#. templates/maint.tpl
-#: standard input:44 standard input:113 standard input:167
-msgid "Choose"
-msgstr ""
-
-#. templates/config.tpl
-#: standard input:47
+#: standard input:77
msgid "New"
msgstr ""
#. templates/config.tpl
-#: standard input:50
+#: standard input:80
msgid "Remove"
msgstr ""
#. templates/config.tpl
-#: standard input:56
+#: standard input:86
msgid "Backup Age"
msgstr ""
#. templates/config.tpl
-#: standard input:59
+#: standard input:89
msgid "Clienttype"
msgstr ""
#. templates/config.tpl
#. templates/restore.tpl
-#: standard input:68 standard input:116
+#: standard input:98 standard input:113
msgid "Locations:"
msgstr ""
#. templates/config.tpl
-#: standard input:71 src/index.php:936
+#: standard input:101 src/index.php:922
msgid "Add"
msgstr ""
#. templates/config.tpl
-#: standard input:74
+#: standard input:104
msgid "Delete"
msgstr ""
-#. templates/status.tpl
-#: standard input:77
-msgid "Clients"
+#. 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"
msgstr ""
#. templates/status.tpl
-#: standard input:80
-msgid "Status for %1"
+#: standard input:125
+msgid "Clients"
msgstr ""
#. templates/status.tpl
-#: standard input:83
+#: standard input:128
msgid "OK at %1"
msgstr ""
#. templates/status.tpl
-#: standard input:86
+#: standard input:131
msgid "Failed at %1"
msgstr ""
#. templates/status.tpl
-#: standard input:89
+#: standard input:134
msgid "Client never backed up"
msgstr ""
#. templates/status.tpl
-#: standard input:92
+#: standard input:137
msgid "ssh-keys are working"
msgstr ""
#. templates/status.tpl
-#: standard input:95
+#: standard input:140
msgid "rdiff-backup-versions differ"
msgstr ""
#. templates/status.tpl
-#: standard input:98
+#: standard input:143
msgid "ssh-keys are not working"
msgstr ""
#. templates/status.tpl
-#: standard input:101
+#: standard input:146
msgid "Backup status"
msgstr ""
#. templates/status.tpl
-#: standard input:104
+#: standard input:149
msgid "Backup last finished at %1"
msgstr ""
#. templates/status.tpl
-#: standard input:107
+#: standard input:152
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:146
+#: standard input:155
msgid "To read the configuration, you must log in as %1 on %2."
msgstr ""
#. templates/login.tpl
-#: standard input:149
+#: standard input:158
msgid "Please enter the password for the %1 account on %2:"
msgstr ""
#. templates/login.tpl
-#: standard input:152
+#: standard input:161
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:155
+#: standard input:164
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:158
+#: standard input:167
msgid "Login"
msgstr ""
-#. 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
+#: src/index.php:735
#, php-format
msgid "No client specified :("
msgstr ""
-#: src/index.php:754
+#: src/index.php:740
#, php-format
msgid "Unable to find %s in the list of clients."
msgstr ""
-#: src/index.php:788
+#: src/index.php:774
#, php-format
msgid "Unable to find %s in the locations of %s."
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 8689303..962b470 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: 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"
+"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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. templates/config.tpl
+#. 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
msgid "Server scheduler"
msgstr "Schemaläggare"
#. templates/config.tpl
-#: standard input:5
+#: standard input:35
msgid "Backup enabled"
msgstr "Säkerhetskopiering aktiverad"
#. templates/config.tpl
-#: standard input:8
+#: standard input:38
msgid "Run backup at"
msgstr "Kör säkerhetskopiering klockan"
#. templates/config.tpl
-#: standard input:11 input:32 src/index.php:938
+#: standard input:41
+#: standard input:62
+#: src/index.php:924
msgid "Update"
msgstr "Uppdatera"
#. templates/config.tpl
#. templates/login.tpl
-#: standard input:14 input:35 input:65 input:161
+#: standard input:44
+#: standard input:65
+#: standard input:95
+#: standard input:170
msgid "Reset"
msgstr "Nollställ"
#. templates/config.tpl
-#: standard input:17
+#: standard input:47
msgid "Server config"
msgstr "Serverkonfiguration"
#. templates/config.tpl
-#: standard input:20 input:53
+#: standard input:50
+#: standard input:83
msgid "Address"
msgstr "Adress"
#. templates/config.tpl
-#: standard input:23
+#: standard input:53
msgid "Destdir"
msgstr "Målkatalog"
#. templates/config.tpl
-#: standard input:26
+#: standard input:56
msgid "Servertype"
msgstr "Servertyp"
#. templates/config.tpl
-#: standard input:29 input:62
+#: standard input:59
+#: standard input:92
msgid "User"
msgstr "Användare"
#. templates/config.tpl
-#: standard input:38
+#: standard input:68
msgid "Client config"
msgstr "Klientkonfiguration"
#. templates/config.tpl
-#: standard input:41
+#: standard input:71
msgid "Client:"
msgstr "Klient:"
#. templates/config.tpl
-#. templates/restore.tpl
-#. templates/maint.tpl
-#: standard input:44 input:113 input:167
-msgid "Choose"
-msgstr "Välj"
-
-#. templates/config.tpl
-#: standard input:47
+#: standard input:77
msgid "New"
msgstr "Ny"
#. templates/config.tpl
-#: standard input:50
+#: standard input:80
msgid "Remove"
msgstr "Ta bort"
#. templates/config.tpl
-#: standard input:56
+#: standard input:86
msgid "Backup Age"
msgstr "Ålder för säkerhetskopior"
#. templates/config.tpl
-#: standard input:59
+#: standard input:89
msgid "Clienttype"
msgstr "Klienttyp"
#. templates/config.tpl
#. templates/restore.tpl
-#: standard input:68 input:116
+#: standard input:98
+#: standard input:113
msgid "Locations:"
msgstr "Platser:"
#. templates/config.tpl
-#: standard input:71 src/index.php:936
+#: standard input:101
+#: src/index.php:922
msgid "Add"
msgstr "Lägg till"
#. templates/config.tpl
-#: standard input:74
+#: standard input:104
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:77
+#: standard input:125
msgid "Clients"
msgstr "Klienter"
#. templates/status.tpl
-#: standard input:80
-msgid "Status for %1"
-msgstr "Status för %1"
-
-#. templates/status.tpl
-#: standard input:83
+#: standard input:128
msgid "OK at %1"
msgstr "OK %1"
#. templates/status.tpl
-#: standard input:86
+#: standard input:131
msgid "Failed at %1"
msgstr "Misslyckades %1"
#. templates/status.tpl
-#: standard input:89
+#: standard input:134
msgid "Client never backed up"
msgstr "Klienten har aldrig säkerhetskopierats"
#. templates/status.tpl
-#: standard input:92
+#: standard input:137
msgid "ssh-keys are working"
msgstr "ssh-nycklarna är rätt konfigurerade"
#. templates/status.tpl
-#: standard input:95
+#: standard input:140
msgid "rdiff-backup-versions differ"
msgstr "rdiff-backup-versionerna stämmer inte överens"
#. templates/status.tpl
-#: standard input:98
+#: standard input:143
msgid "ssh-keys are not working"
msgstr "ssh-nycklarna är felkonfigurerade"
#. templates/status.tpl
-#: standard input:101
+#: standard input:146
msgid "Backup status"
msgstr "Status för säkerhetskopiering"
#. templates/status.tpl
-#: standard input:104
+#: standard input:149
msgid "Backup last finished at %1"
msgstr "Säkerhetskopieringen färdigställdes %1"
#. templates/status.tpl
-#: standard input:107
+#: standard input:152
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:146
+#: standard input:155
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:149
+#: standard input:158
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: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"
+#: 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"
#. templates/login.tpl
-#: 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"
+#: 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"
#. templates/login.tpl
-#: standard input:158
+#: standard input:167
msgid "Login"
msgstr "Logga in"
-#. 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
+#: src/index.php:735
#, php-format
msgid "No client specified :("
msgstr "Ingen klient angiven :("
-#: src/index.php:754
+#: src/index.php:740
#, php-format
msgid "Unable to find %s in the list of clients."
msgstr "Kunde inte hitta %s i listan över klienter."
-#: src/index.php:788
+#: src/index.php:774
#, 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 3eb90c6..6df4065 100644
--- a/src/functions.php
+++ b/src/functions.php
@@ -60,15 +60,13 @@ function loadConfig () {
}
function loadLocale () {
- $found_locale = "";
- if (array_key_exists('locale', $_COOKIE))
- $found_locale = $_COOKIE['locale'];
-
+ $found_locale = $_COOKIE['locale'] ;
+
if ($found_locale == "" && $handle = @opendir ('../locales')) {
- $translations = array () ;
+ $all_locales = array () ;
while (false !== ($file = readdir ($handle))) {
if (is_dir ('../locales/' . $file . '/LC_MESSAGES')) {
- $translations = array_merge ($translations, array ($file)) ;
+ $all_locales = array_merge ($all_locales, array ($file)) ;
}
}
closedir ($handle) ;
@@ -78,56 +76,32 @@ 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 ($translations as $translation) {
- if ($translation == $lang)
- $locale_exact = $lang ;
- elseif (!isset ($locale_match)) {
- if (strpos ($translation, $lang) === 0)
- $locale_match = $translation ;
- }
+ 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 (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))
- $locale = setlocale (LC_ALL, $found_locale . ".UTF8");
+ $locale = setlocale (LC_ALL, $found_locale) ;
+ if (empty($locale))
+ setlocale (LC_ALL, $found_locale . ".UTF8");
bindtextdomain ("slbackup-php", "../locales/");
bind_textdomain_codeset ("slbackup-php", "UTF-8");
textdomain ("slbackup-php");
@@ -166,5 +140,4 @@ function debug ($mixed) {
print_r ($mixed);
echo "\n</pre>\n" ;
}
-
?>
diff --git a/src/index.php b/src/index.php
index af2fad9..0af7099 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 | sort '",
+ $cmd = sprintf ("ssh %s %s@%s 'find %s/rdiff-backup-data -maxdepth 1 -name \"increments.*\" -printf %s'",
$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,8 +406,6 @@ 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) ;
@@ -416,19 +414,6 @@ 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) ;
- }
-
}
@@ -583,50 +568,36 @@ global $backuphost, $backupuser, $logfile, $ssh_options, $ssh_askpass ;
require_once ('functions.php') ;
loadConfig () ;
-require('/usr/share/php/smarty3/Smarty.class.php') ;
+require('/usr/share/php/smarty/libs/Smarty.class.php') ;
session_start() ;
+$authenticated = ($_COOKIE['Authenticated'] == "True") ;
loadLocale () ;
ob_start ();
$smarty = new Smarty();
$smarty->template_dir = $smarty_templ ;
$smarty->compile_dir = $smarty_compile ;
-unset ($_COOKIE['smarty_templ']);
-unset ($_COOKIE['smarty_compile']);
# fetch script to use whith passing the ssh-password
$ssh_askpass = sprintf ("%s/script/mypass.sh",
dirname (dirname ($_SERVER["SCRIPT_FILENAME"])));
-$arguments = $_REQUEST;
-
-# merge _COOKIE and _REQUEST
-$allowed_cookie_keys = array('nonhttps', 'xorstring', 'PHPSESSID', 'locale',);
-foreach ($_COOKIE as $key => $value) {
- if ((! array_key_exists($key, $arguments)) && (in_array($key, $allowed_cookie_keys))) {
- if (is_string($key) && is_string($value)) {
- $arguments[$key] = $value;
- }
- }
-}
# Fetch arguments passed as the script is executed
-foreach ($arguments as $key => $value) {
+foreach ($_REQUEST as $key => $value) {
switch ($key) {
case "smarty_templ":
case "smarty_compile":
case "locale":
case "PHPSESSID":
break ;
- case "nonhttps":
- $nonhttps = $value ;
case "Passwd":
$passwd = $value ;
$submit = "status" ;
break ;
case "xorstring":
if (empty($passwd))
- $xorstring = base64_decode($value) ;
+ $xorstring = $value ;
else break ;
if (empty ($value))
break ;
@@ -669,8 +640,6 @@ foreach ($arguments as $key => $value) {
}
}
-unset ($arguments);
-
if ($submit == "logout") {
unset ($passwd) ;
unset ($xorstring) ;
@@ -697,7 +666,7 @@ if (empty($encrypt) || empty ($xorstring)) {
$xorstring = xorstring ($encrypt, $passwd) ;
}
-setcookie ('xorstring', base64_encode($xorstring)) ;
+setcookie ('xorstring', $xorstring) ;
$scheduler = readcron ($passwd) ;
diff --git a/templates/login.tpl b/templates/login.tpl
index 22bf015..487e104 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 41752aa..50489bc 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 af52faa..2a19f78 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 12c1831..56448b6 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>{t 1=$client}Status for %1{/t}
+ <LI>Status for {$client}
<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.failed|date_format:"%c"}Failed at %1{/t}
+ {t 1=$values.ok|date_format:"%c"}Failed at %1{/t}
{elseif $values.started == ''}
{t}Client never backed up{/t}
{/if}
@@ -48,7 +48,7 @@
<H2>{t}Backup status{/t}</H2>
{t 1=$log.end|date_format:"%c"}Backup last finished at %1{/t}<BR>
- {if $log.start > $log.end}
+ {if $log.start > $log.end }
{t 1=$log.start|date_format:"%c"}A new backup started at %1{/t}<BR>
{/if}
</Body>
hooks/post-receive
--
slbackup-php.git (Debian package slbackup-php)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "slbackup-php.git" (Debian package slbackup-php).
More information about the debian-edu-commits
mailing list