Return-Path: X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7031A18018 for ; Fri, 3 Jul 2015 12:15:31 +0000 (UTC) Received: (qmail 49284 invoked by uid 500); 3 Jul 2015 12:15:31 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 49184 invoked by uid 500); 3 Jul 2015 12:15:31 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 49165 invoked by uid 99); 3 Jul 2015 12:15:31 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jul 2015 12:15:31 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id EE87EAC09BC for ; Fri, 3 Jul 2015 12:15:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1689005 [3/3] - in /manifoldcf/branches/CONNECTORS-1131/framework: crawler-ui/src/main/webapp/ ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/ Date: Fri, 03 Jul 2015 12:15:30 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150703121530.EE87EAC09BC@hades.apache.org> Modified: manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/edittransformation.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/edittransformation.jsp?rev=1689005&r1=1689004&r2=1689005&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/edittransformation.jsp (original) +++ manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/edittransformation.jsp Fri Jul 3 12:15:29 2015 @@ -232,53 +232,54 @@ function isInteger(value) - - - - + +
+ + + + + - -
<% // Get connector list; need this to decide what to do if (set.getRowCount() == 0) { %> -

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditTransformationConnection2")%>

-
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.NoTransformationConnectorsRegistered")%>
+

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditTransformationConnection2")%>

