diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index c69dedbcfb..266b7e48b4 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -54,7 +54,7 @@
-

{options.TITLE_EXPLAIN}
+

{options.TITLE_EXPLAIN}
{options.CONTENT}
@@ -78,11 +78,11 @@ {L_SECURE_TITLE}

{L_DOWNLOAD_ADD_IPS_EXPLAIN}

-
+
-

{L_EXCLUDE_ENTERED_IP}
+

{L_EXCLUDE_ENTERED_IP}
@@ -97,7 +97,7 @@

{L_DOWNLOAD_REMOVE_IPS_EXPLAIN}

-
+
@@ -172,39 +172,39 @@ {L_LEGEND}
-
+
-

{L_SPECIAL_CATEGORY_EXPLAIN}
+

{L_SPECIAL_CATEGORY_EXPLAIN}
{S_CATEGORY_SELECT}
-
+
checked="checked" />
-
+
checked="checked" />
-
+
 src="{PHPBB_ROOT_PATH}images/spacer.gif"src="{UPLOAD_ICON_SRC}" id="image_upload_icon" alt="" title="" /> 
-
+
-
+
{ASSIGNED_EXTENSIONS}
[{L_GO_TO_EXTENSIONS} ]
-

{L_ALLOWED_FORUMS_EXPLAIN}
+

{L_ALLOWED_FORUMS_EXPLAIN}
@@ -254,7 +254,7 @@

- {L_CREATE_GROUP}: + {L_CREATE_GROUP}{L_COLON}

{S_FORM_TOKEN} @@ -348,7 +348,7 @@ {orphan.REAL_FILENAME} {orphan.FILETIME} {orphan.FILESIZE} - {L_ATTACH_ID}: + {L_ATTACH_ID}{L_COLON} @@ -380,7 +380,7 @@
class="requirements_not_met"> -
+

{META_REQUIRE_PHP}

@@ -69,24 +69,24 @@
-
+
{meta_authors.AUTHOR_NAME}
-
+
{meta_authors.AUTHOR_EMAIL}
-
+
{meta_authors.AUTHOR_HOMEPAGE}
-
+
{meta_authors.AUTHOR_ROLE}
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index e29cdcf2e9..cb9cae6c0d 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -112,13 +112,13 @@
{L_FORUM_SETTINGS}
-
+
-
+
@@ -127,7 +127,7 @@
-
+
-

{L_COPY_PERMISSIONS_EXPLAIN}
+

{L_COPY_PERMISSIONS_EXPLAIN}
-
+
-

{L_FORUM_DESC_EXPLAIN}
+

{L_FORUM_DESC_EXPLAIN}
-

{L_FORUM_IMAGE_EXPLAIN}
+

{L_FORUM_IMAGE_EXPLAIN}
{L_FORUM_IMAGE}
-

{L_FORUM_PASSWORD_EXPLAIN}
+

{L_FORUM_PASSWORD_EXPLAIN}
-

{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}
+

{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}
-

{L_FORUM_PASSWORD_UNSET_EXPLAIN}
+

{L_FORUM_PASSWORD_UNSET_EXPLAIN}
-
+
@@ -188,7 +188,7 @@
{L_GENERAL_FORUM_SETTINGS}
-

{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}
+

{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}
@@ -199,46 +199,46 @@
{L_GENERAL_FORUM_SETTINGS}
-
+
-

{L_LIST_SUBFORUMS_EXPLAIN}
+

{L_LIST_SUBFORUMS_EXPLAIN}
-

{L_LIST_INDEX_EXPLAIN}
+

{L_LIST_INDEX_EXPLAIN}
-

{L_ENABLE_POST_REVIEW_EXPLAIN}
+

{L_ENABLE_POST_REVIEW_EXPLAIN}
-

{L_ENABLE_QUICK_REPLY_EXPLAIN}
+

{L_ENABLE_QUICK_REPLY_EXPLAIN}
-

{L_ENABLE_INDEXING_EXPLAIN}
+

{L_ENABLE_INDEXING_EXPLAIN}
-
+
-

{L_ENABLE_RECENT_EXPLAIN}
+

{L_ENABLE_RECENT_EXPLAIN}
-

{L_FORUM_TOPICS_PAGE_EXPLAIN}
+

{L_FORUM_TOPICS_PAGE_EXPLAIN}
@@ -246,34 +246,34 @@
{L_FORUM_PRUNE_SETTINGS}
-

{L_FORUM_AUTO_PRUNE_EXPLAIN}
+

{L_FORUM_AUTO_PRUNE_EXPLAIN}
-

{L_AUTO_PRUNE_FREQ_EXPLAIN}
+

{L_AUTO_PRUNE_FREQ_EXPLAIN}
{L_DAYS}
-

{L_AUTO_PRUNE_DAYS_EXPLAIN}
+

{L_AUTO_PRUNE_DAYS_EXPLAIN}
{L_DAYS}
-

{L_AUTO_PRUNE_VIEWED_EXPLAIN}
+

{L_AUTO_PRUNE_VIEWED_EXPLAIN}
{L_DAYS}
-

{L_PRUNE_OLD_POLLS_EXPLAIN}
+

{L_PRUNE_OLD_POLLS_EXPLAIN}
-
+
-
+
@@ -284,16 +284,16 @@
{L_GENERAL_FORUM_SETTINGS}
-

