From c045205e53fe371cef24440aacf8defa621fa941 Mon Sep 17 00:00:00 2001
From: nikrou <nikrou@piwigo.org>
Date: Tue, 23 Mar 2010 22:06:13 +0000
Subject: Fix problem with white space in language keys

git-svn-id: http://piwigo.org/svn/trunk@5297 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/plugins_new.php                                        |  2 +-
 language/templates/admin.lang.php                            | 12 ++++++------
 .../default/template/mail/text/html/notification_by_mail.tpl |  6 +++---
 .../template/mail/text/plain/notification_by_mail.tpl        |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/admin/plugins_new.php b/admin/plugins_new.php
index a55bdf0ad..c6d6e0f8a 100644
--- a/admin/plugins_new.php
+++ b/admin/plugins_new.php
@@ -71,7 +71,7 @@ if (isset($_GET['installstatus']))
     default:
       array_push($page['errors'],
         sprintf(l10n('An error occured during extraction (%s).'), $_GET['installstatus']),
-        l10n('Please check \"plugins\" folder and sub-folders permissions (CHMOD).'));
+        l10n('Please check "plugins" folder and sub-folders permissions (CHMOD).'));
   }  
 }
 
diff --git a/language/templates/admin.lang.php b/language/templates/admin.lang.php
index 117c54316..74ffe5a8e 100644
--- a/language/templates/admin.lang.php
+++ b/language/templates/admin.lang.php
@@ -270,12 +270,12 @@ $lang['nbm_col_mail'] = 'email';
 $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_hello_1'] = 'Hello ';
-$lang['nbm_content_new_elements'] = 'New elements were added ';
-$lang['nbm_content_new_elements_single'] = ' on ';
-$lang['nbm_content_new_elements_between_1'] = 'between ';
-$lang['nbm_content_new_elements_between_2'] = ' and ';
+$lang['nbm_content_goto_1'] = 'Go to';
+$lang['nbm_content_hello_1'] = 'Hello';
+$lang['nbm_content_new_elements'] = 'New elements were added';
+$lang['nbm_content_new_elements_single'] = 'on';
+$lang['nbm_content_new_elements_between_1'] = 'between';
+$lang['nbm_content_new_elements_between_2'] = 'and';
 $lang['nbm_content_subscribe_by_admin'] = 'The webmaster has subscribed you to receiving notifications by mail.';
 $lang['nbm_content_subscribe_by_himself'] = 'You have subscribed to receiving notifications by mail.';
 $lang['nbm_content_subscribe_link'] = 'To subscribe';
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 b8ccd8fc7..0c159dd6b 100644
--- a/themes/default/template/mail/text/html/notification_by_mail.tpl
+++ b/themes/default/template/mail/text/html/notification_by_mail.tpl
@@ -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)}
@@ -41,7 +41,7 @@
 <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 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 a428dce05..f7bafc692 100644
--- a/themes/default/template/mail/text/plain/notification_by_mail.tpl
+++ b/themes/default/template/mail/text/plain/notification_by_mail.tpl
@@ -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}
-- 
cgit v1.2.3