Re: [PATCH] backup.cgi: New info text for restore

[Matthias Fischer <matthias.fischer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 11691 bytes --]

Hi,

On 06.04.2021 11:51, Michael Tremer wrote:
> Hello,
> 
> I agree with the changes of the text but isn’t the bold font a bit shouty?

No problem for me - I'll prepare a V2 without bold...

> -Michael
> 
>> On 5 Apr 2021, at 13:57, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote:
>> 
>> As a start:
>> Altered the info text for restore to make clear that only the addon *configs*
>> are restored, not the addons themselves.
>> 
>> I tried to take all languages in account - all translation errors are the property of the
>> translation algorithms. ;-)
>> 
>> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
>> ---
>> 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..dab18e6c2 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 <b>Hauptsicherung</b> und anschließend die Sicherung(en) der <b>Addon-Konfiguration(en)</b> ein.<br />Es werden lediglich die gesicherten <b>Konfigurationsdatei(en)</b> der Addons, <b>nicht</b> die installierten Addons wiederhergestellt!<br />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..2511f485d 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 <b>main backup</b> first and then the backup(s) of the <b>addon configuration(s)</b>.<br />Only the backed up addon <b>configuration file(s)</b> will be restored, <b>not</b> the installed addons!<br />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..0855e9a1a 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 <b>copia de seguridad principal</b> y luego la(s) copia(s) de seguridad de la(s) configuración(es) de los <b>addon(es)</b>.<br />Sólo se restaurarán los <b>archivos de configuración de los addons</b> de los que se ha hecho copia de seguridad, <b>no</b> los addons instalados.<br />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..274beb0c3 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 <b>sauvegarde principale</b>, puis la ou les sauvegardes de la ou des <b>configurations des addons</b>.<br />Seuls les <b>fichiers de configuration d\'addons</b> sauvegardés seront restaurés, <b>pas</b> les addons installés!.<br />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..8b14a77c8 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 &eacute; stato scaricato.',
>> +'backupwarning' => 'Importa prima il tuo <b>backup principale</b> e poi il/i backup della/e <b>configurazione/i degli addon</b>.<br />Solo i file di <b>configurazione addon</b> di cui è stato fatto il backup saranno ripristinati, <b>non</b> gli addon installati!<br />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..ba06b10ea 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 <b>hoofdback-up</b> en dan de back-up(en) van de <b>addon configuratie(s)</b>.<br />Alleen de <b>configuratiebestanden</b> van de addons waarvan een backup is gemaakt worden hersteld, <b>niet</b> de geïnstalleerde addons!<br />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..25e6df71f 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 <b>główną kopię zapasową</b>, a następnie kopie zapasowe <b>konfiguracji dodatków</b>.<br />Tylko kopie zapasowe <b>plików konfiguracyjnych dodatków</b> zostaną przywrócone, a <b>nie</b> zainstalowane dodatki!<br />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..45f512783 100644
>> --- a/langs/ru/cgi-bin/ru.pl
>> +++ b/langs/ru/cgi-bin/ru.pl
>> @@ -386,7 +386,7 @@
>> 'backupaddon' => 'Резервная копия аддонов',
>> 'backupprofile' => 'Если не получается переподключиться, укажите другой профиль',
>> 'backups' => 'Резервные копии',
>> -'backupwarning' => 'Пожалуйста, сперва восстановите резервную копию системы, а затем аддоны. <br> Пожалуйста сохраните оригинальное название файла, которое было при скачивании.',
>> +'backupwarning' => 'Сначала импортируйте <b>основную резервную копию</b>, а затем резервную копию <b>конфигурации (ов) надстройки</b>.<br />Только зарезервированные <b>файлы конфигурации надстройки</b> будут восстановлены, <b>не</b> установленные дополнения!<br />Также убедитесь, что в резервных копиях сохранены исходные имена файлов.',
>> '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..7043c5b26 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 <b>ana yedeğinizi</b> ve ardından <b>eklenti yapılandırmasının</b> yedeklerini içe aktarın.<br />Yalnızca yedeklenen eklenti <b>yapılandırma dosyaları</b> geri yüklenecek, yüklü eklentiler <b> değil</b>!<br />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.',
>> -- 
>> 2.18.0
>> 
>