diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-14 10:58:23 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-14 10:58:23 -0500 |
| commit | 716635c834dd2d6644f3d47c67f7184f95a35c0b (patch) | |
| tree | cd2bcc4b9df5517dccd77c6a973220649dc0f88c /phpBB | |
| parent | c5f280351a96aaebd90c27da095c9b1ff28624a5 (diff) | |
| download | forums-716635c834dd2d6644f3d47c67f7184f95a35c0b.tar forums-716635c834dd2d6644f3d47c67f7184f95a35c0b.tar.gz forums-716635c834dd2d6644f3d47c67f7184f95a35c0b.tar.bz2 forums-716635c834dd2d6644f3d47c67f7184f95a35c0b.tar.xz forums-716635c834dd2d6644f3d47c67f7184f95a35c0b.zip | |
[ticket/11103] Fix some language strings
Newlines at end of email files
PHPBB3-11103
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/en/common.php | 8 | ||||
| -rw-r--r-- | phpBB/language/en/email/notifications/bookmark.txt | 4 | ||||
| -rw-r--r-- | phpBB/language/en/email/notifications/post_in_queue.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/notifications/quote.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/notifications/report_pm.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/notifications/report_post.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/notifications/topic_in_queue.txt | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ajax.js | 6 |
8 files changed, 12 insertions, 16 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 78ba02ed0f..2f9f646cd3 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -394,15 +394,15 @@ $lang = array_merge($lang, array( 'NOTIFICATION_PM' => '%1$s sent you a Private Message "%2$s".', 'NOTIFICATION_POST' => '%1$s replied to the topic "%2$s".', 'NOTIFICATION_POST_APPROVED' => 'Your post was approved "%2$s".', - 'NOTIFICATION_POST_DISAPPROVED' => 'Your post "%1$s" was disapproved because "%2$s".', + 'NOTIFICATION_POST_DISAPPROVED' => 'Your post "%1$s" was disapproved for reason: "%2$s".', 'NOTIFICATION_POST_IN_QUEUE' => 'A new post titled "%2$s" was posted by "%1$s" and needs approval.', 'NOTIFICATION_QUOTE' => '%1$s quoted you in the post "%2$s".', - 'NOTIFICATION_REPORT_PM' => '%1$s reported a Private Message "%2$s" because "%3$s".', - 'NOTIFICATION_REPORT_POST' => '%1$s reported a post "%2$s" because "%3$s".', + 'NOTIFICATION_REPORT_PM' => '%1$s reported a Private Message "%2$s" for reason: "%3$s".', + 'NOTIFICATION_REPORT_POST' => '%1$s reported a post "%2$s" for reason: "%3$s".', 'NOTIFICATION_REPORT_CLOSED' => '%1$s closed the report you made for "%2$s".', 'NOTIFICATION_TOPIC' => '%1$s posted a new topic "%2$s" in the forum "%3$s".', 'NOTIFICATION_TOPIC_APPROVED' => 'Your topic "%2$s" in the forum "%3$s" was approved.', - 'NOTIFICATION_TOPIC_DISAPPROVED' => 'Your topic "%1$s" was disapproved because "%2$s".', + 'NOTIFICATION_TOPIC_DISAPPROVED' => 'Your topic "%1$s" was disapproved for reason: "%2$s".', 'NOTIFICATION_TOPIC_IN_QUEUE' => 'A new topic titled "%2$s" was posted by "%1$s" and needs approval.', 'NOTIFY_ADMIN' => 'Please notify the board administrator or webmaster.', 'NOTIFY_ADMIN_EMAIL' => 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>', diff --git a/phpBB/language/en/email/notifications/bookmark.txt b/phpBB/language/en/email/notifications/bookmark.txt index 9888008604..95f17b5693 100644 --- a/phpBB/language/en/email/notifications/bookmark.txt +++ b/phpBB/language/en/email/notifications/bookmark.txt @@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}" Hello {USERNAME}, -You are receiving this notification because the topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}" has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. +You are receiving this notification because a topic you bookmarked, "{TOPIC_TITLE}" at "{SITENAME}", has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. If you want to view the newest post made since your last visit, click the following link: {U_NEWEST_POST} @@ -17,4 +17,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda {U_NOTIFICATION_SETTINGS} -{EMAIL_SIG}
\ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/notifications/post_in_queue.txt b/phpBB/language/en/email/notifications/post_in_queue.txt index 5ce2b8fe09..5208182a70 100644 --- a/phpBB/language/en/email/notifications/post_in_queue.txt +++ b/phpBB/language/en/email/notifications/post_in_queue.txt @@ -14,4 +14,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda {U_NOTIFICATION_SETTINGS} -{EMAIL_SIG}
\ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/notifications/quote.txt b/phpBB/language/en/email/notifications/quote.txt index 8b8584a794..0efcf7940c 100644 --- a/phpBB/language/en/email/notifications/quote.txt +++ b/phpBB/language/en/email/notifications/quote.txt @@ -17,4 +17,4 @@ If you no longer wish to receive updates about replies quoting you, please updat {U_NOTIFICATION_SETTINGS} -{EMAIL_SIG}
\ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/notifications/report_pm.txt b/phpBB/language/en/email/notifications/report_pm.txt index eeaa8ee9b9..f515242893 100644 --- a/phpBB/language/en/email/notifications/report_pm.txt +++ b/phpBB/language/en/email/notifications/report_pm.txt @@ -11,4 +11,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda {U_NOTIFICATION_SETTINGS} -{EMAIL_SIG}
\ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/notifications/report_post.txt b/phpBB/language/en/email/notifications/report_post.txt index f0863d346e..4ece935ccb 100644 --- a/phpBB/language/en/email/notifications/report_post.txt +++ b/phpBB/language/en/email/notifications/report_post.txt @@ -14,4 +14,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda {U_NOTIFICATION_SETTINGS} -{EMAIL_SIG}
\ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/notifications/topic_in_queue.txt b/phpBB/language/en/email/notifications/topic_in_queue.txt index e1ff486ac5..782fc4d629 100644 --- a/phpBB/language/en/email/notifications/topic_in_queue.txt +++ b/phpBB/language/en/email/notifications/topic_in_queue.txt @@ -14,4 +14,4 @@ If you no longer wish to receive updates about replies to bookmarks, please upda {U_NOTIFICATION_SETTINGS} -{EMAIL_SIG}
\ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index d98070a114..0fd56f0e28 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -76,15 +76,11 @@ $('#qr_full_editor').click(function() { }); }); - -/** - * Toggle notification list - */ +// Toggle notification list $('#notification_list_button').click(function() { $('#notification_list').toggle(); }); - /** * This AJAXifies the quick-mod tools. The reason it cannot be a standard * callback / data attribute is that it requires filtering - some of the options |