Merge branch 'seeddms-4.3.11' into develop

CHANGELOG

@@ -1,3 +1,9 @@
+--------------------------------------------------------------------------------
+                     Changes in version 4.3.11
+--------------------------------------------------------------------------------
+- translation updates
+- password expiration can be set to 'never'
+
 --------------------------------------------------------------------------------
                      Changes in version 4.3.10
 --------------------------------------------------------------------------------

languages/ar_EG/lang.inc

@@ -526,6 +526,7 @@ URL: [url]',
 'my_documents' => 'مستنداتي',
 'name' => 'اسم',
 'needs_workflow_action' => 'هذا المستند يتطلب انتباهك . من فضلك تفقد زر مسار العمل',
+'never' => '',
 'new' => 'جديد',
 'new_attrdef' => 'اضافة تعريف سمة',
 'new_default_keywords' => 'اضافة كلمات بحث',

languages/ca_ES/lang.inc

@@ -457,6 +457,7 @@ $text = array(
 'my_documents' => 'Els meus documents',
 'name' => 'Nom',
 'needs_workflow_action' => '',
+'never' => '',
 'new' => 'Nou',
 'new_attrdef' => '',
 'new_default_keywords' => 'Afegir mots clau',

languages/cs_CZ/lang.inc

@@ -533,6 +533,7 @@ URL: [url]',
 'my_documents' => 'Moje dokumenty',
 'name' => 'Název',
 'needs_workflow_action' => 'Tento dokument vyžaduje Vaši pozornost. Prosím zkontrolujte záložku pracovního postupu.',
+'never' => '',
 'new' => 'Nový',
 'new_attrdef' => 'Přidat definici atributu',
 'new_default_keywords' => 'Přidat klíčová slova',

languages/de_DE/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1910)
+//    Translators: Admin (1911)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -533,6 +533,7 @@ URL: [url]',
 'my_documents' => 'Meine Dokumente',
 'name' => 'Name',
 'needs_workflow_action' => 'Diese Dokument erfordert eine Aktion. Bitte schauen Sie auf den Workflow-Reiter.',
+'never' => 'nie',
 'new' => 'Neu',
 'new_attrdef' => 'Neue Attributdefinition',
 'new_default_keywords' => 'Neue Vorlage',

languages/en_GB/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1048), netixw (14)
+//    Translators: Admin (1049), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -533,6 +533,7 @@ URL: [url]',
 'my_documents' => 'My Documents',
 'name' => 'Name',
 'needs_workflow_action' => 'This document requires your attention. Please check the workflow tab.',
+'never' => 'never',
 'new' => 'New',
 'new_attrdef' => 'Add attribute defintion',
 'new_default_keywords' => 'Add keywords',

languages/es_ES/lang.inc

@@ -533,6 +533,7 @@ URL: [url]',
 'my_documents' => 'Mis documentos',
 'name' => 'Nombre',
 'needs_workflow_action' => 'Este documento requiere su atención. Por favor chequee la pestaña de flujo de trabajo.',
+'never' => '',
 'new' => 'Nuevo',
 'new_attrdef' => 'Nueva definición de atributo',
 'new_default_keywords' => 'Agregar palabras claves',

languages/fr_FR/lang.inc

@@ -526,6 +526,7 @@ URL: [url]',
 'my_documents' => 'Mes documents',
 'name' => 'Nom',
 'needs_workflow_action' => 'Ce document requiert votre attention. Consultez l\'onglet workflow.',
+'never' => '',
 'new' => 'Nouveau',
 'new_attrdef' => 'Ajouter une définition d\'attribut',
 'new_default_keywords' => 'Ajouter des mots-clés',

languages/hu_HU/lang.inc

@@ -533,6 +533,7 @@ URL: [url]',
 'my_documents' => 'Saját dokumentumok',
 'name' => 'Név',
 'needs_workflow_action' => 'Ez a dokumentum az Ön beavatkozására vár. Ellenőrizze a munkafolyamat fület.',
+'never' => '',
 'new' => 'Új',
 'new_attrdef' => 'Jellemző meghatározás hozzáadása',
 'new_default_keywords' => 'Kulcsszó hozzáadása',

languages/it_IT/lang.inc

