From d894e8e6401b0ffe0f6dd8885ad06a0826316a03 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Fri, 30 Sep 2011 18:55:38 +0200 Subject: [PATCH] Language variable overhaul English translation now up to date --- .../files/acp/templates/acpSessionLogList.tpl | 4 +- .../acp/page/ACPSessionLogListPage.class.php | 4 +- .../session/log/ACPSessionLogList.class.php | 2 +- wcfsetup/install/lang/de.xml | 23 +- wcfsetup/install/lang/en.xml | 971 ++++++------------ 5 files changed, 342 insertions(+), 662 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl index e758c3c1dd..09dbf68d98 100644 --- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl +++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl @@ -26,7 +26,7 @@ {lang}wcf.user.userAgent{/lang}{if $sortField == 'userAgent'} {/if} {lang}wcf.acp.sessionLog.time{/lang}{if $sortField == 'time'} {/if} {lang}wcf.acp.sessionLog.lastActivityTime{/lang}{if $sortField == 'lastActivityTime'} {/if} - {lang}wcf.acp.sessionLog.accesses{/lang}{if $sortField == 'accesses'} {/if} + {lang}wcf.acp.sessionLog.actions{/lang}{if $sortField == 'actions'} {/if} {if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if} @@ -41,7 +41,7 @@

{$sessionLog->userAgent}

{@$sessionLog->time|time}

{@$sessionLog->lastActivityTime|time}

-

