From 50327e2df6616b24e05b5dcd7bbce479177a7223 Mon Sep 17 00:00:00 2001 From: madmuffin1 Date: Fri, 15 Mar 2013 23:05:40 +0100 Subject: [PATCH 1/5] Removed 6 back-references from language files --- index.php | 2 +- lng/bulgarian.lng.php | 2 +- lng/catalan.lng.php | 2 +- lng/czech.lng.php | 2 +- lng/danish.lng.php | 2 +- lng/dutch.lng.php | 10 +++++----- lng/english.lng.php | 12 ++++++------ lng/french.lng.php | 2 +- lng/german.lng.php | 10 +++++----- lng/italian.lng.php | 10 +++++----- lng/portugues.lng.php | 2 +- lng/russian.lng.php | 2 +- lng/slovak.lng.php | 2 +- lng/spanish.lng.php | 2 +- lng/swedish.lng.php | 2 +- lng/zh-cn.lng.php | 2 +- 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/index.php b/index.php index 830422d6..5dc81363 100644 --- a/index.php +++ b/index.php @@ -252,7 +252,7 @@ if($action == 'login') $message = $lng['error']['login']; break; case 3: - $message = $lng['error']['login_blocked']; + $message = printf($lng['error']['login_blocked'],$settings['login']['deactivatetime']); break; case 4: $cmail = isset($_GET['customermail']) ? $_GET['customermail'] : 'unknown'; diff --git a/lng/bulgarian.lng.php b/lng/bulgarian.lng.php index 09e2fcba..064ee410 100644 --- a/lng/bulgarian.lng.php +++ b/lng/bulgarian.lng.php @@ -197,7 +197,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Трябва да изтриете $lng['error']['ftp_cantdeletemainaccount'] = 'Не можете да изтриете главния си FTP акаунт'; $lng['error']['login'] = 'Грешно име или парола. Моля опитайте отново!'; -$lng['error']['login_blocked'] = 'Този акаунт е бил блокиран заради прекалено много грешки.
Моля опитайте отново след: ' . $settings['login']['deactivatetime'] . ' секунди.'; +$lng['error']['login_blocked'] = 'Този акаунт е бил блокиран заради прекалено много грешки.
Моля опитайте отново след: %s секунди.'; $lng['error']['notallreqfieldsorerrors'] = 'Не сте попълнили всички полета, или сте попълнили някое грешно.'; $lng['error']['oldpasswordnotcorrect'] = 'Старата парола не съответства.'; $lng['error']['youcantallocatemorethanyouhave'] = 'Вие не можете да заделят повече ресурси, отколкото притежаватe.'; diff --git a/lng/catalan.lng.php b/lng/catalan.lng.php index d95271ad..4a5636b8 100644 --- a/lng/catalan.lng.php +++ b/lng/catalan.lng.php @@ -186,7 +186,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'No pots esborrar tots els subdomini $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Ja tens un compte comodí'; $lng['error']['ftp_cantdeletemainaccount'] = 'No pots esborrar el compte principal FTP'; $lng['error']['login'] = 'El nom d\'usuari o la Clau són incorrectes. Sisplau torna-ho a intentar!'; -$lng['error']['login_blocked'] = 'Aquest compte ha estat suspès a causa de massa intents fraudulents d\'identificació.
Si us plau, torna a provar-ho en ' . $settings['login']['deactivatetime'] . ' segons.'; +$lng['error']['login_blocked'] = 'Aquest compte ha estat suspès a causa de massa intents fraudulents d\'identificació.
Si us plau, torna a provar-ho en %s segons.'; $lng['error']['notallreqfieldsorerrors'] = 'No has omplert tots els camps o algun camp és incorrecte.'; $lng['error']['oldpasswordnotcorrect'] = 'La clau antiga no és la correcta.'; $lng['error']['youcantallocatemorethanyouhave'] = 'No pots ocupar més espai del que tens assignat!'; diff --git a/lng/czech.lng.php b/lng/czech.lng.php index 4fcbf842..b7c59e1b 100644 --- a/lng/czech.lng.php +++ b/lng/czech.lng.php @@ -187,7 +187,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Musíte smazat všechny subdomény $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Už jste definovali "catchall" pro tuto doménu.'; $lng['error']['ftp_cantdeletemainaccount'] = 'Nemùžete smazat svùj hlavní FTP Úèet'; $lng['error']['login'] = 'Uživatelské jméno nebo heslo, které jste zadali, je špatné. Prosím zkuste to znovu!'; -$lng['error']['login_blocked'] = 'Tento Úèet byl zablokován z dùvodu pøíliš velkého množství chyb pøi pøihlášení.
Prosím zkuste to znovu za ' . $settings['login']['deactivatetime'] . ' sekund.'; +$lng['error']['login_blocked'] = 'Tento Úèet byl zablokován z dùvodu pøíliš velkého množství chyb pøi pøihlášení.
Prosím zkuste to znovu za %s sekund.'; $lng['error']['notallreqfieldsorerrors'] = 'Nevyplnili jste všechna políèka nebo jsou nì které vyplnì na špatnì .'; $lng['error']['oldpasswordnotcorrect'] = 'Staré heslo není správné.'; $lng['error']['youcantallocatemorethanyouhave'] = 'Nemùžete alokovat více zdrojù než sami vlastníte'; diff --git a/lng/danish.lng.php b/lng/danish.lng.php index a53cc27e..e453046b 100644 --- a/lng/danish.lng.php +++ b/lng/danish.lng.php @@ -185,7 +185,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Du skal først slette alle sub-dom $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Du har allerede valgt en Fang-Alt adresse for dette domæne.'; $lng['error']['ftp_cantdeletemainaccount'] = 'Du kan ikke slette din primære FTP konto.'; $lng['error']['login'] = 'Den indtastede bruger/kode er ikke korrekt. Forsøg venligst igen.'; -$lng['error']['login_blocked'] = 'Denne konto er blevet midlertidigt lukket grundet for mange fejlagtige logind forsøg.
Forsøg venligst igen om ' . $settings['login']['deactivatetime'] . ' sekunder.'; +$lng['error']['login_blocked'] = 'Denne konto er blevet midlertidigt lukket grundet for mange fejlagtige logind forsøg.
Forsøg venligst igen om %s sekunder.'; $lng['error']['notallreqfieldsorerrors'] = 'Alle krævede felter er ikke udfyldt, eller der er fejl i en eller flere af udfyldningerne.'; $lng['error']['oldpasswordnotcorrect'] = 'Det gamle kodeord er ikke indtastet korrekt.'; $lng['error']['youcantallocatemorethanyouhave'] = 'Du kan ikke tildele flere ressourcer end du er blevet bevilliget.'; diff --git a/lng/dutch.lng.php b/lng/dutch.lng.php index 95dc5234..639317ff 100644 --- a/lng/dutch.lng.php +++ b/lng/dutch.lng.php @@ -171,7 +171,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'U moet eerst alle subdomeinen verwi $lng['error']['youhavealreadyacatchallforthisdomain'] = 'U heeft al een catchall voor dit domein aangemaakt.'; $lng['error']['ftp_cantdeletemainaccount'] = 'U kunt uw hoofd FTP account niet verwijderen'; $lng['error']['login'] = 'De door u ingegeven gebruikersnaam en wacthwoord zijn verkeerd. Probeer opnieuw!'; -$lng['error']['login_blocked'] = 'Dit account is inactief vanwege teveel login fouten.
Probeer het nog eens over ' . $settings['login']['deactivatetime'] . ' seconden.'; +$lng['error']['login_blocked'] = 'Dit account is inactief vanwege teveel login fouten.
Probeer het nog eens over %s seconden.'; $lng['error']['notallreqfieldsorerrors'] = 'U heeft niet alle velden goed, of helemaal niet ingevuld.'; $lng['error']['oldpasswordnotcorrect'] = 'Het oude wachtwoord is niet correct.'; $lng['error']['youcantallocatemorethanyouhave'] = 'U kunt niet meer resources gebruiken dan dat u bezit.'; @@ -879,7 +879,7 @@ $lng['customer']['mail_quota'] = 'Mailquotum'; $lng['panel']['megabyte'] = 'MegaByte'; $lng['panel']['not_supported'] = 'Wordt niet ondersteund in: '; $lng['emails']['quota_edit'] = 'E-mailquotum aanpassen'; -$lng['error']['allocatetoomuchquota'] = 'U probeerde %s MB ' . $lng['emails']['quota'] . ' toe te kennen, maar u heeft niet voldoende over.'; +$lng['error']['allocatetoomuchquota'] = 'U probeerde %s MB Quotum toe te kennen, maar u heeft niet voldoende over.'; // Autoresponder module @@ -1314,12 +1314,12 @@ $lng['ticket']['orderdesc'] = 'Hier kunt u uw eigen logische volgorde instellen // ADDED IN FROXLOR 0.9.6-svn3 $lng['serversettings']['defaultwebsrverrhandler_enabled'] = 'Standaard foutdocumenten voor alle klanten activeren'; $lng['serversettings']['defaultwebsrverrhandler_err401']['title'] = 'Bestand/URL voor foutcode 401'; -$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '
'.$lng['panel']['not_supported'].'lighttpd
'; +$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '
Wordt niet ondersteund in: lighttpd
'; $lng['serversettings']['defaultwebsrverrhandler_err403']['title'] = 'Bestand/URL voor foutcode 403'; -$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '
'.$lng['panel']['not_supported'].'lighttpd
'; +$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '
Wordt niet ondersteund in: lighttpd
'; $lng['serversettings']['defaultwebsrverrhandler_err404'] = 'Bestand/URL voor foutcode 404'; $lng['serversettings']['defaultwebsrverrhandler_err500']['title'] = 'Bestand/URL voor foutcode 500'; -$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '
'.$lng['panel']['not_supported'].'lighttpd
'; +$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '
Wordt niet ondersteund in: lighttpd
'; // ADDED IN FROXLOR 0.9.6-svn4 $lng['serversettings']['ticket']['default_priority'] = 'Standaardprioriteit voor support-tickets'; diff --git a/lng/english.lng.php b/lng/english.lng.php index 2544ab38..d11541e0 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -191,7 +191,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'You have to delete all subdomains f $lng['error']['youhavealreadyacatchallforthisdomain'] = 'You have already defined a catchall for this domain.'; $lng['error']['ftp_cantdeletemainaccount'] = 'You cannot delete your main FTP account'; $lng['error']['login'] = 'The username or password you typed in is wrong. Please try it again!'; -$lng['error']['login_blocked'] = 'This account has been suspended because of too many login errors.
Please try again in ' . $settings['login']['deactivatetime'] . ' seconds.'; +$lng['error']['login_blocked'] = 'This account has been suspended because of too many login errors.
Please try again in %s seconds.'; $lng['error']['notallreqfieldsorerrors'] = 'You have not filled in all or filled in some fields incorrectly.'; $lng['error']['oldpasswordnotcorrect'] = 'The old password is not correct.'; $lng['error']['youcantallocatemorethanyouhave'] = 'You cannot allocate more resources than you own for yourself.'; @@ -920,7 +920,7 @@ $lng['customer']['mail_quota'] = 'Mailquota'; $lng['panel']['megabyte'] = 'MegaByte'; $lng['panel']['not_supported'] = 'Not supported in: '; $lng['emails']['quota_edit'] = 'Change E-Mail Quota'; -$lng['error']['allocatetoomuchquota'] = 'You tried to allocate %s MB ' . $lng['emails']['quota'] . ', but you do not have enough left.'; +$lng['error']['allocatetoomuchquota'] = 'You tried to allocate %s MB Quota, but you do not have enough left.'; // Autoresponder module @@ -1359,12 +1359,12 @@ $lng['ticket']['orderdesc'] = 'Here you can define your own logical order for th // ADDED IN FROXLOR 0.9.6-svn3 $lng['serversettings']['defaultwebsrverrhandler_enabled'] = 'Enable default errordocuments for all customers'; $lng['serversettings']['defaultwebsrverrhandler_err401']['title'] = 'File/URL for error 401'; -$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '
'.$lng['panel']['not_supported'].'lighttpd
'; +$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '
Not supported in: lighttpd
'; $lng['serversettings']['defaultwebsrverrhandler_err403']['title'] = 'File/URL for error 403'; -$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '
'.$lng['panel']['not_supported'].'lighttpd
'; +$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '
Not supported in: lighttpd
'; $lng['serversettings']['defaultwebsrverrhandler_err404'] = 'File/URL for error 404'; $lng['serversettings']['defaultwebsrverrhandler_err500']['title'] = 'File/URL for error 500'; -$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '
'.$lng['panel']['not_supported'].'lighttpd
'; +$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '
Not supported in: lighttpd
'; // ADDED IN FROXLOR 0.9.6-svn4 $lng['serversettings']['ticket']['default_priority'] = 'Default support-ticket priority'; @@ -1911,7 +1911,7 @@ $lng['serversettings']['phpfpm_settings']['idle_timeout']['description'] = 'Time // ADDED IN 0.9.27-svn2 $lng['panel']['cancel'] = 'Cancel'; $lng['admin']['delete_statistics'] = 'Delete Statistics'; -$lng['admin']['speciallogwarning'] = 'WARNING: By changing this setting you will lose all your old statistics for this domain. If you are 100% sure you wish to change this type "'.$lng['admin']['delete_statistics'].'" in the field below and click the "'.$lng['panel']['delete'].'" button.

