aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-05-26 15:04:27 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-05-26 15:04:27 +0000
commit9fca29eae3051730b72f6144e2683cd2fe7c8d0b (patch)
tree247a6d85513aecc010d34dec73e80d0996f4df05 /phpBB/language
parent8dc9fc089bf3a45bd5f23986d5c9f4992196834f (diff)
downloadforums-9fca29eae3051730b72f6144e2683cd2fe7c8d0b.tar
forums-9fca29eae3051730b72f6144e2683cd2fe7c8d0b.tar.gz
forums-9fca29eae3051730b72f6144e2683cd2fe7c8d0b.tar.bz2
forums-9fca29eae3051730b72f6144e2683cd2fe7c8d0b.tar.xz
forums-9fca29eae3051730b72f6144e2683cd2fe7c8d0b.zip
some tiny changes...
git-svn-id: file:///svn/phpbb/trunk@5967 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/board.php40
-rw-r--r--phpBB/language/en/posting.php2
-rw-r--r--phpBB/language/en/ucp.php1
3 files changed, 23 insertions, 20 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 673e057a6e..1b19b4e0ba 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -32,28 +32,28 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array(
'ACP_JABBER_SETTINGS_EXPLAIN' => 'Here you can enable and control the use Jabber for instant messaging and board notices. Jabber is an opensource protocol and therefore available for use by anyone. Some Jabber servers include gateways or transports which allow you to contact users on other networks. Not all servers offer all transports and changes in protocols can prevent transports from operating. Note that it may take several seconds to update Jabber account details, do not stop the script till completed!',
- 'JAB_ENABLE' => 'Enable Jabber',
- 'JAB_ENABLE_EXPLAIN' => 'Enables use of jabber messaging and notifications',
-
- 'JAB_SERVER' => 'Jabber server',
- 'JAB_SERVER_EXPLAIN' => 'See %sjabber.org%s for a list of servers',
- 'JAB_PORT' => 'Jabber port',
- 'JAB_PORT_EXPLAIN' => 'Leave blank unless you know it is not 5222',
- 'JAB_USERNAME' => 'Jabber username',
- 'JAB_USERNAME_EXPLAIN' => 'If this user is not registered it will be created if possible.',
- 'JAB_PASSWORD' => 'Jabber password',
- 'JAB_RESOURCE' => 'Jabber resource',
- 'JAB_RESOURCE_EXPLAIN' => 'The resource locates this particular connection, e.g. board, home, etc.',
-
- 'JAB_PASS_CHANGED' => 'Jabber password changed successfully',
- 'JAB_REGISTERED' => 'New account registered successfully',
- 'JAB_CHANGED' => 'Jabber account changed successfully',
- 'JAB_SETTINGS_CHANGED' => 'Jabber settings changed successfully',
-
- 'ERR_JAB_USERNAME' => 'The username specified already exists, please choose an alternative.',
- 'ERR_JAB_REGISTER' => 'An error occured trying to register this account, %s',
'ERR_JAB_PASSCHG' => 'Could not change password',
'ERR_JAB_PASSFAIL' => 'Password update failed, %s',
+ 'ERR_JAB_REGISTER' => 'An error occured trying to register this account, %s',
+ 'ERR_JAB_USERNAME' => 'The username specified already exists, please choose an alternative.',
+
+ 'JAB_CHANGED' => 'Jabber account changed successfully',
+ 'JAB_ENABLE' => 'Enable Jabber',
+ 'JAB_ENABLE_EXPLAIN' => 'Enables use of jabber messaging and notifications',
+ 'JAB_PACKAGE_SIZE' => 'Jabber Package Size',
+ 'JAB_PACKAGE_SIZE_EXPLAIN' => 'This is the number of messages sent in one package. If set to 0 the message is sent immediatly and gets not queued for later sending.',
+ 'JAB_PASSWORD' => 'Jabber password',
+ 'JAB_PASS_CHANGED' => 'Jabber password changed successfully',
+ 'JAB_PORT' => 'Jabber port',
+ 'JAB_PORT_EXPLAIN' => 'Leave blank unless you know it is not 5222',
+ 'JAB_REGISTERED' => 'New account registered successfully',
+ 'JAB_RESOURCE' => 'Jabber resource',
+ 'JAB_RESOURCE_EXPLAIN' => 'The resource locates this particular connection, e.g. board, home, etc.',
+ 'JAB_SERVER' => 'Jabber server',
+ 'JAB_SERVER_EXPLAIN' => 'See %sjabber.org%s for a list of servers',
+ 'JAB_SETTINGS_CHANGED' => 'Jabber settings changed successfully',
+ 'JAB_USERNAME' => 'Jabber username',
+ 'JAB_USERNAME_EXPLAIN' => 'If this user is not registered it will be created if possible.',
));
// Auth settings
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index a0586aa1d7..63b4678bef 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -159,6 +159,8 @@ $lang = array_merge($lang, array(
'SAVE' => 'Save',
'SAVE_DATE' => 'Saved at',
+ 'SAVE_DRAFT' => 'Save Draft',
+ 'SAVE_DRAFT_CONFIRM' => 'Please note that saved drafts only include the subject and the message, any other element will be removed. Do you want to save your draft now?',
'SMILIES' => 'Smilies',
'SMILIES_ARE_OFF' => 'Smilies are <u>OFF</u>',
'SMILIES_ARE_ON' => 'Smilies are <u>ON</u>',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 7afffcb2af..9d1f1ce2c5 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -442,6 +442,7 @@ $lang = array_merge($lang, array(
'WATCHED_FORUMS' => 'Watched Forums',
'WATCHED_TOPICS' => 'Watched Topics',
'WRONG_ACTIVATION' => 'The activation key you supplied does not match any in the database',
+ 'WRONG_DATA_WEBSITE' => 'The website address has to be a valid url, including the protocol. For example http://www.example.com/.',
'YOUR_DETAILS' => 'Your activity',
'YOUR_FOES' => 'Your foes',