From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Fischer To: development@lists.ipfire.org Subject: Re: [PATCH] backup.cgi: New info text for restore Date: Tue, 06 Apr 2021 18:09:36 +0200 Message-ID: In-Reply-To: <7DA70BDE-40D3-4B4E-AA2C-FB8252E633A3@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4601251801604361160==" List-Id: --===============4601251801604361160== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, On 06.04.2021 11:51, Michael Tremer wrote: > Hello, >=20 > I agree with the changes of the text but isn=E2=80=99t the bold font a bit = shouty? No problem for me - I'll prepare a V2 without bold... > -Michael >=20 >> On 5 Apr 2021, at 13:57, Matthias Fischer = wrote: >>=20 >> As a start: >> Altered the info text for restore to make clear that only the addon *confi= gs* >> are restored, not the addons themselves. >>=20 >> I tried to take all languages in account - all translation errors are the = property of the >> translation algorithms. ;-) >>=20 >> 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(-) >>=20 >> 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' =3D> 'Add-On-Sicherung', >> 'backupprofile' =3D> 'Falls die Wiederverbindung scheitert, auf dieses Pro= fil umschalten', >> 'backups' =3D> 'Sicherungen', >> -'backupwarning' =3D> 'Bitte stellen Sie zuerst Ihre Hauptsicherung wieder= her und anschlie=C3=9Fend die der Add-Ons. Achten Sie darauf, dass die Siche= rungen ihre originalen Dateinamen behalten.', >> +'backupwarning' =3D> 'Spielen Sie zuerst Ihre Hauptsicherung und a= nschlie=C3=9Fend die Sicherung(en) der Addon-Konfiguration(en) ein.Es werden lediglich die gesicherten Konfigurationsdatei(en) der Add= ons, nicht die installierten Addons wiederhergestellt!
Achten Sie= au=C3=9Ferdem darauf, dass die Sicherungen ihre originalen Dateinamen behalt= en.', >> 'bad characters in' =3D> 'Ung=C3=BCltige Zeichen in ', >> 'bad characters in script field' =3D> 'Nicht erlaubte Zeichen im Skriptnam= en', >> 'bad characters in the telephone number field' =3D> 'Nicht erlaubte(s) Zei= chen 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' =3D> 'Addon Backup', >> 'backupprofile' =3D> 'In case reconnection fails, switch to profile', >> 'backups' =3D> 'backups', >> -'backupwarning' =3D> 'Please first restore your main backup and after thi= s your addon backups. Please keep the original filename, given when you downl= oad.', >> +'backupwarning' =3D> 'Import your main backup first and then the b= ackup(s) of the addon configuration(s).
Only the backed up addon = configuration file(s) will be restored, not the installed addon= s!
Also make sure that the backups keep their original file names.', >> 'bad characters in' =3D> 'Bad characters in ', >> 'bad characters in script field' =3D> 'Bad characters in script field', >> 'bad characters in the telephone number field' =3D> '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' =3D> 'Addon Backup', >> 'backupprofile' =3D> 'En caso de fallo en la reconexi=C3=B3n, cambie de pe= rfil.', >> 'backups' =3D> 'respaldos', >> -'backupwarning' =3D> 'Por favor primer restaure su respaldo principal y d= espu=C3=A9s de eso el respaldo de los addons. Por favor mantenga el nombre or= iginal que recibi=C3=B3 al descargarlos.', >> +'backupwarning' =3D> 'Importe primero su copia de seguridad principal<= /b> y luego la(s) copia(s) de seguridad de la(s) configuraci=C3=B3n(es) de lo= s addon(es).
S=C3=B3lo se restaurar=C3=A1n los archivos de con= figuraci=C3=B3n de los addons de los que se ha hecho copia de seguridad, = no los addons instalados.
Aseg=C3=BArese tambi=C3=A9n de que las = copias de seguridad mantienen sus nombres de archivo originales.', >> 'bad characters in' =3D> 'Caracteres equivocados en', >> 'bad characters in script field' =3D> 'Caracteres equivocados en el campo = script', >> 'bad characters in the telephone number field' =3D> 'Caracteres equivocado= s en el campo n=C3=BAmero telef=C3=B3nico.', >> 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' =3D> 'Sauvegarde additionnelle', >> 'backupprofile' =3D> 'Dans le cas ou la reconnexion =C3=A9chouerait, chang= er de profil ', >> 'backups' =3D> 'Sauvegardes', >> -'backupwarning' =3D> 'Veuillez restaurer votre sauvegarde principale et e= nsuite vos sauvegardes additionnelles. Veuillez conserver le nom de fichier f= ourni lors du t=C3=A9l=C3=A9chargement.', >> +'backupwarning' =3D> 'Importez d\'abord votre sauvegarde principale, puis la ou les sauvegardes de la ou des configurations des addons.<= br />Seuls les fichiers de configuration d\'addons sauvegard=C3=A9s se= ront restaur=C3=A9s, pas les addons install=C3=A9s!.
Assurez-vous= =C3=A9galement que les sauvegardes conservent leurs noms de fichiers origina= ux.', >> 'bad characters in' =3D> 'Mauvais caract=C3=A8res dans ', >> 'bad characters in script field' =3D> 'Mauvais caract=C3=A8res dans le cha= mp de script', >> 'bad characters in the telephone number field' =3D> 'Mauvais caract=C3=A8r= es dans le champ du num=C3=A9ro de t=C3=A9l=C3=A9phone', >> 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' =3D> 'Addon Backup', >> 'backupprofile' =3D> 'In case reconnection fails, switch to profile', >> 'backups' =3D> 'Backups', >> -'backupwarning' =3D> 'Per favore prima di ripristinare il backup del sist= ema e/o il backup addon, Si prega di mantenere il nome del file originale di = quando é stato scaricato.', >> +'backupwarning' =3D> '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 =C3=A8 stato fatto il backup saranno ripr= istinati, non gli addon installati!
Assicurati anche che i backup= mantengano i nomi originali dei file.', >> 'bad characters in' =3D> 'Bad characters in ', >> 'bad characters in script field' =3D> 'Bad characters in script field', >> 'bad characters in the telephone number field' =3D> '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' =3D> 'Back-up toevoeging', >> 'backupprofile' =3D> 'In geval het opnieuw verbinden mislukt, schakel dan = over naar profiel', >> 'backups' =3D> 'back-ups', >> -'backupwarning' =3D> 'Zet a.u.b. eerst uw hoofdback-ups terug en daarna d= e toevoegde back-ups. Gebruik de originele bestandsnaam die u gebruikt heeft = voor de download.', >> +'backupwarning' =3D> 'Importeer eerst uw hoofdback-up en dan de ba= ck-up(en) van de addon configuratie(s).
Alleen de configuratie= bestanden van de addons waarvan een backup is gemaakt worden hersteld, niet de ge=C3=AFnstalleerde addons!
Zorg er ook voor dat de back-up= s hun oorspronkelijke bestandsnamen behouden.', >> 'bad characters in' =3D> 'Ongeldige tekens in ', >> 'bad characters in script field' =3D> 'Ongeldige tekens in scriptveld', >> 'bad characters in the telephone number field' =3D> 'Ongeldige tekens in t= elefoonnummerveld', >> 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' =3D> 'Kopia dodatk=C3=B3w', >> 'backupprofile' =3D> 'Je=C5=BCeli ponowne po=C5=82=C4=85czenie nie powiedz= ie si=C4=99 prze=C5=82=C4=85cz na profil', >> 'backups' =3D> 'kopie', >> -'backupwarning' =3D> 'Najpierw nale=C5=BCy przywr=C3=B3ci=C4=87 kopi=C4= =99 podstawow=C4=85, a nast=C4=99pnie kopi=C4=99 dodatk=C3=B3w. Prosz=C4=99 n= ie zmienia=C4=87 nazwy pobranych plik=C3=B3w z kopiami.', >> +'backupwarning' =3D> 'Najpierw zaimportuj g=C5=82=C3=B3wn=C4=85 kopi= =C4=99 zapasow=C4=85, a nast=C4=99pnie kopie zapasowe konfiguracji dod= atk=C3=B3w.
Tylko kopie zapasowe plik=C3=B3w konfiguracyjnych dod= atk=C3=B3w zostan=C4=85 przywr=C3=B3cone, a nie zainstalowane doda= tki!
Upewnij si=C4=99 r=C3=B3wnie=C5=BC, =C5=BCe kopie zapasowe zachowuj= =C4=85 oryginalne nazwy plik=C3=B3w.', >> 'bad characters in' =3D> 'Niepoprawny znak w ', >> 'bad characters in script field' =3D> 'Niepoprawny znak w polu skryptu', >> 'bad characters in the telephone number field' =3D> 'Niepoprawny znak w po= lu 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' =3D> '=D0=A0=D0=B5=D0=B7=D0=B5=D1=80=D0=B2=D0=BD=D0=B0=D1=8F= =D0=BA=D0=BE=D0=BF=D0=B8=D1=8F =D0=B0=D0=B4=D0=B4=D0=BE=D0=BD=D0=BE=D0=B2', >> 'backupprofile' =3D> '=D0=95=D1=81=D0=BB=D0=B8 =D0=BD=D0=B5 =D0=BF=D0=BE= =D0=BB=D1=83=D1=87=D0=B0=D0=B5=D1=82=D1=81=D1=8F =D0=BF=D0=B5=D1=80=D0=B5=D0= =BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87=D0=B8=D1=82=D1=8C=D1=81=D1=8F, =D1=83= =D0=BA=D0=B0=D0=B6=D0=B8=D1=82=D0=B5 =D0=B4=D1=80=D1=83=D0=B3=D0=BE=D0=B9 =D0= =BF=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D1=8C', >> 'backups' =3D> '=D0=A0=D0=B5=D0=B7=D0=B5=D1=80=D0=B2=D0=BD=D1=8B=D0=B5 =D0= =BA=D0=BE=D0=BF=D0=B8=D0=B8', >> -'backupwarning' =3D> '=D0=9F=D0=BE=D0=B6=D0=B0=D0=BB=D1=83=D0=B9=D1=81=D1= =82=D0=B0, =D1=81=D0=BF=D0=B5=D1=80=D0=B2=D0=B0 =D0=B2=D0=BE=D1=81=D1=81=D1= =82=D0=B0=D0=BD=D0=BE=D0=B2=D0=B8=D1=82=D0=B5 =D1=80=D0=B5=D0=B7=D0=B5=D1=80= =D0=B2=D0=BD=D1=83=D1=8E =D0=BA=D0=BE=D0=BF=D0=B8=D1=8E =D1=81=D0=B8=D1=81=D1= =82=D0=B5=D0=BC=D1=8B, =D0=B0 =D0=B7=D0=B0=D1=82=D0=B5=D0=BC =D0=B0=D0=B4=D0= =B4=D0=BE=D0=BD=D1=8B.
=D0=9F=D0=BE=D0=B6=D0=B0=D0=BB=D1=83=D0=B9=D1=81= =D1=82=D0=B0 =D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B8=D1=82=D0=B5 =D0=BE=D1= =80=D0=B8=D0=B3=D0=B8=D0=BD=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5 =D0=BD=D0=B0= =D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5 =D1=84=D0=B0=D0=B9=D0=BB=D0=B0, =D0=BA= =D0=BE=D1=82=D0=BE=D1=80=D0=BE=D0=B5 =D0=B1=D1=8B=D0=BB=D0=BE =D0=BF=D1=80=D0= =B8 =D1=81=D0=BA=D0=B0=D1=87=D0=B8=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8.', >> +'backupwarning' =3D> '=D0=A1=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=B0 =D0=B8= =D0=BC=D0=BF=D0=BE=D1=80=D1=82=D0=B8=D1=80=D1=83=D0=B9=D1=82=D0=B5 =D0=BE= =D1=81=D0=BD=D0=BE=D0=B2=D0=BD=D1=83=D1=8E =D1=80=D0=B5=D0=B7=D0=B5=D1=80=D0= =B2=D0=BD=D1=83=D1=8E =D0=BA=D0=BE=D0=BF=D0=B8=D1=8E, =D0=B0 =D0=B7=D0=B0= =D1=82=D0=B5=D0=BC =D1=80=D0=B5=D0=B7=D0=B5=D1=80=D0=B2=D0=BD=D1=83=D1=8E =D0= =BA=D0=BE=D0=BF=D0=B8=D1=8E =D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1= =80=D0=B0=D1=86=D0=B8=D0=B8 (=D0=BE=D0=B2) =D0=BD=D0=B0=D0=B4=D1=81=D1=82=D1= =80=D0=BE=D0=B9=D0=BA=D0=B8.
=D0=A2=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE = =D0=B7=D0=B0=D1=80=D0=B5=D0=B7=D0=B5=D1=80=D0=B2=D0=B8=D1=80=D0=BE=D0=B2=D0= =B0=D0=BD=D0=BD=D1=8B=D0=B5 =D1=84=D0=B0=D0=B9=D0=BB=D1=8B =D0=BA=D0=BE=D0= =BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=B8 =D0=BD=D0=B0=D0=B4= =D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8 =D0=B1=D1=83=D0=B4=D1=83=D1=82= =D0=B2=D0=BE=D1=81=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D1= =8B, =D0=BD=D0=B5 =D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BB=D0= =B5=D0=BD=D0=BD=D1=8B=D0=B5 =D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD= =D0=B8=D1=8F!
=D0=A2=D0=B0=D0=BA=D0=B6=D0=B5 =D1=83=D0=B1=D0=B5=D0=B4=D0= =B8=D1=82=D0=B5=D1=81=D1=8C, =D1=87=D1=82=D0=BE =D0=B2 =D1=80=D0=B5=D0=B7=D0= =B5=D1=80=D0=B2=D0=BD=D1=8B=D1=85 =D0=BA=D0=BE=D0=BF=D0=B8=D1=8F=D1=85 =D1=81= =D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D1=8B =D0=B8=D1=81=D1=85=D0=BE=D0= =B4=D0=BD=D1=8B=D0=B5 =D0=B8=D0=BC=D0=B5=D0=BD=D0=B0 =D1=84=D0=B0=D0=B9=D0=BB= =D0=BE=D0=B2.', >> 'bad characters in' =3D> '=D0=9D=D0=B5=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB= =D1=8C=D0=BD=D1=8B=D0=B5 =D1=81=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB=D1=8B =D0=B2 ', >> 'bad characters in script field' =3D> '=D0=9D=D0=B5=D0=BF=D1=80=D0=B0=D0= =B2=D0=B8=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5 =D1=81=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB= =D1=8B =D0=B2 =D0=BF=D0=BE=D0=BB=D0=B5 =D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82= =D0=B0', >> 'bad characters in the telephone number field' =3D> '=D0=9D=D0=B5=D0=BF=D1= =80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5 =D1=81=D0=B8=D0=BC=D0=B2= =D0=BE=D0=BB=D1=8B =D0=B2 =D0=BF=D0=BE=D0=BB=D0=B5 =D1=82=D0=B5=D0=BB=D0=B5= =D1=84=D0=BE=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE =D0=BD=D0=BE=D0=BC=D0=B5=D1=80=D0= =B0.', >> 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' =3D> 'Eklentiyi yedekle', >> 'backupprofile' =3D> 'Yeniden ba=C4=9Flanma ba=C5=9Far=C4=B1s=C4=B1z durum= da. Profile ge=C3=A7in', >> 'backups' =3D> 'Yedekler', >> -'backupwarning' =3D> 'Eklenti yedeklemesi i=C3=A7in l=C3=BCtfen =C3=B6nce= geri y=C3=BCkleme yedeklemesi olu=C5=9Fturun. =C4=B0ndirme zaman=C4=B1 veril= en orjinal dosya ile devam edin.', >> +'backupwarning' =3D> '=C3=96nce ana yede=C4=9Finizi ve ard=C4=B1nd= an eklenti yap=C4=B1land=C4=B1rmas=C4=B1n=C4=B1n yedeklerini i=C3=A7e = aktar=C4=B1n.
Yaln=C4=B1zca yedeklenen eklenti yap=C4=B1land=C4=B1rma= dosyalar=C4=B1 geri y=C3=BCklenecek, y=C3=BCkl=C3=BC eklentiler de= =C4=9Fil!
Ayr=C4=B1ca yedeklerin orijinal dosya adlar=C4=B1n=C4=B1 k= orudu=C4=9Fundan emin olun.', >> 'bad characters in' =3D> 'Yabl=C4=B1=C5=9F karakterler ', >> 'bad characters in script field' =3D> 'Komut alan=C4=B1ndaki yanl=C4=B1=C5= =9F karakterler', >> 'bad characters in the telephone number field' =3D> 'Telefon numaras=C4=B1= alan=C4=B1ndaki yanl=C4=B1=C5=9F karakterler.', >> --=20 >> 2.18.0 >>=20 >=20 --===============4601251801604361160==--