From patchwork Tue Apr 6 16:46:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 4108 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FFD2X0XWNz3yBV for ; Tue, 6 Apr 2021 16:47:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FFD2V5tJ9zjw; Tue, 6 Apr 2021 16:46:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FFD2V4R2fz2xcy; Tue, 6 Apr 2021 16:46:58 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FFD2S6Bnsz2xYj for ; Tue, 6 Apr 2021 16:46:56 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FFD2S25MszHt for ; Tue, 6 Apr 2021 16:46:56 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1617727616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GQmTYoquc9lHbXo2HZputEj2ECR7HG2XftHDwYWxISg=; b=jPkhliB4K9Z/JGYMaqxwok1U/1e4p+UbFRr4ZDsvdAQjUjnwAxc92YKcFe9hoKNGA6cVtL stkCqh9KgqCWg+Dw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1617727616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GQmTYoquc9lHbXo2HZputEj2ECR7HG2XftHDwYWxISg=; b=jDFo0kyxH6FDZttWNcgMxHyhIvPpuSl4RF43eOyXa5IJP2V1rOplrfUaKEIc1evc4o/JOf XdXIiNeYfIA09hYz+hUWrTOlPK3gJrAKEtqY8Uv2By1+KUiHplIIdyZwyKND8xlnOQeQ1K VAORezkY/Pv0vCZHhRRWIxTwmus9QxX/eMK4uPyv4ZDT1cRoauEFeMYD9FGNSaM7Txi6Zm RXYw3SYlzY6pqB5GN5PxhdM/3NQ8sQgx7XoeE155+WVTxInbDoYYy1vDtqk8KkaOWEe5nB E9BRoQpgaWlI8znernrY931Uh2wpMo2c+Gd19hXhMf8NumrfwPIdyjKb3t/Wtw== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] [V2] backup.cgi: New info text for restore Date: Tue, 6 Apr 2021 18:46:52 +0200 Message-Id: <20210406164652.1772-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This time without bold. ;-) Altered the info text for restore to make clear that only the addon configs are restored, not the addons themselves. Signed-off-by: Matthias Fischer --- langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 2 +- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- langs/it/cgi-bin/it.pl | 2 +- langs/nl/cgi-bin/nl.pl | 2 +- langs/pl/cgi-bin/pl.pl | 2 +- langs/ru/cgi-bin/ru.pl | 2 +- langs/tr/cgi-bin/tr.pl | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 737ddf01d..95af3155b 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -472,7 +472,7 @@ 'backupaddon' => 'Add-On-Sicherung', 'backupprofile' => 'Falls die Wiederverbindung scheitert, auf dieses Profil umschalten', 'backups' => 'Sicherungen', -'backupwarning' => 'Bitte stellen Sie zuerst Ihre Hauptsicherung wieder her und anschließend die der Add-Ons. Achten Sie darauf, dass die Sicherungen ihre originalen Dateinamen behalten.', +'backupwarning' => 'Spielen Sie zuerst Ihre Hauptsicherung und anschließend die Sicherung(en) der Addon-Konfiguration(en) ein.
Es werden lediglich die gesicherten Konfigurationsdatei(en) der Addons, nicht die installierten Addons wiederhergestellt!
Achten Sie außerdem darauf, dass die Sicherungen ihre originalen Dateinamen behalten.', 'bad characters in' => 'Ungültige Zeichen in ', 'bad characters in script field' => 'Nicht erlaubte Zeichen im Skriptnamen', 'bad characters in the telephone number field' => 'Nicht erlaubte(s) Zeichen im Feld Telefonnummer.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 1d059aac8..dc1fd8d67 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -486,7 +486,7 @@ 'backupaddon' => 'Addon Backup', 'backupprofile' => 'In case reconnection fails, switch to profile', 'backups' => 'backups', -'backupwarning' => 'Please first restore your main backup and after this your addon backups. Please keep the original filename, given when you download.', +'backupwarning' => 'Import your main backup first and then the backup(s) of the addon configuration(s).
Only the backed up addon configuration file(s) will be restored, not the installed addons!
Also make sure that the backups keep their original file names.', 'bad characters in' => 'Bad characters in ', 'bad characters in script field' => 'Bad characters in script field', 'bad characters in the telephone number field' => 'Bad characters in the telephone number field.', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 8c744c3c4..c9a7496bc 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -440,7 +440,7 @@ 'backupaddon' => 'Addon Backup', 'backupprofile' => 'En caso de fallo en la reconexión, cambie de perfil.', 'backups' => 'respaldos', -'backupwarning' => 'Por favor primer restaure su respaldo principal y después de eso el respaldo de los addons. Por favor mantenga el nombre original que recibió al descargarlos.', +'backupwarning' => 'Importe primero su copia de seguridad principal y luego la(s) copia(s) de seguridad de la(s) configuración(es) de los addon(es).
Sólo se restaurarán los archivos de configuración de los addons de los que se ha hecho copia de seguridad, no los addons instalados.
Asegúrese también de que las copias de seguridad mantienen sus nombres de archivo originales.', 'bad characters in' => 'Caracteres equivocados en', 'bad characters in script field' => 'Caracteres equivocados en el campo script', 'bad characters in the telephone number field' => 'Caracteres equivocados en el campo número telefónico.', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index c7486e189..301109477 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -492,7 +492,7 @@ 'backupaddon' => 'Sauvegarde additionnelle', 'backupprofile' => 'Dans le cas ou la reconnexion échouerait, changer de profil ', 'backups' => 'Sauvegardes', -'backupwarning' => 'Veuillez restaurer votre sauvegarde principale et ensuite vos sauvegardes additionnelles. Veuillez conserver le nom de fichier fourni lors du téléchargement.', +'backupwarning' => 'Importez d\'abord votre sauvegarde principale, puis la ou les sauvegardes de la ou des configurations des addons.
Seuls les fichiers de configuration d\'addons sauvegardés seront restaurés, pas les addons installés!.
Assurez-vous également que les sauvegardes conservent leurs noms de fichiers originaux.', 'bad characters in' => 'Mauvais caractères dans ', 'bad characters in script field' => 'Mauvais caractères dans le champ de script', 'bad characters in the telephone number field' => 'Mauvais caractères dans le champ du numéro de téléphone', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 4841d0017..e82ecfd35 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -408,7 +408,7 @@ 'backupaddon' => 'Addon Backup', 'backupprofile' => 'In case reconnection fails, switch to profile', 'backups' => 'Backups', -'backupwarning' => 'Per favore prima di ripristinare il backup del sistema e/o il backup addon, Si prega di mantenere il nome del file originale di quando é stato scaricato.', +'backupwarning' => 'Importa prima il tuo backup principale e poi il/i backup della/e configurazione/i degli addon.
Solo i file di configurazione addon di cui è stato fatto il backup saranno ripristinati, non gli addon installati!
Assicurati anche che i backup mantengano i nomi originali dei file.', 'bad characters in' => 'Bad characters in ', 'bad characters in script field' => 'Bad characters in script field', 'bad characters in the telephone number field' => 'Bad characters in the telephone number field.', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 18103d37c..55927839e 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -406,7 +406,7 @@ 'backupaddon' => 'Back-up toevoeging', 'backupprofile' => 'In geval het opnieuw verbinden mislukt, schakel dan over naar profiel', 'backups' => 'back-ups', -'backupwarning' => 'Zet a.u.b. eerst uw hoofdback-ups terug en daarna de toevoegde back-ups. Gebruik de originele bestandsnaam die u gebruikt heeft voor de download.', +'backupwarning' => 'Importeer eerst uw hoofdback-up en dan de back-up(en) van de addon configuratie(s).
Alleen de configuratiebestanden van de addons waarvan een backup is gemaakt worden hersteld, niet de geïnstalleerde addons!
Zorg er ook voor dat de back-ups hun oorspronkelijke bestandsnamen behouden.', 'bad characters in' => 'Ongeldige tekens in ', 'bad characters in script field' => 'Ongeldige tekens in scriptveld', 'bad characters in the telephone number field' => 'Ongeldige tekens in telefoonnummerveld', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index d16328778..147db051c 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -388,7 +388,7 @@ 'backupaddon' => 'Kopia dodatków', 'backupprofile' => 'Jeżeli ponowne połączenie nie powiedzie się przełącz na profil', 'backups' => 'kopie', -'backupwarning' => 'Najpierw należy przywrócić kopię podstawową, a następnie kopię dodatków. Proszę nie zmieniać nazwy pobranych plików z kopiami.', +'backupwarning' => 'Najpierw zaimportuj główną kopię zapasową, a następnie kopie zapasowe konfiguracji dodatków.
Tylko kopie zapasowe plików konfiguracyjnych dodatków zostaną przywrócone, a nie zainstalowane dodatki!
Upewnij się również, że kopie zapasowe zachowują oryginalne nazwy plików.', 'bad characters in' => 'Niepoprawny znak w ', 'bad characters in script field' => 'Niepoprawny znak w polu skryptu', 'bad characters in the telephone number field' => 'Niepoprawny znak w polu z numerem telefonu.', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 58581d353..0d986135d 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -386,7 +386,7 @@ 'backupaddon' => 'Резервная копия аддонов', 'backupprofile' => 'Если не получается переподключиться, укажите другой профиль', 'backups' => 'Резервные копии', -'backupwarning' => 'Пожалуйста, сперва восстановите резервную копию системы, а затем аддоны.
Пожалуйста сохраните оригинальное название файла, которое было при скачивании.', +'backupwarning' => 'Сначала импортируйте основную резервную копию, а затем резервную копию конфигурации (ов) надстройки.
Только зарезервированные файлы конфигурации надстройки будут восстановлены, не установленные дополнения!
Также убедитесь, что в резервных копиях сохранены исходные имена файлов.', 'bad characters in' => 'Неправильные символы в ', 'bad characters in script field' => 'Неправильные символы в поле скрипта', 'bad characters in the telephone number field' => 'Неправильные символы в поле телефонного номера.', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 14de385c1..36c4782d6 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -472,7 +472,7 @@ 'backupaddon' => 'Eklentiyi yedekle', 'backupprofile' => 'Yeniden bağlanma başarısız durumda. Profile geçin', 'backups' => 'Yedekler', -'backupwarning' => 'Eklenti yedeklemesi için lütfen önce geri yükleme yedeklemesi oluşturun. İndirme zamanı verilen orjinal dosya ile devam edin.', +'backupwarning' => 'Önce ana yedeğinizi ve ardından eklenti yapılandırmasının yedeklerini içe aktarın.
Yalnızca yedeklenen eklenti yapılandırma dosyaları geri yüklenecek, yüklü eklentiler değil!
Ayrıca yedeklerin orijinal dosya adlarını koruduğundan emin olun.', 'bad characters in' => 'Yablış karakterler ', 'bad characters in script field' => 'Komut alanındaki yanlış karakterler', 'bad characters in the telephone number field' => 'Telefon numarası alanındaki yanlış karakterler.',