diff options
| -rw-r--r-- | language/de_DE/admin.lang.php | 4 | ||||
| -rw-r--r-- | language/en_UK/admin.lang.php | 2 | ||||
| -rw-r--r-- | language/es_ES/admin.lang.php | 2 | ||||
| -rw-r--r-- | language/fr_FR/admin.lang.php | 2 | ||||
| -rw-r--r-- | language/it_IT/admin.lang.php | 2 | ||||
| -rw-r--r-- | language/nl_NL/admin.lang.php | 2 | ||||
| -rw-r--r-- | language/pl_PL/admin.lang.php | 2 | ||||
| -rw-r--r-- | language/templates/admin.lang.php | 2 | ||||
| -rw-r--r-- | themes/default/template/mail/text/html/notification_by_mail.tpl | 12 | ||||
| -rw-r--r-- | themes/default/template/mail/text/plain/notification_by_mail.tpl | 12 | ||||
| -rwxr-xr-x | tools/replace.php | 8 |
11 files changed, 17 insertions, 33 deletions
diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php index bf1798b94..7b4e44fc6 100644 --- a/language/de_DE/admin.lang.php +++ b/language/de_DE/admin.lang.php @@ -273,9 +273,7 @@ $lang['User'] = "Benutzer"; $lang['Complementary mail content'] = "Detaillierter Inhalt der Beachrichtigungsmail"; $lang['See you soon,'] = "Bis bald,"; $lang['Go to'] = "Gehe zu"; -$lang['.'] = "."; $lang['Hello'] = "Hallo"; -$lang[','] = ","; $lang['New elements were added'] = "Neue Bilder wurden der Galerie hinzugefügt zwischen dem"; $lang['on'] = "an"; $lang['between'] = "zwischen"; @@ -287,7 +285,7 @@ $lang['If you encounter problems or have any question, please send a message to' $lang['[NBM] Problems or questions'] = "[NBM] Probleme oder Fragen"; $lang['The webmaster has unsubscribed you from receiving notifications by mail.'] = "Der Webmaster hat dich für die E-Mailbenachrichtigung ausgetragen"; $lang['You have unsubscribed from receiving notifications by mail.'] = "Sie haben sich ausgetragen für die Benachrichtigung per E-Mail"; -$lang[', click on'] = ", klicke auf diesen Link:"; +$lang[', click on '] = ", klicke auf diesen Link:"; $lang['To unsubscribe'] = "Zum austragen"; $lang['With blank value, gallery title will be used'] = "Bei leerem Inhalt wird der Galerietitel benutzt"; $lang['Notification'] = "Benachrichtigung"; diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index b0d028af5..fa9e6bd5f 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -272,9 +272,7 @@ $lang['User'] = "User"; $lang['Complementary mail content'] = "Complementary mail content"; $lang['See you soon,'] = "See you soon,"; $lang['Go to'] = "Go to"; -$lang['.'] = "."; $lang['Hello'] = "Hello"; -$lang[','] = ","; $lang['New elements were added'] = "New elements were added"; $lang['on'] = "on"; $lang['between'] = "between"; diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php index dc97c272a..762aae01e 100644 --- a/language/es_ES/admin.lang.php +++ b/language/es_ES/admin.lang.php @@ -273,9 +273,7 @@ $lang['User'] = "Usuario"; $lang['Complementary mail content'] = "Contenido complementario en el mail"; $lang['See you soon,'] = "Hasta pronto,"; $lang['Go to'] = "Vayan a"; -$lang['.'] = "."; $lang['Hello'] = "Buenos días"; -$lang[','] = ","; $lang['New elements were added'] = "Los nuevos elementos han sido añadidos"; $lang['on'] = "el"; $lang['between'] = "entre él"; diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index 132bfd2ff..0b41018de 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -273,9 +273,7 @@ $lang['User'] = "Utilisateur"; $lang['Complementary mail content'] = "Contenu complémentaire au mail"; $lang['See you soon,'] = "A bientôt,"; $lang['Go to'] = "Rendez-vous sur"; -$lang['.'] = "."; $lang['Hello'] = "Bonjour"; -$lang[','] = ","; $lang['New elements were added'] = "De nouveaux éléments ont été ajoutés"; $lang['on'] = "le"; $lang['between'] = "entre le"; diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php index 2daff039f..2e2420a19 100644 --- a/language/it_IT/admin.lang.php +++ b/language/it_IT/admin.lang.php @@ -273,9 +273,7 @@ $lang['User'] = "Utente"; $lang['Complementary mail content'] = "Contenuto complementare per l'email"; $lang['See you soon,'] = "A presto,"; $lang['Go to'] = "A presto su"; -$lang['.'] = "."; $lang['Hello'] = "Ciao"; -$lang[','] = ","; $lang['New elements were added'] = "Nuovi elementi sono stati aggiunti"; $lang['on'] = "il"; $lang['between'] = "tra il"; diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php index 8e7afb667..5ba19c4fd 100644 --- a/language/nl_NL/admin.lang.php +++ b/language/nl_NL/admin.lang.php @@ -273,9 +273,7 @@ $lang['User'] = "Gebruiker"; $lang['Complementary mail content'] = "Inhoud mail"; $lang['See you soon,'] = "Zie je snel,"; $lang['Go to'] = "Ga naar"; -$lang['.'] = "http://www.terwolde.net"; $lang['Hello'] = "Hallo"; -$lang[','] = ","; $lang['New elements were added'] = "Nieuwe elementen toegevoegd"; $lang['on'] = "op"; $lang['between'] = "tussen"; diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php index 67cb2ba60..f0169b4ee 100644 --- a/language/pl_PL/admin.lang.php +++ b/language/pl_PL/admin.lang.php @@ -273,9 +273,7 @@ $lang['User'] = "Użytkownik"; $lang['Complementary mail content'] = "Uzupełniająca treść wiadomości"; $lang['See you soon,'] = "Do zobaczenia wkrótce,"; $lang['Go to'] = "Przejdź do"; -$lang['.'] = "."; $lang['Hello'] = "Witaj"; -$lang[','] = ","; $lang['New elements were added'] = "dodano nowe elementy"; $lang['on'] = "dnia"; $lang['between'] = "pomiędzy"; diff --git a/language/templates/admin.lang.php b/language/templates/admin.lang.php index 19abbc5c7..117c54316 100644 --- a/language/templates/admin.lang.php +++ b/language/templates/admin.lang.php @@ -271,9 +271,7 @@ $lang['nbm_col_user'] = 'User'; $lang['nbm_complementary_mail_content'] = 'Complementary mail content'; $lang['nbm_content_byebye'] = 'See you soon,'; $lang['nbm_content_goto_1'] = 'Go to '; -$lang['nbm_content_goto_2'] = '.'; $lang['nbm_content_hello_1'] = 'Hello '; -$lang['nbm_content_hello_2'] = ','; $lang['nbm_content_new_elements'] = 'New elements were added '; $lang['nbm_content_new_elements_single'] = ' on '; $lang['nbm_content_new_elements_between_1'] = 'between '; diff --git a/themes/default/template/mail/text/html/notification_by_mail.tpl b/themes/default/template/mail/text/html/notification_by_mail.tpl index a5639417a..b8ccd8fc7 100644 --- a/themes/default/template/mail/text/html/notification_by_mail.tpl +++ b/themes/default/template/mail/text/html/notification_by_mail.tpl @@ -1,6 +1,6 @@ <div id="nbm_message"> <h2>{'Notification'|@translate}</h2> -<p>{'Hello '|@translate}{$USERNAME},</p> +<p>{'Hello'|@translate} {$USERNAME},</p> {if isset($subscribe_by_admin)} <p>{'The webmaster has subscribed you to receiving notifications by mail.'|@translate}</p> @@ -15,10 +15,10 @@ <p>{'You have unsubscribed from receiving notifications by mail.'|@translate}</p> {/if} {if isset($content_new_elements_single)} -<p>{'New elements were added '|@translate}{' on '|@translate}{$content_new_elements_single.DATE_SINGLE}.</p> +<p>{'New elements were added '|@translate} {'on'|@translate} {$content_new_elements_single.DATE_SINGLE}.</p> {/if} {if isset($content_new_elements_between)} -<p>{'New elements were added '|@translate}{' between '|@translate}{$content_new_elements_between.DATE_BETWEEN_1}{' and '|@translate}{$content_new_elements_between.DATE_BETWEEN_2}.</p> +<p>{'New elements were added '|@translate} {'between'|@translate} {$content_new_elements_between.DATE_BETWEEN_1} {'and'|@translate} {$content_new_elements_between.DATE_BETWEEN_2}.</p> {/if} {if not empty($global_new_lines)} @@ -34,14 +34,14 @@ {/if} {if not empty($GOTO_GALLERY_TITLE)} -<p>{'Go to '|@translate}<a href="{$GOTO_GALLERY_URL}">{$GOTO_GALLERY_TITLE}</a>.</p> +<p>{'Go to'|@translate} <a href="{$GOTO_GALLERY_URL}">{$GOTO_GALLERY_TITLE}</a>.</p> {/if} <p>{'See you soon,'|@translate}</p> <p style="text-align:center">{$SEND_AS_NAME}</p> <p> <br><hr> -{'To unsubscribe'|@translate}{', click on '|@translate}<a href="{$UNSUBSCRIBE_LINK}">{$UNSUBSCRIBE_LINK}</a><br> -{'To subscribe '|@translate}{', click on '|@translate}<a href="{$SUBSCRIBE_LINK}">{$SUBSCRIBE_LINK}</a><br> +{'To unsubscribe'|@translate}{', click on'|@translate} <a href="{$UNSUBSCRIBE_LINK}">{$UNSUBSCRIBE_LINK}</a><br> +{'To subscribe '|@translate}{', click on'|@translate} <a href="{$SUBSCRIBE_LINK}">{$SUBSCRIBE_LINK}</a><br> {'If you encounter problems or have any question, please send a message to'|@translate} <a href="mailto:{$CONTACT_EMAIL}?subject={'[NBM] Problems or questions'|@translate}">{$CONTACT_EMAIL}</a><br> <hr><br> </p> diff --git a/themes/default/template/mail/text/plain/notification_by_mail.tpl b/themes/default/template/mail/text/plain/notification_by_mail.tpl index 4c396ccf2..a428dce05 100644 --- a/themes/default/template/mail/text/plain/notification_by_mail.tpl +++ b/themes/default/template/mail/text/plain/notification_by_mail.tpl @@ -1,4 +1,4 @@ -{'Hello '|@translate}{$USERNAME}, +{'Hello'|@translate} {$USERNAME}, {if isset($subscribe_by_admin)} {'The webmaster has subscribed you to receiving notifications by mail.'|@translate} @@ -13,10 +13,10 @@ {'You have unsubscribed from receiving notifications by mail.'|@translate} {/if} {if isset($content_new_elements_single)} -{'New elements were added '|@translate}{' on '|@translate}{$content_new_elements_single.DATE_SINGLE}. +{'New elements were added '|@translate} {'on'|@translate} {$content_new_elements_single.DATE_SINGLE}. {/if} {if isset($content_new_elements_between)} -{'New elements were added '|@translate}{' between '|@translate}{$content_new_elements_between.DATE_BETWEEN_1}{' and '|@translate}{$content_new_elements_between.DATE_BETWEEN_2}. +{'New elements were added '|@translate} {'between'|@translate} {$content_new_elements_between.DATE_BETWEEN_1} {'and'|@translate} {$content_new_elements_between.DATE_BETWEEN_2}. {/if} {if not empty($global_new_lines)} {foreach from=$global_new_lines item=line} @@ -27,7 +27,7 @@ {$custom_mail_content} {/if} {if not empty($GOTO_GALLERY_TITLE)} -{'.'|@translate}{$GOTO_GALLERY_TITLE} {$GOTO_GALLERY_URL} {'.'|@translate} +.{$GOTO_GALLERY_TITLE} {$GOTO_GALLERY_URL} . {/if} {'See you soon,'|@translate} @@ -35,7 +35,7 @@ ______________________________________________________________________________ -{'To unsubscribe'|@translate}{', click on '|@translate}{$UNSUBSCRIBE_LINK} -{'To subscribe'|@translate}{', click on '|@translate}{$SUBSCRIBE_LINK} +{'To unsubscribe'|@translate}{', click on'|@translate} {$UNSUBSCRIBE_LINK} +{'To subscribe'|@translate}{', click on'|@translate} {$SUBSCRIBE_LINK} {'If you encounter problems or have any question, please send a message to'|@translate} {$CONTACT_EMAIL} ______________________________________________________________________________ diff --git a/tools/replace.php b/tools/replace.php index 21d38c0e4..0596ca064 100755 --- a/tools/replace.php +++ b/tools/replace.php @@ -18,10 +18,10 @@ $nbLines = count($lines); $pattern = "`(.*{')(.*)('\|@translate}.*)`Um"; $replace = "'{\''.keyReplace('\\1').'\'|@translate}'"; -include "language/en_UK/common.lang.php"; -include "language/en_UK/admin.lang.php"; -include "language/en_UK/upgrade.lang.php"; -include "language/en_UK/install.lang.php"; +include "language/templates/common.lang.php"; +include "language/templates/admin.lang.php"; +include "language/templates/upgrade.lang.php"; +include "language/templates/install.lang.php"; while ($n < $nbLines) { preg_match_all($pattern, $lines[$n], $matches); |