From f8e9bf9424156d348c1868e6e5969d8353796188 Mon Sep 17 00:00:00 2001 From: Florian Knodt Date: Thu, 13 Dec 2012 01:25:40 +0100 Subject: [PATCH 1/2] Fixed misplaced translation --- install/lng/english.lng.php | 6 ++++++ install/lng/french.lng.php | 6 ++++++ install/lng/german.lng.php | 6 ++++++ lng/bulgarian.lng.php | 1 - lng/dutch.lng.php | 1 - lng/english.lng.php | 1 - lng/french.lng.php | 1 - lng/german.lng.php | 1 - lng/italian.lng.php | 2 -- lng/polish.lng.php | 1 - lng/portugues.lng.php | 1 - 11 files changed, 18 insertions(+), 9 deletions(-) diff --git a/install/lng/english.lng.php b/install/lng/english.lng.php index b59f5589..44f8bb0d 100644 --- a/install/lng/english.lng.php +++ b/install/lng/english.lng.php @@ -73,6 +73,12 @@ $lng['install']['bcmathdescription'] = 'Traffic-calculation related functions wi $lng['install']['openbasedir'] = 'Testing if open_basedir is enabled...'; $lng['install']['openbasedirenabled'] = 'enabled. Froxlor will not work properly with open_basedir enabled. Please disable open_basedir for Froxlor'; +/** + * ADDED IN 1.2.19-svn7 + */ + +$lng['install']['servername_should_be_fqdn'] = 'The servername should be a FQDN and not an IP address'; + /** * Renamed in 1.2.19-svn40 */ diff --git a/install/lng/french.lng.php b/install/lng/french.lng.php index b4d0aa4d..ad3d9862 100644 --- a/install/lng/french.lng.php +++ b/install/lng/french.lng.php @@ -63,6 +63,12 @@ $lng['install']['click_here_to_login'] = 'Cliquez ici pour vous rendre � l\'in $lng['install']['httpuser'] = 'Nom du utilisateur du HTTP'; $lng['install']['httpgroup'] = 'Nom du la group du HTTP'; +/** + * ADDED IN 1.2.19-svn7 + */ + +$lng['install']['servername_should_be_fqdn'] = 'Le nom du serveur doit être un nom FQDN, pas une adresse IP'; + /** * Renamed in 1.2.19-svn40 */ diff --git a/install/lng/german.lng.php b/install/lng/german.lng.php index e2f9b434..95144a09 100644 --- a/install/lng/german.lng.php +++ b/install/lng/german.lng.php @@ -73,6 +73,12 @@ $lng['install']['openbasedirenabled'] = 'aktiviert. Froxlor wird mit aktiviertem $lng['install']['httpuser'] = 'HTTP Username'; $lng['install']['httpgroup'] = 'HTTP Gruppenname'; +/** + * ADDED IN 1.2.19-svn7 + */ + +$lng['install']['servername_should_be_fqdn'] = 'Der Servername sollte eine FQDN sein und keine IP Adresse'; + /** * Renamed in 1.2.19-svn40 */ diff --git a/lng/bulgarian.lng.php b/lng/bulgarian.lng.php index f4c98744..fee5028d 100644 --- a/lng/bulgarian.lng.php +++ b/lng/bulgarian.lng.php @@ -808,7 +808,6 @@ $lng['message']['success'] = 'Successfully sent message to %s recipients'; $lng['message']['noreceipients'] = 'No e-mail has been sent because there are no recipients in the database'; $lng['admin']['sslsettings'] = 'SSL settings'; $lng['cronjobs']['notyetrun'] = 'Not yet run'; -$lng['install']['servername_should_be_fqdn'] = 'The servername should be a FQDN and not an IP address'; $lng['serversettings']['default_vhostconf']['title'] = 'Default vHost-settings'; $lng['serversettings']['default_vhostconf']['description'] = 'The content of this field will be included into the domain vHost container directly. Attention: The code won\'t be checked for any errors. If it contains errors, webserver might not start again!'; $lng['error']['invalidip'] = 'Invalid IP address: %s'; diff --git a/lng/dutch.lng.php b/lng/dutch.lng.php index 1be2ea65..9ecf1708 100644 --- a/lng/dutch.lng.php +++ b/lng/dutch.lng.php @@ -781,7 +781,6 @@ $lng['message']['success'] = 'Bericht verzonden naar ontvagers %s'; $lng['message']['noreceipients'] = 'Er is geen email verstuurd omdat er geen ontvangers in de database zijn'; $lng['admin']['sslsettings'] = 'Instellingen voor SSL'; $lng['cronjobs']['notyetrun'] = 'Nog niet uitgevoerd'; -$lng['install']['servername_should_be_fqdn'] = 'De servernaam dient een FQDN te zijn en geen IP-adres'; $lng['serversettings']['default_vhostconf']['title'] = 'Standaard vhost-instellingen'; $lng['serversettings']['default_vhostconf']['description'] = 'De inhoud van dit veld wordt rechtstreeks in de vhost-container geplaatst. N.B.: Deze code wordt niet op fouten gecontroleerd. In geval van fouten kan het zijn dat de webserver niet meer start!'; $lng['error']['invalidip'] = '%s is een ongeldig IP-adres'; diff --git a/lng/english.lng.php b/lng/english.lng.php index 08f766a1..ffd0f1fc 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -794,7 +794,6 @@ $lng['message']['success'] = 'Successfully sent message to %s recipients'; $lng['message']['noreceipients'] = 'No e-mail has been sent because there are no recipients in the database'; $lng['admin']['sslsettings'] = 'SSL settings'; $lng['cronjobs']['notyetrun'] = 'Not yet run'; -$lng['install']['servername_should_be_fqdn'] = 'The servername should be a FQDN and not an IP address'; $lng['serversettings']['default_vhostconf']['title'] = 'Default vHost-settings'; $lng['serversettings']['default_vhostconf']['description'] = 'The content of this field will be included into the domain vHost container directly. Attention: The code won\'t be checked for any errors. If it contains errors, webserver might not start again!'; $lng['error']['invalidip'] = 'Invalid IP address: %s'; diff --git a/lng/french.lng.php b/lng/french.lng.php index 026d167f..83fbbec9 100644 --- a/lng/french.lng.php +++ b/lng/french.lng.php @@ -798,7 +798,6 @@ $lng['message']['success'] = 'Le message a été envoyé aux destinataires "%s"' $lng['message']['noreceipients'] = 'Aucun e-mail n\'a été envoyé car il n\'existe aucun destinataire dans la base de données'; $lng['admin']['sslsettings'] = 'Paramètres SSL'; $lng['cronjobs']['notyetrun'] = 'Pas encore lancé'; -$lng['install']['servername_should_be_fqdn'] = 'Le nom du serveur doit être un nom FQDN, pas une adresse IP'; $lng['serversettings']['default_vhostconf']['title'] = 'Paramètres par défaut pour les vHosts'; $lng['emails']['quota'] = 'Quota'; $lng['emails']['noquota'] = 'Pas de quota'; diff --git a/lng/german.lng.php b/lng/german.lng.php index 661581f5..7dae6256 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -797,7 +797,6 @@ $lng['message']['success'] = 'Nachricht erfolgreich an %s Empfänger gesendet'; $lng['message']['noreceipients'] = 'Es wurde keine E-Mail versendet da sich keine Empfänger in der Datenbank befinden'; $lng['admin']['sslsettings'] = 'SSL Einstellungen'; $lng['cronjobs']['notyetrun'] = 'Bisher nicht gestartet'; -$lng['install']['servername_should_be_fqdn'] = 'Der Servername sollte eine FQDN sein und keine IP Adresse'; $lng['serversettings']['default_vhostconf']['title'] = 'Standard Vhost-Einstellungen'; $lng['serversettings']['default_vhostconf']['description'] = 'Der Inhalt dieses Feldes wird direkt in jeden Domain-vHost-Container übernommen. Achtung: Der Code wird nicht auf Fehler geprüft. Etwaige Fehler werden also auch übernommen. Der Webserver könnte nicht mehr starten!'; $lng['error']['invalidip'] = 'Ungültige IP Adresse: %s'; diff --git a/lng/italian.lng.php b/lng/italian.lng.php index c80cadaf..cc8e59a8 100644 --- a/lng/italian.lng.php +++ b/lng/italian.lng.php @@ -6,7 +6,6 @@ * Copyright (c) 2010 the Froxlor Team (see authors). * * For the full copyright and license information, please view the COPYING - * file that was distributed with this source code. You can also view the * COPYING file online at http://files.froxlor.org/misc/COPYING.txt * * @copyright (c) the authors @@ -794,7 +793,6 @@ $lng['message']['success'] = 'Inviato correttamente il messaggio a %s recipients $lng['message']['noreceipients'] = 'Nessuna e-mail è stata inviata perch¸ non ci sono i destinatari nel database'; $lng['admin']['sslsettings'] = 'Impostazioni SSL'; $lng['cronjobs']['notyetrun'] = 'Non ancora avviato'; -$lng['install']['servername_should_be_fqdn'] = 'Il nomeserver deve essere un nome di dominio completo (FQDN) e non un indirizzo IP'; $lng['serversettings']['default_vhostconf']['title'] = 'Impostazioni default vhost'; $lng['serversettings']['default_vhostconf']['description'] = 'Il contenuto di questo campo sarà incluso direttamente nel contenitore di dominio vhost. Attenzione: Il codice non sarà controllato per eventuali errori. Se contiene errori, il webserver non riavviarsi correttamente!'; $lng['error']['invalidip'] = 'Indirizzo IP non valido: %s'; diff --git a/lng/polish.lng.php b/lng/polish.lng.php index 21d60d36..1891a963 100644 --- a/lng/polish.lng.php +++ b/lng/polish.lng.php @@ -787,7 +787,6 @@ $lng['message']['success'] = 'Successfully sent message to %s recipients'; $lng['message']['noreceipients'] = 'No e-mail has been sent because there are no recipients in the database'; $lng['admin']['sslsettings'] = 'Ustawienia SSL'; $lng['cronjobs']['notyetrun'] = 'Nigdy nie uruchamiany'; -$lng['install']['servername_should_be_fqdn'] = 'The servername should be a FQDN and not an IP address'; $lng['serversettings']['default_vhostconf']['title'] = 'Default vhost-settings'; $lng['serversettings']['default_vhostconf']['description'] = 'The content of this field will be included into every domain vhost container directly. Attention: The code won\'t be checked for any errors. If it contains errors, apache might ot start again!'; $lng['error']['invalidip'] = 'Niepoprawny adres IP: %s'; diff --git a/lng/portugues.lng.php b/lng/portugues.lng.php index ebe98b9f..58cbff8b 100644 --- a/lng/portugues.lng.php +++ b/lng/portugues.lng.php @@ -694,7 +694,6 @@ $lng['message']['success'] = 'Mensagens enviadas para %s destinatários com suce $lng['message']['noreceipients'] = 'Email não enviado porque não tem destinatário no banco de dados'; $lng['admin']['sslsettings'] = 'Configuração de SSL'; $lng['cronjobs']['notyetrun'] = 'Ainda não está rodando'; -$lng['install']['servername_should_be_fqdn'] = 'O nome do servidor deve ser a FQDN e não um endereço de IP'; $lng['serversettings']['default_vhostconf']['title'] = 'Configuração de Vhost padrão'; $lng['serversettings']['default_vhostconf']['description'] = 'O conteúdo deste campo será incluído a cada novo vhost criado. Atenção: O código será checado para algum erro. Se contiver erros, o apache pode não iniciar mais'; $lng['emails']['quota'] = 'Quota'; From 123cc1336e8edf65ea28e71645de77630707f872 Mon Sep 17 00:00:00 2001 From: Florian Knodt Date: Thu, 13 Dec 2012 01:32:42 +0100 Subject: [PATCH 2/2] ...and add a bit of grammar to the german translation... --- install/lng/german.lng.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/lng/german.lng.php b/install/lng/german.lng.php index 95144a09..0007c232 100644 --- a/install/lng/german.lng.php +++ b/install/lng/german.lng.php @@ -77,7 +77,7 @@ $lng['install']['httpgroup'] = 'HTTP Gruppenname'; * ADDED IN 1.2.19-svn7 */ -$lng['install']['servername_should_be_fqdn'] = 'Der Servername sollte eine FQDN sein und keine IP Adresse'; +$lng['install']['servername_should_be_fqdn'] = 'Der Servername sollte eine FQDN sein und keine IP Adresse sein'; /** * Renamed in 1.2.19-svn40