'; +$lng['admin']['speciallogwarning'] = 'WARNING: By changing this setting you will lose all your old statistics for this domain. If you are 100% sure you wish to change this type "'.$lng['admin']['delete_statistics'].'" in the field below and click the "delete" button.

'; // ADDED IN 0.9.28-svn2 $lng['serversettings']['vmail_maildirname']['title'] = 'Maildir name'; diff --git a/lng/french.lng.php b/lng/french.lng.php index 9ebb9ac3..9b46eff7 100644 --- a/lng/french.lng.php +++ b/lng/french.lng.php @@ -198,7 +198,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Il faut d\'abord supprimer tous les $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Vous avez déjà défini une adresse "catchall" pour ce domaine.'; $lng['error']['ftp_cantdeletemainaccount'] = 'Vous ne pouvez pas supprimer votre accès principal.'; $lng['error']['login'] = 'Identifiant / mot de passe invalide.'; -$lng['error']['login_blocked'] = 'Cet identifiant a été bloqué à cause de nombreuses tentatives de connexions invalides.
Veuillez réessayer dans ' . $settings['login']['deactivatetime'] . ' secondes.'; +$lng['error']['login_blocked'] = 'Cet identifiant a été bloqué à cause de nombreuses tentatives de connexions invalides.
Veuillez réessayer dans %s secondes.'; $lng['error']['notallreqfieldsorerrors'] = 'Vous n\'avez pas rempli toutes les cases obligatoires ou vous les avez remplis avec des informations invalides.'; $lng['error']['oldpasswordnotcorrect'] = 'L\'ancien mot de passe n\'est pas correct.'; $lng['error']['youcantallocatemorethanyouhave'] = 'Vous ne pouvez pas distribuer plus de ressources qu\'il n\'en reste.'; diff --git a/lng/german.lng.php b/lng/german.lng.php index b4f9f3a4..ebf85e57 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -191,7 +191,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Sie müssen erst alle Subdomains l $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Sie haben bereits eine Adresse als Catchall für diese Domain definiert.'; $lng['error']['ftp_cantdeletemainaccount'] = 'Sie können Ihren Hauptaccount nicht löschen.'; $lng['error']['login'] = 'Der angegebene Benutzername/Passwort ist falsch.'; -$lng['error']['login_blocked'] = 'Dieser Account wurde aufgrund zu vieler Fehlversuche vorrübergehend geschlossen.
Bitte versuchen Sie es in ' . $settings['login']['deactivatetime'] . ' Sekunden erneut.'; +$lng['error']['login_blocked'] = 'Dieser Account wurde aufgrund zu vieler Fehlversuche vorrübergehend geschlossen.
Bitte versuchen Sie es in %s Sekunden erneut.'; $lng['error']['notallreqfieldsorerrors'] = 'Sie haben nicht alle Felder oder ein Feld mit fehlerhaften Angaben ausgefüllt.'; $lng['error']['oldpasswordnotcorrect'] = 'Das alte Passwort ist nicht korrekt.'; $lng['error']['youcantallocatemorethanyouhave'] = 'Sie können nicht mehr Ressourcen verteilen als Sie noch frei haben.'; @@ -924,7 +924,7 @@ $lng['customer']['mail_quota'] = 'E-Mail Kontingent'; $lng['panel']['megabyte'] = 'MegaByte'; $lng['emails']['quota_edit'] = 'E-Mail Kontingent ändern'; $lng['panel']['not_supported'] = 'Nicht unterstüzt in: '; -$lng['error']['allocatetoomuchquota'] = 'Sie versuchen %s MB ' . $lng['emails']['quota'] . ' zu zuweisen, haben aber nicht genug übrig.'; +$lng['error']['allocatetoomuchquota'] = 'Sie versuchen %s MB Kontingent zu zuweisen, haben aber nicht genug übrig.'; // Autoresponder module @@ -1354,12 +1354,12 @@ $lng['ticket']['orderdesc'] = 'Hier kann eine logische Sortierung für die Ticke // ADDED IN FROXLOR 0.9.6-svn3 $lng['serversettings']['defaultwebsrverrhandler_enabled'] = 'Verwende Standard-Fehlerdokumente für alle Kunden'; $lng['serversettings']['defaultwebsrverrhandler_err401']['title'] = 'Datei/URL für Fehler 401'; -$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '
'.$lng['panel']['not_supported'].'lighttpd
'; +$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '
Nicht unterstüzt in: lighttpd
'; $lng['serversettings']['defaultwebsrverrhandler_err403']['title'] = 'Datei/URL für Fehler 403'; -$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '
'.$lng['panel']['not_supported'].'lighttpd
'; +$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '
Nicht unterstüzt in: lighttpd
'; $lng['serversettings']['defaultwebsrverrhandler_err404'] = 'Datei/URL für Fehler 404'; $lng['serversettings']['defaultwebsrverrhandler_err500']['title'] = 'Datei/URL für Fehler 500'; -$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '
'.$lng['panel']['not_supported'].'lighttpd
'; +$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '
Nicht unterstüzt in: lighttpd
'; // ADDED IN FROXLOR 0.9.6-svn4 $lng['serversettings']['ticket']['default_priority'] = 'Voreingestellte Support-Ticket Priorität'; diff --git a/lng/italian.lng.php b/lng/italian.lng.php index 0e14a5f5..dcdfe4ee 100644 --- a/lng/italian.lng.php +++ b/lng/italian.lng.php @@ -189,7 +189,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Prima di creare un dominio wildcard $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Hai già definito un catchall per questo dominio.'; $lng['error']['ftp_cantdeletemainaccount'] = 'Non puoi cancellare il tuo account FTP principale.'; $lng['error']['login'] = 'Il nome utente o la password da te immessi sono incorretti. Per favore riprova!'; -$lng['error']['login_blocked'] = 'Questo account è stato sospeso per i troppi tentativi di login falliti.
Riprovi tra ' . $settings['login']['deactivatetime'] . ' secondi.'; +$lng['error']['login_blocked'] = 'Questo account è stato sospeso per i troppi tentativi di login falliti.
Riprovi tra %s secondi.'; $lng['error']['notallreqfieldsorerrors'] = 'Alcuni campi sono stati lasciati vuoti o sono stati riempiti incorrettamente.'; $lng['error']['oldpasswordnotcorrect'] = 'La vecchia password non è corretta.'; $lng['error']['youcantallocatemorethanyouhave'] = 'Non puoi assegnare più risorse di quante ne possieda tu stesso.'; @@ -899,7 +899,7 @@ $lng['customer']['mail_quota'] = 'Limite Mail'; $lng['panel']['megabyte'] = 'MegaByte'; $lng['panel']['not_supported'] = 'Non supportato in: '; $lng['emails']['quota_edit'] = 'Cambia limite E-Mail'; -$lng['error']['allocatetoomuchquota'] = 'Si è tentato di allocare %s MB ' . $lng['emails']['quota'] . ', ma non c\'è abbastanza spazio disponibile.'; +$lng['error']['allocatetoomuchquota'] = 'Si è tentato di allocare %s MB Limite, ma non c\'è abbastanza spazio disponibile.'; // Autoresponder module @@ -1340,12 +1340,12 @@ $lng['ticket']['orderdesc'] = 'Qui è possibile definire il tuo ordine logico pe // ADDED IN FROXLOR 0.9.6-svn3 $lng['serversettings']['defaultwebsrverrhandler_enabled'] = 'Abilita errordocuments in automatico per tutti i clienti'; $lng['serversettings']['defaultwebsrverrhandler_err401']['title'] = 'File/URL per l\'errore 401'; -$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '
'.$lng['panel']['not_supported'].'lighttpd
'; +$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '
Non supportato in: lighttpd
'; $lng['serversettings']['defaultwebsrverrhandler_err403']['title'] = 'File/URL per l\'errore 403'; -$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '
'.$lng['panel']['not_supported'].'lighttpd
'; +$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '
Non supportato in: lighttpd
'; $lng['serversettings']['defaultwebsrverrhandler_err404'] = 'File/URL per l\'errore 404'; $lng['serversettings']['defaultwebsrverrhandler_err500']['title'] = 'File/URL per l\'errore 500'; -$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '
'.$lng['panel']['not_supported'].'lighttpd
'; +$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '
Non supportato in: lighttpd
'; // ADDED IN FROXLOR 0.9.6-svn4 $lng['serversettings']['ticket']['default_priority'] = 'Priorità predefinita per il supporto ticket'; diff --git a/lng/portugues.lng.php b/lng/portugues.lng.php index 2c0dfdf9..07fd4f2e 100644 --- a/lng/portugues.lng.php +++ b/lng/portugues.lng.php @@ -190,7 +190,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Voce deve deletar todos subdominios $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Voce já definiu uma conta pega tudo para este dominio.'; $lng['error']['ftp_cantdeletemainaccount'] = 'Voce não pode deletar a conta principal de FTP'; $lng['error']['login'] = 'O usuário ou senha digitados, não estão corretos. Por favor tente novamente!'; -$lng['error']['login_blocked'] = 'Esta conta está suspensa por exceder as tentativas de login permitidas.
Por favor tente novamente em ' . $settings['login']['deactivatetime'] . ' segundos.'; +$lng['error']['login_blocked'] = 'Esta conta está suspensa por exceder as tentativas de login permitidas.
Por favor tente novamente em %s segundos.'; $lng['error']['notallreqfieldsorerrors'] = 'Voce não preencheu todos os campos ou preencheu algum campo incorretamente.'; $lng['error']['oldpasswordnotcorrect'] = 'A senha antiga não confere.'; $lng['error']['youcantallocatemorethanyouhave'] = 'Voce não pode alocar mais recursos do que voce mesmo possui.'; diff --git a/lng/russian.lng.php b/lng/russian.lng.php index f22e1931..a3eb83d4 100644 --- a/lng/russian.lng.php +++ b/lng/russian.lng.php @@ -505,7 +505,7 @@ $lng['error']['login'] = 'Указанные имя пользователя и // Der angegebene Benutzername/Passwort ist falsch. -$lng['error']['login_blocked'] = 'Из-за многочисленных ошибочных попыток логина аккаунт временно закрыт.
Пожалуйста попробуйте через ' . $settings['login']['deactivatetime'] . ' секунд ещё раз.'; +$lng['error']['login_blocked'] = 'Из-за многочисленных ошибочных попыток логина аккаунт временно закрыт.
Пожалуйста попробуйте через %s секунд ещё раз.'; // Dieser Account wurde aufgrund zu vieler Fehlversuche vorruebergehend geschlossen.
Bitte versuchen Sie es in '.$settings['login']['deactivatetime'].' Sekunden erneut. diff --git a/lng/slovak.lng.php b/lng/slovak.lng.php index 990f8656..2611cb68 100644 --- a/lng/slovak.lng.php +++ b/lng/slovak.lng.php @@ -185,7 +185,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Pred vytvorením wildcard domény n $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Pre túto doménu ste uŸ doménový kô¹ nadefinovali.'; $lng['error']['ftp_cantdeletemainaccount'] = 'NemôŸete vymaza» Vá¹ hlavný FTP úèet'; $lng['error']['login'] = 'UŸívateµské meno alebo heslo, ktoré ste zadali je nesprávne. Prosím, skúste znovu!'; -$lng['error']['login_blocked'] = 'Tento úèet bol suspendovaný z dôvodu veµkého mnoŸsta chybových prihlasení.
Prosím, skúste znovu za ' . $settings['login']['deactivatetime'] . ' sekúnd.'; +$lng['error']['login_blocked'] = 'Tento úèet bol suspendovaný z dôvodu veµkého mnoŸsta chybových prihlasení.
Prosím, skúste znovu za %s sekúnd.'; $lng['error']['notallreqfieldsorerrors'] = 'Nevyplnili ste v¹etky polia, alebo sú niektoré nesprávne.'; $lng['error']['oldpasswordnotcorrect'] = 'Stará heslo nie je správne.'; $lng['error']['youcantallocatemorethanyouhave'] = 'NemôŸete vymedzi» viac prostiedkov ako sú povolené pre Vás.'; diff --git a/lng/spanish.lng.php b/lng/spanish.lng.php index eeb14eb2..1e15e260 100644 --- a/lng/spanish.lng.php +++ b/lng/spanish.lng.php @@ -187,7 +187,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Usted debe primero borar todos los $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Usted acaba de definer una Direccion como Catchall para este dominio.'; $lng['error']['ftp_cantdeletemainaccount'] = 'Usted no puede suprimir su cuenta principal del ftp'; $lng['error']['login'] = 'El Nombre de Usuario/Clave esta Errado. Por favor intento otra vez!'; -$lng['error']['login_blocked'] = 'Esta cuenta fue cerrada transitoriamente debido a demasiados intentos falsos.
Por favor intente otra vez en ' . $settings['login']['deactivatetime'] . ' segundos.'; +$lng['error']['login_blocked'] = 'Esta cuenta fue cerrada transitoriamente debido a demasiados intentos falsos.
Por favor intente otra vez en %s segundos.'; $lng['error']['notallreqfieldsorerrors'] = 'Usted no ha llenado todos los espacios asignados o ha colocado un dato Erroneo.'; $lng['error']['oldpasswordnotcorrect'] = 'La Clave Vieja no es correcta.'; $lng['error']['youcantallocatemorethanyouhave'] = 'Usted no puede afectar un aparato más recursos que los que usted posee.'; diff --git a/lng/swedish.lng.php b/lng/swedish.lng.php index 83cfbb38..10fc4b50 100644 --- a/lng/swedish.lng.php +++ b/lng/swedish.lng.php @@ -183,7 +183,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Du måste radera alla sub-domäner $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Du har redan skapat en maildump för denna domän.'; $lng['error']['ftp_cantdeletemainaccount'] = 'Det går inte att radera huvud FTP kontot för domänen'; $lng['error']['login'] = 'Användarnamnet eller lösenordet var felaktigt, försök igen!'; -$lng['error']['login_blocked'] = 'Kontot har blivit avstängt på grund av för många felaktiga inloggningsförsök.
Försök igen om ' . $settings['login']['deactivatetime'] . ' sekunder.'; +$lng['error']['login_blocked'] = 'Kontot har blivit avstängt på grund av för många felaktiga inloggningsförsök.
Försök igen om %s sekunder.'; $lng['error']['notallreqfieldsorerrors'] = 'Du har inte fyllt i alla fält eller så har du skrivit in något som inte accepteras.'; $lng['error']['oldpasswordnotcorrect'] = 'Det gamla lösenordet är fel.'; $lng['error']['youcantallocatemorethanyouhave'] = 'Du kan inte skapa fler resurser än du äger själv (You cannot allocate more resources than you own for yourself).'; diff --git a/lng/zh-cn.lng.php b/lng/zh-cn.lng.php index c76c334a..dbd46a35 100644 --- a/lng/zh-cn.lng.php +++ b/lng/zh-cn.lng.php @@ -190,7 +190,7 @@ $lng['error']['firstdeleteallsubdomains'] = '在您创建一个新的原始域 $lng['error']['youhavealreadyacatchallforthisdomain'] = '您已经为这项域名设置了一个电邮户口'; $lng['error']['ftp_cantdeletemainaccount'] = '您不能删除您的主账户'; $lng['error']['login'] = '被输入的用户名/密码错误'; -$lng['error']['login_blocked'] = '由于多次错误的尝试这个账户将被关闭！
请您在' . $settings['login']['deactivatetime'] . '秒后重新尝试。'; +$lng['error']['login_blocked'] = '由于多次错误的尝试这个账户将被关闭！
请您在%s秒后重新尝试。'; $lng['error']['notallreqfieldsorerrors'] = '您没有填写所有的文本栏或者有一个文本栏被错误填写'; $lng['error']['oldpasswordnotcorrect'] = '旧密码不正确'; $lng['error']['youcantallocatemorethanyouhave'] = '您不能分配比您现有的更多的资源。'; From 2912d0ec4c904229a2777c491a8c9c0fa73d88e4 Mon Sep 17 00:00:00 2001 From: madmuffin1 Date: Sat, 16 Mar 2013 09:03:46 +0100 Subject: [PATCH 2/5] Fix sprintf/printf confusion. Thanks to @Discordier --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 5dc81363..c639174c 100644 --- a/index.php +++ b/index.php @@ -252,7 +252,7 @@ if($action == 'login') $message = $lng['error']['login']; break; case 3: - $message = printf($lng['error']['login_blocked'],$settings['login']['deactivatetime']); + $message = sprintf($lng['error']['login_blocked'],$settings['login']['deactivatetime']); break; case 4: $cmail = isset($_GET['customermail']) ? $_GET['customermail'] : 'unknown'; From 4675bfe2b9d57212e7f274c6925da9d590816f2c Mon Sep 17 00:00:00 2001 From: madmuffin1 Date: Thu, 21 Mar 2013 21:50:17 +0100 Subject: [PATCH 3/5] * removed more backreferences in language files (refs #1171) --- customer_domains.php | 2 ++ lng/english.lng.php | 2 +- lng/german.lng.php | 2 +- templates/Froxlor/admin/domains/domains_edit.tpl | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/customer_domains.php b/customer_domains.php index 8c46e0f8..daa388ca 100644 --- a/customer_domains.php +++ b/customer_domains.php @@ -605,6 +605,8 @@ elseif($page == 'domains') $title = $subdomain_edit_data['domain_edit']['title']; $image = $subdomain_edit_data['domain_edit']['image']; + $speciallogwarning = sprintf($lng['admin']['speciallogwarning'], $lng['admin']['delete_statistics']); + eval("echo \"" . getTemplate("domains/domains_edit") . "\";"); } } diff --git a/lng/english.lng.php b/lng/english.lng.php index d11541e0..371ad1e0 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1911,7 +1911,7 @@ $lng['serversettings']['phpfpm_settings']['idle_timeout']['description'] = 'Time // ADDED IN 0.9.27-svn2 $lng['panel']['cancel'] = 'Cancel'; $lng['admin']['delete_statistics'] = 'Delete Statistics'; -$lng['admin']['speciallogwarning'] = 'WARNING: By changing this setting you will lose all your old statistics for this domain. If you are 100% sure you wish to change this type "'.$lng['admin']['delete_statistics'].'" in the field below and click the "delete" button.

