[1.0.14] Nederlandse vertaling

Discussieer hier over alles rondom phpBB.
Forumregels
LEES: Algemene Voorwaarden. Dit forum is niet voor technische vragen!
BetaDevil
Berichten: 2810
Lid geworden op: 28 mei 2006, 15:27

Re: [1.0.0] Nederlandse vertaling

Bericht door BetaDevil » 18 mar 2008, 17:25

Wij gebruiken je, jouw, jij en in de formele vertaling is het u, uw

Gebruikersavatar
Johan
Berichten: 2376
Lid geworden op: 05 mei 2007, 15:24
Locatie: memberlist.php

Re: [1.0.0] Nederlandse vertaling

Bericht door Johan » 20 mar 2008, 20:09

Als je geen eigenaar-rechten hebt, en je wilt iets wijzigen van iemand die dat wel heeft, krijg je deze melding:

Je moet oprichter rechten hebben, om een andere oprichter te kunnen beheren.

Eigenaar word in 1x 'oprichter'.. waarschijnlijk hebben 2 twee verschillende mensen het woord founder vertaald :mrgreen:
Voormalig Support Teamlid

Gebruikersavatar
Lucas
Berichten: 1630
Lid geworden op: 19 feb 2007, 10:52
Locatie: R´dam

Re: [1.0.0] Nederlandse vertaling

Bericht door Lucas » 21 mar 2008, 00:44

Ik denk dat de eerste "oprichter" beter kan worden vervangen door het woord: "oprichtings-rechten"

Gebruikersavatar
Pascal
Berichten: 2315
Lid geworden op: 20 feb 2007, 18:55
Locatie: Nijmegen
Contacteer:

Re: [1.0.0] Nederlandse vertaling

Bericht door Pascal » 25 mar 2008, 22:03

om een andere oprichter te kunnen beheren.

moet dit niet beheerder zijn?
Keep bleeding, keep, keep bleeding love
I keep bleeding, I keep, keep bleeding love
Keep bleeding, keep, keep bleeding love
You cut me open

BetaDevil
Berichten: 2810
Lid geworden op: 28 mei 2006, 15:27

Re: [1.0.0] Nederlandse vertaling

Bericht door BetaDevil » 26 mar 2008, 16:27

Nee. Een oprichter kan niet door beheerders worden teruggezet op normaal lid zodat het niet zo snel fout kan gaan.

Gebruikersavatar
Pascal
Berichten: 2315
Lid geworden op: 20 feb 2007, 18:55
Locatie: Nijmegen
Contacteer:

Re: [1.0.0] Nederlandse vertaling

Bericht door Pascal » 26 mar 2008, 16:31

vergeet mij zin, die sloeg nergens op :?
Keep bleeding, keep, keep bleeding love
I keep bleeding, I keep, keep bleeding love
Keep bleeding, keep, keep bleeding love
You cut me open

Gebruikersavatar
Johan
Berichten: 2376
Lid geworden op: 05 mei 2007, 15:24
Locatie: memberlist.php

Re: [1.0.0] Nederlandse vertaling

Bericht door Johan » 27 mar 2008, 14:44

simvader schreef:om een andere oprichter te kunnen beheren.

moet dit niet beheerder zijn?
Ik kies Eigenaar
Voormalig Support Teamlid

ElbertF
Berichten: 5803
Lid geworden op: 12 okt 2004, 08:34
Contacteer:

Re: [1.0.0] Nederlandse vertaling

Bericht door ElbertF » 27 mar 2008, 14:50

Oprichter hoeft geen eigenaar te zijn.

Gebruikersavatar
Johan
Berichten: 2376
Lid geworden op: 05 mei 2007, 15:24
Locatie: memberlist.php

Re: [1.0.0] Nederlandse vertaling

Bericht door Johan » 27 mar 2008, 15:14

Maar bij de gebruikersbeheer staat wel 'Maak eigenaar', en dat komt ook van Founder.. dus 2x anders vertaald :)
Voormalig Support Teamlid

Jim
Berichten: 3900
Lid geworden op: 21 feb 2007, 14:53
Locatie: Groningen
Contacteer:

Re: [1.0.0] Nederlandse vertaling

Bericht door Jim » 04 apr 2008, 12:29

ElbertF schreef:Oprichter hoeft geen eigenaar te zijn.
Daarom juist, en het is mogelijk meerdere mensen die rechten te geven.
Jim Mossing Holsteyn - Beheerder
Documentatie | Algemene voorwaarden | Wiki

Heb je suggesties over het verbeteren van phpBB.nl of andere site-gerelateerde vragen? Stuur me een PB!

Gebruikersavatar
Lucas
Berichten: 1630
Lid geworden op: 19 feb 2007, 10:52
Locatie: R´dam

Re: [1.0.0] Nederlandse vertaling

Bericht door Lucas » 08 apr 2008, 12:20

--Tot hier verwerkt in de 1.0.1 vertaling--

Jim
Berichten: 3900
Lid geworden op: 21 feb 2007, 14:53
Locatie: Groningen
Contacteer:

Re: [1.0.1] Nederlandse vertaling

Bericht door Jim » 08 apr 2008, 15:11

Is er ook ergens een lijst met alle taalveranderingen.
Want alle MOD talen opnieuw doen is niet handig voor mijn forum met vele MODs.
Jim Mossing Holsteyn - Beheerder
Documentatie | Algemene voorwaarden | Wiki

Heb je suggesties over het verbeteren van phpBB.nl of andere site-gerelateerde vragen? Stuur me een PB!

Gebruikersavatar
lunagang
Berichten: 120
Lid geworden op: 28 mei 2004, 15:52

Re: [1.0.1] Nederlandse vertaling

Bericht door lunagang » 08 apr 2008, 16:18

