mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

merge revisions i missed... hopefully not breaking things - did not check every change.

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@9077 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2008-11-22 19:38:25 +00:00
parent 47b4b83468
commit d46e8e6f98
33 changed files with 161 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/language/en/acp/styles.php
View File

@@ -166,7 +166,7 @@ $lang = array_merge($lang, array(
'IMG_FORUM_UNREAD_SUBFORUM' => 'Subforum new posts',
'IMG_SUBFORUM_READ' => 'Legend subforum',
'IMG_SUBFORUM_UNREAD' => 'Legend subforum new posts',
'IMG_TOPIC_MOVED' => 'Topic moved',
'IMG_TOPIC_READ' => 'Topic',

12
phpBB/language/en/common.php
View File

@@ -260,7 +260,7 @@ $lang = array_merge($lang, array(
'HOME' => 'Home',
'ICQ' => 'ICQ',
'ICQ_STATUS' => 'ICQ status',
'ICQ_STATUS' => 'ICQ status',
'IF' => 'If',
'IMAGE' => 'Image',
'IMAGE_FILETYPE_INVALID' => 'Image file type %d for mimetype %s not supported.',
@@ -331,7 +331,7 @@ $lang = array_merge($lang, array(
'MODERATORS' => 'Moderators',
'MONTH' => 'Month',
'MOVE' => 'Move',
'MSNM' => 'MSNM/WLM',
'MSNM' => 'MSNM/WLM',
'NA' => 'N/A',
'NEWEST_USER' => 'Our newest member <strong>%s</strong>',
@@ -370,7 +370,7 @@ $lang = array_merge($lang, array(
'NO_MEMBERS' => 'No members found for this search criterion.',
'NO_MESSAGES' => 'No messages',
'NO_MODE' => 'No mode specified.',
'NO_MODERATORS' => 'No moderators assigned at this board.',
'NO_MODERATORS' => 'There are no moderators.',
'NO_NEW_MESSAGES' => 'No new messages',
'NO_NEW_PM' => '<strong>0</strong> new messages',
'NO_NEW_POSTS' => 'No new posts',
@@ -502,7 +502,7 @@ $lang = array_merge($lang, array(
'SEARCHING_FORUMS' => 'Searching forums',
'SEARCH_ACTIVE_TOPICS' => 'View active topics',
'SEARCH_FOR' => 'Search for',
'SEARCH_FORUM' => 'Search this forum…',
'SEARCH_FORUM' => 'Search this forum…',
'SEARCH_NEW' => 'View new posts',
'SEARCH_POSTS_BY' => 'Search posts by',
'SEARCH_SELF' => 'View your posts',
@@ -545,7 +545,7 @@ $lang = array_merge($lang, array(
'THE_TEAM' => 'The team',
'TIME' => 'Time',
'TOO_LONG' => 'The value you entered is too long.',
'TOO_LONG' => 'The value you entered is too long',
'TOO_LONG_AIM' => 'The screenname you entered is too long.',
'TOO_LONG_CONFIRM_CODE' => 'The confirm code you entered is too long.',
@@ -680,7 +680,7 @@ $lang = array_merge($lang, array(
'YEAR' => 'Year',
'YEAR_MONTH_DAY' => '(YYYY-MM-DD)',
'YES' => 'Yes',
'YIM' => 'YIM',
'YIM' => 'YIM',
'YOU_LAST_VISIT' => 'Last visit was: %s',
'YOU_NEW_PM' => 'A new private message is waiting for you in your Inbox.',
'YOU_NEW_PMS' => 'New private messages are waiting for you in your Inbox.',