diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html index 9f8ed9648a..60090d5a3f 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -21,7 +21,7 @@
{REGISTERED_IP}
-
[ {L_WHOIS} ]
+
[ {L_WHOIS} ]
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index 8ad28f175d..434f6c2996 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -88,7 +88,7 @@ $lang = array_merge($lang, array( 'FORUM_PASSWORD_EXPLAIN' => 'Defines a password for this forum, use the permission system in preference.', 'FORUM_PASSWORD_MISMATCH' => 'The passwords you entered did not match.', 'FORUM_PRUNE_SETTINGS' => 'Forum prune settings', - 'FORUM_RESYNCED' => 'Forum "%s" successfully resynced', + 'FORUM_RESYNCED' => 'Forum “%s” successfully resynced', 'FORUM_RULES_EXPLAIN' => 'Forum rules are displayed at any page within the given forum.', 'FORUM_RULES_LINK' => 'Link to forum rules', 'FORUM_RULES_LINK_EXPLAIN' => 'You are able to enter the URL of the page/post containing your forum rules here. This setting will override the forum rules text you specified.', diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index b1f01204fa..b52946e135 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -244,7 +244,7 @@ $lang = array_merge($lang, array( '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".', + 'NO_REMOVE_DEFAULT_REASON' => 'You are not able to remove the default reason “Other”.', 'REASON_ADD' => 'Add report/denial reason', 'REASON_ADDED' => 'Report/denial reason successfully added.', diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index df45be62c3..69064608b3 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -65,7 +65,7 @@ $lang = array_merge($lang, array( 'CONFIG_CONVERT' => 'Converting the configuration', 'CONFIG_FILE_UNABLE_WRITE' => 'It was not possible to write the configuration file. Alternative methods for this file to be created are presented below.', 'CONFIG_FILE_WRITTEN' => 'The configuration file has been written. You may now proceed to the next step of the installation.', - 'CONFIG_PHPBB_EMPTY' => 'The phpBB3 config variable for "%s" is empty.', + 'CONFIG_PHPBB_EMPTY' => 'The phpBB3 config variable for “%s” is empty.', 'CONFIG_RETRY' => 'Retry', 'CONTACT_EMAIL_CONFIRM' => 'Confirm contact e-mail', 'CONTINUE_CONVERT' => 'Continue conversion', @@ -88,7 +88,7 @@ $lang = array_merge($lang, array( 'CONV_ERROR_FORUM_ACCESS' => 'Unable to get forum access information.', 'CONV_ERROR_GET_CATEGORIES' => 'Unable to get categories.', 'CONV_ERROR_GET_CONFIG' => 'Could not retrieve your board configuration.', - 'CONV_ERROR_COULD_NOT_READ' => 'Unable to access/read "%s".', + 'CONV_ERROR_COULD_NOT_READ' => 'Unable to access/read “%s”.', 'CONV_ERROR_GROUP_ACCESS' => 'Unable to get group authentication information.', 'CONV_ERROR_INCONSISTENT_GROUPS' => 'Inconsistency in groups table detected in add_bots() - you need to add all special groups if you do it manually.', 'CONV_ERROR_INSERT_BOT' => 'Unable to insert bot into users table.', @@ -98,7 +98,7 @@ $lang = array_merge($lang, array( 'CONV_ERROR_NO_AVATAR_PATH' => 'Note to developer: you must specify $convertor[\'avatar_path\'] to use %s.', 'CONV_ERROR_NO_FORUM_PATH' => 'The relative path to the source board has not been specified.', 'CONV_ERROR_NO_GALLERY_PATH' => 'Note to developer: you must specify $convertor[\'avatar_gallery_path\'] to use %s.', - 'CONV_ERROR_NO_GROUP' => 'Group "%1$s" could not be found in %2$s.', + 'CONV_ERROR_NO_GROUP' => 'Group “%1$s” could not be found in %2$s.', 'CONV_ERROR_NO_RANKS_PATH' => 'Note to developer: you must specify $convertor[\'ranks_path\'] to use %s.', 'CONV_ERROR_NO_SMILIES_PATH' => 'Note to developer: you must specify $convertor[\'smilies_path\'] to use %s.', 'CONV_ERROR_NO_UPLOAD_DIR' => 'Note to developer: you must specify $convertor[\'upload_path\'] to use %s.', @@ -107,7 +107,7 @@ $lang = array_merge($lang, array( 'CONV_ERROR_REPLACE_CATEGORY' => 'Unable to insert new forum replacing old category.', 'CONV_ERROR_REPLACE_FORUM' => 'Unable to insert new forum replacing old forum.', 'CONV_ERROR_USER_ACCESS' => 'Unable to get user authentication information.', - 'CONV_ERROR_WRONG_GROUP' => 'Wrong group "%1$s" defined in %2$s.', + 'CONV_ERROR_WRONG_GROUP' => 'Wrong group “%1$s” defined in %2$s.', 'CONV_OPTIONS_BODY' => 'This page collects the data required to access the source board. Enter the database details of your former board; the converter will not change anything in the database given below. The source board should be disabled to allow a consistent conversion.', 'CONV_SAVED_MESSAGES' => 'Saved messages', @@ -120,7 +120,7 @@ $lang = array_merge($lang, array( 'DB_ERR_INSERT' => 'Error while processing INSERT query.', 'DB_ERR_LAST' => 'Error while processing query_last.', 'DB_ERR_QUERY_FIRST' => 'Error while executing query_first.', - 'DB_ERR_QUERY_FIRST_TABLE' => 'Error while executing query_first, %s ("%s").', + 'DB_ERR_QUERY_FIRST_TABLE' => 'Error while executing query_first, %s (“%s”).', 'DB_ERR_SELECT' => 'Error while running SELECT query.', 'DB_HOST' => 'Database server hostname or DSN', 'DB_HOST_EXPLAIN' => 'DSN stands for Data Source Name and is relevant only for ODBC installs.', @@ -267,7 +267,7 @@ $lang = array_merge($lang, array( 'NAMING_CONFLICT' => 'Naming conflict: %s and %s are both aliases

%s', 'NEXT_STEP' => 'Proceed to next step', 'NOT_FOUND' => 'Cannot find', - 'NOT_UNDERSTAND' => 'Could not understand %s #%d, table %s ("%s")', + 'NOT_UNDERSTAND' => 'Could not understand %s #%d, table %s (“%s”)', 'NO_CONVERTORS' => 'No convertors are available for use.', 'NO_CONVERT_SPECIFIED' => 'No convertor specified.', 'NO_LOCATION' => 'Cannot determine location. If you know Imagemagick is installed, you may specify the location later within your administration control panel', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index dc20fd64e8..000c32cbae 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -224,7 +224,7 @@ $lang = array_merge($lang, array( 'NO_TOPIC_SELECTED' => 'You must select at least one topic to perform this action.', 'NO_TOPICS_QUEUE' => 'There are no topics waiting for approval.', - 'ONLY_TOPIC' => 'Only topic "%s"', + 'ONLY_TOPIC' => 'Only topic “%s”', 'OTHER_USERS' => 'Other users posting from this IP', 'POSTER' => 'Poster', diff --git a/phpBB/styles/prosilver/template/mcp_whois.html b/phpBB/styles/prosilver/template/mcp_whois.html index 2bd065996c..5872bd0b91 100644 --- a/phpBB/styles/prosilver/template/mcp_whois.html +++ b/phpBB/styles/prosilver/template/mcp_whois.html @@ -5,7 +5,9 @@

{L_RETURN_POST}

- 
{WHOIS}
+
+ 
{WHOIS}
+

{L_RETURN_POST}

diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html index 9f338b2104..b111d743f9 100644 --- a/phpBB/styles/prosilver/template/viewonline_body.html +++ b/phpBB/styles/prosilver/template/viewonline_body.html @@ -23,7 +23,7 @@ - {user_row.USERNAME_FULL} {L_IP}: {user_row.USER_IP} » {L_WHOIS} + {user_row.USERNAME_FULL} {L_IP}: {user_row.USER_IP} » {L_WHOIS}
{user_row.USER_BROWSER} {user_row.FORUM_LOCATION} {user_row.LASTUPDATE} diff --git a/phpBB/styles/prosilver/template/viewonline_whois.html b/phpBB/styles/prosilver/template/viewonline_whois.html index 5baa12aa58..a9c6473727 100644 --- a/phpBB/styles/prosilver/template/viewonline_whois.html +++ b/phpBB/styles/prosilver/template/viewonline_whois.html @@ -5,11 +5,12 @@
-
+ 
{WHOIS}
-
+
+{L_CLOSE_WINDOW} \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/viewonline_body.html b/phpBB/styles/subsilver2/template/viewonline_body.html index ce3b9a77c6..1fcab016b6 100644 --- a/phpBB/styles/subsilver2/template/viewonline_body.html +++ b/phpBB/styles/subsilver2/template/viewonline_body.html @@ -21,7 +21,7 @@ -

{user_row.USERNAME_FULL}

{L_IP}: {user_row.USER_IP} » {L_WHOIS}

+

{user_row.USERNAME_FULL}

{L_IP}: {user_row.USER_IP} » {L_WHOIS}

{user_row.USER_BROWSER}

 {user_row.LASTUPDATE}

{user_row.FORUM_LOCATION}

diff --git a/phpBB/styles/subsilver2/template/viewonline_whois.html b/phpBB/styles/subsilver2/template/viewonline_whois.html index d10fa2ac0f..033d848ac4 100644 --- a/phpBB/styles/subsilver2/template/viewonline_whois.html +++ b/phpBB/styles/subsilver2/template/viewonline_whois.html @@ -5,7 +5,7 @@ {L_WHOIS} - 
{WHOIS}
+ 
{WHOIS}

{L_CLOSE_WINDOW}