[debian-edu-commits] debian-edu/slbackup-php.git (#34) - master (branch) updated: debian/0.3-3-9-gddae78d
Mike Gabriel
sunweaver at alioth.debian.org
Fri Mar 22 22:06:16 UTC 2013
The branch, master has been updated
via ddae78ddd37cd09d4f9a22c808c80320f537cab7 (commit)
from 4ae4d1940f03d983b7735d62eb522ed154f6a699 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
.../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 -
9 files changed, 1 insertions(+), 2237 deletions(-)
delete mode 100644 debian/patches/001_slbackup-php_cookie+request-merge.patch
delete mode 100644 debian/patches/002_slbackup-php_restore-paths-with-blanks.patch
delete mode 100644 debian/patches/003_slbackup-php_fix-failed-in-status-template.patch
delete mode 100644 debian/patches/004_slbackup-php_translate-status-for.patch
delete mode 100644 debian/patches/099_slbackup-php_i18n-pot-po-update.patch
delete mode 100644 debian/patches/100_slbackup-php_fix-language-detection.patch
delete mode 100644 debian/patches/101_slbackup-php_i18n-de.patch
delete mode 100644 debian/patches/series
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8d88edd..307857d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ slbackup-php (0.4.3-2) UNRELEASED; urgency=low
requested by the Debian release team. This reduction of changes is
to make a transition of slbackup-php 0.4.3 into wheezy possible.
* Cherry-picks from 0.4.3-1:
+ + Drop of complete patch series.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 29 Aug 2012 22:49:05 +0200
diff --git a/debian/patches/001_slbackup-php_cookie+request-merge.patch b/debian/patches/001_slbackup-php_cookie+request-merge.patch
deleted file mode 100644
index 4ad804d..0000000
--- a/debian/patches/001_slbackup-php_cookie+request-merge.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-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
deleted file mode 100644
index 2eb5c31..0000000
--- a/debian/patches/002_slbackup-php_restore-paths-with-blanks.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-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
deleted file mode 100644
index 0939b66..0000000
--- a/debian/patches/003_slbackup-php_fix-failed-in-status-template.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 6e72c19..0000000
--- a/debian/patches/004_slbackup-php_translate-status-for.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index b9ffe44..0000000
--- a/debian/patches/099_slbackup-php_i18n-pot-po-update.patch
+++ /dev/null
@@ -1,1579 +0,0 @@
-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
deleted file mode 100644
index 0f4216e..0000000
--- a/debian/patches/100_slbackup-php_fix-language-detection.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-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
deleted file mode 100644
index d269250..0000000
--- a/debian/patches/101_slbackup-php_i18n-de.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-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
deleted file mode 100644
index ecdc4e1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,7 +0,0 @@
-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
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