+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.NoTransformationConnectorsRegistered")%>
<% } else { %> -
- - - - - - - - + +
+ + + + + + + + + - - - - - + + + + + + <% int tabNum = 0; while (tabNum < tabsArray.size()) @@ -287,20 +288,20 @@ function isInteger(value) if (tab.equals(tabName)) { %> - + <% } else { %> - + <% } } %> - - - + + + +
<% if (description.length() > 0) { %> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditTransformationConnection")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>' + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditTransformationConnection")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>' <% } else { %> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditATransformationConnection")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditATransformationConnection")%> <% } %> -
<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%>
+
<% @@ -308,42 +309,45 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"edittransformation.Name"))) { %> - - - - + + + + + +
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.NameColon")%> + + + + - - - - -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.NameColon")%> <% // If the connection doesn't exist yet, we are allowed to change the name. if (connection == null || connectionName.length() < 1) { %> - + <% } else { %> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%> - + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%> + <% } %> -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.DescriptionColon")%> - -
+
+ <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.DescriptionColon")%> + + +
<% } else { // Hiddens for the Name tab %> - - + + <% } @@ -352,10 +356,10 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"edittransformation.Type"))) { %> - - - - + +
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.ConnectionTypeColon")%> + + + + - -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.ConnectionTypeColon")%> <% if (className.length() > 0) { @@ -363,24 +367,24 @@ function isInteger(value) if (value == null) { %> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%> <% } else { %> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(value)%> + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(value)%> <% } %> - + <% } else { int i = 0; %> - <% while (i < set.getRowCount()) { @@ -388,25 +392,26 @@ function isInteger(value) String thisClassName = row.getValue("classname").toString(); String thisDescription = row.getValue("description").toString(); %> - + <% } %> - + <% } %> -
+
<% } else { // Hiddens for the "Type" tab %> - + <% } @@ -415,20 +420,20 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"edittransformation.Throttling"))) { %> - - - - - - -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.MaxConnectionsColon")%>
+ + + + + + +
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.MaxConnectionsColon")%>
<% } else { // Hiddens for "Throttling" tab %> - + <% } @@ -436,14 +441,16 @@ function isInteger(value) TransformationConnectorFactory.outputConfigurationBody(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabName); %> - - - - -
+ + + + - -
+ <% if (className.length() > 0) { %> - " onClick="javascript:Save()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.SaveThisTransformationConnection")%>"/> + " onClick="javascript:Save()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.SaveThisTransformationConnection")%>"/> <% } else @@ -451,26 +458,28 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"edittransformation.Type"))) { %> - " onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.ContinueToNextPage")%>"/> + " onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.ContinueToNextPage")%>"/> <% } } %> -  " onClick="javascript:Cancel()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.CancelTransformationConnectionEditing")%>"/>
-
- + " onClick="javascript:Cancel()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.CancelTransformationConnectionEditing")%>"/> + +
+
+ <% } %> -
+
Added: manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp?rev=1689005&view=auto ============================================================================== --- manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp (added) +++ manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp Fri Jul 3 12:15:29 2015 @@ -0,0 +1,60 @@ +<%@ include file="adminHeaders.jsp" %> + +<% + +/* $Id$ */ + +/** +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +%> + + + + + + + + + + + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.ApacheManifoldCFMaintenanceUnderway")%> + + + + + + + + + + + + +
+

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.MaintenanceUnderway")%>

+ + + + + +
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.PleaseTryAgainLater")%>
">OK
+ +
+ + + + Propchange: manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp ------------------------------------------------------------------------------ svn:keywords = Id Modified: manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/showjobstatus.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/showjobstatus.jsp?rev=1689005&r1=1689004&r2=1689005&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/showjobstatus.jsp (original) +++ manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/showjobstatus.jsp Fri Jul 3 12:15:29 2015 @@ -20,8 +20,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -boolean maintenanceUnderway = org.apache.manifoldcf.crawler.system.ManifoldCF.checkMaintenanceUnderway(); +%> +<% +try +{ + // Check if authorized + if (!adminprofile.checkAllowed(threadContext,IAuthorizer.CAPABILITY_RUN_JOBS)) + { + variableContext.setParameter("target","index.jsp"); +%> + +<% + } + + if (org.apache.manifoldcf.crawler.system.ManifoldCF.checkMaintenanceUnderway()) + { +%> + +<% + } + + // Get the max count + int maxCount = LockManagerFactory.getIntProperty(threadContext,"org.apache.manifoldcf.ui.maxstatuscount",500000); + // Get the job manager handle + IJobManager manager = JobManagerFactory.make(threadContext); + JobStatus[] jobs = manager.getAllStatus(true,maxCount); %> @@ -35,54 +59,54 @@ boolean maintenanceUnderway = org.apache @@ -91,36 +115,24 @@ boolean maintenanceUnderway = org.apache - - - - - -
-

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.StatusOfJobs")%>

-<% -if (maintenanceUnderway == false) -{ -%> -
- - - - -<% - try - { - // Get the max count - int maxCount = LockManagerFactory.getIntProperty(threadContext,"org.apache.manifoldcf.ui.maxstatuscount",500000); - // Get the job manager handle - IJobManager manager = JobManagerFactory.make(threadContext); - JobStatus[] jobs = manager.getAllStatus(true,maxCount); -%> - - - - - - - +
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Name")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Status")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.StartTime")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.EndTime")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Documents")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Active")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Processed")%>
+ + + + + + + +
+

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.StatusOfJobs")%>

+ + + + + + + + + + + + <% int i = 0; while (i < jobs.length) @@ -198,17 +210,17 @@ if (maintenanceUnderway == false) endTime = new Date(js.getEndTime()).toString(); } %> - > - > + - - - - - + + + + + + + <% } %> - - - - -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Name")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Status")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.StartTime")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.EndTime")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Documents")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Active")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Processed")%>
- +
+ <% if (status == JobStatus.JOBSTATUS_NOTYETRUN || status == JobStatus.JOBSTATUS_COMPLETED || status == JobStatus.JOBSTATUS_ERROR) { %> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Start")%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Startminimal")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Start")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Startminimal")%> <% } if (status == JobStatus.JOBSTATUS_RUNNING || @@ -218,8 +230,8 @@ if (maintenanceUnderway == false) status == JobStatus.JOBSTATUS_STARTING) { %> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restart")%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restartminimal")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restart")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restartminimal")%> <% } if (status == JobStatus.JOBSTATUS_RUNNING || @@ -227,7 +239,7 @@ if (maintenanceUnderway == false) status == JobStatus.JOBSTATUS_WINDOWWAIT) { %> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Pause")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Pause")%> <% } if (status == JobStatus.JOBSTATUS_RUNNING || @@ -240,58 +252,49 @@ if (maintenanceUnderway == false) status == JobStatus.JOBSTATUS_RESTARTING) { %> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Abort")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Abort")%> <% } if (status == JobStatus.JOBSTATUS_PAUSED) { %> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Resume")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Resume")%> <% } %> - - <%=""%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(js.getDescription())%><%=statusName%><%=startTime%><%=endTime%><%=(js.getQueueCountExact()?"":"> ")%><%=new Long(js.getDocumentsInQueue()).toString()%><%=(js.getOutstandingCountExact()?"":"> ")%><%=new Long(js.getDocumentsOutstanding()).toString()%><%=(js.getProcessedCountExact()?"":"> ")%><%=new Long(js.getDocumentsProcessed()).toString()%>
<%=""%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(js.getDescription())%><%=statusName%><%=startTime%><%=endTime%><%=(js.getQueueCountExact()?"":"> ")%><%=new Long(js.getDocumentsInQueue()).toString()%><%=(js.getOutstandingCountExact()?"":"> ")%><%=new Long(js.getDocumentsOutstanding()).toString()%><%=(js.getProcessedCountExact()?"":"> ")%><%=new Long(js.getDocumentsProcessed()).toString()%>
"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Refresh")%>
+
"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Refresh")%>
<% - } - catch (ManifoldCFException e) - { - out.println("Error: "+e.getMessage()); - - e.printStackTrace(); - } -%> -
-<% } -else +catch (ManifoldCFException e) { + e.printStackTrace(); + variableContext.setParameter("text",e.getMessage()); + variableContext.setParameter("target","index.jsp"); %> - - - -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.PleaseTryAgainLater")%>
+ <% } %> -
+ + + + Modified: manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1689005&r1=1689004&r2=1689005&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties (original) +++ manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties Fri Jul 3 12:15:29 2015 @@ -528,7 +528,6 @@ showjobstatus.Active=Active showjobstatus.Processed=Processed showjobstatus.RefreshStatus=Refresh status showjobstatus.Refresh=Refresh -showjobstatus.PleaseTryAgainLater=This page is unavailable due to maintenance operations. Please try again later. showjobstatus.StatusOfJobs=Status of Jobs showjobstatus.Notyetrun=Not yet run @@ -849,6 +848,9 @@ error.Error=Error! error.Return=Return error.Unauthorized=Apache ManifoldCF: Unauthorized activity error.UnauthorizedAccess=You do not have permissions to perform this activity +error.ApacheManifoldCFMaintenanceUnderway=Apache ManifoldCF: Maintenance underway +error.MaintenanceUnderway=Maintenance underway +error.PleaseTryAgainLater=This page is unavailable due to maintenance operations. Please try again later. viewjob.ApacheManifoldCFViewJob=Apache ManifoldCF: View Job viewjob.ViewAJob=View a Job Modified: manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties?rev=1689005&r1=1689004&r2=1689005&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties (original) +++ manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties Fri Jul 3 12:15:29 2015 @@ -528,7 +528,6 @@ showjobstatus.Active=アクテ� showjobstatus.Processed=済み showjobstatus.RefreshStatus=状態一覧を更新 showjobstatus.Refresh=更新 -showjobstatus.PleaseTryAgainLater=保守処理中です。少々お待ちください。 showjobstatus.StatusOfJobs=ジョブの状態 showjobstatus.Notyetrun=未実行 @@ -850,6 +849,9 @@ error.Error=エラー error.Return=戻る error.Unauthorized=Apache ManifoldCF: Unauthorized activity error.UnauthorizedAccess=You do not have permissions to perform this activity +error.ApacheManifoldCFMaintenanceUnderway=Apache ManifoldCF: Maintenance underway +error.MaintenanceUnderway=Maintenance underway +error.PleaseTryAgainLater=保守処理中です。少々お待ちください。 viewjob.ApacheManifoldCFViewJob=Apache ManifoldCF：ジョブ情報 viewjob.ViewAJob=ジョブ情報 Modified: manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties?rev=1689005&r1=1689004&r2=1689005&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties (original) +++ manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties Fri Jul 3 12:15:29 2015 @@ -528,7 +528,6 @@ showjobstatus.Active=有效 showjobstatus.Processed=已处理 showjobstatus.RefreshStatus=刷新状态列表 showjobstatus.Refresh=刷新 -showjobstatus.PleaseTryAgainLater=维护中。请稍等。 showjobstatus.StatusOfJobs=作业状态 showjobstatus.Notyetrun=还未执行 @@ -850,6 +849,9 @@ error.Error=错误 error.Return=返回 error.Unauthorized=Apache ManifoldCF: Unauthorized activity error.UnauthorizedAccess=You do not have permissions to perform this activity +error.ApacheManifoldCFMaintenanceUnderway=Apache ManifoldCF: Maintenance underway +error.MaintenanceUnderway=Maintenance underway +error.PleaseTryAgainLater=维护中。请稍等。 viewjob.ApacheManifoldCFViewJob=Apache ManifoldCF: 作业信息 viewjob.ViewAJob=作业信息