'; +$lng['admin']['speciallogwarning'] = 'WARNING: By changing this setting you will lose all your old statistics for this domain. If you are 100% sure you wish to change this type "%s" in the field below and click the "delete" button.

'; // ADDED IN 0.9.28-svn2 $lng['serversettings']['vmail_maildirname']['title'] = 'Maildir name'; diff --git a/lng/german.lng.php b/lng/german.lng.php index ebf85e57..7a437cf4 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1641,7 +1641,7 @@ $lng['serversettings']['phpfpm_settings']['idle_timeout']['description'] = 'Time // ADDED IN 0.9.27-svn2 $lng['panel']['cancel'] = 'abbrechen'; $lng['admin']['delete_statistics'] = 'Statistiken Löschen'; -$lng['admin']['speciallogwarning'] = 'ACHTUNG: Durch diese Einstellungen werden Sie alle bisherige Statistiken dieser Domain verlieren. Wenn Sie dabei wirklich sicher sind, geben Sie bitte folgenden Text in das nachfolgende Textfeld ein: "'.$lng['admin']['delete_statistics'].'" und bestätigen Sie mit "'.$lng['panel']['delete'].'".

'; +$lng['admin']['speciallogwarning'] = 'ACHTUNG: Durch diese Einstellungen werden Sie alle bisherige Statistiken dieser Domain verlieren. Wenn Sie dabei wirklich sicher sind, geben Sie bitte folgenden Text in das nachfolgende Textfeld ein: "%s" und bestätigen Sie mit "Löschen".

