aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-07-11 12:11:14 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-07-11 12:11:14 +0200
commit35588c20bd350743ff1b98993e3ea26c39be3567 (patch)
treedffaf753cd28067839271627bfd64103f73209f2 /phpBB
parent1a1fb4a915ba762e10a218e88ec9daa5f7d3472f (diff)
parentf2745d1e574af528270869994f2323db68dc8466 (diff)
downloadforums-35588c20bd350743ff1b98993e3ea26c39be3567.tar
forums-35588c20bd350743ff1b98993e3ea26c39be3567.tar.gz
forums-35588c20bd350743ff1b98993e3ea26c39be3567.tar.bz2
forums-35588c20bd350743ff1b98993e3ea26c39be3567.tar.xz
forums-35588c20bd350743ff1b98993e3ea26c39be3567.zip
Merge pull request #2713 from n-aleha/ticket/12768
[ticket/12768] 'NOTIFICATION_REPORT_CLOSED' entry has wrong indentation * n-aleha/ticket/12768: [ticket/12768] More fixes in language files [ticket/12768] 'NOTIFICATION_REPORT_CLOSED' entry has wrong indentation
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/language/en/acp/common.php4
-rw-r--r--phpBB/language/en/common.php4
-rw-r--r--phpBB/language/en/install.php4
-rw-r--r--phpBB/language/en/memberlist.php2
-rw-r--r--phpBB/language/en/ucp.php4
5 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index b374e39367..61c718195e 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -247,7 +247,7 @@ $lang = array_merge($lang, array(
'DOWNLOAD_AS' => 'Download as',
'DOWNLOAD_STORE' => 'Download or store file',
'DOWNLOAD_STORE_EXPLAIN' => 'You may directly download the file or save it in your <samp>store/</samp> folder.',
- 'DOWNLOADS' => 'Downloads',
+ 'DOWNLOADS' => 'Downloads',
'EDIT' => 'Edit',
'ENABLE' => 'Enable',
@@ -310,7 +310,7 @@ $lang = array_merge($lang, array(
'TASKS_NOT_READY' => 'Not ready tasks:',
'TASKS_READY' => 'Ready tasks:',
- 'TOTAL_SIZE' => 'Total size',
+ 'TOTAL_SIZE' => 'Total size',
'UCP' => 'User Control Panel',
'USERNAMES_EXPLAIN' => 'Place each username on a separate line.',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index dbef16c5f2..5af3ad4fbc 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -299,7 +299,7 @@ $lang = array_merge($lang, array(
1 => 'There is %d guest user online',
2 => 'There are %d guest users online',
),
- 'GUEST_USERS_TOTAL' => array(
+ 'GUEST_USERS_TOTAL' => array(
1 => '%d guest',
2 => '%d guests',
),
@@ -462,7 +462,7 @@ $lang = array_merge($lang, array(
'NOTIFICATION_REASON' => '<em>Reason:</em> %1$s.',
'NOTIFICATION_REPORT_PM' => '<strong>Private Message reported</strong> by %1$s:',
'NOTIFICATION_REPORT_POST' => '<strong>Post reported</strong> by %1$s:',
- 'NOTIFICATION_REPORT_CLOSED' => '<strong>Report closed</strong> by %1$s for:',
+ 'NOTIFICATION_REPORT_CLOSED' => '<strong>Report closed</strong> by %1$s for:',
'NOTIFICATION_TOPIC' => '<strong>New topic</strong> by %1$s:',
'NOTIFICATION_TOPIC_APPROVED' => '<strong>Topic approved</strong>:',
'NOTIFICATION_TOPIC_DISAPPROVED' => '<strong>Topic disapproved</strong>:',
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 65448e3299..a2b27f0a60 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -291,8 +291,8 @@ $lang = array_merge($lang, array(
'PCRE_UTF_SUPPORT_EXPLAIN' => 'phpBB will <strong>not</strong> run if your PHP installation is not compiled with UTF-8 support in the PCRE extension.',
'PHP_GETIMAGESIZE_SUPPORT' => 'PHP function getimagesize() is available',
'PHP_GETIMAGESIZE_SUPPORT_EXPLAIN' => '<strong>Required</strong> - In order for phpBB to function correctly, the getimagesize function needs to be available.',
- 'PHP_JSON_SUPPORT' => 'PHP JSON support',
- 'PHP_JSON_SUPPORT_EXPLAIN' => '<strong>Required</strong> - In order for phpBB to function correctly, the PHP JSON extension needs to be available.',
+ 'PHP_JSON_SUPPORT' => 'PHP JSON support',
+ 'PHP_JSON_SUPPORT_EXPLAIN' => '<strong>Required</strong> - In order for phpBB to function correctly, the PHP JSON extension needs to be available.',
'PHP_OPTIONAL_MODULE' => 'Optional modules',
'PHP_OPTIONAL_MODULE_EXPLAIN' => '<strong>Optional</strong> - These modules or applications are optional. However, if they are available they will enable extra features.',
'PHP_SUPPORTED_DB' => 'Supported databases',
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index c1bb25e7fb..1a05975892 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -146,6 +146,6 @@ $lang = array_merge($lang, array(
'VIEW_FACEBOOK_PROFILE' => 'View Facebook Profile',
'VIEW_SKYPE_PROFILE' => 'View Skype Profile',
'VIEW_TWITTER_PROFILE' => 'View Twitter Profile',
- 'VIEW_YOUTUBE_CHANNEL' => 'View YouTube Channel',
+ 'VIEW_YOUTUBE_CHANNEL' => 'View YouTube Channel',
'VIEW_GOOGLEPLUS_PROFILE' => 'View Google+ Profile',
));
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index c4328aa3a6..d464a9219e 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -328,12 +328,12 @@ $lang = array_merge($lang, array(
'NOTIFICATION_TYPE_BOOKMARK' => 'Someone replies to a topic you have bookmarked',
'NOTIFICATION_TYPE_GROUP_REQUEST' => 'Someone requests to join a group you lead',
'NOTIFICATION_TYPE_IN_MODERATION_QUEUE' => 'A post or topic needs approval',
- 'NOTIFICATION_TYPE_MODERATION_QUEUE' => 'Your topics/posts are approved or disapproved by a moderator',
+ 'NOTIFICATION_TYPE_MODERATION_QUEUE' => 'Your topics/posts are approved or disapproved by a moderator',
'NOTIFICATION_TYPE_PM' => 'Someone sends you a private message',
'NOTIFICATION_TYPE_POST' => 'Someone replies to a topic to which you are subscribed',
'NOTIFICATION_TYPE_QUOTE' => 'Someone quotes you in a post',
'NOTIFICATION_TYPE_REPORT' => 'Someone reports a post',
- 'NOTIFICATION_TYPE_TOPIC' => 'Someone creates a topic in a forum to which you are subscribed',
+ 'NOTIFICATION_TYPE_TOPIC' => 'Someone creates a topic in a forum to which you are subscribed',
'NOTIFICATION_TYPE_ADMIN_ACTIVATE_USER' => 'Newly registered user requiring activation',
'NOTIFY_METHOD' => 'Notification method',
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-03 15:07:58 +0000