{L_LIST_INDEX_EXPLAIN}
+

{L_LIST_INDEX_EXPLAIN}
-

{L_FORUM_LINK_EXPLAIN}
+

{L_FORUM_LINK_EXPLAIN}
-

{L_FORUM_LINK_TRACK_EXPLAIN}
+

{L_FORUM_LINK_TRACK_EXPLAIN}
@@ -304,17 +304,17 @@
{L_FORUM_RULES}
-

{L_FORUM_RULES_LINK_EXPLAIN}
+

{L_FORUM_RULES_LINK_EXPLAIN}
-
+
{FORUM_RULES_PREVIEW}
-

{L_FORUM_RULES_EXPLAIN}
+

{L_FORUM_RULES_EXPLAIN}
@@ -351,12 +351,12 @@
{L_FORUM_DELETE}
-
+
{FORUM_NAME}
-
+
@@ -365,7 +365,7 @@
-
+
@@ -449,7 +449,7 @@
{forums.FORUM_IMAGE}
{forums.FORUM_NAME}{forums.FORUM_NAME}
{forums.FORUM_DESCRIPTION} -

{L_TOPICS}: {forums.FORUM_TOPICS} / {L_POSTS}: {forums.FORUM_POSTS} +

{L_TOPICS}{L_COLON} {forums.FORUM_TOPICS} / {L_POSTS}{L_COLON} {forums.FORUM_POSTS} @@ -482,7 +482,7 @@
- {L_SELECT_FORUM}: + {L_SELECT_FORUM}{L_COLON} {S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_forums_copy_perm.html b/phpBB/adm/style/acp_forums_copy_perm.html index acec3c1967..1fcf2f62a4 100644 --- a/phpBB/adm/style/acp_forums_copy_perm.html +++ b/phpBB/adm/style/acp_forums_copy_perm.html @@ -9,7 +9,7 @@
-

{L_COPY_PERMISSIONS_EXPLAIN}
+

{L_COPY_PERMISSIONS_EXPLAIN}
{S_FORM_TOKEN}{S_HIDDEN_FIELDS} diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 6e52880131..4701bf702f 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -22,11 +22,11 @@
{L_GROUP_DETAILS}
-
for="group_name">{L_GROUP_NAME}:
+
for="group_name">{L_GROUP_NAME}{L_COLON}
{GROUP_NAME}
-
+
@@ -34,7 +34,7 @@
-

{L_GROUP_TYPE_EXPLAIN}
+

{L_GROUP_TYPE_EXPLAIN}
@@ -48,7 +48,7 @@
-

{L_COPY_PERMISSIONS_EXPLAIN}
+

{L_COPY_PERMISSIONS_EXPLAIN}
@@ -58,24 +58,24 @@ {L_GROUP_OPTIONS_SAVE}
-

{L_GROUP_FOUNDER_MANAGE_EXPLAIN}
+

{L_GROUP_FOUNDER_MANAGE_EXPLAIN}
-

{L_GROUP_SKIP_AUTH_EXPLAIN}
+

{L_GROUP_SKIP_AUTH_EXPLAIN}
-
+
-
+
-

{L_GROUP_RECEIVE_PM_EXPLAIN}
+

{L_GROUP_RECEIVE_PM_EXPLAIN}
@@ -83,19 +83,19 @@
{L_GROUP_SETTINGS_SAVE}
-

{L_GROUP_MESSAGE_LIMIT_EXPLAIN}
+

{L_GROUP_MESSAGE_LIMIT_EXPLAIN}
-

{L_GROUP_MAX_RECIPIENTS_EXPLAIN}
+

{L_GROUP_MAX_RECIPIENTS_EXPLAIN}
-

{L_GROUP_COLOR_EXPLAIN}
+

{L_GROUP_COLOR_EXPLAIN}
      [ {L_COLOUR_SWATCH} ]
-
+
@@ -103,32 +103,32 @@
{L_GROUP_AVATAR}
-

{L_AVATAR_EXPLAIN}
+

{L_AVATAR_EXPLAIN}
{AVATAR_IMAGE}
-
+
-

{L_UPLOAD_AVATAR_URL_EXPLAIN}
+

{L_UPLOAD_AVATAR_URL_EXPLAIN}
-

{L_LINK_REMOTE_AVATAR_EXPLAIN}
+

{L_LINK_REMOTE_AVATAR_EXPLAIN}
-

{L_LINK_REMOTE_SIZE_EXPLAIN}
+

{L_LINK_REMOTE_SIZE_EXPLAIN}
{L_PIXEL} × {L_PIXEL}
-
+
@@ -138,7 +138,7 @@
{L_AVATAR_GALLERY}
-
+
 
@@ -258,17 +258,17 @@
{L_ADD_USERS}
-
+
-

{L_USER_GROUP_DEFAULT_EXPLAIN}
+

{L_USER_GROUP_DEFAULT_EXPLAIN}
-

{L_USERNAMES_EXPLAIN}
+

{L_USERNAMES_EXPLAIN}
[ {L_FIND_USERNAME} ]
@@ -322,7 +322,7 @@
- {L_CREATE_GROUP}: + {L_CREATE_GROUP}{L_COLON} {S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html index 3a03573756..1e309d4cbc 100644 --- a/phpBB/adm/style/acp_groups_position.html +++ b/phpBB/adm/style/acp_groups_position.html @@ -9,7 +9,7 @@
{L_LEGEND_SETTINGS}
-

{L_LEGEND_SORT_GROUPNAME_EXPLAIN}
+

{L_LEGEND_SORT_GROUPNAME_EXPLAIN}
@@ -82,7 +82,7 @@
{L_TEAMPAGE_SETTINGS}
-
+


@@ -90,7 +90,7 @@
-

{L_TEAMPAGE_FORUMS_EXPLAIN}
+

{L_TEAMPAGE_FORUMS_EXPLAIN}
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html index 0b3b1b02d1..726c8c8b32 100644 --- a/phpBB/adm/style/acp_inactive.html +++ b/phpBB/adm/style/acp_inactive.html @@ -33,7 +33,7 @@ {inactive.USERNAME_FULL} -
{L_POSTS}: {inactive.POSTS} [{L_SEARCH_USER_POSTS}] +
{L_POSTS}{L_COLON} {inactive.POSTS} [{L_SEARCH_USER_POSTS}] {inactive.JOINED} {inactive.INACTIVE_DATE} @@ -53,7 +53,7 @@
- {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} Users per page: + {L_DISPLAY_LOG}{L_COLON}  {S_LIMIT_DAYS} {L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR} Users per page{L_COLON}
diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html index 2ba1424bda..639bcd221f 100644 --- a/phpBB/adm/style/acp_jabber.html +++ b/phpBB/adm/style/acp_jabber.html @@ -21,35 +21,35 @@

{L_JAB_GTALK_NOTE}

-

{L_JAB_ENABLE_EXPLAIN}
+

{L_JAB_ENABLE_EXPLAIN}
-

{L_JAB_SERVER_EXPLAIN}
+

{L_JAB_SERVER_EXPLAIN}
-

{L_JAB_PORT_EXPLAIN}
+

{L_JAB_PORT_EXPLAIN}
-

{L_JAB_USERNAME_EXPLAIN}
+

{L_JAB_USERNAME_EXPLAIN}
-

{L_JAB_PASSWORD_EXPLAIN}
+

{L_JAB_PASSWORD_EXPLAIN}
-

{L_JAB_USE_SSL_EXPLAIN}
+

{L_JAB_USE_SSL_EXPLAIN}
-

{L_JAB_PACKAGE_SIZE_EXPLAIN}
+

{L_JAB_PACKAGE_SIZE_EXPLAIN}
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index 81276287c1..c400437049 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -13,7 +13,7 @@
{L_DOWNLOAD_AS}
-
+
{RADIO_BUTTONS}
@@ -35,19 +35,19 @@
{LANG_LOCAL_NAME}
-
+
-
+
-
+
{LANG_ISO}
-
+
@@ -147,7 +147,7 @@ -   {L_UPLOAD_METHOD}:  id="method" checked="checked" value="{buttons.VALUE}" name="method" /> {buttons.VALUE}  +   {L_UPLOAD_METHOD}{L_COLON}  id="method" checked="checked" value="{buttons.VALUE}" name="method" /> {buttons.VALUE}  @@ -186,12 +186,12 @@
{L_UPLOAD_SETTINGS}
-
+
{NAME}
-

{data.EXPLAIN}
+

{data.EXPLAIN}
diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index 1e54f89afe..e13196f65d 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -9,7 +9,7 @@
- {L_SEARCH_KEYWORDS}:   + {L_SEARCH_KEYWORDS}{L_COLON}  
@@ -67,7 +67,7 @@
- {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} + {L_DISPLAY_LOG}{L_COLON}  {S_LIMIT_DAYS} {L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR} {S_FORM_TOKEN}
@@ -75,7 +75,7 @@
- {L_SELECT_FORUM}: + {L_SELECT_FORUM}{L_COLON}
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index d9f833d878..8b591294d4 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -89,56 +89,56 @@ - {L_NUMBER_POSTS}: + {L_NUMBER_POSTS}{L_COLON} {TOTAL_POSTS} - {L_POSTS_PER_DAY}: + {L_POSTS_PER_DAY}{L_COLON} {POSTS_PER_DAY} - {L_NUMBER_TOPICS}: + {L_NUMBER_TOPICS}{L_COLON} {TOTAL_TOPICS} - {L_TOPICS_PER_DAY}: + {L_TOPICS_PER_DAY}{L_COLON} {TOPICS_PER_DAY} - {L_NUMBER_USERS}: + {L_NUMBER_USERS}{L_COLON} {TOTAL_USERS} - {L_USERS_PER_DAY}: + {L_USERS_PER_DAY}{L_COLON} {USERS_PER_DAY} - {L_NUMBER_FILES}: + {L_NUMBER_FILES}{L_COLON} {TOTAL_FILES} - {L_FILES_PER_DAY}: + {L_FILES_PER_DAY}{L_COLON} {FILES_PER_DAY} - {L_BOARD_STARTED}: + {L_BOARD_STARTED}{L_COLON} {START_DATE} - {L_AVATAR_DIR_SIZE}: + {L_AVATAR_DIR_SIZE}{L_COLON} {AVATAR_DIR_SIZE} - {L_DATABASE_SIZE}: + {L_DATABASE_SIZE}{L_COLON} {DBSIZE} - {L_UPLOAD_DIR_SIZE}: + {L_UPLOAD_DIR_SIZE}{L_COLON} {UPLOAD_DIR_SIZE} - {L_DATABASE_SERVER_INFO}: + {L_DATABASE_SERVER_INFO}{L_COLON} {DATABASE_INFO} - {L_GZIP_COMPRESSION}: + {L_GZIP_COMPRESSION}{L_COLON} {GZIP_COMPRESSION} - {L_BOARD_VERSION}: + {L_BOARD_VERSION}{L_COLON} style="color: #228822;"style="color: #BC2A4D;" title="{L_MORE_INFORMATION}">{BOARD_VERSION} [ {L_VERSIONCHECK_FORCE_UPDATE} ] - {L_NUMBER_ORPHAN}: + {L_NUMBER_ORPHAN}{L_COLON} {TOTAL_ORPHAN}   @@ -261,7 +261,7 @@ {inactive.USERNAME_FULL} -
{L_POSTS}: {inactive.POSTS} [{L_SEARCH_USER_POSTS}] +
{L_POSTS}{L_COLON} {inactive.POSTS} [{L_SEARCH_USER_POSTS}] {inactive.JOINED} {inactive.INACTIVE_DATE} diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 6c4645e80c..1e49198725 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -72,37 +72,37 @@
{L_GENERAL_OPTIONS}
-

+

{L_MODULE_LANGNAME_EXPLAIN}
-
+
-
+
-
+
style="display: none;">
-

{L_MODULE_DISPLAYED_EXPLAIN}
+

{L_MODULE_DISPLAYED_EXPLAIN}
-

+

{L_CHOOSE_MODULE_EXPLAIN}
-

+

{L_CHOOSE_MODE_EXPLAIN}
@@ -201,7 +201,7 @@
- {L_SELECT_MODULE}: + {L_SELECT_MODULE}{L_COLON}
diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index 2ac77af25d..d654c320ca 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -36,11 +36,11 @@
{L_ROLE_DETAILS}
-
+
-

{L_ROLE_DESCRIPTION_EXPLAIN}
+

{L_ROLE_DESCRIPTION_EXPLAIN}
@@ -182,7 +182,7 @@
- {L_CREATE_ROLE}:
+ {L_CREATE_ROLE}{L_COLON}
{S_FORM_TOKEN}
diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index b44cca782e..88a82532a1 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -19,7 +19,7 @@

{L_EXPLAIN}

-

{L_FORUMS}: {FORUM_NAMES}

+

{L_FORUMS}{L_COLON} {FORUM_NAMES}

@@ -30,7 +30,7 @@ {L_LOOK_UP_FORUM}

{L_LOOK_UP_FORUMS_EXPLAIN}

-
+
@@ -52,7 +52,7 @@ {L_LOOK_UP_FORUM}

{L_SELECT_FORUM_SUBFORUM_EXPLAIN}

-
+
@@ -74,7 +74,7 @@
{L_LOOK_UP_USER}
-
+
[ {L_FIND_USERNAME} ]
@@ -95,7 +95,7 @@
{L_LOOK_UP_GROUP}
-
+
@@ -225,7 +225,7 @@
{L_LOOK_UP_USER}
-
+
[ {L_FIND_USERNAME} ]
@@ -266,7 +266,7 @@
{L_LOOK_UP_GROUP}
-
+
 
@@ -317,7 +317,7 @@
{S_HIDDEN_FIELDS} {S_FORM_TOKEN} - {L_SELECT_TYPE}: + {L_SELECT_TYPE}{L_COLON}
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index 5be69aa20b..13be669f70 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -24,22 +24,22 @@
{L_TITLE}
-

{L_FIELD_TYPE_EXPLAIN}
+

{L_FIELD_TYPE_EXPLAIN}
{FIELD_TYPE}
-

{L_FIELD_IDENT_EXPLAIN}
+

{L_FIELD_IDENT_EXPLAIN}
{FIELD_IDENT}
-

{L_FIELD_IDENT_EXPLAIN}
+

{L_FIELD_IDENT_EXPLAIN}
-

{L_DISPLAY_PROFILE_FIELD_EXPLAIN}
+

{L_DISPLAY_PROFILE_FIELD_EXPLAIN}
@@ -48,31 +48,31 @@
{L_VISIBILITY_OPTION}
-

{L_DISPLAY_AT_PROFILE_EXPLAIN}
+

{L_DISPLAY_AT_PROFILE_EXPLAIN}
checked="checked" />
-

{L_DISPLAY_AT_REGISTER_EXPLAIN}
+

{L_DISPLAY_AT_REGISTER_EXPLAIN}
checked="checked" />
-

{L_DISPLAY_ON_PM_EXPLAIN}
+

{L_DISPLAY_ON_PM_EXPLAIN}
checked="checked" />
-

{L_DISPLAY_ON_VT_EXPLAIN}
+

{L_DISPLAY_ON_VT_EXPLAIN}
checked="checked" />
-

{L_REQUIRED_FIELD_EXPLAIN}
+

{L_REQUIRED_FIELD_EXPLAIN}
checked="checked" />
-

{L_SHOW_NOVALUE_FIELD_EXPLAIN}
+

{L_SHOW_NOVALUE_FIELD_EXPLAIN}
checked="checked" />
-

{L_HIDE_PROFILE_FIELD_EXPLAIN}
+

{L_HIDE_PROFILE_FIELD_EXPLAIN}
checked="checked" />
@@ -86,22 +86,22 @@
{L_LANG_SPECIFIC}
-
+
-

{L_FIELD_DESCRIPTION_EXPLAIN}
+

{L_FIELD_DESCRIPTION_EXPLAIN}
-

{L_DEFAULT_VALUE_EXPLAIN}
+

{L_DEFAULT_VALUE_EXPLAIN}
-
+

{L_EDIT_DROPDOWN_LANG_EXPLAIN} @@ -130,7 +130,7 @@ {L_TITLE}
-

{option.EXPLAIN}
+

{option.EXPLAIN}
{option.FIELD}
@@ -153,7 +153,7 @@ {options.LANGUAGE}
-

{options.field.L_EXPLAIN}
+

{options.field.L_EXPLAIN}
{options.field.FIELD}
diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html index dfc5827117..aede662bcb 100644 --- a/phpBB/adm/style/acp_prune_forums.html +++ b/phpBB/adm/style/acp_prune_forums.html @@ -43,7 +43,7 @@ {L_SELECT_FORUM}

{L_LOOK_UP_FORUMS_EXPLAIN}

-
+
@@ -65,32 +65,32 @@

{L_FORUM}

-

{L_SELECTED_FORUMS}: {FORUM_LIST}

+

{L_SELECTED_FORUMS}{L_COLON} {FORUM_LIST}

{L_FORUM_PRUNE}
-
+
-
+
-

{L_PRUNE_OLD_POLLS_EXPLAIN}
+

{L_PRUNE_OLD_POLLS_EXPLAIN}
-
+
-
+
diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html index 4ca562fd32..75fa04a157 100644 --- a/phpBB/adm/style/acp_prune_users.html +++ b/phpBB/adm/style/acp_prune_users.html @@ -11,39 +11,39 @@
{L_CRITERIA}
-
+
-
+
-
+
-

{L_JOINED_EXPLAIN}
+

{L_JOINED_EXPLAIN}
{L_AFTER}

{L_BEFORE}
-

{L_LAST_ACTIVE_EXPLAIN}
+

{L_LAST_ACTIVE_EXPLAIN}
-
+
-
+
-

{L_PRUNE_USERS_GROUP_EXPLAIN}
+

{L_PRUNE_USERS_GROUP_EXPLAIN}
@@ -52,7 +52,7 @@
{L_USERNAMES}
-

{L_SELECT_USERS_EXPLAIN}
+

{L_SELECT_USERS_EXPLAIN}
[ {L_FIND_USERNAME} ]
@@ -61,12 +61,12 @@
{L_OPTIONS}
-

{L_DELETE_USER_POSTS_EXPLAIN}
+

{L_DELETE_USER_POSTS_EXPLAIN}
-

{L_DEACTIVATE_DELETE_EXPLAIN}
+

{L_DEACTIVATE_DELETE_EXPLAIN}
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index 7fb7da7095..a475370f73 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -25,22 +25,22 @@
{L_ACP_RANKS}
-
+
-
+
-
+
-
+
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index ff83f6b792..3da70bc0c8 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -12,32 +12,32 @@
{L_GENERAL_SEARCH_SETTINGS}
-

{L_YES_SEARCH_EXPLAIN}
+

{L_YES_SEARCH_EXPLAIN}
-

{L_SEARCH_INTERVAL_EXPLAIN}
+

{L_SEARCH_INTERVAL_EXPLAIN}
{L_SECONDS}
-

{L_SEARCH_GUEST_INTERVAL_EXPLAIN}
+

{L_SEARCH_GUEST_INTERVAL_EXPLAIN}
{L_SECONDS}
-

{L_LIMIT_SEARCH_LOAD_EXPLAIN}
+

{L_LIMIT_SEARCH_LOAD_EXPLAIN}
-

{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}
+

{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}
-

{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}
+

{L_MAX_NUM_SEARCH_KEYWORDS_EXPLAIN}
-

{L_SEARCH_STORE_RESULTS_EXPLAIN}
+

{L_SEARCH_STORE_RESULTS_EXPLAIN}
{L_SECONDS}
@@ -45,7 +45,7 @@
{L_SEARCH_TYPE}
-

{L_SEARCH_TYPE_EXPLAIN}
+

{L_SEARCH_TYPE_EXPLAIN}
@@ -110,7 +110,7 @@ {backend.S_HIDDEN_FIELDS} - {L_INDEX_STATS}: {backend.L_NAME} ({L_ACTIVE}) + {L_INDEX_STATS}{L_COLON} {backend.L_NAME} ({L_ACTIVE}) @@ -126,9 +126,9 @@ - + - + diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index b09cbafc95..3dc4c2d616 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -36,7 +36,7 @@
-
+
@@ -44,11 +44,11 @@
{STYLE_PATH}
-
+
{STYLE_COPYRIGHT}
-
+
-
+
-
+
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index 837629255b..96c9de6ebb 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -13,7 +13,7 @@
{L_SELECT_USER}
-
+
[ {L_FIND_USERNAME} ]
@@ -68,7 +68,7 @@
- {L_SELECT_FORM}: + {L_SELECT_FORM}{L_COLON} {S_FORM_TOKEN}
@@ -106,7 +106,7 @@
{L_ACP_USER_RANK}
-
+
@@ -146,7 +146,7 @@
- {L_USER_GROUP_ADD}: + {L_USER_GROUP_ADD}{L_COLON} {S_FORM_TOKEN}
@@ -177,7 +177,7 @@
- + @@ -192,7 +192,7 @@
- {L_SORT_BY}: + {L_SORT_BY}{L_COLON}
@@ -219,7 +219,7 @@
- {L_SELECT_FORUM}: + {L_SELECT_FORUM}{L_COLON} {S_FORM_TOKEN}
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html index 35d8374237..2135b52fb9 100644 --- a/phpBB/adm/style/acp_users_avatar.html +++ b/phpBB/adm/style/acp_users_avatar.html @@ -3,36 +3,36 @@
{L_ACP_USER_AVATAR}
-

{L_AVATAR_EXPLAIN}
+

{L_AVATAR_EXPLAIN}
{AVATAR_IMAGE}
-
+
-

{L_UPLOAD_AVATAR_URL_EXPLAIN}
+

{L_UPLOAD_AVATAR_URL_EXPLAIN}
-

{L_LINK_REMOTE_AVATAR_EXPLAIN}
+

{L_LINK_REMOTE_AVATAR_EXPLAIN}
-

{L_LINK_REMOTE_SIZE_EXPLAIN}
+

{L_LINK_REMOTE_SIZE_EXPLAIN}
{L_PIXEL} × {L_PIXEL}
-
+
@@ -42,7 +42,7 @@
{L_AVATAR_GALLERY}
-
+
 
diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html index 1dad7f1927..d1a4f59445 100644 --- a/phpBB/adm/style/acp_users_feedback.html +++ b/phpBB/adm/style/acp_users_feedback.html @@ -40,7 +40,7 @@
- {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} + {L_DISPLAY_LOG}{L_COLON}  {S_LIMIT_DAYS} {L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html index 5c5fa010f4..b7e3a9822e 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -3,54 +3,54 @@
{L_ACP_USER_OVERVIEW}
-

{L_NAME_CHARS_EXPLAIN}
+

{L_NAME_CHARS_EXPLAIN}
[ {L_USE_PERMISSIONS} ]
-
+
{USER_INACTIVE_REASON}
-
+
{USER_REGISTERED}
-
+
{REGISTERED_IP}
[ {L_WHOIS} ]
-
+
{USER_LASTACTIVE}
-
+
{USER_POSTS} ({L_POSTS_IN_QUEUE}) ({L_POSTS_IN_QUEUE})
-
+
{USER_WARNINGS}
-

{L_FOUNDER_EXPLAIN}
+

{L_FOUNDER_EXPLAIN}
-
+
-

{L_CHANGE_PASSWORD_EXPLAIN}
+

{L_CHANGE_PASSWORD_EXPLAIN}
-

{L_CONFIRM_PASSWORD_EXPLAIN}
+

{L_CONFIRM_PASSWORD_EXPLAIN}
@@ -107,16 +107,16 @@
{L_USER_TOOLS}
-
+
@@ -135,7 +135,7 @@
{L_DELETE_USER}
-

{L_DELETE_USER_EXPLAIN}
+

{L_DELETE_USER_EXPLAIN}
diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html index 9439f0cf03..f1b9e28a66 100644 --- a/phpBB/adm/style/acp_users_prefs.html +++ b/phpBB/adm/style/acp_users_prefs.html @@ -9,52 +9,52 @@
{L_UCP_PREFS_PERSONAL}
-
+
-
+
-

{L_ALLOW_PM_EXPLAIN}
+

{L_ALLOW_PM_EXPLAIN}
-
+
-

{L_NOTIFY_METHOD_EXPLAIN}
+

{L_NOTIFY_METHOD_EXPLAIN}
-
+
-
+
-
+
-
+
-

{L_BOARD_DATE_FORMAT_EXPLAIN}
+

{L_BOARD_DATE_FORMAT_EXPLAIN}
style="display:none;">
@@ -63,22 +63,22 @@
{L_UCP_PREFS_POST}
-
+
-
+
-
+
-
+
@@ -87,57 +87,57 @@
{L_UCP_PREFS_VIEW}
-
+
-
+
-
+
-
+
-
+
-
+
-
+
{S_TOPIC_SORT_DAYS}
-
+
{S_TOPIC_SORT_KEY}
-
+
{S_TOPIC_SORT_DIR}
-
+
{S_POST_SORT_DAYS}
-
+
{S_POST_SORT_KEY}
-
+
{S_POST_SORT_DIR}
diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html index ea7204e2e4..3232e8d1f5 100644 --- a/phpBB/adm/style/acp_users_profile.html +++ b/phpBB/adm/style/acp_users_profile.html @@ -3,44 +3,44 @@
{L_USER_PROFILE}
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-

{L_BIRTHDAY_EXPLAIN}
-
{L_DAY}: {L_MONTH}: {L_YEAR}:
+

{L_BIRTHDAY_EXPLAIN}
+
{L_DAY}{L_COLON} {L_MONTH}{L_COLON} {L_YEAR}{L_COLON}
@@ -49,7 +49,7 @@ {L_USER_CUSTOM_PROFILE_FIELDS}
-
for="{profile_fields.FIELD_ID}">{profile_fields.LANG_NAME}:
{profile_fields.LANG_EXPLAIN}
+
for="{profile_fields.FIELD_ID}">{profile_fields.LANG_NAME}{L_COLON}
{profile_fields.LANG_EXPLAIN}
{profile_fields.FIELD}
{profile_fields.ERROR}
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html index d55deac808..c9cc053eec 100644 --- a/phpBB/adm/style/acp_users_signature.html +++ b/phpBB/adm/style/acp_users_signature.html @@ -26,7 +26,7 @@ d: '{LA_BBCODE_D_HELP}', tip: '{L_STYLES_TIP}' - ,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}' + ,cb_{custom_tags.BBCODE_ID}{L_COLON} '{custom_tags.A_BBCODE_HELPLINE}' } @@ -66,7 +66,7 @@ - {L_FONT_SIZE}: @@ -92,8 +92,8 @@ // ]]> -
-
+
+
@@ -104,7 +104,7 @@
-
{L_OPTIONS}: {BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}
+
{L_OPTIONS}{L_COLON} {BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}
diff --git a/phpBB/adm/style/captcha_default_acp_demo.html b/phpBB/adm/style/captcha_default_acp_demo.html index 0b1434f7e0..0f137f28df 100644 --- a/phpBB/adm/style/captcha_default_acp_demo.html +++ b/phpBB/adm/style/captcha_default_acp_demo.html @@ -1,4 +1,4 @@
-

{L_CAPTCHA_PREVIEW_EXPLAIN}
+

{L_CAPTCHA_PREVIEW_EXPLAIN}
{L_PREVIEW}
diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html index e2804bbc7d..b333d9205c 100644 --- a/phpBB/adm/style/captcha_gd_acp.html +++ b/phpBB/adm/style/captcha_gd_acp.html @@ -14,32 +14,32 @@ {L_GENERAL_OPTIONS}
-

{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}
+

{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}
-

{L_CAPTCHA_GD_X_GRID_EXPLAIN}
+

{L_CAPTCHA_GD_X_GRID_EXPLAIN}
-

{L_CAPTCHA_GD_Y_GRID_EXPLAIN}
+

{L_CAPTCHA_GD_Y_GRID_EXPLAIN}
-

{L_CAPTCHA_GD_WAVE_EXPLAIN}
+

{L_CAPTCHA_GD_WAVE_EXPLAIN}
-

{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}
+

{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}
-

{L_CAPTCHA_GD_FONTS_EXPLAIN}
+

{L_CAPTCHA_GD_FONTS_EXPLAIN}
diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html index 4eb46d2d3c..99f3f24f70 100644 --- a/phpBB/adm/style/captcha_qa_acp.html +++ b/phpBB/adm/style/captcha_qa_acp.html @@ -59,7 +59,7 @@
{L_EDIT_QUESTION}
-

{L_QUESTION_STRICT_EXPLAIN}
+

{L_QUESTION_STRICT_EXPLAIN}
diff --git a/phpBB/adm/style/captcha_qa_acp_demo.html b/phpBB/adm/style/captcha_qa_acp_demo.html index 0ea2d6a024..79170e27c6 100644 --- a/phpBB/adm/style/captcha_qa_acp_demo.html +++ b/phpBB/adm/style/captcha_qa_acp_demo.html @@ -1,5 +1,5 @@
-

{L_CONFIRM_QUESTION_EXPLAIN}
+

{L_CONFIRM_QUESTION_EXPLAIN}
diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html index 34912c7955..67176ebd07 100644 --- a/phpBB/adm/style/captcha_recaptcha_acp.html +++ b/phpBB/adm/style/captcha_recaptcha_acp.html @@ -13,11 +13,11 @@ {L_GENERAL_OPTIONS}
-

{L_RECAPTCHA_PUBLIC_EXPLAIN}
+

{L_RECAPTCHA_PUBLIC_EXPLAIN}
-

{L_RECAPTCHA_PRIVATE_EXPLAIN}
+

{L_RECAPTCHA_PRIVATE_EXPLAIN}
diff --git a/phpBB/adm/style/custom_profile_fields.html b/phpBB/adm/style/custom_profile_fields.html index 351397d3c7..982356bfa7 100644 --- a/phpBB/adm/style/custom_profile_fields.html +++ b/phpBB/adm/style/custom_profile_fields.html @@ -26,7 +26,7 @@ - {L_DAY}: - {L_MONTH}: - {L_YEAR}: + {L_DAY}{L_COLON} + {L_MONTH}{L_COLON} + {L_YEAR}{L_COLON} diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html index cf78f30b50..5fec8c4789 100644 --- a/phpBB/adm/style/install_convert.html +++ b/phpBB/adm/style/install_convert.html @@ -86,7 +86,7 @@
-

{checks.TITLE_EXPLAIN}
+

{checks.TITLE_EXPLAIN}
{checks.RESULT}
@@ -109,7 +109,7 @@
-

{options.TITLE_EXPLAIN}
+

{options.TITLE_EXPLAIN}
{options.CONTENT}
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html index e306d8f6bf..6826654ded 100644 --- a/phpBB/adm/style/install_header.html +++ b/phpBB/adm/style/install_header.html @@ -42,7 +42,7 @@ function dE(n, s, type)
- + {S_LANG_SELECT}
diff --git a/phpBB/adm/style/install_install.html b/phpBB/adm/style/install_install.html index 79006fba69..1a809a3588 100644 --- a/phpBB/adm/style/install_install.html +++ b/phpBB/adm/style/install_install.html @@ -20,7 +20,7 @@
-
{checks.TITLE}:
{checks.TITLE_EXPLAIN}
+
{checks.TITLE}{L_COLON}
{checks.TITLE_EXPLAIN}
{checks.RESULT}
@@ -43,7 +43,7 @@
-

{options.TITLE_EXPLAIN}
+

{options.TITLE_EXPLAIN}
{options.CONTENT}
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index 818889c89b..b5fa46dbf6 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -221,13 +221,13 @@
{new.DIR_PART}
{new.FILE_PART} -
{L_FILE_USED}: {new.CUSTOM_ORIGINAL} +
{L_FILE_USED}{L_COLON} {new.CUSTOM_ORIGINAL}
-
+
[{new.L_SHOW_DIFF}]{L_BINARY_FILE}
-
+
@@ -245,11 +245,11 @@
{not_modified.DIR_PART}
{not_modified.FILE_PART} -
{L_FILE_USED}: {not_modified.CUSTOM_ORIGINAL} +
{L_FILE_USED}{L_COLON} {not_modified.CUSTOM_ORIGINAL}
-
[{not_modified.L_SHOW_DIFF}]{L_BINARY_FILE}
+
[{not_modified.L_SHOW_DIFF}]{L_BINARY_FILE}
-
+
@@ -266,24 +266,24 @@ {L_STATUS_MODIFIED}
{modified.DIR_PART}
{modified.FILE_PART} -
{L_FILE_USED}: {modified.CUSTOM_ORIGINAL} +
{L_FILE_USED}{L_COLON} {modified.CUSTOM_ORIGINAL}
-
 
+
 
-
+
-
[{modified.L_SHOW_DIFF}]{L_BINARY_FILE}
+
[{modified.L_SHOW_DIFF}]{L_BINARY_FILE}
-
[{L_SHOW_DIFF_FINAL}] 
+
[{L_SHOW_DIFF_FINAL}] 
-
[{L_SHOW_DIFF_FINAL}] 
+
[{L_SHOW_DIFF_FINAL}] 
@@ -299,13 +299,13 @@
{new_conflict.DIR_PART}
{new_conflict.FILE_PART} -
{L_FILE_USED}: {new_conflict.CUSTOM_ORIGINAL} +
{L_FILE_USED}{L_COLON} {new_conflict.CUSTOM_ORIGINAL}
-
+
[{new_conflict.L_SHOW_DIFF}]{L_BINARY_FILE}
-
+
@@ -322,38 +322,38 @@ {L_STATUS_CONFLICT}
{conflict.DIR_PART}
{conflict.FILE_PART} -
{L_FILE_USED}: {conflict.CUSTOM_ORIGINAL} -
{L_NUM_CONFLICTS}: {conflict.NUM_CONFLICTS} +
{L_FILE_USED}{L_COLON} {conflict.CUSTOM_ORIGINAL} +
{L_NUM_CONFLICTS}{L_COLON} {conflict.NUM_CONFLICTS}
-
+
[{L_DOWNLOAD_CONFLICTS}]
{L_DOWNLOAD_CONFLICTS_EXPLAIN} {L_BINARY_FILE}
-
+
-
 
+
 
-
[{L_SHOW_DIFF_MODIFIED}]
+
[{L_SHOW_DIFF_MODIFIED}]
-
[{L_SHOW_DIFF_MODIFIED}]
+
[{L_SHOW_DIFF_MODIFIED}]
-
[{L_SHOW_DIFF_FINAL}]
+
[{L_SHOW_DIFF_FINAL}]
-
[{L_SHOW_DIFF_FINAL}]
+
[{L_SHOW_DIFF_FINAL}]
@@ -392,7 +392,7 @@
{L_SELECT_DOWNLOAD_FORMAT}
-
+
{RADIO_BUTTONS}
@@ -455,12 +455,12 @@
{L_FTP_SETTINGS}
-
+
{UPLOAD_METHOD}
-

{data.EXPLAIN}
+

{data.EXPLAIN}
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index b5d25e82f2..ecdc40e157 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -223,7 +223,7 @@ table.hrdiff caption span {

{L_SKIP}

- + @@ -231,7 +231,7 @@ table.hrdiff caption span { -
{L_NUM_CONFLICTS}: {NUM_CONFLICTS}
+
{L_NUM_CONFLICTS}{L_COLON} {NUM_CONFLICTS}

diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index f6d0e1025f..f7902e6d2e 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -9,7 +9,7 @@
{backend.L_NAME} ({L_ACTIVE})
{backend.data.STATISTIC_1}:{backend.data.STATISTIC_1}{L_COLON} {backend.data.VALUE_1}{backend.data.STATISTIC_2}:{backend.data.STATISTIC_2}{L_COLON} {backend.data.VALUE_2}
{attach.REAL_FILENAME}
{L_PM}: {L_POST}: {attach.TOPIC_TITLE}		{attach.REAL_FILENAME}
{L_PM}{L_COLON} {L_POST}{L_COLON} {attach.TOPIC_TITLE}		 {attach.POST_TIME} {attach.SIZE} {attach.DOWNLOAD_COUNT}