Ik zal Het Eendje (van viewtopic.php?p=339202#p339202) vragen of hij zijn vergelijkscript nog ergens heeft liggen, dan zal ik de lijst plaatsen ;)

Raimon
Berichten: 4397
Lid geworden op: 27 aug 2005, 12:59
Contacteer:

Re: [1.0.1] Nederlandse vertaling

Bericht door Raimon » 08 apr 2008, 16:27

lunagang schreef:Ik zal Het Eendje (van viewtopic.php?p=339202#p339202) vragen of hij zijn vergelijkscript nog ergens heeft liggen, dan zal ik de lijst plaatsen ;)
Dat heet tegenwoordig een patch, met een patch zie je alle changes.
Daar heb je echt geen MOD of een "scriptje" voor nodig, hetzelfde doet men met custom styles, daarbij heb je echt geen hulp nodig van een script met fouten.
Binnen 3 minuten zie je alle veranderingen die nodig zijn, ik heb ze zelfs nog voor mijn forum voor de nederlandse taal, zodat ik ze makkelijk kan invoeren in het automatische update pakket.
Laatst gewijzigd door Raimon op 08 apr 2008, 16:37, 2 keer totaal gewijzigd.

Jim
Berichten: 3900
Lid geworden op: 21 feb 2007, 14:53
Locatie: Groningen
Contacteer:

Re: [1.0.1] Nederlandse vertaling

Bericht door Jim » 08 apr 2008, 16:29

Raimon schreef:
lunagang schreef:Ik zal Het Eendje (van viewtopic.php?p=339202#p339202) vragen of hij zijn vergelijkscript nog ergens heeft liggen, dan zal ik de lijst plaatsen ;)
Dat heet tegenwoordig een patch, met de patch zie je alle changes.
Daar heb je echt geen MOD voor nodig, hetzelfde doet men met custom styles, daarbij heb je echt geen hulp nodig van een script met fouten.
Binnen 3 minuten vind je alle changes.
Er die bestaat al. Mag ook in het engels hoor, dan vertaal ik het zelf.
Jim Mossing Holsteyn - Beheerder
Documentatie | Algemene voorwaarden | Wiki

Heb je suggesties over het verbeteren van phpBB.nl of andere site-gerelateerde vragen? Stuur me een PB!

Raimon
Berichten: 4397
Lid geworden op: 27 aug 2005, 12:59
Contacteer:

Re: [1.0.1] Nederlandse vertaling

Bericht door Raimon » 08 apr 2008, 16:31

Code: Selecteer alles

diff -x images -x imageset -crNEB phpbb300/language/en/acp/attachments.php phpbb301/language/en/acp/attachments.php
*** phpbb300/language/en/acp/attachments.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/attachments.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * acp_attachments [English]
  *
  * @package language
! * @version $Id: attachments.php,v 1.31 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * acp_attachments [English]
  *
  * @package language
! * @version $Id: attachments.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
diff -x images -x imageset -crNEB phpbb300/language/en/acp/ban.php phpbb301/language/en/acp/ban.php
*** phpbb300/language/en/acp/ban.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/ban.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * acp_ban [English]
  *
  * @package language
! * @version $Id: ban.php,v 1.19 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * acp_ban [English]
  *
  * @package language
! * @version $Id: ban.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
diff -x images -x imageset -crNEB phpbb300/language/en/acp/board.php phpbb301/language/en/acp/board.php
*** phpbb300/language/en/acp/board.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/board.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * acp_board [English]
  *
  * @package language
! * @version $Id: board.php,v 1.101 2007/11/03 20:29:39 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * acp_board [English]
  *
  * @package language
! * @version $Id: board.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
***************
*** 134,140 ****
  	'ACP_POST_SETTINGS_EXPLAIN'			=> 'Here you can set all default settings for posting.',
  	'ALLOW_POST_LINKS'					=> 'Allow links in posts/private messages',
  	'ALLOW_POST_LINKS_EXPLAIN'			=> 'If disallowed the <code>[URL]</code> BBCode tag and automatic/magic URLs are disabled.',
! 	'ALLOW_POST_FLASH'					=> 'Allow use of <code>[FLASH]</code> BBCode tag in posts. ',
  	'ALLOW_POST_FLASH_EXPLAIN'			=> 'If disallowed the <code>[FLASH]</code> BBCode tag is disabled in posts. Otherwise the permission system controls which users can use the <code>[FLASH]</code> BBCode tag.',
  
  	'BUMP_INTERVAL'					=> 'Bump interval',
--- 134,140 ----
  	'ACP_POST_SETTINGS_EXPLAIN'			=> 'Here you can set all default settings for posting.',
  	'ALLOW_POST_LINKS'					=> 'Allow links in posts/private messages',
  	'ALLOW_POST_LINKS_EXPLAIN'			=> 'If disallowed the <code>[URL]</code> BBCode tag and automatic/magic URLs are disabled.',
! 	'ALLOW_POST_FLASH'					=> 'Allow use of <code>[FLASH]</code> BBCode tag in posts',
  	'ALLOW_POST_FLASH_EXPLAIN'			=> 'If disallowed the <code>[FLASH]</code> BBCode tag is disabled in posts. Otherwise the permission system controls which users can use the <code>[FLASH]</code> BBCode tag.',
  
  	'BUMP_INTERVAL'					=> 'Bump interval',
***************
*** 323,329 ****
  	'LDAP_USER'						=> 'LDAP user <var>dn</var>',
  	'LDAP_USER_EXPLAIN'				=> 'Leave blank to use anonymous binding. If filled in phpBB uses the specified distinguished name on login attempts to find the correct user, e.g. <samp>uid=Username,ou=MyUnit,o=MyCompany,c=US</samp>. Required for Active Directory Servers.',
  	'LDAP_USER_FILTER'				=> 'LDAP user filter',
! 	'LDAP_USER_FILTER_EXPLAIN'		=> 'Optionally you can further limit the searched objects with additional filters. For example <samp>objectClass=posixGroup</samp> would result in the use of <samp>(&(uid=$username)(objectClass=posixGroup))</samp>',
  ));
  
  // Server Settings
--- 323,329 ----
  	'LDAP_USER'						=> 'LDAP user <var>dn</var>',
  	'LDAP_USER_EXPLAIN'				=> 'Leave blank to use anonymous binding. If filled in phpBB uses the specified distinguished name on login attempts to find the correct user, e.g. <samp>uid=Username,ou=MyUnit,o=MyCompany,c=US</samp>. Required for Active Directory Servers.',
  	'LDAP_USER_FILTER'				=> 'LDAP user filter',
! 	'LDAP_USER_FILTER_EXPLAIN'		=> 'Optionally you can further limit the searched objects with additional filters. For example <samp>objectClass=posixGroup</samp> would result in the use of <samp>(&(uid=$username)(objectClass=posixGroup))</samp>',
  ));
  
  // Server Settings
diff -x images -x imageset -crNEB phpbb300/language/en/acp/bots.php phpbb301/language/en/acp/bots.php
*** phpbb300/language/en/acp/bots.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/bots.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * acp_bots [English]
  *
  * @package language
! * @version $Id: bots.php,v 1.12 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * acp_bots [English]
  *
  * @package language