{#$sessionLog->accesses}

+

{#$sessionLog->actions}

{if $additionalColumns.$sessionLog->sessionLogID|isset}{@$additionalColumns.$sessionLog->sessionLogID}{/if} diff --git a/wcfsetup/install/files/lib/acp/page/ACPSessionLogListPage.class.php b/wcfsetup/install/files/lib/acp/page/ACPSessionLogListPage.class.php index 2947dd45be..fd0178189b 100755 --- a/wcfsetup/install/files/lib/acp/page/ACPSessionLogListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/ACPSessionLogListPage.class.php @@ -38,7 +38,7 @@ class ACPSessionLogListPage extends SortablePage { /** * @see wcf\page\SortablePage::$validSortFields */ - public $validSortFields = array('sessionLogID', 'username', 'ipAddress', 'userAgent', 'time', 'lastActivityTime', 'accesses'); + public $validSortFields = array('sessionLogID', 'username', 'ipAddress', 'userAgent', 'time', 'lastActivityTime', 'actions'); /** * @see wcf\page\MultipleLinkPage::$objectListClassName @@ -49,7 +49,7 @@ class ACPSessionLogListPage extends SortablePage { * @see wcf\page\MultipleLinkPage::readObjects() */ public function readObjects() { - $this->sqlOrderBy = (($this->sortField != 'accesses' && $this->sortField != 'username') ? 'acp_session_log.' : '').$this->sortField." ".$this->sortOrder; + $this->sqlOrderBy = (($this->sortField != 'actions' && $this->sortField != 'username') ? 'acp_session_log.' : '').$this->sortField." ".$this->sortOrder; parent::readObjects(); } diff --git a/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLogList.class.php b/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLogList.class.php index a95b49b959..bd15fee970 100644 --- a/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLogList.class.php +++ b/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLogList.class.php @@ -24,7 +24,7 @@ class ACPSessionLogList extends DatabaseObjectList { public function readObjects() { if (!empty($this->sqlSelects)) $this->sqlSelects .= ','; $this->sqlSelects .= " user_table.username, acp_session.sessionID AS active, - (SELECT COUNT(*) FROM wcf".WCF_N."_acp_session_access_log WHERE sessionLogID = ".$this->getDatabaseTableAlias().".sessionLogID) AS accesses"; + (SELECT COUNT(*) FROM wcf".WCF_N."_acp_session_access_log WHERE sessionLogID = ".$this->getDatabaseTableAlias().".sessionLogID) AS actions"; $this->sqlJoins .= " LEFT JOIN wcf".WCF_N."_user user_table ON (user_table.userID = ".$this->getDatabaseTableAlias().".userID) LEFT JOIN wcf".WCF_N."_acp_session acp_session ON (acp_session.sessionID = ".$this->getDatabaseTableAlias().".sessionID)"; diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 00c2a7e20e..0d80367199 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -71,11 +71,11 @@ - + - + @@ -354,7 +354,7 @@ username}«]]> - + @@ -479,7 +479,7 @@ - + @@ -490,13 +490,13 @@ - + - + - + @@ -506,9 +506,9 @@ - + - + @@ -547,7 +547,7 @@ - + @@ -594,6 +594,8 @@ + + @@ -621,5 +623,6 @@ + \ No newline at end of file diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index e473bf343d..bf4d6c9192 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -1,77 +1,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Newbie: Intro to cron.]]> - - - - - - - - - - - - - - + + + @@ -87,9 +20,26 @@ - - + + + + + + + + + Newbie: Intro to cron.]]> + + + + description|truncate:50:' ...'}"?]]> + + + + + + @@ -98,50 +48,41 @@ - - - - - - - - + groupName}"?]]> + - - - - - + + - + - - - - - - - - - - - + + + + + + + + + + + - + - + @@ -149,34 +90,28 @@ - + - + - + - + - - - - - + - - - + @@ -191,19 +126,31 @@ - + + - - - - - - + + + + + + + + + + + + + + + + + @@ -217,30 +164,30 @@ + - - - - + + + + + + - + + + + - - - - - - - - + + - + - + @@ -249,33 +196,31 @@ + - - - - - - - - - - - - - - - - + + - - - - - - memcached.org.]]> - - + + + + + + + + + + + + + + + + + + + @@ -284,66 +229,26 @@ - - - - - - - - - - - - - - - - - - - - - - - Captcha images on every place where web forms can be submitted. Unregistered users then first have to identify the code on the Captcha before they can submit the form. Robots cannot read the code. Please not that Captcha images cannot be read by blind and visually impaired people.]]> - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -371,281 +276,73 @@ - - - - + + + + + + memcached.org.]]> + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - 1} (#{@$excludedPackage.instanceNo}){/if} in version {$excludedPackage.packageVersion}]]> - - 1} (#{@$excludingPackage.instanceNo}){/if} in version {$excludingPackage.packageVersion}]]> - - - {$package.name} ({if $package.open == 0}Installed{else}{if $package.file|isset}is located in this package{else}Not available{/if}{/if})]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - getName()}" could not be updated with the supplied archive.]]> - - - - - - - - - getName()}"]]> - - - - - - - - - - - - - - - - - - - - - - - {$packageName|encodeJS}: ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {foreach from=$failures item=$failure}{$failure.templateName} (Originally patched by: {$failure.packageName})
{/foreach}The original patch package that was previously applied may no longer function. You should still continue with this update by clicking on the "{lang}wcf.global.button.next{/lang}" button.]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1}s{/if})]]> - 1} (#{$updatableInstance.instanceNo}){/if} version {$updatableInstance.packageVersion}]]> - - - - - - - - - - - - - - 1} (#{#$package.instanceNo}){/if} {$package.fromversion} is updated to {$package.toVersion}]]> - - - - - username}"]]> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + + serverURL}"?]]> - - + + - - - - @@ -653,23 +350,27 @@ + + + username}"]]> + + + + + + + + + + + + - - - - - - - - - - - + username}"?]]> - @@ -677,21 +378,19 @@ Extensible Markup Language)]]> - - + + - without additional security notification, on all users matching the set conditions. Bulk processing can be very performance intensive, so it should only be executed while the forum is set offline. To have a correct display of your content you should update the counters. The processing can not be reversed, so please be attentive when using this function.]]> - @@ -703,7 +402,6 @@ - @@ -721,191 +419,170 @@ user->username}.]]> - - - - - - - + + + + + + + + 1) ? $minutes + ' minutes' : 'A minute') + ' ago']]> + 1) ? $hours + ' hours' : 'An hour' ) + ' ago']]> + 1) ? '%day%' : 'Yesterday' ) + ', %time%']]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \T\o\d\a\y, g:ia]]> - - - + + + + + + + - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - + - - - - - 1 ? "Image " + (this.currentIndex + 1) + " of " + this.links.length + (this.currentLink.title ? (" - " + this.currentLink.title) : "") : (this.currentLink.title ? this.currentLink.title : "")]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - + - - - - - + \ No newline at end of file -- 2.20.1