'; // ADDED IN 0.9.28-svn5 $lng['error']['operationnotpermitted'] = 'Diese Aktion ist nicht erlaubt!'; diff --git a/templates/Froxlor/admin/domains/domains_edit.tpl b/templates/Froxlor/admin/domains/domains_edit.tpl index 0af64edb..e1c7aaac 100644 --- a/templates/Froxlor/admin/domains/domains_edit.tpl +++ b/templates/Froxlor/admin/domains/domains_edit.tpl @@ -15,7 +15,7 @@ $header
{$lng['admin']['delete_statistics']}
-

{$lng['admin']['speciallogwarning']}

+

{$speciallogwarning}

  From 6a16940aa06355f298075707e4823930f70acf62 Mon Sep 17 00:00:00 2001 From: madmuffin1 Date: Fri, 22 Mar 2013 16:04:12 +0100 Subject: [PATCH 4/5] * Removed last real backreference ($lng['dkim']['dkim_keylength']) from language files (refs #1171) --- actions/admin/settings/180.dkim.php | 7 ++++++- lng/dutch.lng.php | 2 +- lng/english.lng.php | 2 +- lng/german.lng.php | 2 +- lng/italian.lng.php | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/actions/admin/settings/180.dkim.php b/actions/admin/settings/180.dkim.php index c47f5358..25f10648 100644 --- a/actions/admin/settings/180.dkim.php +++ b/actions/admin/settings/180.dkim.php @@ -17,6 +17,8 @@ * */ +global $settings; + return array( 'groups' => array( 'dkim' => array( @@ -79,7 +81,10 @@ return array( 'save_method' => 'storeSettingFieldInsertBindTask', ), 'dkim_keylength' => array( - 'label' => $lng['dkim']['dkim_keylength'], + 'label' => array( + 'title' => $lng['dkim']['dkim_keylength']['title'], + 'description' => sprintf($lng['dkim']['dkim_keylength']['description'],$settings['dkim']['dkim_prefix']) + ), 'settinggroup' => 'dkim', 'varname' => 'dkim_keylength', 'type' => 'option', diff --git a/lng/dutch.lng.php b/lng/dutch.lng.php index 639317ff..04af9fc0 100644 --- a/lng/dutch.lng.php +++ b/lng/dutch.lng.php @@ -1252,7 +1252,7 @@ $lng['dkim']['dkim_algorithm']['title'] = 'Toegestane hash-algoritmen'; $lng['dkim']['dkim_algorithm']['description'] = 'Toegestane hash-algoritmen, kies "Alle" voor alle algoritmen of 1 of meerdere van onderstaande'; $lng['dkim']['dkim_servicetype'] = 'Type services'; $lng['dkim']['dkim_keylength']['title'] = 'Lengte sleutel'; -$lng['dkim']['dkim_keylength']['description'] = 'Let op: Indien u deze waarde wijzigt, dient u allen geheime en publieke sleutels in "'.$settings['dkim']['dkim_prefix'].'" te verwijderen'; +$lng['dkim']['dkim_keylength']['description'] = 'Let op: Indien u deze waarde wijzigt, dient u allen geheime en publieke sleutels in "%s" te verwijderen'; $lng['dkim']['dkim_notes']['title'] = 'Notities voor DKIM'; $lng['dkim']['dkim_notes']['description'] = 'Notities die van belang kunnen zijn voor mensen, bijvoorbeeld een URL als http://www.dnswatch.info. Geen enkel programma zal deze informatie verwerken. Deze informatie dient schaars te zijn gezien de beperkte ruimte in DNS. Dit is bedoeld voor beheerders, niet voor eindgebruikers.'; $lng['dkim']['dkim_add_adsp']['title'] = 'DKIM ADSP toevoegen'; diff --git a/lng/english.lng.php b/lng/english.lng.php index 371ad1e0..fdbd0451 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1296,7 +1296,7 @@ $lng['dkim']['dkim_algorithm']['title'] = 'Allowed Hash Algorithms'; $lng['dkim']['dkim_algorithm']['description'] = 'Define allowed hash algorithms, chose "All" for all algorithms or one or more from the other available algorithms'; $lng['dkim']['dkim_servicetype'] = 'Service Types'; $lng['dkim']['dkim_keylength']['title'] = 'Key-length'; -$lng['dkim']['dkim_keylength']['description'] = 'Attention: If you change this values, you need to delete all the private/public keys in "'.$settings['dkim']['dkim_prefix'].'"'; +$lng['dkim']['dkim_keylength']['description'] = 'Attention: If you change this values, you need to delete all the private/public keys in "%s"'; $lng['dkim']['dkim_notes']['title'] = 'DKIM Notes'; $lng['dkim']['dkim_notes']['description'] = 'Notes that might be of interest to a human, e.g. a URL like http://www.dnswatch.info. No interpretation is made by any program. This tag should be used sparingly due to space limitations in DNS. This is intended for use by administrators, not end users.'; $lng['dkim']['dkim_add_adsp']['title'] = 'Add DKIM ADSP entry'; diff --git a/lng/german.lng.php b/lng/german.lng.php index 7a437cf4..220f0020 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1275,7 +1275,7 @@ $lng['dkim']['dkim_algorithm']['title'] = 'Gültige Hash Algorithmen'; $lng['dkim']['dkim_algorithm']['description'] = 'Wählen sie einen Algorithmus, "All" für alle Algorithmen oder Einen oder Mehrere von den verfügbaren Algorithmen'; $lng['dkim']['dkim_servicetype'] = 'Service Typen'; $lng['dkim']['dkim_keylength']['title'] = 'Schlüssel-Länge'; -$lng['dkim']['dkim_keylength']['description'] = 'Achtung: Bei Änderung dieser Einstellung müssen alle private/public Schlüssel in "'.$settings['dkim']['dkim_prefix'].'" gelöscht werden.'; +$lng['dkim']['dkim_keylength']['description'] = 'Achtung: Bei Änderung dieser Einstellung müssen alle private/public Schlüssel in "%s" gelöscht werden.'; $lng['dkim']['dkim_notes']['title'] = 'DKIM Notiz'; $lng['dkim']['dkim_notes']['description'] = 'Eine Notiz, welche für Menschen interessant sein könnte, Z.B. eine URL wie http://www.dnswatch.info. Es gibt keine programmgesteuerte Interpretation für dieses Feld. Gehen sie sparsam mit der Anzahl der Zeichen um, da es Einschränkungen seitens des DNS Dienstes gibt. Dieses Feld ist für Administratoren gedacht, nicht für Benutzer.'; $lng['dkim']['dkim_add_adsp']['title'] = 'DKIM ADSP Eintrag hinzufügen'; diff --git a/lng/italian.lng.php b/lng/italian.lng.php index dcdfe4ee..505b9fbb 100644 --- a/lng/italian.lng.php +++ b/lng/italian.lng.php @@ -1277,7 +1277,7 @@ $lng['dkim']['dkim_algorithm']['title'] = 'Ammessi Algoritmi Hash'; $lng['dkim']['dkim_algorithm']['description'] = 'Definire gli algoritmi di hash permessi, scegliere "Tutti" per permettere tutti gli algoritmi oppure uno o più tra gli altri algoritmi disponibili'; $lng['dkim']['dkim_servicetype'] = 'Tipi di Servizio'; $lng['dkim']['dkim_keylength']['title'] = 'Lunghezza Chiave'; -$lng['dkim']['dkim_keylength']['description'] = 'Attenzione: Se si modifica questo valore è necessario eliminare tutte le chiavi private/pubbliche in "'.$settings['dkim']['dkim_prefix'].'"'; +$lng['dkim']['dkim_keylength']['description'] = 'Attenzione: Se si modifica questo valore è necessario eliminare tutte le chiavi private/pubbliche in "%s"'; $lng['dkim']['dkim_notes']['title'] = 'Note DKIM'; $lng['dkim']['dkim_notes']['description'] = 'Nota potrebbe essere di interesse, es. un URL come http://www.dnswatch.info. Nessuna interpretazione è fatta da nessun programma. Questo tag deve essere usato con parsimonia per ragioni di spazio nel DNS. Questo è destinato ad essere utilizzato dagli amministratori e non dagli utenti finali.'; $lng['dkim']['dkim_add_adsp']['title'] = 'Aggiungi un valore DKIM ADSP'; From f2ecf74d41284c1f0c5b029d5f705f59c43005fa Mon Sep 17 00:00:00 2001 From: madmuffin1 Date: Fri, 22 Mar 2013 16:38:56 +0100 Subject: [PATCH 5/5] Removed error references strings from all language_files, these language files should now be suitable for translation using transifex (refs #1171) --- lng/bulgarian.lng.php | 9 --------- lng/catalan.lng.php | 13 ++----------- lng/czech.lng.php | 13 ------------- lng/danish.lng.php | 9 --------- lng/dutch.lng.php | 13 ------------- lng/english.lng.php | 13 ------------- lng/error_references.php | 35 +++++++++++++++++++++++++++++++++++ lng/french.lng.php | 13 ------------- lng/german.lng.php | 13 ------------- lng/hungarian.lng.php | 9 --------- lng/italian.lng.php | 15 +-------------- lng/portugues.lng.php | 13 ------------- lng/russian.lng.php | 9 --------- lng/slovak.lng.php | 9 --------- lng/spanish.lng.php | 9 --------- lng/swedish.lng.php | 13 ------------- 16 files changed, 38 insertions(+), 170 deletions(-) create mode 100644 lng/error_references.php diff --git a/lng/bulgarian.lng.php b/lng/bulgarian.lng.php index 064ee410..0c22d7f9 100644 --- a/lng/bulgarian.lng.php +++ b/lng/bulgarian.lng.php @@ -205,15 +205,7 @@ $lng['error']['mustbeurl'] = 'Вие не сте въвели валиден и $lng['error']['invalidpath'] = 'Не сте избрали валиден URL (може би проблеми с "dirlisting?")'; $lng['error']['stringisempty'] = 'Липства стойност в полето'; $lng['error']['stringiswrong'] = 'Грешна стойност в полето'; -$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\''; -$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\''; -$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\''; -$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\''; -$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\''; $lng['error']['newpasswordconfirmerror'] = 'Нова парола и потвърждение не съвпадат'; -$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\''; -$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\''; -$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\''; $lng['error']['mydomain'] = '\'Домейн\''; $lng['error']['mydocumentroot'] = '\'Главна директория\''; $lng['error']['loginnameexists'] = 'Потребителското име %s е заето'; @@ -239,7 +231,6 @@ $lng['error']['destinationnonexist'] = 'Моля коригирайте поле $lng['error']['destinationalreadyexistasmail'] = 'Препрадката към %s вече съществува като активен E-mail адрес.'; $lng['error']['destinationalreadyexist'] = 'Вече има препрадка към %s .'; $lng['error']['destinationiswrong'] = 'Пренасочването %s съдържа невалиден символ (и), или е непълна.'; -$lng['error']['domainname'] = $lng['domains']['domainname']; $lng['error']['ticketnotaccessible'] = 'Нямате достъп до този билет.'; /** diff --git a/lng/catalan.lng.php b/lng/catalan.lng.php index 4a5636b8..db425ff1 100644 --- a/lng/catalan.lng.php +++ b/lng/catalan.lng.php @@ -194,15 +194,7 @@ $lng['error']['mustbeurl'] = 'No has escrit una URL correcte'; $lng['error']['invalidpath'] = 'No has escrit una URL vàlida (potser hi ha algun problema en el llistat de directoris)'; $lng['error']['stringisempty'] = 'Camp de text buit'; $lng['error']['stringiswrong'] = 'Contingut erroni en el camp de text'; -$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\''; -$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\''; -$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\''; -$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\''; -$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\''; $lng['error']['newpasswordconfirmerror'] = 'La nova clau no coincideix amb la confirmació'; -$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\''; -$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\''; -$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\''; $lng['error']['mydomain'] = '\'Domini\''; $lng['error']['mydocumentroot'] = '\'Arrel dels documents\''; $lng['error']['loginnameexists'] = 'Ja existeix l\'usuari %s'; @@ -229,7 +221,6 @@ $lng['error']['destinationnonexist'] = 'Si us plau crea la redirecció a \ $lng['error']['destinationalreadyexistasmail'] = 'La redirecció a %s ja existeix com un compte de correu.'; $lng['error']['destinationalreadyexist'] = 'Ja hi ha una redirecció a %s .'; $lng['error']['destinationiswrong'] = 'La redirecció %s conté caràcters invàlids o és incompleta.'; -$lng['error']['domainname'] = $lng['domains']['domainname']; /** * Questions @@ -255,9 +246,9 @@ $lng['question']['admin_configs_reallyrebuild'] = 'Segur que vols regenerar les * Mails */ -$lng['mails']['pop_success']['mailbody'] = 'Hola,\n\nel teu compte d\'email $destination\ns\'ha creat satisfactoriament.\n\nAix� és un missatge creat automàticament, si us plau uno responguis. Gràcies.'; +$lng['mails']['pop_success']['mailbody'] = 'Hola,\n\nel teu compte d\'email {EMAIL}\ns\'ha creat satisfactoriament.\n\nAix� és un missatge creat automàticament, si us plau uno responguis. Gràcies.'; $lng['mails']['pop_success']['subject'] = 'Compte de correu creat satisfactoriament'; -$lng['mails']['createcustomer']['mailbody'] = 'Hola {FIRSTNAME} {NAME},\n\n aquí te la seva informació:\n\nNom d\'usuari: $loginname\nClau: $password\n\n Gràcies per tot, disfruta del teu compte'; +$lng['mails']['createcustomer']['mailbody'] = 'Hola {FIRSTNAME} {NAME},\n\n aquí te la seva informació:\n\nNom d\'usuari: {USERNAME}\nClau: {PASSWORD}\n\n Gràcies per tot, disfruta del teu compte'; $lng['mails']['createcustomer']['subject'] = 'Informació del compte'; /** diff --git a/lng/czech.lng.php b/lng/czech.lng.php index b7c59e1b..eb945b99 100644 --- a/lng/czech.lng.php +++ b/lng/czech.lng.php @@ -195,15 +195,7 @@ $lng['error']['mustbeurl'] = 'Vložili jste nesprávnou nebo nekompletní url (n $lng['error']['invalidpath'] = 'Nevybrali jste správnou url (možná problém s "dirlistingem"?)'; $lng['error']['stringisempty'] = 'Chybì jící vstup v poli'; $lng['error']['stringiswrong'] = 'špatný vstup v poli'; -$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\''; -$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\''; -$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\''; -$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\''; -$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\''; $lng['error']['newpasswordconfirmerror'] = 'Nové heslo se neshoduje s tím pro potvrzení'; -$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\''; -$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\''; -$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\''; $lng['error']['mydomain'] = '\'Domain\''; $lng['error']['loginnameexists'] = 'Pøihlašovací jméno %s již existuje'; $lng['error']['emailiswrong'] = 'Emailová adresa %s obsahuje nepovolené znaky nebo je nekompletní'; @@ -229,7 +221,6 @@ $lng['error']['destinationnonexist'] = 'Prosím vytvoøte pøeposílatele v poli $lng['error']['destinationalreadyexistasmail'] = 'Pøeposílaè na %s již existuje jako aktivní emailová adresa.'; $lng['error']['destinationalreadyexist'] = 'Už jste nastavili pøeposílaè na %s .'; $lng['error']['destinationiswrong'] = 'Pøeposílaè %s obsahuje nesprávné znaky nebo není kompletní.'; -$lng['error']['domainname'] = $lng['domains']['domainname']; /** * Questions @@ -642,13 +633,9 @@ $lng['question']['ticket_reallyclose'] = 'Opravdu chcete zavøít tiket "%s"?'; $lng['question']['ticket_reallydelete'] = 'Opravdu chcete smazat tiket "%s"?'; $lng['question']['ticket_reallydeletecat'] = 'Opravdu chcete smazat kategorii "%s"?'; $lng['question']['ticket_reallyarchive'] = 'Opravdu chcete pøesunout tiket "%s" do archivu?'; -$lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\''; -$lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\''; -$lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\''; $lng['error']['nomoreticketsavailable'] = 'Použili jste všechny dostupné tikety. Prosím kontaktujte svého administrátora.'; $lng['error']['nocustomerforticket'] = 'Nemohu vytváøet tikety bez zákazníkù'; $lng['error']['categoryhastickets'] = 'Kategorie stále obsahuje tikety.
Prosím smažte tikety aby jste mohli smazat kategorii'; -$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets']; $lng['admin']['ticketsettings'] = 'Tikety-podpory nastavení'; $lng['admin']['archivelastrun'] = 'Poslední archivace tiketù'; $lng['serversettings']['ticket']['noreply_email']['title'] = 'Bez odpovì dní e-mailová adresa'; diff --git a/lng/danish.lng.php b/lng/danish.lng.php index e453046b..39203d6c 100644 --- a/lng/danish.lng.php +++ b/lng/danish.lng.php @@ -193,15 +193,7 @@ $lng['error']['mustbeurl'] = 'Din indtastning er ikke en gyldig URL (f.eks. http $lng['error']['invalidpath'] = 'Du har valgt en ikke gyldig url (måske et problem med mappe list?)'; $lng['error']['stringisempty'] = 'Manglende intasting i feltet'; $lng['error']['stringiswrong'] = 'Forkert indtastning i feltet'; -$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\''; -$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\''; -$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\''; -$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\''; -$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\''; $lng['error']['newpasswordconfirmerror'] = 'Det nye kodeord og kontrol indtastning stemmer ikke overens'; -$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\''; -$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\''; -$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\''; $lng['error']['mydomain'] = '\'Domæne\''; $lng['error']['mydocumentroot'] = '\'Mapperod\''; $lng['error']['loginnameexists'] = 'Brugernavnet %s eksisterer allerede'; @@ -228,7 +220,6 @@ $lng['error']['destinationnonexist'] = 'Opret venligst videresenderen i feltet.' $lng['error']['destinationalreadyexistasmail'] = 'Videresenderen til %s eksisterer allerede som en aktiv eMail-adresse.'; $lng['error']['destinationalreadyexist'] = 'Der er allerede angivet en videresender til %s .'; $lng['error']['destinationiswrong'] = 'Videresenderen %s indeholder ugyldige tegn eller er ikke komplet.'; -$lng['error']['domainname'] = $lng['domains']['domainname']; /** * Questions diff --git a/lng/dutch.lng.php b/lng/dutch.lng.php index 04af9fc0..5db019c9 100644 --- a/lng/dutch.lng.php +++ b/lng/dutch.lng.php @@ -179,15 +179,7 @@ $lng['error']['mustbeurl'] = 'U heeft geen goed of compleet URL ingegeven (bijv. $lng['error']['invalidpath'] = 'U heeft geen goed URL ingegeven (misschien een probleem met dirlisting?)'; $lng['error']['stringisempty'] = 'Geen waarde in invoerveld'; $lng['error']['stringiswrong'] = 'Verkeerde waarde in invoerveld'; -$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\''; -$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\''; -$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\''; -$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\''; -$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\''; $lng['error']['newpasswordconfirmerror'] = 'Het nieuwe wacthwoord en de bevestiging zijn niet gelijk'; -$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\''; -$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\''; -$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\''; $lng['error']['loginnameexists'] = 'Loginnaam %s bestaat al'; $lng['error']['emailiswrong'] = 'E-mail Adres %s bevat illegale karakters of is niet compleet'; $lng['error']['loginnameiswrong'] = 'Loginnaame %s bevat illegale karakters'; @@ -212,7 +204,6 @@ $lng['error']['destinationnonexist'] = 'Maak uw forwarder in het veld \'Destinat $lng['error']['destinationalreadyexistasmail'] = 'De forwarder naar %s bestaat reeds als actief e-mail adres.'; $lng['error']['destinationalreadyexist'] = 'U heeft al een forwarder die verwijst naar %s .'; $lng['error']['destinationiswrong'] = 'De forwarder naar %s bevat illegale karakter(s) of is niet compleet.'; -$lng['error']['domainname'] = $lng['domains']['domainname']; /** * Questions @@ -620,13 +611,9 @@ $lng['question']['ticket_reallyclose'] = 'Weet u zeker dat u ticket "%s" wilt sl $lng['question']['ticket_reallydelete'] = 'Weet u zeker dat u ticket "%s" wilt verwijderen?'; $lng['question']['ticket_reallydeletecat'] = 'Weet u zeker dat u de categorie "%s" wilt verwijderen?'; $lng['question']['ticket_reallyarchive'] = 'Weet u zeker dat u ticket "%s" wilt archiveren?'; -$lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\''; -$lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\''; -$lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\''; $lng['error']['nomoreticketsavailable'] = 'U hebt al uw beschikbare tickets verbruikt. Neem contact op met uw beheerder.'; $lng['error']['nocustomerforticket'] = 'U kunt geen tickets aanmaken zonder gebruikers'; $lng['error']['categoryhastickets'] = 'Deze categorie bevat nog tickets.
Verwijder de tickets eerst alvorens de categorie te verwijderen'; -$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets']; $lng['admin']['ticketsettings'] = 'Instellingen voor ondersteuningstickets'; $lng['admin']['archivelastrun'] = 'Laatste archivering tickets'; $lng['serversettings']['ticket']['noreply_email']['title'] = 'Emailadres voor geen-antwoord'; diff --git a/lng/english.lng.php b/lng/english.lng.php index fdbd0451..06c9f77a 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -199,15 +199,7 @@ $lng['error']['mustbeurl'] = 'You have not typed a valid or complete url (e.g. h $lng['error']['invalidpath'] = 'You have not chosen a valid URL (maybe problems with the dirlisting?)'; $lng['error']['stringisempty'] = 'Missing Input in Field'; $lng['error']['stringiswrong'] = 'Wrong Input in Field'; -$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\''; -$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\''; -$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\''; -$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\''; -$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\''; $lng['error']['newpasswordconfirmerror'] = 'New password and confirmation does not match'; -$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\''; -$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\''; -$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\''; $lng['error']['mydomain'] = '\'Domain\''; $lng['error']['mydocumentroot'] = '\'Documentroot\''; $lng['error']['loginnameexists'] = 'Login-Name %s already exists'; @@ -234,7 +226,6 @@ $lng['error']['destinationnonexist'] = 'Please create your forwarder in the fiel $lng['error']['destinationalreadyexistasmail'] = 'The forwarder to %s already exists as active e-mail-address.'; $lng['error']['destinationalreadyexist'] = 'You have already defined a forwarder to %s .'; $lng['error']['destinationiswrong'] = 'The forwarder %s contains invalid character(s) or is incomplete.'; -$lng['error']['domainname'] = $lng['domains']['domainname']; $lng['error']['ticketnotaccessible'] = 'You cannot access this ticket.'; /** @@ -665,13 +656,9 @@ $lng['question']['ticket_reallyclose'] = 'Do you really want to close the ticket $lng['question']['ticket_reallydelete'] = 'Do you really want to delete the ticket "%s"?'; $lng['question']['ticket_reallydeletecat'] = 'Do you really want to delete the category "%s"?'; $lng['question']['ticket_reallyarchive'] = 'Do you really want to move the ticket "%s" to the archive?'; -$lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\''; -$lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\''; -$lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\''; $lng['error']['nomoreticketsavailable'] = 'You have used all your available tickets. Please contact your administrator.'; $lng['error']['nocustomerforticket'] = 'Cannot create tickets without customers'; $lng['error']['categoryhastickets'] = 'The category still has tickets in it.
Please delete the tickets to delete the category'; -$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets']; $lng['admin']['ticketsettings'] = 'Support-Ticket settings'; $lng['admin']['archivelastrun'] = 'Last ticket archiving'; $lng['serversettings']['ticket']['noreply_email']['title'] = 'No-reply e-mail address'; diff --git a/lng/error_references.php b/lng/error_references.php new file mode 100644 index 00000000..f39e7f29 --- /dev/null +++ b/lng/error_references.php @@ -0,0 +1,35 @@ + + * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt + * @package Language + * + */ + +/** + * Error References Mapping (do not need to be translated) + */ + +$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\''; +$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\''; +$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\''; +$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\''; +$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\''; +$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\''; +$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\''; +$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\''; +$lng['error']['domainname'] = $lng['domains']['domainname']; +$lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\''; +$lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\''; +$lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\''; +$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets']; \ No newline at end of file diff --git a/lng/french.lng.php b/lng/french.lng.php index 9b46eff7..68d60943 100644 --- a/lng/french.lng.php +++ b/lng/french.lng.php @@ -206,15 +206,7 @@ $lng['error']['mustbeurl'] = 'Vous n\'avez pas entré une adresse URL valide.'; $lng['error']['invalidpath'] = 'Vous n\'avez pas choisi une adresse URL valide (probablement à cause de problèmes avec le listing de dossiers ?)'; $lng['error']['stringisempty'] = 'Entrée manquante'; $lng['error']['stringiswrong'] = 'Entrée invalide'; -$lng['error']['myloginname'] = '"' . $lng['login']['username'] . '"'; -$lng['error']['mypassword'] = '"' . $lng['login']['password'] . '"'; -$lng['error']['oldpassword'] = '"' . $lng['changepassword']['old_password'] . '"'; -$lng['error']['newpassword'] = '"' . $lng['changepassword']['new_password'] . '"'; -$lng['error']['newpasswordconfirm'] = '"' . $lng['changepassword']['new_password_confirm'] . '"'; $lng['error']['newpasswordconfirmerror'] = 'Le nouveau mot de passe et sa confirmation ne sont pas identiques pas.'; -$lng['error']['myname'] = '"' . $lng['customer']['name'] . '"'; -$lng['error']['myfirstname'] = '"' . $lng['customer']['firstname'] . '"'; -$lng['error']['emailadd'] = '"' . $lng['customer']['email'] . '"'; $lng['error']['mydomain'] = '"domaine"'; $lng['error']['loginnameexists'] = 'L\'identifiant "%s" existe déjà.'; $lng['error']['emailiswrong'] = 'L\'adresse "%s" contient des signes invalides ou est incomplète.'; @@ -240,7 +232,6 @@ $lng['error']['destinationnonexist'] = 'Veuillez écrire votre adresse de renvoi $lng['error']['destinationalreadyexistasmail'] = 'Le renvoi vers l\'adresse "%s" existe déjà comme adresse active.'; $lng['error']['destinationalreadyexist'] = 'Il existe déjà une réexpédition vers l\'adresse "%s".'; $lng['error']['destinationiswrong'] = 'L\'adresse "%s" contient des signes invalides ou est incomplète.'; -$lng['error']['domainname'] = $lng['domains']['domainname']; $lng['error']['loginnameissystemaccount'] = 'Vous ne pouvez pas créer un compte identique au compte système, veuillez réessayer avec un autre nom.'; /** @@ -659,13 +650,9 @@ $lng['question']['ticket_reallyclose'] = 'Etes-vous sûr de vouloir clôturer le $lng['question']['ticket_reallydelete'] = 'Etes-vous sûr de vouloir supprimer le billet "%s" ?'; $lng['question']['ticket_reallydeletecat'] = 'Etes-vous sûr de vouloir supprimer la catégorie "%s" ?'; $lng['question']['ticket_reallyarchive'] = 'Etes-vous sûr de vouloir archiver le billet "%s" ?'; -$lng['error']['mysubject'] = '"' . $lng['ticket']['subject'] . '"'; -$lng['error']['mymessage'] = '"' . $lng['ticket']['message'] . '"'; -$lng['error']['mycategory'] = '"' . $lng['ticket']['category'] . '"'; $lng['error']['nomoreticketsavailable'] = 'Vous n\'avez plus de billets de disponibles. Veuillez contacter votre administrateur.'; $lng['error']['nocustomerforticket'] = 'Ne peut créer de billet sans client'; $lng['error']['categoryhastickets'] = 'La catégorie possède des billets.
Veuillez d\'abord supprimer tous les billets de cette catégorie.'; -$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets']; $lng['admin']['ticketsettings'] = 'Paramètres des billets de support'; $lng['admin']['archivelastrun'] = 'Derniers billets archivés'; $lng['serversettings']['ticket']['noreply_email']['title'] = 'Adresse e-mail de non réponse'; diff --git a/lng/german.lng.php b/lng/german.lng.php index 220f0020..b33dcab5 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -199,15 +199,7 @@ $lng['error']['mustbeurl'] = 'Sie müssen eine vollständige URL angeben (z.B. h $lng['error']['invalidpath'] = 'Sie haben keine gültige URL ausgewählt (Evtl. Probleme beim Verzeichnislisting?)'; $lng['error']['stringisempty'] = 'Fehlende Eingabe im Feld'; $lng['error']['stringiswrong'] = 'Falsche Eingabe im Feld'; -$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\''; -$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\''; -$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\''; -$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\''; -$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\''; $lng['error']['newpasswordconfirmerror'] = 'Das neue Passwort und die Bestätigung sind nicht identisch.'; -$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\''; -$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\''; -$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\''; $lng['error']['mydomain'] = '\'Domain\''; $lng['error']['mydocumentroot'] = '\'Documentroot\''; $lng['error']['loginnameexists'] = 'Der Login-Name %s existiert bereits.'; @@ -234,7 +226,6 @@ $lng['error']['destinationnonexist'] = 'Bitte geben Sie Ihre Weiterleitungsadres $lng['error']['destinationalreadyexistasmail'] = 'Die Weiterleitung zu %s exisitiert bereits als aktive E-Mail-Adresse.'; $lng['error']['destinationalreadyexist'] = 'Es gibt bereits eine Weiterleitung nach %s .'; $lng['error']['destinationiswrong'] = 'Die Weiterleitungsadresse-Adresse %s enthält ungültige Zeichen oder ist nicht vollständig.'; -$lng['error']['domainname'] = $lng['domains']['domainname']; $lng['error']['ticketnotaccessible'] = 'Sie können sich das Ticket nicht ansehen.'; /** @@ -668,13 +659,9 @@ $lng['question']['ticket_reallyclose'] = 'Wollen Sie das Ticket "%s" wirklich sc $lng['question']['ticket_reallydelete'] = 'Wollen Sie das Ticket "%s" wirklich löschen?'; $lng['question']['ticket_reallydeletecat'] = 'Wollen Sie die Kategorie "%s" wirklich löschen?'; $lng['question']['ticket_reallyarchive'] = 'Wollen Sie das Ticket "%s" wirklich in das Archiv verschieben?'; -$lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\''; -$lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\''; -$lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\''; $lng['error']['nomoreticketsavailable'] = 'Sie haben Ihr Ticketkontingent aufgebraucht. Bitte kontaktieren Sie ihren Administrator.'; $lng['error']['nocustomerforticket'] = 'Keine Kunden vorhanden um ein Ticket zu erstellen.'; $lng['error']['categoryhastickets'] = 'In dieser Kategorie befinden sich noch Tickets.
Bitte löschen Sie diese um die Kategorie zu löschen'; -$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets']; $lng['admin']['ticketsettings'] = 'Support-Ticket Einstellungen'; $lng['admin']['archivelastrun'] = 'Letzte Ticket-Archivierung'; $lng['serversettings']['ticket']['noreply_email']['title'] = 'Keine-Antwort E-Mail Adresse'; diff --git a/lng/hungarian.lng.php b/lng/hungarian.lng.php index f557b908..5a27055b 100644 --- a/lng/hungarian.lng.php +++ b/lng/hungarian.lng.php @@ -194,15 +194,7 @@ $lng['error']['mustbeurl'] = 'Nem teljes vagy nem érvényes URL-t (pl.: http:// $lng['error']['invalidpath'] = 'Nem választott ki érvényes URL-t (lehet, hogy probléma van a könyvtárlistázással?).'; $lng['error']['stringisempty'] = 'A mezőben nincs adat.'; $lng['error']['stringiswrong'] = 'A mezőben helytelen adat van.'; -$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\''; -$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\''; -$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\''; -$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\''; -$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\''; $lng['error']['newpasswordconfirmerror'] = 'Az új jelszó és annak megerősítése nem egyezik meg.'; -$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\''; -$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\''; -$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\''; $lng['error']['mydomain'] = '\'Domain\''; $lng['error']['mydocumentroot'] = '\'Dokumentum útvonal\''; $lng['error']['loginnameexists'] = 'A(z) %s felhasználónév már létezik'; @@ -229,7 +221,6 @@ $lng['error']['destinationnonexist'] = 'Kérem, levél-továbbítóját a \'Cé $lng['error']['destinationalreadyexistasmail'] = 'A(z) %s továbbító már létezik mint aktív e-mail cím.'; $lng['error']['destinationalreadyexist'] = 'Ön már létrehozott egy továbbítót ehhez: %s .'; $lng['error']['destinationiswrong'] = 'A(z) %s továbbító érvénytelen karakter(eke)t tartalmaz vagy nem teljes.'; -$lng['error']['domainname'] = $lng['domains']['domainname']; /** * Questions diff --git a/lng/italian.lng.php b/lng/italian.lng.php index 505b9fbb..5a8bd756 100644 --- a/lng/italian.lng.php +++ b/lng/italian.lng.php @@ -197,15 +197,7 @@ $lng['error']['mustbeurl'] = 'Non hai inserito un\'indirizzo valido o completo ( $lng['error']['invalidpath'] = 'Non hai scelto un\'indirizzo valido.'; $lng['error']['stringisempty'] = 'Manca il dato nel campo.'; $lng['error']['stringiswrong'] = 'Dato incorretto.'; -$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\''; -$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\''; -$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\''; -$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\''; -$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\''; $lng['error']['newpasswordconfirmerror'] = 'La nuova password non corrisponde a quella vecchia.'; -$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\''; -$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\''; -$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\''; $lng['error']['mydomain'] = '\'Dominio\''; $lng['error']['mydocumentroot'] = '\'Documentroot\''; $lng['error']['loginnameexists'] = 'Il login %s esiste già.'; @@ -232,7 +224,6 @@ $lng['error']['destinationnonexist'] = 'Per favore crea il tuo reindirizzamento $lng['error']['destinationalreadyexistasmail'] = 'Il reindirizzamento a %s esiste già come indirizzo Email attivo.'; $lng['error']['destinationalreadyexist'] = 'Hai già definito un reindirizzamento per %s .'; $lng['error']['destinationiswrong'] = 'Il reindirizzamento %s contiene caratteri invalidi o è incompleto.'; -$lng['error']['domainname'] = $lng['domains']['domainname']; /** * Questions @@ -650,13 +641,9 @@ $lng['question']['ticket_reallyclose'] = 'Vuoi veramente chiudere il ticket"%s"? $lng['question']['ticket_reallydelete'] = 'Vuoi veramente cancellare il ticket"%s"?'; $lng['question']['ticket_reallydeletecat'] = 'Vuoi veramente eliminare la categoria "%s"?'; $lng['question']['ticket_reallyarchive'] = 'Vuoi veramente spostare il ticket "%s" in archivio?'; -$lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\''; -$lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\''; -$lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\''; $lng['error']['nomoreticketsavailable'] = 'Sono stati usati tutti i ticket disponibili. Si prega di contattare l\'amministratore.'; $lng['error']['nocustomerforticket'] = 'Impossibile creare ticket senza clienti'; $lng['error']['categoryhastickets'] = 'La categoria contiene ancora ticket.
Si prega di cancellare i ticket per eliminare la categoria'; -$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets']; $lng['admin']['ticketsettings'] = 'Impostazioni Gestione Ticket'; $lng['admin']['archivelastrun'] = 'Ultimo ticket archiviato'; $lng['serversettings']['ticket']['noreply_email']['title'] = 'Non rispondere a questo indirizzo email'; @@ -1581,7 +1568,7 @@ $lng['menue']['traffic']['table'] = 'Traffico'; $lng['error']['admin_domain_emailsystemhostname'] = 'Spiacente, l\'hostname di sistema non può essere usato come dominio di un cliente'; $lng['backup_allowed'] = 'Backup permesso'; $lng['extras']['backup_create'] = 'Creare il Backup?'; -$lng['extras']['backup_info'] = 'Il Backup sarà eseguito una volta al giorno nella cartella "' . $settings['system']['backup_dir'] . '".'; +$lng['extras']['backup_info'] = 'Il Backup sarà eseguito una volta al giorno nella cartella ...'; $lng['extras']['backup_info_sep'] = 'Contiene gli archivi compressi dei file HTML Files e dei Database.'; $lng['extras']['backup_info_big'] = 'Contiene un archivio compresso dei file HTML Files e dei Database.'; $lng['extras']['backup_count_info'] = '

Si tenga in considerazione che il backup utilizza lo spazio web!'; diff --git a/lng/portugues.lng.php b/lng/portugues.lng.php index 07fd4f2e..59db4cb8 100644 --- a/lng/portugues.lng.php +++ b/lng/portugues.lng.php @@ -198,15 +198,7 @@ $lng['error']['mustbeurl'] = 'Voce não digitou uma URL válida (ex. http://seud $lng['error']['invalidpath'] = 'Optou por um URL não válido (eventuais problemas na lista do directório)'; $lng['error']['stringisempty'] = 'Faltando informação no campo'; $lng['error']['stringiswrong'] = 'Erro na informação do campo'; -$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\''; -$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\''; -$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\''; -$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\''; -$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\''; $lng['error']['newpasswordconfirmerror'] = 'A nova senha e a confirmação não conferem'; -$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\''; -$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\''; -$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\''; $lng['error']['mydomain'] = '\'Dominio\''; $lng['error']['mydocumentroot'] = '\'Documento principal\''; $lng['error']['loginnameexists'] = 'Login %s já existe'; @@ -233,7 +225,6 @@ $lng['error']['destinationnonexist'] = 'Por favor crie seu redirecionamento no c $lng['error']['destinationalreadyexistasmail'] = 'O redirecionamento %s já existe como uma conta de e-mail.'; $lng['error']['destinationalreadyexist'] = 'Voce já definiu um redirecionamento para %s .'; $lng['error']['destinationiswrong'] = 'O redirecionamento %s contem caracteres inválidos ou incompletos.'; -$lng['error']['domainname'] = $lng['domains']['domainname']; /** * Questions @@ -586,13 +577,9 @@ $lng['question']['ticket_reallyclose'] = 'Você deseja fechar o ticket"%s"?'; $lng['question']['ticket_reallydelete'] = 'Você deseja apagar o ticket"%s"?'; $lng['question']['ticket_reallydeletecat'] = 'Você deseja deletar a categoria "%s"?'; $lng['question']['ticket_reallyarchive'] = 'Você deseja mover o ticket "%s" para o arquivo?'; -$lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\''; -$lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\''; -$lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\''; $lng['error']['nomoreticketsavailable'] = 'Você já utilizou todos seus tickets disponíveis. Por favor contacte seu administrador'; $lng['error']['nocustomerforticket'] = 'Não pode criar Tickets sem Clientes'; $lng['error']['categoryhastickets'] = 'A categoria ainda tem tikets na mesma.
Por favor elimine os bilhetes para eliminar a categoria'; -$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets']; $lng['admin']['ticketsettings'] = 'Configurações de Ticket de Suporte'; $lng['admin']['archivelastrun'] = 'Último arquivamento de ticket'; $lng['serversettings']['ticket']['noreply_email']['title'] = 'Não responder endereço de email'; diff --git a/lng/russian.lng.php b/lng/russian.lng.php index a3eb83d4..4a367536 100644 --- a/lng/russian.lng.php +++ b/lng/russian.lng.php @@ -537,18 +537,10 @@ $lng['error']['stringiswrong'] = 'Неправильные данные в по // Falsche Eingabe im Feld -$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\''; -$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\''; -$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\''; -$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\''; -$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\''; $lng['error']['newpasswordconfirmerror'] = 'Новый пароль и повторённый новый пароль отличаются.'; // Das neue Passwort und die Bestaetigung sind nicht identisch. -$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\''; -$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\''; -$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\''; $lng['error']['mydomain'] = '\'Домен\''; // \'Domain\' @@ -653,7 +645,6 @@ $lng['error']['destinationiswrong'] = 'Адрес для пересылки %s // Die Weiterleitungsadresse-Adresse %s beinhaltet ungueltige Zeichen oder ist nicht vollstaendig. -$lng['error']['domainname'] = $lng['domains']['domainname']; /** * Questions diff --git a/lng/slovak.lng.php b/lng/slovak.lng.php index 2611cb68..759af73a 100644 --- a/lng/slovak.lng.php +++ b/lng/slovak.lng.php @@ -193,15 +193,7 @@ $lng['error']['mustbeurl'] = 'Nezadali ste správu alebo kompletnú URL (napr. h $lng['error']['invalidpath'] = 'Nevybrali ste správu URL (moŸno je problém so zoznamom adresárov)'; $lng['error']['stringisempty'] = 'Chýbajúce vstupné pole'; $lng['error']['stringiswrong'] = 'Nesprávne vstupné pole'; -$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\''; -$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\''; -$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\''; -$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\''; -$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\''; $lng['error']['newpasswordconfirmerror'] = 'Nové a potvrdzujúce heslo sa nezhodujú'; -$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\''; -$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\''; -$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\''; $lng['error']['mydomain'] = '\'Domain\''; $lng['error']['mydocumentroot'] = '\'Documentroot\''; $lng['error']['loginnameexists'] = 'Prihlasovacie meno %s uŸ existuje'; @@ -228,7 +220,6 @@ $lng['error']['destinationnonexist'] = 'Prosím, vytvorte Va¹e presmerovanie v $lng['error']['destinationalreadyexistasmail'] = 'Presmerovanie na %s uŸ existuje s aktívnou E-mail adresou.'; $lng['error']['destinationalreadyexist'] = 'UŸ ste definovali presmerovanie na %s .'; $lng['error']['destinationiswrong'] = 'Presmerovanie %s obsahuje neplatný(é) znak(y) alebo je nekompletné.'; -$lng['error']['domainname'] = $lng['domains']['domainname']; /** * Questions diff --git a/lng/spanish.lng.php b/lng/spanish.lng.php index 1e15e260..c36a33e2 100644 --- a/lng/spanish.lng.php +++ b/lng/spanish.lng.php @@ -195,15 +195,7 @@ $lng['error']['mustbeurl'] = 'Usted tiene que dar una completa direccion URL(por $lng['error']['invalidpath'] = 'No ha seleccionado una URL válida (¿probablemente problemas con el listado de registros?)'; $lng['error']['stringisempty'] = 'Falta un dato'; $lng['error']['stringiswrong'] = 'Dato falso'; -$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\''; -$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\''; -$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\''; -$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\''; -$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\''; $lng['error']['newpasswordconfirmerror'] = 'La Clave Nueva a la Confirmacion de Clave no Coinciden'; -$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\''; -$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\''; -$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\''; $lng['error']['mydomain'] = '\'dominio\''; $lng['error']['mydocumentroot'] = '\'Documentroot\''; $lng['error']['loginnameexists'] = 'Conexión-Nombre %s existe ya'; @@ -230,7 +222,6 @@ $lng['error']['destinationnonexist'] = 'Crear por favor su email-expedición en $lng['error']['destinationalreadyexistasmail'] = 'La direccion Secundaria %s ya existe como Direccion e-mail activa.'; $lng['error']['destinationalreadyexist'] = 'Ya existe una Direccion Secundaria para %s .'; $lng['error']['destinationiswrong'] = 'La Direccion Secundaria %s contiene simbolos invalidos o esta incompleta.'; -$lng['error']['domainname'] = $lng['domains']['domainname']; /** * Questions diff --git a/lng/swedish.lng.php b/lng/swedish.lng.php index 10fc4b50..80cbd63a 100644 --- a/lng/swedish.lng.php +++ b/lng/swedish.lng.php @@ -191,15 +191,7 @@ $lng['error']['mustbeurl'] = 'Du har inte skrivit in en korrekt url (e.g. http:/ $lng['error']['invalidpath'] = 'Du har inte valt en korrekt url (Kanske har du lagt till en katalogsäkerhet så att katalogerna inte kan visas?)'; $lng['error']['stringisempty'] = 'Du måste skriva in något i fältet'; $lng['error']['stringiswrong'] = 'Fel inatningsfält'; -$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\''; -$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\''; -$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\''; -$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\''; -$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\''; $lng['error']['newpasswordconfirmerror'] = 'New password and confirmation does not match'; -$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\''; -$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\''; -$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\''; $lng['error']['mydomain'] = '\'Domain\''; $lng['error']['mydocumentroot'] = '\'Documentroot\''; $lng['error']['loginnameexists'] = 'Login-Name %s är upptaget'; @@ -226,7 +218,6 @@ $lng['error']['destinationnonexist'] = 'Skapa en forwarder i fältet \'Destinati $lng['error']['destinationalreadyexistasmail'] = 'Denna forwarder %s, finns redan som aktiv E-postadress.'; $lng['error']['destinationalreadyexist'] = 'Du har redan skapat en forwarder till %s .'; $lng['error']['destinationiswrong'] = 'Denna forwarder: %s innehåller ogiltiga tecken eller så är den inte komplett adress.'; -$lng['error']['domainname'] = $lng['domains']['domainname']; /** * Questions @@ -638,13 +629,9 @@ $lng['question']['ticket_reallyclose'] = 'Är du säker på att du vill stänga $lng['question']['ticket_reallydelete'] = 'Är du säker på att du vill radera supportärendet "%s"?'; $lng['question']['ticket_reallydeletecat'] = 'Är du säker på att du vill radera kategorin "%s"?'; $lng['question']['ticket_reallyarchive'] = 'Är du säker på att du vill flytta supportärendet "%s" till arkivet?'; -$lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\''; -$lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\''; -$lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\''; $lng['error']['nomoreticketsavailable'] = 'Du har redan använt alla supportärenden som du fått tilldelade. Kontakta administratören om du behöver fler.'; $lng['error']['nocustomerforticket'] = 'Det går inte att skapa ett supportärende utan kunder'; $lng['error']['categoryhastickets'] = 'Denna kategori har fortfarande supportärenden.
Du måste radera dessa ärenden innan du kan radera denna kategori'; -$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets']; $lng['admin']['ticketsettings'] = 'Supportärende inställningar'; $lng['admin']['archivelastrun'] = 'Sista supportärende som arkiverats'; $lng['serversettings']['ticket']['noreply_email']['title'] = 'Svara-Inte E-post adress';