! * @version $Id: bots.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
diff -x images -x imageset -crNEB phpbb300/language/en/acp/common.php phpbb301/language/en/acp/common.php
*** phpbb300/language/en/acp/common.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/common.php	Mon Apr  7 19:43:10 2008
***************
*** 1,10 ****
  <?php
  /**
  *
! * acp common [English]
  *
  * @package language
! * @version $Id: common.php,v 1.120 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 1,10 ----
  <?php
  /**
  *
! * acp_common [English]
  *
  * @package language
! * @version $Id: common.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
***************
*** 57,63 ****
  	'ACP_BOARD_MANAGEMENT'		=> 'Board management',
  	'ACP_BOARD_SETTINGS'		=> 'Board settings',
  	'ACP_BOTS'					=> 'Spiders/Robots',
! 	
  	'ACP_CAPTCHA'				=> 'CAPTCHA',
  
  	'ACP_CAT_DATABASE'			=> 'Database',
--- 57,63 ----
  	'ACP_BOARD_MANAGEMENT'		=> 'Board management',
  	'ACP_BOARD_SETTINGS'		=> 'Board settings',
  	'ACP_BOTS'					=> 'Spiders/Robots',
! 
  	'ACP_CAPTCHA'				=> 'CAPTCHA',
  
  	'ACP_CAT_DATABASE'			=> 'Database',
***************
*** 75,88 ****
  	'ACP_COOKIE_SETTINGS'		=> 'Cookie settings',
  	'ACP_CRITICAL_LOGS'			=> 'Error log',
  	'ACP_CUSTOM_PROFILE_FIELDS'	=> 'Custom profile fields',
! 	
  	'ACP_DATABASE'				=> 'Database management',
  	'ACP_DISALLOW'				=> 'Disallow',
  	'ACP_DISALLOW_USERNAMES'	=> 'Disallow usernames',
! 	
  	'ACP_EMAIL_SETTINGS'		=> 'E-mail settings',
  	'ACP_EXTENSION_GROUPS'		=> 'Manage extension groups',
! 	
  	'ACP_FORUM_BASED_PERMISSIONS'	=> 'Forum based permissions',
  	'ACP_FORUM_LOGS'				=> 'Forum logs',
  	'ACP_FORUM_MANAGEMENT'			=> 'Forum management',
--- 75,88 ----
  	'ACP_COOKIE_SETTINGS'		=> 'Cookie settings',
  	'ACP_CRITICAL_LOGS'			=> 'Error log',
  	'ACP_CUSTOM_PROFILE_FIELDS'	=> 'Custom profile fields',
! 
  	'ACP_DATABASE'				=> 'Database management',
  	'ACP_DISALLOW'				=> 'Disallow',
  	'ACP_DISALLOW_USERNAMES'	=> 'Disallow usernames',
! 
  	'ACP_EMAIL_SETTINGS'		=> 'E-mail settings',
  	'ACP_EXTENSION_GROUPS'		=> 'Manage extension groups',
! 
  	'ACP_FORUM_BASED_PERMISSIONS'	=> 'Forum based permissions',
  	'ACP_FORUM_LOGS'				=> 'Forum logs',
  	'ACP_FORUM_MANAGEMENT'			=> 'Forum management',
***************
*** 99,118 ****
  	'ACP_GROUPS_MANAGE'				=> 'Manage groups',
  	'ACP_GROUPS_MANAGEMENT'			=> 'Group management',
  	'ACP_GROUPS_PERMISSIONS'		=> 'Groups’ permissions',
! 	
  	'ACP_ICONS'					=> 'Topic icons',
  	'ACP_ICONS_SMILIES'			=> 'Topic icons/smilies',
  	'ACP_IMAGESETS'				=> 'Imagesets',
  	'ACP_INACTIVE_USERS'		=> 'Inactive users',
  	'ACP_INDEX'					=> 'ACP index',
! 	
  	'ACP_JABBER_SETTINGS'		=> 'Jabber settings',
! 	
  	'ACP_LANGUAGE'				=> 'Language management',
  	'ACP_LANGUAGE_PACKS'		=> 'Language packs',
  	'ACP_LOAD_SETTINGS'			=> 'Load settings',
  	'ACP_LOGGING'				=> 'Logging',
! 	
  	'ACP_MAIN'					=> 'ACP index',
  	'ACP_MANAGE_EXTENSIONS'		=> 'Manage extensions',
  	'ACP_MANAGE_FORUMS'			=> 'Manage forums',
--- 99,118 ----
  	'ACP_GROUPS_MANAGE'				=> 'Manage groups',
  	'ACP_GROUPS_MANAGEMENT'			=> 'Group management',
  	'ACP_GROUPS_PERMISSIONS'		=> 'Groups’ permissions',
! 
  	'ACP_ICONS'					=> 'Topic icons',
  	'ACP_ICONS_SMILIES'			=> 'Topic icons/smilies',
  	'ACP_IMAGESETS'				=> 'Imagesets',
  	'ACP_INACTIVE_USERS'		=> 'Inactive users',
  	'ACP_INDEX'					=> 'ACP index',
! 
  	'ACP_JABBER_SETTINGS'		=> 'Jabber settings',
! 
  	'ACP_LANGUAGE'				=> 'Language management',
  	'ACP_LANGUAGE_PACKS'		=> 'Language packs',
  	'ACP_LOAD_SETTINGS'			=> 'Load settings',
  	'ACP_LOGGING'				=> 'Logging',
! 
  	'ACP_MAIN'					=> 'ACP index',
  	'ACP_MANAGE_EXTENSIONS'		=> 'Manage extensions',
  	'ACP_MANAGE_FORUMS'			=> 'Manage forums',
***************
*** 125,133 ****
  	'ACP_MODULE_MANAGEMENT'		=> 'Module management',
  	'ACP_MOD_LOGS'				=> 'Moderator log',
  	'ACP_MOD_ROLES'				=> 'Moderator roles',
! 	
  	'ACP_ORPHAN_ATTACHMENTS'	=> 'Orphaned attachments',
! 	
  	'ACP_PERMISSIONS'			=> 'Permissions',
  	'ACP_PERMISSION_MASKS'		=> 'Permission masks',
  	'ACP_PERMISSION_ROLES'		=> 'Permission roles',
--- 125,135 ----
  	'ACP_MODULE_MANAGEMENT'		=> 'Module management',
  	'ACP_MOD_LOGS'				=> 'Moderator log',
  	'ACP_MOD_ROLES'				=> 'Moderator roles',
! 
! 	'ACP_NO_ITEMS'				=> 'There are no items yet.',
! 
  	'ACP_ORPHAN_ATTACHMENTS'	=> 'Orphaned attachments',
! 
  	'ACP_PERMISSIONS'			=> 'Permissions',
  	'ACP_PERMISSION_MASKS'		=> 'Permission masks',
  	'ACP_PERMISSION_ROLES'		=> 'Permission roles',
***************
*** 137,145 ****
  	'ACP_PRUNE_FORUMS'			=> 'Prune forums',
  	'ACP_PRUNE_USERS'			=> 'Prune users',
  	'ACP_PRUNING'				=> 'Pruning',
! 	
  	'ACP_QUICK_ACCESS'			=> 'Quick access',
! 	
  	'ACP_RANKS'					=> 'Ranks',
  	'ACP_REASONS'				=> 'Report/denial reasons',
  	'ACP_REGISTER_SETTINGS'		=> 'User registration settings',
--- 139,147 ----
  	'ACP_PRUNE_FORUMS'			=> 'Prune forums',
  	'ACP_PRUNE_USERS'			=> 'Prune users',
  	'ACP_PRUNING'				=> 'Pruning',
! 
  	'ACP_QUICK_ACCESS'			=> 'Quick access',
! 
  	'ACP_RANKS'					=> 'Ranks',
  	'ACP_REASONS'				=> 'Report/denial reasons',
  	'ACP_REGISTER_SETTINGS'		=> 'User registration settings',
***************
*** 158,167 ****
  	'ACP_STYLE_COMPONENTS'		=> 'Style components',
  	'ACP_STYLE_MANAGEMENT'		=> 'Style management',
  	'ACP_STYLES'				=> 'Styles',
! 	
  	'ACP_TEMPLATES'				=> 'Templates',
  	'ACP_THEMES'				=> 'Themes',
! 	
  	'ACP_UPDATE'					=> 'Updating',
  	'ACP_USERS_FORUM_PERMISSIONS'	=> 'Users’ forum permissions',
  	'ACP_USERS_LOGS'				=> 'User logs',
--- 160,169 ----
  	'ACP_STYLE_COMPONENTS'		=> 'Style components',
  	'ACP_STYLE_MANAGEMENT'		=> 'Style management',
  	'ACP_STYLES'				=> 'Styles',
! 
  	'ACP_TEMPLATES'				=> 'Templates',
  	'ACP_THEMES'				=> 'Themes',
! 
  	'ACP_UPDATE'					=> 'Updating',
  	'ACP_USERS_FORUM_PERMISSIONS'	=> 'Users’ forum permissions',
  	'ACP_USERS_LOGS'				=> 'User logs',
***************
*** 188,194 ****
  	'ACP_VIEW_FORUM_PERMISSIONS'		=> 'View forum-based permissions',
  	'ACP_VIEW_GLOBAL_MOD_PERMISSIONS'	=> 'View global moderation permissions',
  	'ACP_VIEW_USER_PERMISSIONS'			=> 'View user-based permissions',
! 	
  	'ACP_WORDS'					=> 'Word censoring',
  
  	'ACTION'				=> 'Action',
--- 190,196 ----
  	'ACP_VIEW_FORUM_PERMISSIONS'		=> 'View forum-based permissions',
  	'ACP_VIEW_GLOBAL_MOD_PERMISSIONS'	=> 'View global moderation permissions',
  	'ACP_VIEW_USER_PERMISSIONS'			=> 'View user-based permissions',
! 
  	'ACP_WORDS'					=> 'Word censoring',
  
  	'ACTION'				=> 'Action',
***************
*** 242,248 ****
  	'NOTIFY'				=> 'Notification',
  	'NO_ADMIN'				=> 'You are not authorised to administrate this board.',
  	'NO_EMAILS_DEFINED'		=> 'No valid e-mail addresses found.',
! 	'NO_PASSWORD_SUPPLIED'	=> 'You need to enter your password to access the Administration Control Panel.',	
  
  	'OFF'					=> 'Off',
  	'ON'					=> 'On',
--- 244,250 ----
  	'NOTIFY'				=> 'Notification',
  	'NO_ADMIN'				=> 'You are not authorised to administrate this board.',
  	'NO_EMAILS_DEFINED'		=> 'No valid e-mail addresses found.',
! 	'NO_PASSWORD_SUPPLIED'	=> 'You need to enter your password to access the Administration Control Panel.',
  
  	'OFF'					=> 'Off',
  	'ON'					=> 'On',
***************
*** 252,258 ****
  	'PARSE_URLS'						=> 'Parse links',
  	'PERMISSIONS_TRANSFERRED'			=> 'Permissions transferred',
  	'PERMISSIONS_TRANSFERRED_EXPLAIN'	=> 'You currently have the permissions from %1$s. You are able to browse the board with this user’s permissions, but not access the administration control panel since admin permissions were not transferred. You can <a href="%2$s"><strong>revert to your permission set</strong></a> at any time.',
! 	'PIXEL'								=> 'px',	
  	'PROCEED_TO_ACP'					=> '%sProceed to the ACP%s',
  
  	'REMIND'							=> 'Remind',
--- 254,260 ----
  	'PARSE_URLS'						=> 'Parse links',
  	'PERMISSIONS_TRANSFERRED'			=> 'Permissions transferred',
  	'PERMISSIONS_TRANSFERRED_EXPLAIN'	=> 'You currently have the permissions from %1$s. You are able to browse the board with this user’s permissions, but not access the administration control panel since admin permissions were not transferred. You can <a href="%2$s"><strong>revert to your permission set</strong></a> at any time.',
! 	'PIXEL'								=> 'px',
  	'PROCEED_TO_ACP'					=> '%sProceed to the ACP%s',
  
  	'REMIND'							=> 'Remind',
***************
*** 262,267 ****
--- 264,274 ----
  	'SELECT_ANONYMOUS'		=> 'Select anonymous user',
  	'SELECT_OPTION'			=> 'Select option',
  
+ 	'SETTING_TOO_LOW'		=> 'The entered value for the setting “%1$s” is too low. The minimal allowed value is %2$d.',
+ 	'SETTING_TOO_BIG'		=> 'The entered value for the setting “%1$s” is too big. The maximal allowed value is %2$d.',	
+ 	'SETTING_TOO_LONG'		=> 'The entered value for the setting “%1$s” is too long. The maximal allowed length is %2$d.',
+ 	'SETTING_TOO_SHORT'		=> 'The entered value for the setting “%1$s” is not long enough. The minimal allowed length is %2$d.',
+ 
  	'UCP'					=> 'User Control Panel',
  	'USERNAMES_EXPLAIN'		=> 'Place each username on a separate line.',
  	'USER_CONTROL_PANEL'	=> 'User Control Panel',
***************
*** 404,410 ****
  
  	'LOG_ACL_TRANSFER_PERMISSIONS'		=> '<strong>Permissions transferred from</strong><br />» %s',
  	'LOG_ACL_RESTORE_PERMISSIONS'		=> '<strong>Own permissions restored after using permissions from</strong><br />» %s',
! 	
  	'LOG_ADMIN_AUTH_FAIL'		=> '<strong>Failed administration login attempt</strong>',
  	'LOG_ADMIN_AUTH_SUCCESS'	=> '<strong>Successful administration login</strong>',
  
--- 411,417 ----
  
  	'LOG_ACL_TRANSFER_PERMISSIONS'		=> '<strong>Permissions transferred from</strong><br />» %s',
  	'LOG_ACL_RESTORE_PERMISSIONS'		=> '<strong>Own permissions restored after using permissions from</strong><br />» %s',
! 
  	'LOG_ADMIN_AUTH_FAIL'		=> '<strong>Failed administration login attempt</strong>',
  	'LOG_ADMIN_AUTH_SUCCESS'	=> '<strong>Successful administration login</strong>',
  
***************
*** 498,504 ****
  
  	'LOG_ERROR_JABBER'		=> '<strong>Jabber error</strong><br />» %s',
  	'LOG_ERROR_EMAIL'		=> '<strong>E-mail error</strong><br />» %s',
! 	
  	'LOG_FORUM_ADD'							=> '<strong>Created new forum</strong><br />» %s',
  	'LOG_FORUM_DEL_FORUM'					=> '<strong>Deleted forum</strong><br />» %s',
  	'LOG_FORUM_DEL_FORUMS'					=> '<strong>Deleted forum and its subforums</strong><br />» %s',
--- 505,511 ----
  
  	'LOG_ERROR_JABBER'		=> '<strong>Jabber error</strong><br />» %s',
  	'LOG_ERROR_EMAIL'		=> '<strong>E-mail error</strong><br />» %s',
! 
  	'LOG_FORUM_ADD'							=> '<strong>Created new forum</strong><br />» %s',
  	'LOG_FORUM_DEL_FORUM'					=> '<strong>Deleted forum</strong><br />» %s',
  	'LOG_FORUM_DEL_FORUMS'					=> '<strong>Deleted forum and its subforums</strong><br />» %s',
diff -x images -x imageset -crNEB phpbb300/language/en/acp/database.php phpbb301/language/en/acp/database.php
*** phpbb300/language/en/acp/database.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/database.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * acp_database [English]
  *
  * @package language
! * @version $Id: database.php,v 1.25 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * acp_database [English]
  *
  * @package language
! * @version $Id: database.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
diff -x images -x imageset -crNEB phpbb300/language/en/acp/email.php phpbb301/language/en/acp/email.php
*** phpbb300/language/en/acp/email.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/email.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * acp_email [English]
  *
  * @package language
! * @version $Id: email.php,v 1.16 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * acp_email [English]
  *
  * @package language
! * @version $Id: email.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
diff -x images -x imageset -crNEB phpbb300/language/en/acp/forums.php phpbb301/language/en/acp/forums.php
*** phpbb300/language/en/acp/forums.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/forums.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * acp_forums [English]
  *
  * @package language
! * @version $Id: forums.php,v 1.32 2007/10/05 13:14:58 kellanved Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * acp_forums [English]
  *
  * @package language
! * @version $Id: forums.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
***************
*** 114,123 ****
  
  	'GENERAL_FORUM_SETTINGS'	=> 'General forum settings',
  
! 	'LINK'					=> 'Link',
! 	'LIST_INDEX'			=> 'List subforum in parent-forum’s legend',
! 	'LIST_INDEX_EXPLAIN'	=> 'Displays this forum on the index and elsewhere as a link within the legend of its parent-forum.',
! 	'LOCKED'				=> 'Locked',
  
  	'MOVE_POSTS_NO_POSTABLE_FORUM'	=> 'The forum you selected for moving the posts to is not postable. Please select a postable forum.',
  	'MOVE_POSTS_TO'					=> 'Move posts to',
--- 114,125 ----
  
  	'GENERAL_FORUM_SETTINGS'	=> 'General forum settings',
  
! 	'LINK'						=> 'Link',
! 	'LIST_INDEX'				=> 'List subforum in parent-forum’s legend',
! 	'LIST_INDEX_EXPLAIN'		=> 'Displays this forum on the index and elsewhere as a link within the legend of its parent-forum if the parent-forum’s “List subforums in legend” option is enabled.',
! 	'LIST_SUBFORUMS'			=> 'List subforums in legend',
! 	'LIST_SUBFORUMS_EXPLAIN'	=> 'Displays this forum’s subforums on the index and elsewhere as a link within the legend if their “List subforum in parent-forum’s legend” option is enabled.',
! 	'LOCKED'					=> 'Locked',
  
  	'MOVE_POSTS_NO_POSTABLE_FORUM'	=> 'The forum you selected for moving the posts to is not postable. Please select a postable forum.',
  	'MOVE_POSTS_TO'					=> 'Move posts to',
diff -x images -x imageset -crNEB phpbb300/language/en/acp/groups.php phpbb301/language/en/acp/groups.php
*** phpbb300/language/en/acp/groups.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/groups.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * acp_groups [English]
  *
  * @package language
! * @version $Id: groups.php,v 1.29 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * acp_groups [English]
  *
  * @package language
! * @version $Id: groups.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
***************
*** 107,112 ****
--- 107,113 ----
  	'NO_GROUPS_CREATED'			=> 'No groups created yet.',
  	'NO_PERMISSIONS'			=> 'Do not copy permissions',
  	'NO_USERS'					=> 'You haven’t entered any users.',
+ 	'NO_USERS_ADDED'			=> 'No users were added to the group.',
  
  	'SPECIAL_GROUPS'			=> 'Pre-defined groups',
  	'SPECIAL_GROUPS_EXPLAIN'	=> 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings.',
diff -x images -x imageset -crNEB phpbb300/language/en/acp/language.php phpbb301/language/en/acp/language.php
*** phpbb300/language/en/acp/language.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/language.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * acp_language [English]
  *
  * @package language
! * @version $Id: language.php,v 1.16 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * acp_language [English]
  *
  * @package language
! * @version $Id: language.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
diff -x images -x imageset -crNEB phpbb300/language/en/acp/modules.php phpbb301/language/en/acp/modules.php
*** phpbb300/language/en/acp/modules.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/modules.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * acp_modules [English]
  *
  * @package language
! * @version $Id: modules.php,v 1.13 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * acp_modules [English]
  *
  * @package language
! * @version $Id: modules.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
diff -x images -x imageset -crNEB phpbb300/language/en/acp/permissions.php phpbb301/language/en/acp/permissions.php
*** phpbb300/language/en/acp/permissions.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/permissions.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * acp_permissions [English]
  *
  * @package language
! * @version $Id: permissions.php,v 1.38 2007/10/08 14:38:26 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * acp_permissions [English]
  *
  * @package language
! * @version $Id: permissions.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
***************
*** 115,121 ****
  
  	'DEFAULT'					=> 'Default',
  	'DELETE_ROLE'				=> 'Delete role',
! 	'DELETE_ROLE_CONFIRM'		=> 'Are you sure you want to remove this role? Items having this role assigned will <strong>not</strong> loose their permission settings.',
  	'DISPLAY_ROLE_ITEMS'		=> 'View items using this role',
  
  	'EDIT_PERMISSIONS'			=> 'Edit permissions',
--- 115,121 ----
  
  	'DEFAULT'					=> 'Default',
  	'DELETE_ROLE'				=> 'Delete role',
! 	'DELETE_ROLE_CONFIRM'		=> 'Are you sure you want to remove this role? Items having this role assigned will <strong>not</strong> lose their permission settings.',
  	'DISPLAY_ROLE_ITEMS'		=> 'View items using this role',
  
  	'EDIT_PERMISSIONS'			=> 'Edit permissions',
diff -x images -x imageset -crNEB phpbb300/language/en/acp/permissions_phpbb.php phpbb301/language/en/acp/permissions_phpbb.php
*** phpbb300/language/en/acp/permissions_phpbb.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/permissions_phpbb.php	Mon Apr  7 19:43:10 2008
***************
*** 1,9 ****
  <?php
  /**
! * acp_permissions (phpBB Permission Set) [English]
  *
  * @package language
! * @version $Id: permissions_phpbb.php,v 1.29 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  */
--- 1,9 ----
  <?php
  /**
! * acp_permissions_phpbb (phpBB Permission Set) [English]
  *
  * @package language
! * @version $Id: permissions_phpbb.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  */
***************
*** 35,41 ****
  
  /**
  *	MODDERS PLEASE NOTE
! *	
  *	You are able to put your permission sets into a separate file too by
  *	prefixing the new file with permissions_ and putting it into the acp
  *	language folder.
--- 35,41 ----
  
  /**
  *	MODDERS PLEASE NOTE
! *
  *	You are able to put your permission sets into a separate file too by
  *	prefixing the new file with permissions_ and putting it into the acp
  *	language folder.
diff -x images -x imageset -crNEB phpbb300/language/en/acp/posting.php phpbb301/language/en/acp/posting.php
*** phpbb300/language/en/acp/posting.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/posting.php	Mon Apr  7 19:43:10 2008
***************
*** 1,10 ****
  <?php
  /**
  *
! * posting [English]
  *
  * @package language
! * @version $Id: posting.php,v 1.50 2007/11/28 20:09:01 kellanved Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 1,10 ----
  <?php
  /**
  *
! * acp_posting [English]
  *
  * @package language
! * @version $Id: posting.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
***************
*** 54,60 ****
  	'BBCODE_TAG_TOO_LONG'		=> 'The tag name you selected is too long.',
  	'BBCODE_TAG_DEF_TOO_LONG'	=> 'The tag definition that you have entered is too long, please shorten your tag definition.',
  	'BBCODE_USAGE'				=> 'BBCode usage',
! 	'BBCODE_USAGE_EXAMPLE'		=> '[hilight={COLOR}]{TEXT}[/hilight]<br /><br />[font={SIMPLETEXT1}]{SIMPLETEXT2}[/font]',
  	'BBCODE_USAGE_EXPLAIN'		=> 'Here you define how to use the BBCode. Replace any variable input by the corresponding token (%ssee below%s).',
  
  	'EXAMPLE'						=> 'Example:',
--- 54,60 ----
  	'BBCODE_TAG_TOO_LONG'		=> 'The tag name you selected is too long.',
  	'BBCODE_TAG_DEF_TOO_LONG'	=> 'The tag definition that you have entered is too long, please shorten your tag definition.',
  	'BBCODE_USAGE'				=> 'BBCode usage',
! 	'BBCODE_USAGE_EXAMPLE'		=> '[highlight={COLOR}]{TEXT}[/highlight]<br /><br />[font={SIMPLETEXT1}]{SIMPLETEXT2}[/font]',
  	'BBCODE_USAGE_EXPLAIN'		=> 'Here you define how to use the BBCode. Replace any variable input by the corresponding token (%ssee below%s).',
  
  	'EXAMPLE'						=> 'Example:',
***************
*** 103,109 ****
  	'DISPLAY_POSTING_NO'		=> 'Not on posting page',
  
  
! 	
  	'EDIT_ICONS'				=> 'Edit icons',
  	'EDIT_SMILIES'				=> 'Edit smilies',
  	'EMOTION'					=> 'Emotion',
--- 103,109 ----
  	'DISPLAY_POSTING_NO'		=> 'Not on posting page',
  
  
! 
  	'EDIT_ICONS'				=> 'Edit icons',
  	'EDIT_SMILIES'				=> 'Edit smilies',
  	'EMOTION'					=> 'Emotion',
***************
*** 162,167 ****
--- 162,169 ----
  	'SMILIES_CONFIG'			=> 'Smiley configuration',
  	'SMILIES_DELETED'			=> 'The smiley has been removed successfully.',
  	'SMILIES_EDIT'				=> 'Edit smiley',
+ 	'SMILIE_NO_CODE'			=> 'The smilie “%s”  was ignored, as there was no code entered.',
+ 	'SMILIE_NO_EMOTION'			=> 'The smilie “%s” was ignored, as there was no emotion entered.',
  	'SMILIES_NONE_EDITED'		=> 'No smilies were updated.',
  	'SMILIES_ONE_EDITED'		=> 'The smiley has been updated successfully.',
  	'SMILIES_EDITED'			=> 'The smilies have been updated successfully.',
***************
*** 205,211 ****
  	'ADD_RANK'				=> 'Add new rank',
  
  	'MUST_SELECT_RANK'		=> 'You must select a rank.',
! 	
  	'NO_ASSIGNED_RANK'		=> 'No special rank assigned.',
  	'NO_RANK_TITLE'			=> 'You haven’t specified a title for the rank.',
  	'NO_UPDATE_RANKS'		=> 'The rank was successfully deleted. However user accounts using this rank were not updated. You will need to manually reset the rank on these accounts.',
--- 207,213 ----
  	'ADD_RANK'				=> 'Add new rank',
  
  	'MUST_SELECT_RANK'		=> 'You must select a rank.',
! 
  	'NO_ASSIGNED_RANK'		=> 'No special rank assigned.',
  	'NO_RANK_TITLE'			=> 'You haven’t specified a title for the rank.',
  	'NO_UPDATE_RANKS'		=> 'The rank was successfully deleted. However user accounts using this rank were not updated. You will need to manually reset the rank on these accounts.',
***************
*** 241,252 ****
  	'ACP_REASONS_EXPLAIN'	=> 'Here you can manage the reasons used in reports and denial messages when disapproving posts. There is one default reason (marked with a *) you are not able to remove, this reason is normally used for custom messages if no reason fits.',
  	'ADD_NEW_REASON'		=> 'Add new reason',
  	'AVAILABLE_TITLES'		=> 'Available localised reason titles',
! 	
  	'IS_NOT_TRANSLATED'			=> 'Reason has <strong>not</strong> been localised.',
  	'IS_NOT_TRANSLATED_EXPLAIN'	=> 'Reason has <strong>not</strong> been localised. If you want to provide the localised form, specify the correct key from the language files report reasons section.',
  	'IS_TRANSLATED'				=> 'Reason has been localised.',
  	'IS_TRANSLATED_EXPLAIN'		=> 'Reason has been localised. If the title you enter here is specified within the language files report reasons section, the localised form of the title and description will be used.',
! 	
  	'NO_REASON'					=> 'Reason could not be found.',
  	'NO_REASON_INFO'			=> 'You have to specify a title and a description for this reason.',
  	'NO_REMOVE_DEFAULT_REASON'	=> 'You are not able to remove the default reason “Other”.',
--- 243,254 ----
  	'ACP_REASONS_EXPLAIN'	=> 'Here you can manage the reasons used in reports and denial messages when disapproving posts. There is one default reason (marked with a *) you are not able to remove, this reason is normally used for custom messages if no reason fits.',
  	'ADD_NEW_REASON'		=> 'Add new reason',
  	'AVAILABLE_TITLES'		=> 'Available localised reason titles',
! 
  	'IS_NOT_TRANSLATED'			=> 'Reason has <strong>not</strong> been localised.',
  	'IS_NOT_TRANSLATED_EXPLAIN'	=> 'Reason has <strong>not</strong> been localised. If you want to provide the localised form, specify the correct key from the language files report reasons section.',
  	'IS_TRANSLATED'				=> 'Reason has been localised.',
  	'IS_TRANSLATED_EXPLAIN'		=> 'Reason has been localised. If the title you enter here is specified within the language files report reasons section, the localised form of the title and description will be used.',
! 
  	'NO_REASON'					=> 'Reason could not be found.',
  	'NO_REASON_INFO'			=> 'You have to specify a title and a description for this reason.',
  	'NO_REMOVE_DEFAULT_REASON'	=> 'You are not able to remove the default reason “Other”.',
diff -x images -x imageset -crNEB phpbb300/language/en/acp/profile.php phpbb301/language/en/acp/profile.php
*** phpbb300/language/en/acp/profile.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/profile.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * acp_profile [English]
  *
  * @package language
! * @version $Id: profile.php,v 1.26 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * acp_profile [English]
  *
  * @package language
! * @version $Id: profile.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
diff -x images -x imageset -crNEB phpbb300/language/en/acp/prune.php phpbb301/language/en/acp/prune.php
*** phpbb300/language/en/acp/prune.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/prune.php	Mon Apr  7 19:43:09 2008
***************
*** 4,10 ****
  * acp_prune [English]
  *
  * @package language
! * @version $Id: prune.php,v 1.14 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * acp_prune [English]
  *
  * @package language
! * @version $Id: prune.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
diff -x images -x imageset -crNEB phpbb300/language/en/acp/search.php phpbb301/language/en/acp/search.php
*** phpbb300/language/en/acp/search.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/search.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * acp_search [English]
  *
  * @package language
! * @version $Id: search.php,v 1.21 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * acp_search [English]
  *
  * @package language
! * @version $Id: search.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
diff -x images -x imageset -crNEB phpbb300/language/en/acp/styles.php phpbb301/language/en/acp/styles.php
*** phpbb300/language/en/acp/styles.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/styles.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * acp_styles [English]
  *
  * @package language
! * @version $Id: styles.php,v 1.40 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * acp_styles [English]
  *
  * @package language
! * @version $Id: styles.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
diff -x images -x imageset -crNEB phpbb300/language/en/acp/users.php phpbb301/language/en/acp/users.php
*** phpbb300/language/en/acp/users.php	Wed Dec 12 20:12:49 2007
--- phpbb301/language/en/acp/users.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * acp_users [English]
  *
  * @package language
! * @version $Id: users.php,v 1.32 2007/10/08 14:38:26 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * acp_users [English]
  *
  * @package language
! * @version $Id: users.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
***************
*** 44,53 ****
  
  	'CANNOT_BAN_FOUNDER'			=> 'You are not allowed to ban founder accounts.',
  	'CANNOT_BAN_YOURSELF'			=> 'You are not allowed to ban yourself.',
! 	'CANNOT_DEACTIVATE_BOT'			=> 'You are not allowed to deactivate bot accounts. Please deactivate the bot instead.',
  	'CANNOT_DEACTIVATE_FOUNDER'		=> 'You are not allowed to deactivate founder accounts.',
  	'CANNOT_DEACTIVATE_YOURSELF'	=> 'You are not allowed to deactivate your own account.',
! 	'CANNOT_FORCE_REACT_BOT'		=> 'You are not allowed to force reactivation on bot accounts. Please deactivate the bot instead.',
  	'CANNOT_FORCE_REACT_FOUNDER'	=> 'You are not allowed to force reactivation on founder accounts.',
  	'CANNOT_FORCE_REACT_YOURSELF'	=> 'You are not allowed to force reactivation of your own account.',
  	'CANNOT_REMOVE_ANONYMOUS'		=> 'You are not able to remove the guest user account.',
--- 44,53 ----
  
  	'CANNOT_BAN_FOUNDER'			=> 'You are not allowed to ban founder accounts.',
  	'CANNOT_BAN_YOURSELF'			=> 'You are not allowed to ban yourself.',
! 	'CANNOT_DEACTIVATE_BOT'			=> 'You are not allowed to deactivate bot accounts. Please deactivate the bot within the bots page instead.',
  	'CANNOT_DEACTIVATE_FOUNDER'		=> 'You are not allowed to deactivate founder accounts.',
  	'CANNOT_DEACTIVATE_YOURSELF'	=> 'You are not allowed to deactivate your own account.',
! 	'CANNOT_FORCE_REACT_BOT'		=> 'You are not allowed to force reactivation on bot accounts. Please reactivate the bot within the bots page instead.',
  	'CANNOT_FORCE_REACT_FOUNDER'	=> 'You are not allowed to force reactivation on founder accounts.',
  	'CANNOT_FORCE_REACT_YOURSELF'	=> 'You are not allowed to force reactivation of your own account.',
  	'CANNOT_REMOVE_ANONYMOUS'		=> 'You are not able to remove the guest user account.',
diff -x images -x imageset -crNEB phpbb300/language/en/common.php phpbb301/language/en/common.php
*** phpbb300/language/en/common.php	Wed Dec 12 20:12:50 2007
--- phpbb301/language/en/common.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * common [English]
  *
  * @package language
! * @version $Id: common.php,v 1.195 2007/11/06 14:55:07 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * common [English]
  *
  * @package language
! * @version $Id: common.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
***************
*** 106,111 ****
--- 106,112 ----
  	'BOARD_DISABLE'			=> 'Sorry but this board is currently unavailable.',
  	'BOARD_DISABLED'		=> 'This board is currently disabled.',
  	'BOARD_UNAVAILABLE'		=> 'Sorry but the board is temporarily unavailable, please try again in a few minutes.',
+ 	'BROWSING_FORUM'		=> 'Users browsing this forum: %1$s',
  	'BROWSING_FORUM_GUEST'	=> 'Users browsing this forum: %1$s and %2$d guest',
  	'BROWSING_FORUM_GUESTS'	=> 'Users browsing this forum: %1$s and %2$d guests',
  	'BYTES'					=> 'Bytes',
***************
*** 245,260 ****
  	'G_REGISTERED_COPPA'		=> 'Registered COPPA users',
  	'G_GLOBAL_MODERATORS'		=> 'Global moderators',
  
! 	'HIDDEN_USERS_ONLINE'		=> '%d hidden users online',
! 	'HIDDEN_USERS_TOTAL'		=> '%d hidden and ',
! 	'HIDDEN_USERS_ZERO_ONLINE'	=> '0 hidden users online',
! 	'HIDDEN_USERS_ZERO_TOTAL'	=> '0 hidden and ',
! 	'HIDDEN_USER_ONLINE'		=> '%d hidden user online',
! 	'HIDDEN_USER_TOTAL'			=> '%d hidden and ',
! 	'HIDE_GUESTS'				=> 'Hide guests',
! 	'HIDE_ME'					=> 'Hide my online status this session',
! 	'HOURS'						=> 'Hours',
! 	'HOME'						=> 'Home',
  
  	'ICQ'						=> 'ICQ',
  	'ICQ_STATUS'				=> 'ICQ status',	
--- 246,264 ----
  	'G_REGISTERED_COPPA'		=> 'Registered COPPA users',
  	'G_GLOBAL_MODERATORS'		=> 'Global moderators',
  
! 	'HIDDEN_USERS_ONLINE'			=> '%d hidden users online',
! 	'HIDDEN_USERS_TOTAL'			=> '%d hidden',
! 	'HIDDEN_USERS_TOTAL_AND'		=> '%d hidden and ',
! 	'HIDDEN_USERS_ZERO_ONLINE'		=> '0 hidden users online',
! 	'HIDDEN_USERS_ZERO_TOTAL'		=> '0 hidden',
! 	'HIDDEN_USERS_ZERO_TOTAL_AND'	=> '0 hidden and ',
! 	'HIDDEN_USER_ONLINE'			=> '%d hidden user online',
! 	'HIDDEN_USER_TOTAL'				=> '%d hidden',
! 	'HIDDEN_USER_TOTAL_AND'			=> '%d hidden and ',
! 	'HIDE_GUESTS'					=> 'Hide guests',
! 	'HIDE_ME'						=> 'Hide my online status this session',
! 	'HOURS'							=> 'Hours',
! 	'HOME'							=> 'Home',
  
  	'ICQ'						=> 'ICQ',
  	'ICQ_STATUS'				=> 'ICQ status',	
***************
*** 278,283 ****
--- 282,288 ----
  	'JUMP_TO_PAGE'			=> 'Click to jump to page…',
  
  	'KB'					=> 'KB',
+ 	'KIB'					=> 'KiB',
  
  	'LAST_POST'							=> 'Last post',
  	'LAST_UPDATED'						=> 'Last updated',
***************
*** 311,316 ****
--- 316,322 ----
  	'MARK_ALL'				=> 'Mark all',
  	'MARK_FORUMS_READ'		=> 'Mark forums read',
  	'MB'					=> 'MB',
+ 	'MIB'					=> 'MiB',
  	'MCP'					=> 'Moderator Control Panel',
  	'MEMBERLIST'			=> 'Members',
  	'MEMBERLIST_EXPLAIN'	=> 'View complete list of members',
***************
*** 444,453 ****
--- 450,462 ----
  	'REGISTERED_USERS'			=> 'Registered users:',
  	'REG_USERS_ONLINE'			=> 'There are %d registered users and ',
  	'REG_USERS_TOTAL'			=> '%d registered, ',
+ 	'REG_USERS_TOTAL_AND'		=> '%d registered and ',
  	'REG_USERS_ZERO_ONLINE'		=> 'There are 0 registered users and ',
  	'REG_USERS_ZERO_TOTAL'		=> '0 registered, ',
+ 	'REG_USERS_ZERO_TOTAL_AND'	=> '0 registered and ',
  	'REG_USER_ONLINE'			=> 'There is %d registered user and ',
  	'REG_USER_TOTAL'			=> '%d registered, ',
+ 	'REG_USER_TOTAL_AND'		=> '%d registered and ',
  	'REMOVE'					=> 'Remove',
  	'REMOVE_INSTALL'			=> 'Please delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.',
  	'REPLIES'					=> 'Replies',
diff -x images -x imageset -crNEB phpbb300/language/en/groups.php phpbb301/language/en/groups.php
*** phpbb300/language/en/groups.php	Wed Dec 12 20:12:50 2007
--- phpbb301/language/en/groups.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * groups [English]
  *
  * @package language
! * @version $Id: groups.php,v 1.22 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * groups [English]
  *
  * @package language
! * @version $Id: groups.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
***************
*** 40,47 ****
  	'ALREADY_IN_GROUP'			=> 'You are already a member of the selected group.',
  	'ALREADY_IN_GROUP_PENDING'	=> 'You already requested joining the selected group.',
  
! 	'CHANGED_DEFAULT_GROUP'	=> 'Successfully changed default group.',
! 	
  	'GROUP_AVATAR'						=> 'Group avatar',
  	'GROUP_CHANGE_DEFAULT'				=> 'Are you sure you want to change your default membership to the group “%s”?',
  	'GROUP_CLOSED'						=> 'Closed',
--- 40,49 ----
  	'ALREADY_IN_GROUP'			=> 'You are already a member of the selected group.',
  	'ALREADY_IN_GROUP_PENDING'	=> 'You already requested joining the selected group.',
  
! 	'CANNOT_JOIN_GROUP'			=> 'You are not able to join this group. You are only able to join open and freely open groups.',
! 	'CANNOT_RESIGN_GROUP'		=> 'You are not able to resign from this group. You are only able to resign from open and freely open groups.',
! 	'CHANGED_DEFAULT_GROUP'		=> 'Successfully changed default group.',
! 
  	'GROUP_AVATAR'						=> 'Group avatar',
  	'GROUP_CHANGE_DEFAULT'				=> 'Are you sure you want to change your default membership to the group “%s”?',
  	'GROUP_CLOSED'						=> 'Closed',
diff -x images -x imageset -crNEB phpbb300/language/en/help_bbcode.php phpbb301/language/en/help_bbcode.php
*** phpbb300/language/en/help_bbcode.php	Wed Dec 12 20:12:50 2007
--- phpbb301/language/en/help_bbcode.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * help_bbcode [English]
  *
  * @package language
! * @version $Id: help_bbcode.php,v 1.27 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * help_bbcode [English]
  *
  * @package language
! * @version $Id: help_bbcode.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
diff -x images -x imageset -crNEB phpbb300/language/en/help_faq.php phpbb301/language/en/help_faq.php
*** phpbb300/language/en/help_faq.php	Wed Dec 12 20:12:50 2007
--- phpbb301/language/en/help_faq.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * help_faq [English]
  *
  * @package language
! * @version $Id: help_faq.php,v 1.42 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * help_faq [English]
  *
  * @package language
! * @version $Id: help_faq.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
***************
*** 144,150 ****
  	),
  	array(
  		0 => 'Why did I receive a warning?',
! 		1 => 'Each board administrator has their own set of rules for their site. If you have broken a rule, you may issued a warning. Please note that this is the board administrator’s decision, and the phpBB Group has nothing to do with the warnings on the given site. Contact the board administrator if you are unsure about why you were issued a warning.'
  	),
  	array(
  		0 => 'How can I report posts to a moderator?',
--- 144,150 ----
  	),
  	array(
  		0 => 'Why did I receive a warning?',
! 		1 => 'Each board administrator has their own set of rules for their site. If you have broken a rule, you may be issued a warning. Please note that this is the board administrator’s decision, and the phpBB Group has nothing to do with the warnings on the given site. Contact the board administrator if you are unsure about why you were issued a warning.'
  	),
  	array(
  		0 => 'How can I report posts to a moderator?',
diff -x images -x imageset -crNEB phpbb300/language/en/install.php phpbb301/language/en/install.php
*** phpbb300/language/en/install.php	Wed Dec 12 20:12:50 2007
--- phpbb301/language/en/install.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * install [English]
  *
  * @package language
! * @version $Id: install.php,v 1.131 2007/11/18 11:48:18 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * install [English]
  *
  * @package language
! * @version $Id: install.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
***************
*** 85,91 ****
  	'CONVERT_NEW_CONVERSION'	=> 'New conversion',
  	'CONVERT_NOT_EXIST'			=> 'The specified convertor does not exist.',
  	'CONVERT_OPTIONS'			=> 'Options',
! 	'CONVERT_SETTINGS_VERIFIED'	=> 'The information you entered has been verified. To start the conversion process, push the button below to begin.',
  	'CONV_ERR_FATAL'			=> 'Fatal conversion error',
  
  	'CONV_ERROR_ATTACH_FTP_DIR'			=> 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.',
--- 85,91 ----
  	'CONVERT_NEW_CONVERSION'	=> 'New conversion',
  	'CONVERT_NOT_EXIST'			=> 'The specified convertor does not exist.',
  	'CONVERT_OPTIONS'			=> 'Options',
! 	'CONVERT_SETTINGS_VERIFIED'	=> 'The information you entered has been verified. To start the conversion process, please push the button below.',
  	'CONV_ERR_FATAL'			=> 'Fatal conversion error',
  
  	'CONV_ERROR_ATTACH_FTP_DIR'			=> 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.',
***************
*** 460,466 ****
  	'NO_VISIBLE_CHANGES'			=> 'No visible changes',
  	'NOTICE'						=> 'Notice',
  	'NUM_CONFLICTS'					=> 'Number of conflicts',
! 	'NUMBER_OF_FILES_COLLECTED'		=> 'Currently having differences about %1$d from %2$d files collected.<br />Please wait until file collection finished.',
  
  	'OLD_UPDATE_FILES'		=> 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.',
  
--- 460,466 ----
  	'NO_VISIBLE_CHANGES'			=> 'No visible changes',
  	'NOTICE'						=> 'Notice',
  	'NUM_CONFLICTS'					=> 'Number of conflicts',
! 	'NUMBER_OF_FILES_COLLECTED'		=> 'Currently differences of %1$d of %2$d files have been checked.<br />Please wait until all files are checked.',
  
  	'OLD_UPDATE_FILES'		=> 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.',
  
diff -x images -x imageset -crNEB phpbb300/language/en/mcp.php phpbb301/language/en/mcp.php
*** phpbb300/language/en/mcp.php	Wed Dec 12 20:12:50 2007
--- phpbb301/language/en/mcp.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * mcp [English]
  *
  * @package language
! * @version $Id: mcp.php,v 1.83 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * mcp [English]
  *
  * @package language
! * @version $Id: mcp.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
***************
*** 223,229 ****
  	'NO_POST_SELECTED'				=> 'You must select at least one post to perform this action.',
  	'NO_REASON_DISAPPROVAL'			=> 'Please give an appropriate reason for disapproval.',
  	'NO_REPORT'						=> 'No report found',
! 	'NO_REPORTS'					=> 'No reports found',	
  	'NO_REPORT_SELECTED'			=> 'You must select at least one report to perform this action.',
  	'NO_TOPIC_ICON'					=> 'None',
  	'NO_TOPIC_SELECTED'				=> 'You must select at least one topic to perform this action.',
--- 223,229 ----
  	'NO_POST_SELECTED'				=> 'You must select at least one post to perform this action.',
  	'NO_REASON_DISAPPROVAL'			=> 'Please give an appropriate reason for disapproval.',
  	'NO_REPORT'						=> 'No report found',
! 	'NO_REPORTS'					=> 'No reports found',
  	'NO_REPORT_SELECTED'			=> 'You must select at least one report to perform this action.',
  	'NO_TOPIC_ICON'					=> 'None',
  	'NO_TOPIC_SELECTED'				=> 'You must select at least one topic to perform this action.',
***************
*** 273,280 ****
  	'REPORT_TOTAL'				=> 'In total there is <strong>1</strong> report to review.',
  	'RESYNC'					=> 'Resync',
  	'RETURN_MESSAGE'			=> '%sReturn to the message%s',
! 	'RETURN_NEW_FORUM'			=> '%sReturn to the new forum%s',
! 	'RETURN_NEW_TOPIC'			=> '%sReturn to the new topic%s',
  	'RETURN_POST'				=> '%sReturn to the post%s',
  	'RETURN_QUEUE'				=> '%sReturn to the queue%s',
  	'RETURN_REPORTS'			=> '%sReturn to the reports%s',
--- 273,280 ----
  	'REPORT_TOTAL'				=> 'In total there is <strong>1</strong> report to review.',
  	'RESYNC'					=> 'Resync',
  	'RETURN_MESSAGE'			=> '%sReturn to the message%s',
! 	'RETURN_NEW_FORUM'			=> '%sGo to the new forum%s',
! 	'RETURN_NEW_TOPIC'			=> '%sGo to the new topic%s',
  	'RETURN_POST'				=> '%sReturn to the post%s',
  	'RETURN_QUEUE'				=> '%sReturn to the queue%s',
  	'RETURN_REPORTS'			=> '%sReturn to the reports%s',
diff -x images -x imageset -crNEB phpbb300/language/en/memberlist.php phpbb301/language/en/memberlist.php
*** phpbb300/language/en/memberlist.php	Wed Dec 12 20:12:50 2007
--- phpbb301/language/en/memberlist.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * memberlist [English]
  *
  * @package language
! * @version $Id: memberlist.php,v 1.35 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * memberlist [English]
  *
  * @package language
! * @version $Id: memberlist.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
***************
*** 84,90 ****
  	'IM_MSNM_CONNECT'		=> 'MSNM is not connected.\nYou have to connect to MSNM to continue.',		
  	'IM_NAME'				=> 'Your Name',
  	'IM_NO_DATA'			=> 'There is no suitable contact information for this user.',
! 	'IM_NO_JABBER'			=> 'Sorry, direct messaging of Jabber users is not supported on this server. You will need a Jabber client installed on your system to contact the recipient above.',
  	'IM_RECIPIENT'			=> 'Recipient',
  	'IM_SEND'				=> 'Send message',
  	'IM_SEND_MESSAGE'		=> 'Send message',
--- 84,90 ----
  	'IM_MSNM_CONNECT'		=> 'MSNM is not connected.\nYou have to connect to MSNM to continue.',		
  	'IM_NAME'				=> 'Your Name',
  	'IM_NO_DATA'			=> 'There is no suitable contact information for this user.',
! 	'IM_NO_JABBER'			=> 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.',
  	'IM_RECIPIENT'			=> 'Recipient',
  	'IM_SEND'				=> 'Send message',
  	'IM_SEND_MESSAGE'		=> 'Send message',
diff -x images -x imageset -crNEB phpbb300/language/en/posting.php phpbb301/language/en/posting.php
*** phpbb300/language/en/posting.php	Wed Dec 12 20:12:50 2007
--- phpbb301/language/en/posting.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * posting [English]
  *
  * @package language
! * @version $Id: posting.php,v 1.74 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * posting [English]
  *
  * @package language
! * @version $Id: posting.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
***************
*** 77,83 ****
  	'DELETE_MESSAGE'			=> 'Delete message',
  	'DELETE_MESSAGE_CONFIRM'	=> 'Are you sure you want to delete this message?',
  	'DELETE_OWN_POSTS'			=> 'Sorry but you can only delete your own posts.',
! 	'DELETE_POST_CONFIRM'		=> 'Are you sure you want to delete this message?',
  	'DELETE_POST_WARN'			=> 'Once deleted the post cannot be recovered',
  	'DISABLE_BBCODE'			=> 'Disable BBCode',
  	'DISABLE_MAGIC_URL'			=> 'Do not automatically parse URLs',
--- 77,83 ----
  	'DELETE_MESSAGE'			=> 'Delete message',
  	'DELETE_MESSAGE_CONFIRM'	=> 'Are you sure you want to delete this message?',
  	'DELETE_OWN_POSTS'			=> 'Sorry but you can only delete your own posts.',
! 	'DELETE_POST_CONFIRM'		=> 'Are you sure you want to delete this post?',
  	'DELETE_POST_WARN'			=> 'Once deleted the post cannot be recovered',
  	'DISABLE_BBCODE'			=> 'Disable BBCode',
  	'DISABLE_MAGIC_URL'			=> 'Do not automatically parse URLs',
diff -x images -x imageset -crNEB phpbb300/language/en/search.php phpbb301/language/en/search.php
*** phpbb300/language/en/search.php	Wed Dec 12 20:12:50 2007
--- phpbb301/language/en/search.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * search [English]
  *
  * @package language
! * @version $Id: search.php,v 1.26 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * search [English]
  *
  * @package language
! * @version $Id: search.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
diff -x images -x imageset -crNEB phpbb300/language/en/search_ignore_words.php phpbb301/language/en/search_ignore_words.php
*** phpbb300/language/en/search_ignore_words.php	Wed Dec 12 20:12:50 2007
--- phpbb301/language/en/search_ignore_words.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * search_ignore_words [English]
  *
  * @package language
! * @version $Id: search_ignore_words.php,v 1.3 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * search_ignore_words [English]
  *
  * @package language
! * @version $Id: search_ignore_words.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
diff -x images -x imageset -crNEB phpbb300/language/en/search_synonyms.php phpbb301/language/en/search_synonyms.php
*** phpbb300/language/en/search_synonyms.php	Wed Dec 12 20:12:50 2007
--- phpbb301/language/en/search_synonyms.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * search_synonyms [English]
  *
  * @package language
! * @version $Id: search_synonyms.php,v 1.3 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * search_synonyms [English]
  *
  * @package language
! * @version $Id: search_synonyms.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
diff -x images -x imageset -crNEB phpbb300/language/en/ucp.php phpbb301/language/en/ucp.php
*** phpbb300/language/en/ucp.php	Wed Dec 12 20:12:50 2007
--- phpbb301/language/en/ucp.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * ucp [English]
  *
  * @package language
! * @version $Id: ucp.php,v 1.136 2007/10/08 14:38:26 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * ucp [English]
  *
  * @package language
! * @version $Id: ucp.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
***************
*** 88,94 ****
  	'ATTACHMENTS_DELETED'			=> 'Attachments successfully deleted.',
  	'ATTACHMENT_DELETED'			=> 'Attachment successfully deleted.',
  	'AVATAR_CATEGORY'				=> 'Category',
! 	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$d pixels, height: %2$d pixels, file size: %3$dkB.',
  	'AVATAR_FEATURES_DISABLED'		=> 'The avatar functionality is currently disabled.',
  	'AVATAR_GALLERY'				=> 'Local gallery',
  	'AVATAR_GENERAL_UPLOAD_ERROR'	=> 'Could not upload avatar to %s.',
--- 88,94 ----
  	'ATTACHMENTS_DELETED'			=> 'Attachments successfully deleted.',
  	'ATTACHMENT_DELETED'			=> 'Attachment successfully deleted.',
  	'AVATAR_CATEGORY'				=> 'Category',
! 	'AVATAR_EXPLAIN'				=> 'Maximum dimensions; width: %1$d pixels, height: %2$d pixels, file size: %3$.2f KiB.',
  	'AVATAR_FEATURES_DISABLED'		=> 'The avatar functionality is currently disabled.',
  	'AVATAR_GALLERY'				=> 'Local gallery',
  	'AVATAR_GENERAL_UPLOAD_ERROR'	=> 'Could not upload avatar to %s.',
***************
*** 223,228 ****
--- 223,229 ----
  
  	'IF_FOLDER_FULL'			=> 'If folder is full',
  	'IMPORTANT_NEWS'			=> 'Important announcements',
+ 	'INVALID_USER_BIRTHDAY'			=> 'The entered birthday is not a valid date.',
  	'INVALID_CHARS_USERNAME'	=> 'The username contains forbidden characters.',
  	'INVALID_CHARS_NEW_PASSWORD'=> 'The password does not contain the required characters.',
  	'ITEMS_REQUIRED'			=> 'The items marked with * are required profile fields and need to be filled out.',
diff -x images -x imageset -crNEB phpbb300/language/en/viewforum.php phpbb301/language/en/viewforum.php
*** phpbb300/language/en/viewforum.php	Wed Dec 12 20:12:50 2007
--- phpbb301/language/en/viewforum.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * viewforum [English]
  *
  * @package language
! * @version $Id: viewforum.php,v 1.18 2007/10/04 15:07:24 acydburn Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * viewforum [English]
  *
  * @package language
! * @version $Id: viewforum.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
diff -x images -x imageset -crNEB phpbb300/language/en/viewtopic.php phpbb301/language/en/viewtopic.php
*** phpbb300/language/en/viewtopic.php	Wed Dec 12 20:12:50 2007
--- phpbb301/language/en/viewtopic.php	Mon Apr  7 19:43:10 2008
***************
*** 4,10 ****
  * viewtopic [English]
  *
  * @package language
! * @version $Id: viewtopic.php,v 1.20 2007/10/29 13:39:34 kellanved Exp $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
--- 4,10 ----
  * viewtopic [English]
  *
  * @package language
! * @version $Id: viewtopic.php 8479 2008-03-29 00:22:48Z naderman $
  * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
Standaard patch, mocht je het in nederlands willen, heb ik er nog eentje staan op sourceforge IIRC.
Bron: http://prdownloads.sourceforge.net/phpb ... p?download

Gebruikersavatar
DoubleJ
Berichten: 502
Lid geworden op: 22 jan 2005, 17:20
Locatie: Enschede
Contacteer:

Re: [1.0.1] Nederlandse vertaling

Bericht door DoubleJ » 08 apr 2008, 18:46

Ik heb de 1.0.1 vertaling nu ook op mijn forum geplaatst, een paar puntjes van kritiek omtrent te vertaling:

Ten eerste in common.php

vandaag en gisteren zijn nog steeds van een , voorzien, wat niet hoort. Je behoort in je Datum format aan te geven of er een comma staat of niet, en dit hoort dan ook niet thuis in de taalbestanden.

Verder viel het me op dat jullie IPV tabs, spaties hier en daar gebruikt hebben, niet dat dit voor het parsen veel uitmaakt, maar daardoor staat niet alles meer op een 'rij'.


Dat waren even mijn puntjes voor de 1.0.1 vertaling.
DoubleJ - "Waarom makkelijk doen, als het ook moeilijk kan."

Gebruikersavatar
MandersOnline
Berichten: 732
Lid geworden op: 27 aug 2003, 22:58
Locatie: Amsterdam
Contacteer:

Re: [1.0.1] Nederlandse vertaling

Bericht door MandersOnline » 08 apr 2008, 19:24

Kan je mij aangeven welke common.php dat is? en eventueel de regel, scheelt weer zoeken namenlijk ;)
Verder ga ik ook even kijken om die spaties er uit te gaan halen, deze zal wel in meerdere bestanden voorkomen neem ik aan.

Gebruikersavatar
lunagang
Berichten: 120
Lid geworden op: 28 mei 2004, 15:52

Re: [1.0.1] Nederlandse vertaling

Bericht door lunagang » 08 apr 2008, 20:31

Raimon schreef:Dat heet tegenwoordig een patch, met een patch zie je alle changes.
Daar heb je echt geen MOD of een "scriptje" voor nodig, hetzelfde doet men met custom styles, daarbij heb je echt geen hulp nodig van een script met fouten.
Binnen 3 minuten zie je alle veranderingen die nodig zijn, ik heb ze zelfs nog voor mijn forum voor de nederlandse taal, zodat ik ze makkelijk kan invoeren in het automatische update pakket.
Daar had ik inderdaad nog niet aan gedacht :o Daar heb ik toch wel originele taalbestanden van versie 3.0.0 nodig? Laat ik die nou net niet meer hebben... Of heb ik de patchdownload op phpBB.nl over het hoofd gezien?

Gebruikersavatar
Tazmanian
Berichten: 293
Lid geworden op: 16 aug 2007, 15:19
Locatie: Hamme - Belgie
Contacteer:

Re: [1.0.1] Nederlandse vertaling

Bericht door Tazmanian » 08 apr 2008, 21:52

Dit staat rond lijn 209

Code: Selecteer alles

'acl_a_user'		=> array('lang'	=> 'Kan gebruikers beheren', 'cat'	=> 'user_group'),
					   array('lang' => 'Kan gebruikers beheren<br /><em>Dit voegt ook de mogelijkheid toe om de gebruikers browser agent te zien in de wie is er online lijst.</em>', 'cat' => 'user_group'),
Klopt dit?
Omdat dit wel staat in de nl file en niet in de en file kreeg ik de melding via 'Taalpakketten' dat er niet aanwezige taalvariabelen zijn.

Plaats reactie