@@ -457,6 +457,7 @@ $text = array(
 'my_documents' => 'Documenti personali',
 'name' => 'Nome',
 'needs_workflow_action' => '',
+'never' => '',
 'new' => 'Nuovo',
 'new_attrdef' => 'Nuovo attributo',
 'new_default_keywords' => 'Aggiungi parole chiave',

languages/nl_NL/lang.inc

@@ -526,6 +526,7 @@ URL: [url]',
 'my_documents' => 'Mijn Documenten',
 'name' => 'Naam',
 'needs_workflow_action' => 'Dit document vereist uw aandacht. Bekijk deze onder het tabblad workflows.',
+'never' => '',
 'new' => 'Nieuw',
 'new_attrdef' => 'Voeg kenmerk definitie toe',
 'new_default_keywords' => 'Sleutelwoorden toevoegen',

languages/pl_PL/lang.inc

@@ -526,6 +526,7 @@ URL: [url]',
 'my_documents' => 'Moje dokumenty',
 'name' => 'Nazwa',
 'needs_workflow_action' => 'Dokument wymaga uwagi. Proszę sprawdzić kartę workflow.',
+'never' => '',
 'new' => 'Nowy',
 'new_attrdef' => 'Dodaj definicję atrybutu',
 'new_default_keywords' => 'Dodaj słowa kluczowe',

languages/pt_BR/lang.inc

@@ -532,6 +532,7 @@ URL: [url]',
 'my_documents' => 'Meus Documentos',
 'name' => 'Nome',
 'needs_workflow_action' => 'Este documento requer sua atenção. Por favor, verifique a guia de fluxo de trabalho.',
+'never' => '',
 'new' => 'Novo',
 'new_attrdef' => 'Adicionar definição de atributo',
 'new_default_keywords' => 'Adicionar palavras-chave',

languages/ru_RU/lang.inc

@@ -526,6 +526,7 @@ URL: [url]',
 'my_documents' => 'Мои документы',
 'name' => 'Имя',
 'needs_workflow_action' => 'Этот документ требует вашего внимания. См. вкладку «Процесс».',
+'never' => '',
 'new' => 'Новый',
 'new_attrdef' => 'Добавить определение атрибута',
 'new_default_keywords' => 'Добавить метки',

languages/sk_SK/lang.inc

@@ -457,6 +457,7 @@ $text = array(
 'my_documents' => 'Moje dokumenty',
 'name' => 'Meno',
 'needs_workflow_action' => '',
+'never' => '',
 'new' => 'Nove',
 'new_attrdef' => '',
 'new_default_keywords' => 'Pridať kľúčové slová',

languages/sv_SE/lang.inc

@@ -526,6 +526,7 @@ URL: [url]',
 'my_documents' => 'Mina dokument',
 'name' => 'Namn',
 'needs_workflow_action' => 'Detta dokument behöver din uppmärksamhet. Kolla arbetsflödet.',
+'never' => '',
 'new' => 'Ny',
 'new_attrdef' => 'Lägg till attributdefinition',
 'new_default_keywords' => 'Lägg till nyckelord',

languages/zh_CN/lang.inc

@@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (541), fengjohn (5)
+//    Translators: Admin (542), fengjohn (5)
 
 $text = array(
 'accept' => '接受',
@@ -124,7 +124,7 @@ URL: [url]',
 'backup_remove' => '删除备份',
 'backup_tools' => '备份工具',
 'between' => '时间段',
-'browse' => '',
+'browse' => '浏览',
 'calendar' => '日历',
 'calendar_week' => '',
 'cancel' => '取消',
@@ -461,6 +461,7 @@ URL: [url]',
 'my_documents' => '我的文档',
 'name' => '名称',
 'needs_workflow_action' => '',
+'never' => '',
 'new' => 'New',
 'new_attrdef' => '添加属性',
 'new_default_keywords' => '添加关键字',

views/bootstrap/class.ForcePasswordChange.php

@@ -36,7 +36,7 @@ class SeedDMS_View_ForcePasswordChange extends SeedDMS_Bootstrap_Style {
 		$user = $this->params['user'];
 		$passwordstrength = $this->params['passwordstrength'];
 
-		$this->htmlStartPage(getMLText("sign_in"), "login");
+		$this->htmlStartPage(getMLText("sign_in"), "forcepasswordchange");
 		$this->globalBanner();
 		$this->contentStart();
 		echo "<h3>".getMLText('password_expiration')."</h3>";

views/bootstrap/class.PasswordForgotten.php

@@ -34,7 +34,7 @@ class SeedDMS_View_PasswordForgotten extends SeedDMS_Bootstrap_Style {
 	function show() { /* {{{ */
 		$referrer = $this->params['referrer'];
 
-		$this->htmlStartPage(getMLText("password_forgotten"), "login");
+		$this->htmlStartPage(getMLText("password_forgotten"), "passwordforgotten");
 		$this->globalBanner();
 		$this->contentStart();
 		$this->pageNavigation(getMLText("password_forgotten"));

views/bootstrap/class.UsrMgr.php

@@ -157,7 +157,7 @@ function showUser(selectObj) {
 ?>
 		<tr>
 			<td><?php printMLText("password_expiration");?>:</td>
-			<td><select name="pwdexpiration"><option value="<?php echo date('Y-m-d H:i:s'); ?>"><?php printMLText("now");?></option><option value="<?php echo date('Y-m-d H:i:s', time()+$passwordexpiration*86400); ?>"><?php printMLText("according_settings");?></option></select></td>
+			<td><select name="pwdexpiration"><option value="<?php echo date('Y-m-d H:i:s'); ?>"><?php printMLText("now");?></option><option value="<?php echo date('Y-m-d H:i:s', time()+$passwordexpiration*86400); ?>"><?php printMLText("according_settings");?></option><option value="0000-00-00"><?php printMLText("never");?></option></select></td>
 		</tr>
 <?php
 		}
@@ -382,7 +382,7 @@ function showUser(selectObj) {
 ?>
 		<tr>
 			<td><?php printMLText("password_expiration");?>:</td>
-			<td><select name="pwdexpiration"><option value=""><?php printMLText("keep");?></option><option value="<?php echo date('Y-m-d H:i:s'); ?>"><?php printMLText("now");?></option><option value="<?php echo date('Y-m-d H:i:s', time()+$passwordexpiration*86400); ?>"><?php printMLText("according_settings");?></option></select> <?php echo $currUser->getPwdExpiration(); ?></td>
+			<td><select name="pwdexpiration"><option value=""><?php printMLText("keep");?></option><option value="<?php echo date('Y-m-d H:i:s'); ?>"><?php printMLText("now");?></option><option value="<?php echo date('Y-m-d H:i:s', time()+$passwordexpiration*86400); ?>"><?php printMLText("according_settings");?></option><option value="0000-00-00"><?php printMLText("never");?></option></select> <?php echo $currUser->getPwdExpiration(); ?></td>
 		</tr>
 <?php
 	}