From 50772bd7a9a5fbe474e8fe7db641c8cef05d9160 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 6 Jul 2016 13:04:19 +0200 Subject: [PATCH 01/65] include missing files --- op/op.ImportFS.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/op/op.ImportFS.php b/op/op.ImportFS.php index d64ec17a1..b505a0857 100644 --- a/op/op.ImportFS.php +++ b/op/op.ImportFS.php @@ -1,10 +1,11 @@ Date: Wed, 6 Jul 2016 22:26:57 +0200 Subject: [PATCH 02/65] add new phrases for 2-factor auth --- languages/ar_EG/lang.inc | 4 ++++ languages/bg_BG/lang.inc | 4 ++++ languages/ca_ES/lang.inc | 4 ++++ languages/cs_CZ/lang.inc | 4 ++++ languages/de_DE/lang.inc | 6 +++++- languages/en_GB/lang.inc | 6 +++++- languages/es_ES/lang.inc | 4 ++++ languages/fr_FR/lang.inc | 4 ++++ languages/hr_HR/lang.inc | 4 ++++ languages/hu_HU/lang.inc | 4 ++++ languages/it_IT/lang.inc | 4 ++++ languages/ko_KR/lang.inc | 4 ++++ languages/nl_NL/lang.inc | 4 ++++ languages/pl_PL/lang.inc | 4 ++++ languages/pt_BR/lang.inc | 4 ++++ languages/ro_RO/lang.inc | 4 ++++ languages/ru_RU/lang.inc | 4 ++++ languages/sk_SK/lang.inc | 4 ++++ languages/sv_SE/lang.inc | 4 ++++ languages/tr_TR/lang.inc | 4 ++++ languages/uk_UA/lang.inc | 4 ++++ languages/zh_CN/lang.inc | 4 ++++ languages/zh_TW/lang.inc | 4 ++++ 23 files changed, 94 insertions(+), 2 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index b4efb5e2f..c88e33e69 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (1267) $text = array( +'2_factor_auth' => '', 'accept' => 'وافق', 'access_control' => '', 'access_control_is_off' => '', @@ -999,6 +1000,8 @@ URL: [url]', 'settings_Edition' => 'اعدادات التحرير', 'settings_editOnlineFileTypes' => '', 'settings_editOnlineFileTypes_desc' => '', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => '', @@ -1331,6 +1334,7 @@ URL: [url]', 'timeline_status_change' => 'ﺖﻐﻳﺭ ﺎﻠﺣﺎﻟﺓ ﻢﻋ ﺎﻟﺰﻤﻧ', 'to' => 'الى', 'toggle_manager' => 'رجح مدير', +'toggle_qrcode' => '', 'to_before_from' => '', 'transition_triggered_email' => 'تم تحريك انتقال مسار العمل', 'transition_triggered_email_body' => 'تم تحريك انتقال مسار العمل diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 2abd8dfbf..f2b0667e9 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (785) $text = array( +'2_factor_auth' => '', 'accept' => 'Приеми', 'access_control' => '', 'access_control_is_off' => '', @@ -864,6 +865,8 @@ $text = array( 'settings_Edition' => 'Настройки редакция', 'settings_editOnlineFileTypes' => '', 'settings_editOnlineFileTypes_desc' => '', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Разреши Admin Rev App', @@ -1196,6 +1199,7 @@ $text = array( 'timeline_status_change' => '', 'to' => 'към', 'toggle_manager' => 'Превключи мениджър', +'toggle_qrcode' => '', 'to_before_from' => '', 'transition_triggered_email' => 'Забелязана промяна на процес', 'transition_triggered_email_body' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 8c3bc0b53..477b7778d 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (702) $text = array( +'2_factor_auth' => '', 'accept' => 'Acceptar', 'access_control' => '', 'access_control_is_off' => '', @@ -869,6 +870,8 @@ URL: [url]', 'settings_Edition' => 'Edition settings', 'settings_editOnlineFileTypes' => '', 'settings_editOnlineFileTypes_desc' => '', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => '', @@ -1201,6 +1204,7 @@ URL: [url]', 'timeline_status_change' => 'Versió [version]:[status]', 'to' => 'Fins', 'toggle_manager' => 'Intercanviar manager', +'toggle_qrcode' => '', 'to_before_from' => '', 'transition_triggered_email' => '', 'transition_triggered_email_body' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 2b09834da..451999a09 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (707), kreml (455) $text = array( +'2_factor_auth' => '', 'accept' => 'Přijmout', 'access_control' => '', 'access_control_is_off' => '', @@ -1008,6 +1009,8 @@ URL: [url]', 'settings_Edition' => '', 'settings_editOnlineFileTypes' => '', 'settings_editOnlineFileTypes_desc' => '', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => '', @@ -1340,6 +1343,7 @@ URL: [url]', 'timeline_status_change' => 'Verze [version]: [status]', 'to' => 'Do', 'toggle_manager' => 'Přepnout správce', +'toggle_qrcode' => '', 'to_before_from' => 'Datum ukončení nesmí být před datem zahájení', 'transition_triggered_email' => 'Transformace pracovního postupu spuštěna', 'transition_triggered_email_body' => 'Transformace pracovního postupu spuštěna diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index d0f978a6d..15976a0a9 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,9 +19,10 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2241), dgrutsch (21) +// Translators: Admin (2243), dgrutsch (21) $text = array( +'2_factor_auth' => '2-Faktor Authentifizierung', 'accept' => 'Übernehmen', 'access_control' => 'Zugriffskontrolle', 'access_control_is_off' => 'Erweiterte Zugriffskontrolle ist ausgeschaltet', @@ -1045,6 +1046,8 @@ URL: [url]', 'settings_Edition' => 'Funktions-Einstellungen', 'settings_editOnlineFileTypes' => 'Dateitypen für Online-Editieren:', 'settings_editOnlineFileTypes_desc' => 'Dateien mit den angegebenen Endungen können Online editiert werden (benutzen Sie ausschließlich Kleinbuchstaben).', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => 'Ermögliche Bestätigung des Dokumentenempfang', 'settings_enableAcknowledgeWorkflow_desc' => 'Anwählen, um den Workflow zur Kenntnisnahme von Dokumenten einzuschalten', 'settings_enableAdminRevApp' => 'Admin darf freigeben/prüfen', @@ -1377,6 +1380,7 @@ URL: [url]', 'timeline_status_change' => 'Version [version]: [status]', 'to' => 'bis', 'toggle_manager' => 'Managerstatus wechseln', +'toggle_qrcode' => 'Zeige/verberge QR-Code', 'to_before_from' => 'Endedatum darf nicht vor dem Startdatum liegen', 'transition_triggered_email' => 'Workflow transition triggered', 'transition_triggered_email_body' => 'Workflow transition triggered diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 6575659c5..7750dab6f 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,9 +19,10 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1391), dgrutsch (7), netixw (14) +// Translators: Admin (1395), dgrutsch (7), netixw (14) $text = array( +'2_factor_auth' => '2-factor authentication', 'accept' => 'Accept', 'access_control' => 'Access control', 'access_control_is_off' => 'Advanced access control is turned off', @@ -1046,6 +1047,8 @@ URL: [url]', 'settings_Edition' => 'Edition settings', 'settings_editOnlineFileTypes' => 'Edit Online File Types:', 'settings_editOnlineFileTypes_desc' => 'Files with one of the following endings can be edited online (USE ONLY LOWER CASE CHARACTERS)', +'settings_enable2FactorAuthentication' => 'Enable 2-factor authentication', +'settings_enable2FactorAuthentication_desc' => 'Enable/disable 2 factor authentication. The users will need the Google Authenticator on its mobile phone.', 'settings_enableAcknowledgeWorkflow' => 'Enable acknowledge of document reception', 'settings_enableAcknowledgeWorkflow_desc' => 'Enable, to turn on the workflow to acknowledge document reception.', 'settings_enableAdminRevApp' => 'Allow review/approval for admins', @@ -1378,6 +1381,7 @@ URL: [url]', 'timeline_status_change' => 'Version [version]: [status]', 'to' => 'To', 'toggle_manager' => 'Toggle manager', +'toggle_qrcode' => 'Show/hide QR code', 'to_before_from' => 'End date may not be before start date', 'transition_triggered_email' => 'Workflow transition triggered', 'transition_triggered_email_body' => 'Workflow transition triggered diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 2437468af..8c1e06052 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -22,6 +22,7 @@ // Translators: acabello (20), Admin (993), angel (123), francisco (2), jaimem (14) $text = array( +'2_factor_auth' => '', 'accept' => 'Aceptar', 'access_control' => '', 'access_control_is_off' => '', @@ -1014,6 +1015,8 @@ URL: [url]', 'settings_Edition' => 'Configuración de edición', 'settings_editOnlineFileTypes' => '', 'settings_editOnlineFileTypes_desc' => '', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Habilitar Administrador Rev Apr', @@ -1346,6 +1349,7 @@ URL: [url]', 'timeline_status_change' => 'Versión [version]: [estado]', 'to' => 'Hasta', 'toggle_manager' => 'Intercambiar mánager', +'toggle_qrcode' => '', 'to_before_from' => 'La fecha de finalización no debe ser anterior a la de inicio', 'transition_triggered_email' => 'Workflow transition triggered', 'transition_triggered_email_body' => 'Workflow transition triggered diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 547bd2120..95189084e 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (1032), jeromerobert (50), lonnnew (9) $text = array( +'2_factor_auth' => '', 'accept' => 'Accepter', 'access_control' => '', 'access_control_is_off' => '', @@ -990,6 +991,8 @@ URL: [url]', 'settings_Edition' => 'Paramètres d’édition', 'settings_editOnlineFileTypes' => 'Editer le type de fichier', 'settings_editOnlineFileTypes_desc' => 'Editer la description du type de fichier', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Activer Admin Rev App', @@ -1322,6 +1325,7 @@ URL: [url]', 'timeline_status_change' => 'Version [version] : [status]', 'to' => 'Au', 'toggle_manager' => 'Basculer \'Responsable\'', +'toggle_qrcode' => '', 'to_before_from' => '', 'transition_triggered_email' => 'Transition de workflow activé', 'transition_triggered_email_body' => '', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index fd30c71be..d4e40ef91 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (1187), marbanas (16) $text = array( +'2_factor_auth' => '', 'accept' => 'Prihvati', 'access_control' => '', 'access_control_is_off' => '', @@ -1035,6 +1036,8 @@ Internet poveznica: [url]', 'settings_Edition' => 'Postavke izdanja', 'settings_editOnlineFileTypes' => '', 'settings_editOnlineFileTypes_desc' => '', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => 'Omogućavanje potvrđivanja prijema dokumenta', 'settings_enableAcknowledgeWorkflow_desc' => 'Omogućite kako bi omogućili tok rada za potvrđivajne prijema dokumenta.', 'settings_enableAdminRevApp' => 'Dopusti pregled/ovjeru za administratore', @@ -1367,6 +1370,7 @@ Internet poveznica: [url]', 'timeline_status_change' => 'Verzija [version]: [status]', 'to' => 'Do', 'toggle_manager' => 'Zamjeni upravitelja', +'toggle_qrcode' => '', 'to_before_from' => 'Datum završetka ne može biti prije datuma početka', 'transition_triggered_email' => 'Zatražena promjena toka rada', 'transition_triggered_email_body' => 'Zatražena promjena toka rada diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index c26d0b62b..2381560da 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (587), ribaz (1023) $text = array( +'2_factor_auth' => '', 'accept' => 'Elfogad', 'access_control' => '', 'access_control_is_off' => '', @@ -1013,6 +1014,8 @@ URL: [url]', 'settings_Edition' => 'Kiadás beállítások', 'settings_editOnlineFileTypes' => '', 'settings_editOnlineFileTypes_desc' => '', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Engedélyezi a felülvizsgálatot/jóváhagyást az adminisztrátorok számára', @@ -1345,6 +1348,7 @@ URL: [url]', 'timeline_status_change' => '[version]: [status] Verzio', 'to' => 'ig', 'toggle_manager' => 'Kulcs kezelő', +'toggle_qrcode' => '', 'to_before_from' => 'A lejárati dátum nem előzheti meg a kezdési dátumot', 'transition_triggered_email' => 'Munkamenet átmenet kiváltva', 'transition_triggered_email_body' => 'Munkafolyamat átmenet kiváltva diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 70fba75e1..8656d17ba 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (1527), s.pnt (26) $text = array( +'2_factor_auth' => '', 'accept' => 'Accetta', 'access_control' => '', 'access_control_is_off' => '', @@ -1037,6 +1038,8 @@ URL: [url]', 'settings_Edition' => 'Impostazioni di edizione', 'settings_editOnlineFileTypes' => 'Tipi di files modificabili Online', 'settings_editOnlineFileTypes_desc' => '', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => 'Abilitare per notifiche', 'settings_enableAcknowledgeWorkflow_desc' => 'Abilitare per attivare sul workflow le ricevute di notifica.', 'settings_enableAdminRevApp' => 'Permetti la revisione/approvazione da parte degli amministratori', @@ -1369,6 +1372,7 @@ URL: [url]', 'timeline_status_change' => 'Versione - Stato', 'to' => 'A', 'toggle_manager' => 'Gestore', +'toggle_qrcode' => '', 'to_before_from' => 'La data di fine non può essere antecedente a quella di inizio', 'transition_triggered_email' => 'Inizio transizione del flusso di lavoro', 'transition_triggered_email_body' => 'Transizione del flusso di lavoro iniziata diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 05473f3fb..d9ea262eb 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (939), daivoc (418) $text = array( +'2_factor_auth' => '', 'accept' => '동의', 'access_control' => '', 'access_control_is_off' => '', @@ -1028,6 +1029,8 @@ URL : [url]', 'settings_Edition' => '판(Edition) 설정', 'settings_editOnlineFileTypes' => '', 'settings_editOnlineFileTypes_desc' => '', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => '문서 수신의 응답 활성화', 'settings_enableAcknowledgeWorkflow_desc' => '문서의 수신 확인을 위해 워크플로어를 선택하고 활성화 합니다.', 'settings_enableAdminRevApp' => '관리자에 대한 검토 / 승인 허용', @@ -1360,6 +1363,7 @@ URL : [url]', 'timeline_status_change' => '버전 [version]: [status]', 'to' => '마감일', 'toggle_manager' => '전환 매니저', +'toggle_qrcode' => '', 'to_before_from' => '종료일은 시작일 전이 될수 없습니다', 'transition_triggered_email' => '워크플로우 전환 트리거', 'transition_triggered_email_body' => '워크플로우 전환 트리거 diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 479f84a0f..0c57d84dc 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (718), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270) $text = array( +'2_factor_auth' => '', 'accept' => 'Accept', 'access_control' => 'Toegangscontrole', 'access_control_is_off' => '', @@ -1041,6 +1042,8 @@ URL: [url]', 'settings_Edition' => 'Uitgave instellingen', 'settings_editOnlineFileTypes' => 'Instellingen Filetypes', 'settings_editOnlineFileTypes_desc' => 'Online zoekmethoden bewerken', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => 'Aanzetten Workflow-stappen', 'settings_enableAcknowledgeWorkflow_desc' => 'Aanzetten workflow-stappen', 'settings_enableAdminRevApp' => 'Inschakelen Beheer Contr/Beoord', @@ -1373,6 +1376,7 @@ URL: [url]', 'timeline_status_change' => 'Versie [version]: [status]', 'to' => 'aan', 'toggle_manager' => 'Wijzig Beheerder', +'toggle_qrcode' => '', 'to_before_from' => 'De einddatum mag niet voor de startdatum liggen', 'transition_triggered_email' => 'Workflow-overgang geactiveerd', 'transition_triggered_email_body' => 'Workflow Overgang diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index c7e5ffa2f..2337a101b 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (737), netixw (84), romi (93), uGn (112) $text = array( +'2_factor_auth' => '', 'accept' => 'Akceptuj', 'access_control' => '', 'access_control_is_off' => '', @@ -993,6 +994,8 @@ URL: [url]', 'settings_Edition' => 'Ustawienia edycji', 'settings_editOnlineFileTypes' => '', 'settings_editOnlineFileTypes_desc' => '', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Dołącz Administratora do recenzji/rewizji', @@ -1325,6 +1328,7 @@ URL: [url]', 'timeline_status_change' => 'Wersja [wersja]: [status]', 'to' => 'Do', 'toggle_manager' => 'Przełączanie zarządcy', +'toggle_qrcode' => '', 'to_before_from' => '', 'transition_triggered_email' => 'Uruchomiono proces przepływu', 'transition_triggered_email_body' => 'Uruchomiono proces przepływu diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index a502d42b1..6fb04dcbd 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (907), flaviove (627), lfcristofoli (352) $text = array( +'2_factor_auth' => '', 'accept' => 'Aceitar', 'access_control' => '', 'access_control_is_off' => '', @@ -1011,6 +1012,8 @@ URL: [url]', 'settings_Edition' => 'Configurações Edição', 'settings_editOnlineFileTypes' => '', 'settings_editOnlineFileTypes_desc' => '', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Permitir revisão/aprovação para administradores', @@ -1343,6 +1346,7 @@ URL: [url]', 'timeline_status_change' => 'Versão [versão]: [estado]', 'to' => 'To', 'toggle_manager' => 'Toggle manager', +'toggle_qrcode' => '', 'to_before_from' => 'A data de término não pode ser anterior a data de início', 'transition_triggered_email' => 'Transição de fluxo de trabalho desencadeado', 'transition_triggered_email_body' => 'Transição do fluxo de trabalho triggered diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 00fad576c..c6eb879b1 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (1043), balan (87) $text = array( +'2_factor_auth' => '', 'accept' => 'Accept', 'access_control' => '', 'access_control_is_off' => '', @@ -1036,6 +1037,8 @@ URL: [url]', 'settings_Edition' => 'Setările Editiei', 'settings_editOnlineFileTypes' => '', 'settings_editOnlineFileTypes_desc' => '', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Permite revizuirea/aprobarea pentru admini', @@ -1368,6 +1371,7 @@ URL: [url]', 'timeline_status_change' => 'Versiune [versiune]: [stare]', 'to' => 'La', 'toggle_manager' => 'Comută Manager', +'toggle_qrcode' => '', 'to_before_from' => 'Data de încheiere nu poate fi înainte de data de începere', 'transition_triggered_email' => 'Tranziție Workflow declanșată', 'transition_triggered_email_body' => 'Tranziție Workflow declanșată diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 60f4c02c4..143333caa 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (1543) $text = array( +'2_factor_auth' => '', 'accept' => 'Принять', 'access_control' => '', 'access_control_is_off' => '', @@ -1043,6 +1044,8 @@ URL: [url]', 'settings_Edition' => 'Настройки версий', 'settings_editOnlineFileTypes' => '', 'settings_editOnlineFileTypes_desc' => '', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => 'Включить подтверждение получения документа', 'settings_enableAcknowledgeWorkflow_desc' => 'Включить для активации функции подтверждения получения документа', 'settings_enableAdminRevApp' => 'Администратор как
рецензирующий и утверждающий', @@ -1375,6 +1378,7 @@ URL: [url]', 'timeline_status_change' => 'Версия [version]: [status]', 'to' => 'До', 'toggle_manager' => 'Изменить как менеджера', +'toggle_qrcode' => '', 'to_before_from' => 'Конечная дата не может быть меньше начальной даты', 'transition_triggered_email' => 'Изменено состояние процесса', 'transition_triggered_email_body' => 'Изменено состояние процесса diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index b5764231a..ff3af7643 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (499), destinqo (19) $text = array( +'2_factor_auth' => '', 'accept' => 'Prijať', 'access_control' => '', 'access_control_is_off' => '', @@ -868,6 +869,8 @@ URL: [url]', 'settings_Edition' => '', 'settings_editOnlineFileTypes' => '', 'settings_editOnlineFileTypes_desc' => '', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => '', @@ -1200,6 +1203,7 @@ URL: [url]', 'timeline_status_change' => 'Verzia [version]: [status]', 'to' => 'Do', 'toggle_manager' => 'Prepnúť stav manager', +'toggle_qrcode' => '', 'to_before_from' => '', 'transition_triggered_email' => '', 'transition_triggered_email_body' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index aed205b61..e87e3d976 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (1129), tmichelfelder (106) $text = array( +'2_factor_auth' => '', 'accept' => 'Godkänn', 'access_control' => '', 'access_control_is_off' => '', @@ -999,6 +1000,8 @@ URL: [url]', 'settings_Edition' => 'Redigeringsinställningar', 'settings_editOnlineFileTypes' => 'Redigera online-filtyper', 'settings_editOnlineFileTypes_desc' => 'Filer med en av följande filtyper kan redigeras online OBS! ANVÄND BARA SMÅ BOKSTÄVER)', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Visa Admin i listan granska/godkänna', @@ -1331,6 +1334,7 @@ URL: [url]', 'timeline_status_change' => 'Version [version]: [status]', 'to' => 'till', 'toggle_manager' => 'Byt manager', +'toggle_qrcode' => '', 'to_before_from' => 'Slutdatum får inte vara innan startdatum', 'transition_triggered_email' => 'Arbetsflödesövergång utlöstes', 'transition_triggered_email_body' => 'Arbetsflödesövergång utlöstes diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 70616f3ff..1a429e969 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (1038), aydin (83) $text = array( +'2_factor_auth' => '', 'accept' => 'Kabul', 'access_control' => '', 'access_control_is_off' => '', @@ -1015,6 +1016,8 @@ URL: [url]', 'settings_Edition' => 'Düzenleme ayarları', 'settings_editOnlineFileTypes' => '', 'settings_editOnlineFileTypes_desc' => '', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => 'Yöneticilere kontrol/onay izni ver', @@ -1347,6 +1350,7 @@ URL: [url]', 'timeline_status_change' => 'Versiyon [version]: [status]', 'to' => 'Kime', 'toggle_manager' => 'Değişim yönetimi', +'toggle_qrcode' => '', 'to_before_from' => 'Bitiş tarihi başlama tarihinden önce olamaz', 'transition_triggered_email' => 'İş Akış Geçişi Tetiklendi', 'transition_triggered_email_body' => 'İş Akış Geçişi Tetiklendi diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 98170f86a..b380e52e0 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (1324) $text = array( +'2_factor_auth' => '', 'accept' => 'Прийняти', 'access_control' => '', 'access_control_is_off' => '', @@ -1036,6 +1037,8 @@ URL: [url]', 'settings_Edition' => 'Налаштування версій', 'settings_editOnlineFileTypes' => '', 'settings_editOnlineFileTypes_desc' => '', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => 'Увімкнути підтвердження отримання документу', 'settings_enableAcknowledgeWorkflow_desc' => 'Включіть для активації функції підтвердження отримання документу', 'settings_enableAdminRevApp' => 'Адміністратор може бути
рецензент і затверджувач', @@ -1368,6 +1371,7 @@ URL: [url]', 'timeline_status_change' => 'Версія [version]: [status]', 'to' => 'До', 'toggle_manager' => 'Змінити ознаку менеджера', +'toggle_qrcode' => '', 'to_before_from' => 'Кінцева дата не може бути меншою початкової дати', 'transition_triggered_email' => 'Змінено стан процесу', 'transition_triggered_email_body' => 'Змінено стан процесу diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 556031f64..8172262ba 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (635), fengjohn (5) $text = array( +'2_factor_auth' => '', 'accept' => '接受', 'access_control' => '', 'access_control_is_off' => '', @@ -870,6 +871,8 @@ URL: [url]', 'settings_Edition' => '编辑设置', 'settings_editOnlineFileTypes' => '', 'settings_editOnlineFileTypes_desc' => '', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => '', @@ -1202,6 +1205,7 @@ URL: [url]', 'timeline_status_change' => '版本 [版本]: [状态]', 'to' => '到', 'toggle_manager' => '角色切换', +'toggle_qrcode' => '', 'to_before_from' => '', 'transition_triggered_email' => '', 'transition_triggered_email_body' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 59888a7c8..ced16d3ea 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -22,6 +22,7 @@ // Translators: Admin (2369) $text = array( +'2_factor_auth' => '', 'accept' => '接受', 'access_control' => '', 'access_control_is_off' => '', @@ -868,6 +869,8 @@ URL: [url]', 'settings_Edition' => '', 'settings_editOnlineFileTypes' => '', 'settings_editOnlineFileTypes_desc' => '', +'settings_enable2FactorAuthentication' => '', +'settings_enable2FactorAuthentication_desc' => '', 'settings_enableAcknowledgeWorkflow' => '', 'settings_enableAcknowledgeWorkflow_desc' => '', 'settings_enableAdminRevApp' => '', @@ -1200,6 +1203,7 @@ URL: [url]', 'timeline_status_change' => '版本 [版本號]:[狀態]', 'to' => '到', 'toggle_manager' => '角色切換', +'toggle_qrcode' => '', 'to_before_from' => '', 'transition_triggered_email' => '', 'transition_triggered_email_body' => '', From f323d1cabffb36498b2b47fd2f862bac570ed812 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 12 Jul 2016 17:49:09 +0200 Subject: [PATCH 03/65] minor updates --- languages/es_ES/lang.inc | 4 ++-- languages/pt_BR/lang.inc | 6 +++--- languages/zh_CN/lang.inc | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 8c1e06052..81811ef96 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/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: acabello (20), Admin (993), angel (123), francisco (2), jaimem (14) +// Translators: acabello (20), Admin (994), angel (123), francisco (2), jaimem (14) $text = array( '2_factor_auth' => '', @@ -514,7 +514,7 @@ URL: [url]', 'identical_version' => 'La nueva versión es idéntica a la actual.', 'import' => '', 'importfs' => '', -'import_fs' => '', +'import_fs' => 'Importar desde sistema de aechivos', 'import_fs_warning' => '', 'include_content' => '', 'include_documents' => 'Incluir documentos', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 6fb04dcbd..459f727a7 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/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 (907), flaviove (627), lfcristofoli (352) +// Translators: Admin (909), flaviove (627), lfcristofoli (352) $text = array( '2_factor_auth' => '', @@ -229,7 +229,7 @@ URL: [url]', 'choose_workflow_action' => 'Escolha a ação de fluxo de trabalho', 'choose_workflow_state' => 'Escolha um estado de fluxo de trabalho', 'class_name' => '', -'clear_cache' => '', +'clear_cache' => 'Limpar o Cache', 'clear_clipboard' => 'Limpar área de transferência', 'clear_password' => '', 'clipboard' => 'Área de transferência', @@ -513,7 +513,7 @@ URL: [url]', 'identical_version' => 'Nova versão é idêntica à versão atual.', 'import' => '', 'importfs' => '', -'import_fs' => '', +'import_fs' => 'Importar do sistema de arquivos', 'import_fs_warning' => '', 'include_content' => '', 'include_documents' => 'Include documents', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 8172262ba..23f41ba59 100644 --- a/languages/zh_CN/lang.inc +++ b/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 (635), fengjohn (5) +// Translators: Admin (637), fengjohn (5) $text = array( '2_factor_auth' => '', @@ -444,7 +444,7 @@ URL: [url]', 'identical_version' => '', 'import' => '', 'importfs' => '', -'import_fs' => '', +'import_fs' => '从文件系统导入', 'import_fs_warning' => '', 'include_content' => '', 'include_documents' => '包含文档', @@ -687,7 +687,7 @@ URL: [url]', 'removed_revispr' => '', 'removed_workflow_email_body' => '', 'removed_workflow_email_subject' => '', -'remove_marked_files' => '', +'remove_marked_files' => '删除选中的文件', 'repaired' => '', 'repairing_objects' => '', 'request_workflow_action_email_body' => '', From a964f20bdca2d85a13dec505c8ad9c48db823913 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 13 Jul 2016 07:39:49 +0200 Subject: [PATCH 04/65] fix migration sql statements The changes still refer to the database used in mydms 1.7.2 --- install/update-3.4.0/update.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/install/update-3.4.0/update.sql b/install/update-3.4.0/update.sql index 510676fe9..dfc4b7a75 100644 --- a/install/update-3.4.0/update.sql +++ b/install/update-3.4.0/update.sql @@ -29,6 +29,8 @@ END START TRANSACTION; +ALTER TABLE `tblDocumentContent` MODIFY `version` smallint(5) unsigned NOT NULL; + ALTER TABLE tblACLs ENGINE=InnoDB; ALTER TABLE tblCategory ENGINE=InnoDB; @@ -99,6 +101,8 @@ ALTER TABLE tblDocuments ADD CONSTRAINT `tblDocuments_folder` FOREIGN KEY (`fold CALL DROPFK('tblDocumentContent', 'tblDocumentDocument_document'); +ALTER TABLE tblDocumentContent DROP PRIMARY KEY; + ALTER TABLE tblDocumentContent ADD CONSTRAINT `tblDocumentContent_document` FOREIGN KEY (`document`) REFERENCES `tblDocuments` (`id`); CALL DROPFK('tblDocumentLinks', 'tblDocumentLinks_user'); From 37b995d94680d6d7fbd2e0f8cefbaec7c880b72d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 14 Jul 2016 07:00:45 +0200 Subject: [PATCH 05/65] add phrases for 2-fact-auth, slovak, italien, polish updates --- languages/ar_EG/lang.inc | 3 +++ languages/bg_BG/lang.inc | 7 +++++-- languages/ca_ES/lang.inc | 3 +++ languages/cs_CZ/lang.inc | 3 +++ languages/de_DE/lang.inc | 7 +++++-- languages/en_GB/lang.inc | 7 +++++-- languages/es_ES/lang.inc | 7 +++++-- languages/fr_FR/lang.inc | 7 +++++-- languages/hr_HR/lang.inc | 7 +++++-- languages/hu_HU/lang.inc | 7 +++++-- languages/it_IT/lang.inc | 11 +++++++---- languages/ko_KR/lang.inc | 7 +++++-- languages/nl_NL/lang.inc | 7 +++++-- languages/pl_PL/lang.inc | 9 ++++++--- languages/pt_BR/lang.inc | 7 +++++-- languages/ro_RO/lang.inc | 7 +++++-- languages/ru_RU/lang.inc | 7 +++++-- languages/sk_SK/lang.inc | 29 ++++++++++++++++------------- languages/sv_SE/lang.inc | 7 +++++-- languages/tr_TR/lang.inc | 7 +++++-- languages/uk_UA/lang.inc | 7 +++++-- languages/zh_CN/lang.inc | 7 +++++-- languages/zh_TW/lang.inc | 7 +++++-- 23 files changed, 123 insertions(+), 54 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index c88e33e69..7d05b2e68 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -23,6 +23,8 @@ $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => 'وافق', 'access_control' => '', 'access_control_is_off' => '', @@ -1289,6 +1291,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => 'مجهول', 'storage_size' => 'حجم التخزين', +'submit_2_fact_auth' => '', 'submit_approval' => 'ادخال موافقة', 'submit_login' => 'تسجيل الدخول', 'submit_password' => 'تحديد كلمة سر جديدة', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index f2b0667e9..79a65c330 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (785) +// Translators: Admin (786) $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => 'Приеми', 'access_control' => '', 'access_control_is_off' => '', @@ -975,7 +977,7 @@ $text = array( 'settings_luceneDir' => 'Каталог за пълнотекстовия индекс', 'settings_luceneDir_desc' => 'Път, където Lucene ще пише своя индекс', 'settings_maxDirID' => 'Максимален ID на папка', -'settings_maxDirID_desc' => 'Максимум подпапки в родителската папка. По подразбиране: 32700.', +'settings_maxDirID_desc' => 'Максимум подпапки в родителската папка. По подразбиране: 0.', 'settings_maxExecutionTime' => 'Максимално време за изпълнение (с)', 'settings_maxExecutionTime_desc' => 'Установява максимално време за изпълнение на скрипта, преди да бъде прибит от парсера', 'settings_maxRecursiveCount' => '', @@ -1154,6 +1156,7 @@ $text = array( 'status_revisor_removed' => '', 'status_unknown' => 'Неизвестен', 'storage_size' => 'Размер на хранилището', +'submit_2_fact_auth' => '', 'submit_approval' => 'Утвърди', 'submit_login' => 'Влез', 'submit_password' => 'Установи нова парола', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 477b7778d..fef9204b4 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -23,6 +23,8 @@ $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => 'Acceptar', 'access_control' => '', 'access_control_is_off' => '', @@ -1159,6 +1161,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => 'Desconegut', 'storage_size' => 'Storage size', +'submit_2_fact_auth' => '', 'submit_approval' => 'Enviar aprovació', 'submit_login' => 'Connectat', 'submit_password' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 451999a09..42d3d203a 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -23,6 +23,8 @@ $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => 'Přijmout', 'access_control' => '', 'access_control_is_off' => '', @@ -1298,6 +1300,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => 'Neznámý', 'storage_size' => 'Velikost úložiště', +'submit_2_fact_auth' => '', 'submit_approval' => 'Poslat ke schválení', 'submit_login' => 'Přihlásit se', 'submit_password' => 'Zadat nové heslo', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 15976a0a9..3bb856412 100644 --- a/languages/de_DE/lang.inc +++ b/languages/de_DE/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2243), dgrutsch (21) +// Translators: Admin (2247), dgrutsch (21) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', +'2_factor_auth_info' => 'Dieses System erfordert 2-Faktor-Authentifikation. Dazu brauchen den Google Authenticator auf Ihrem Mobiltelefon. Unten sehen Sie zwei QR-Codes. Der rechte Code beinhaltet Ihren aktuellen geheimen Schlüssel. Auf der linken Seite wird ein neuer Schlüssel angezeigt. Wenn Sie den neuen Schlüssel speichern, dann stellen Sie zuvor sicher, dass sie ihn mit dem Google Authenticator zuvor eingescant haben.', +'2_fact_auth_secret' => 'Schlüssel', 'accept' => 'Übernehmen', 'access_control' => 'Zugriffskontrolle', 'access_control_is_off' => 'Erweiterte Zugriffskontrolle ist ausgeschaltet', @@ -1156,7 +1158,7 @@ URL: [url]', 'settings_luceneDir' => 'Verzeichnis für Volltextindex', 'settings_luceneDir_desc' => 'Verzeichnis in dem der Lucene-Index abgelegt wird.', 'settings_maxDirID' => 'Max. Anzahl Unterverzeichnisse', -'settings_maxDirID_desc' => 'Maximale Anzahl der Unterverzeichnisse in einem Verzeichnis. Voreingestellt ist 32700.', +'settings_maxDirID_desc' => 'Maximale Anzahl der Unterverzeichnisse in einem Verzeichnis. Ändern Sie diesen Wert nur, wenn Sie genau wissen was Sie tun! Voreingestellt ist 0.', 'settings_maxExecutionTime' => 'Max. Ausführungszeit (s)', 'settings_maxExecutionTime_desc' => 'Maximale Zeit in Sekunden bis ein Skript beendet wird.', 'settings_maxRecursiveCount' => 'Max. Anzahl Anzahl rekursiver Dokumente/Ordner.', @@ -1335,6 +1337,7 @@ URL: [url]', 'status_revisor_removed' => 'Überprüfer von Liste entfernt', 'status_unknown' => 'unbekannt', 'storage_size' => 'Speicherverbrauch', +'submit_2_fact_auth' => 'Schlüssel speichern', 'submit_approval' => 'Freigabe hinzufügen', 'submit_login' => 'Anmelden', 'submit_password' => 'Setze neues Passwort', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 7750dab6f..165271dba 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1395), dgrutsch (7), netixw (14) +// Translators: Admin (1399), dgrutsch (7), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', +'2_factor_auth_info' => 'This system enforces 2 factor authentication. You will need the Google Authenticator on your mobile phone. Below you see two QR codes. The right one is your current secret. On the left you can set a new secret. If you set a new secret make sure to rescan it with Google Authenticator.', +'2_fact_auth_secret' => 'Secret', 'accept' => 'Accept', 'access_control' => 'Access control', 'access_control_is_off' => 'Advanced access control is turned off', @@ -1157,7 +1159,7 @@ URL: [url]', 'settings_luceneDir' => 'Directory for full text index', 'settings_luceneDir_desc' => 'Path to Lucene index', 'settings_maxDirID' => 'Max Directory ID', -'settings_maxDirID_desc' => 'Maximum number of sub-directories per parent directory. Default: 32700.', +'settings_maxDirID_desc' => 'Maximum number of sub-directories per parent directory. Do not change this value unless you know what you do! Default: 0.', 'settings_maxExecutionTime' => 'Max Execution Time (s)', 'settings_maxExecutionTime_desc' => 'This sets the maximum time in seconds a script is allowed to run before it is terminated by the parse', 'settings_maxRecursiveCount' => 'Max. number of recursive document/folder count', @@ -1336,6 +1338,7 @@ URL: [url]', 'status_revisor_removed' => 'Revisor removed from list', 'status_unknown' => 'Unknown', 'storage_size' => 'Storage size', +'submit_2_fact_auth' => 'Save secret', 'submit_approval' => 'Submit approval', 'submit_login' => 'Sign in', 'submit_password' => 'Set new password', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 81811ef96..e14373269 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: acabello (20), Admin (994), angel (123), francisco (2), jaimem (14) +// Translators: acabello (20), Admin (995), angel (123), francisco (2), jaimem (14) $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => 'Aceptar', 'access_control' => '', 'access_control_is_off' => '', @@ -1125,7 +1127,7 @@ URL: [url]', 'settings_luceneDir' => 'Carpeta del índice de texto completo', 'settings_luceneDir_desc' => 'Ruta hacia el índice Lucene', 'settings_maxDirID' => 'ID máximo de carpeta', -'settings_maxDirID_desc' => 'Número máximo de subcarpetas por carpeta principal. Por defecto: 32700.', +'settings_maxDirID_desc' => 'Número máximo de subcarpetas por carpeta principal. Por defecto: 0.', 'settings_maxExecutionTime' => 'Tiempo máximo de ejecución (s)', 'settings_maxExecutionTime_desc' => 'Esto configura el tiempo máximo en segundos que un script puede estar ejectutándose antes de que el analizador lo pare', 'settings_maxRecursiveCount' => 'Número máximo del contador de carpetas/documentos recursivos', @@ -1304,6 +1306,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => 'Desconocido', 'storage_size' => 'Tamaño de almacenamiento', +'submit_2_fact_auth' => '', 'submit_approval' => 'Enviar aprobación', 'submit_login' => 'Conectar', 'submit_password' => 'Fijar nueva contraseña', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 95189084e..bbae6fb42 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1032), jeromerobert (50), lonnnew (9) +// Translators: Admin (1033), jeromerobert (50), lonnnew (9) $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => 'Accepter', 'access_control' => '', 'access_control_is_off' => '', @@ -1101,7 +1103,7 @@ URL: [url]', 'settings_luceneDir' => 'Répertoire index Lucene', 'settings_luceneDir_desc' => 'Chemin vers index Lucene', 'settings_maxDirID' => 'Max ID répertoire', -'settings_maxDirID_desc' => 'Nombre maximum de sous-répertoires par le répertoire parent. Par défaut: 32700.', +'settings_maxDirID_desc' => 'Nombre maximum de sous-répertoires par le répertoire parent. Par défaut: 0.', 'settings_maxExecutionTime' => 'Temps d\'exécution max (s)', 'settings_maxExecutionTime_desc' => 'Ceci définit la durée maximale en secondes q\'un script est autorisé à exécuter avant de se terminer par l\'analyse syntaxique', 'settings_maxRecursiveCount' => 'Nombre maximal de document/dossier récursif', @@ -1280,6 +1282,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => 'Inconnu', 'storage_size' => 'Taille occupée', +'submit_2_fact_auth' => '', 'submit_approval' => 'Soumettre approbation', 'submit_login' => 'Connexion', 'submit_password' => 'Entrez nouveau mot de passe', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index d4e40ef91..9275bd4fe 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1187), marbanas (16) +// Translators: Admin (1188), marbanas (16) $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => 'Prihvati', 'access_control' => '', 'access_control_is_off' => '', @@ -1146,7 +1148,7 @@ Internet poveznica: [url]', 'settings_luceneDir' => 'Mapa za indeksiranje cijelog teksta', 'settings_luceneDir_desc' => 'Putanja to Lucene indeksa', 'settings_maxDirID' => 'Max Directory ID', -'settings_maxDirID_desc' => 'Maksimalni broj podmapa po nadređenoj mapi. Zadano: 32700.', +'settings_maxDirID_desc' => 'Maksimalni broj podmapa po nadređenoj mapi. Zadano: 0.', 'settings_maxExecutionTime' => 'Max. vrijeme izvršenja (s)', 'settings_maxExecutionTime_desc' => 'Ovo postavlja maksimalno vrijeme u sekundama u kojem je skripti dopušteno da se pokrene prije nego se prekine rasčlanjivanjem', 'settings_maxRecursiveCount' => 'Max. broj rekurzivnog dokumenta/mape', @@ -1325,6 +1327,7 @@ Internet poveznica: [url]', 'status_revisor_removed' => 'Revizor uklonjen s liste', 'status_unknown' => 'Nepoznato', 'storage_size' => 'Veličina pohrane', +'submit_2_fact_auth' => '', 'submit_approval' => 'Pošaljite odobrenje', 'submit_login' => 'PRIJAVI SE', 'submit_password' => 'Postavite novu lozinku', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 2381560da..1f6113650 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (587), ribaz (1023) +// Translators: Admin (588), ribaz (1023) $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => 'Elfogad', 'access_control' => '', 'access_control_is_off' => '', @@ -1124,7 +1126,7 @@ URL: [url]', 'settings_luceneDir' => 'Teljes szöveg index könyvtára', 'settings_luceneDir_desc' => 'Lucene index elérési útvonal', 'settings_maxDirID' => 'Legnagyobb könyvtár azonosító', -'settings_maxDirID_desc' => 'Szülő könyvtárban lévő alkönyvtárak maximális mennyisége, Alapérték: 32700.', +'settings_maxDirID_desc' => 'Szülő könyvtárban lévő alkönyvtárak maximális mennyisége, Alapérték: 0.', 'settings_maxExecutionTime' => 'Maximális végrehajtási idő (s)', 'settings_maxExecutionTime_desc' => 'Beállítja a szkript maximális engedélyezett futási idejét másodpercben mielőtt megszakítja az értelmező', 'settings_maxRecursiveCount' => 'Rekurzív dokumentum/mappa számláló legnagyobb értéke', @@ -1303,6 +1305,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => 'Ismeretlen', 'storage_size' => 'Tároló mérete', +'submit_2_fact_auth' => '', 'submit_approval' => 'Jóváhagyás küldése', 'submit_login' => 'Bejelentkezés', 'submit_password' => 'Új jelszó megadása', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 8656d17ba..0d477efda 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1527), s.pnt (26) +// Translators: Admin (1530), s.pnt (26) $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => 'Accetta', 'access_control' => '', 'access_control_is_off' => '', @@ -518,9 +520,9 @@ URL: [url]', 'hu_HU' => 'Ungherese', 'id' => 'ID', 'identical_version' => 'La nuova versione è identica a quella attuale.', -'import' => '', +'import' => 'Importa', 'importfs' => '', -'import_fs' => '', +'import_fs' => 'Importa dalla cartella di sistema', 'import_fs_warning' => '', 'include_content' => 'Includi contenuto', 'include_documents' => 'Includi documenti', @@ -1148,7 +1150,7 @@ URL: [url]', 'settings_luceneDir' => 'Cartella di indicizzazione fulltext', 'settings_luceneDir_desc' => 'Cartella di memorizzazione dell\'indice utilizzato da Lucene', 'settings_maxDirID' => 'Max numero di ID-Cartella', -'settings_maxDirID_desc' => 'Numero massimo di sottocartelle contenibili in una cartella. Default: 32700.', +'settings_maxDirID_desc' => 'Numero massimo di sottocartelle contenibili in una cartella. Default: 0.', 'settings_maxExecutionTime' => 'Tempo Max di esecuzione (s)', 'settings_maxExecutionTime_desc' => 'Imposta il tempo limite per l\'esecuzione di uno script prima che il parser lo termini.', 'settings_maxRecursiveCount' => 'Conteggio ricursivo Max di files e cartelle', @@ -1327,6 +1329,7 @@ URL: [url]', 'status_revisor_removed' => 'Revisore rimosso dalla lista', 'status_unknown' => 'Sconosciuto', 'storage_size' => 'Spazio di archiviazione', +'submit_2_fact_auth' => '', 'submit_approval' => 'Invio approvazione', 'submit_login' => 'Accedi', 'submit_password' => 'Impostazione nuova password', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index d9ea262eb..f64546c25 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (939), daivoc (418) +// Translators: Admin (940), daivoc (418) $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => '동의', 'access_control' => '', 'access_control_is_off' => '', @@ -1139,7 +1141,7 @@ URL : [url]', 'settings_luceneDir' => '전체 텍스트 인덱스에 대한 디렉토리', 'settings_luceneDir_desc' => 'Lucene 색인 경로', 'settings_maxDirID' => '최대 디렉토리 ID', -'settings_maxDirID_desc' => '상위 디렉토리 당 서브 디렉토리의 최대 수 기본값 : 32700', +'settings_maxDirID_desc' => '', 'settings_maxExecutionTime' => '최대 실행 시간 (들)', 'settings_maxExecutionTime_desc' => '종료되기 전 스크립트의 구문 분석 할 수있는 최대 시간을 초 단위로 설정', 'settings_maxRecursiveCount' => '최대 재귀 문서 / 폴더의 수', @@ -1318,6 +1320,7 @@ URL : [url]', 'status_revisor_removed' => '감사자 목록에서 제거', 'status_unknown' => '알 수없는', 'storage_size' => '저장 크기', +'submit_2_fact_auth' => '', 'submit_approval' => '승인 제출', 'submit_login' => '로그인', 'submit_password' => '새 비밀번호를 설정', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 0c57d84dc..a9bc0c0ad 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (718), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270) +// Translators: Admin (719), gijsbertush (329), pepijn (45), reinoutdijkstra@hotmail.com (270) $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => 'Accept', 'access_control' => 'Toegangscontrole', 'access_control_is_off' => '', @@ -1152,7 +1154,7 @@ URL: [url]', 'settings_luceneDir' => 'Map voor volledigetekst index', 'settings_luceneDir_desc' => 'Pad naar Lucene index', 'settings_maxDirID' => 'Max Map ID', -'settings_maxDirID_desc' => 'Maximaal toegestane aantal submappen per bovenliggende map. Standaard: 32700.', +'settings_maxDirID_desc' => 'Maximaal toegestane aantal submappen per bovenliggende map. Standaard: 0.', 'settings_maxExecutionTime' => 'Max Uitvoertijd (s)', 'settings_maxExecutionTime_desc' => 'Dit bepaald de maximale tijd in seconden waarin een script mag worden uitgevoerd, voordat het afgebroken wordt', 'settings_maxRecursiveCount' => 'Max. nummers of recursieve document/map telling', @@ -1331,6 +1333,7 @@ URL: [url]', 'status_revisor_removed' => 'Verwijderd', 'status_unknown' => 'Onbekend', 'storage_size' => 'Omvang opslag', +'submit_2_fact_auth' => '', 'submit_approval' => 'Verzend [Goedkeuring]', 'submit_login' => 'Log in', 'submit_password' => 'Nieuw wachtwoord instellen', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 2337a101b..f8d1a9095 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (737), netixw (84), romi (93), uGn (112) +// Translators: Admin (739), netixw (84), romi (93), uGn (112) $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => 'Akceptuj', 'access_control' => '', 'access_control_is_off' => '', @@ -507,7 +509,7 @@ URL: [url]', 'identical_version' => 'Nowa wersja jest identyczna z obecną', 'import' => '', 'importfs' => '', -'import_fs' => '', +'import_fs' => 'Import z systemu plików', 'import_fs_warning' => '', 'include_content' => '', 'include_documents' => 'Uwzględnij dokumenty', @@ -1104,7 +1106,7 @@ URL: [url]', 'settings_luceneDir' => 'Katalog dla indeksu pełnotekstowego', 'settings_luceneDir_desc' => 'Ścieżka do indeksu Lucene', 'settings_maxDirID' => 'Maksymalny ID katalogu', -'settings_maxDirID_desc' => 'Maksymalna liczba podkatalogów dla katalogu nadrzędnego. Domyślnie: 32700.', +'settings_maxDirID_desc' => 'Maksymalna liczba podkatalogów dla katalogu nadrzędnego. Domyślnie: 0.', 'settings_maxExecutionTime' => 'Maksymalny czas wykonywania (s)', 'settings_maxExecutionTime_desc' => 'Ustawia maksymalny czas, liczony w sekundach, jaki ma na wykonanie skrypt zanim zostanie zakończony.', 'settings_maxRecursiveCount' => 'Max. liczba rekurencji dokumentów/folderów', @@ -1283,6 +1285,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => 'Nieznany', 'storage_size' => 'Zajętość dysku', +'submit_2_fact_auth' => '', 'submit_approval' => 'Zaakceptuj', 'submit_login' => 'Zaloguj się', 'submit_password' => 'Ustaw nowe hasło', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 459f727a7..06d41fb30 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (909), flaviove (627), lfcristofoli (352) +// Translators: Admin (910), flaviove (627), lfcristofoli (352) $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => 'Aceitar', 'access_control' => '', 'access_control_is_off' => '', @@ -1122,7 +1124,7 @@ URL: [url]', 'settings_luceneDir' => 'Diretório para o índice de texto completo', 'settings_luceneDir_desc' => 'Caminho para o índice Lucene', 'settings_maxDirID' => 'Max Diretório ID', -'settings_maxDirID_desc' => 'O número máximo de sub-diretórios por diretório mãe. Padrão: 32700.', +'settings_maxDirID_desc' => 'O número máximo de sub-diretórios por diretório mãe. Padrão: 0.', 'settings_maxExecutionTime' => 'Max Tempo de Execução (s)', 'settings_maxExecutionTime_desc' => 'Isso define o tempo máximo em segundos que é permitido executar antes de ser finalizado pelo parse', 'settings_maxRecursiveCount' => 'Max. número de contagem de documentos/pasta recursiva', @@ -1301,6 +1303,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => 'Unknown', 'storage_size' => 'Tamanho de armazenamento', +'submit_2_fact_auth' => '', 'submit_approval' => '', 'submit_login' => 'Entrar', 'submit_password' => 'Definir uma nova senha', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index c6eb879b1..8aabc3717 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1043), balan (87) +// Translators: Admin (1044), balan (87) $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => 'Accept', 'access_control' => '', 'access_control_is_off' => '', @@ -1147,7 +1149,7 @@ URL: [url]', 'settings_luceneDir' => 'Directorul pentru indexul de text integral(full text index)', 'settings_luceneDir_desc' => 'Calea catre indexul Lucene', 'settings_maxDirID' => 'ID director Maxim', -'settings_maxDirID_desc' => 'Numărul maxim de sub-directoare pe director părinte. Implicit: 32700.', +'settings_maxDirID_desc' => 'Numărul maxim de sub-directoare pe director părinte. Implicit: 0.', 'settings_maxExecutionTime' => 'Timp Maxim de executie (s)', 'settings_maxExecutionTime_desc' => 'Acesta stabilește timpul maxim în secunde în care un script este permis să ruleze înainte de a fi oprit', 'settings_maxRecursiveCount' => 'Numarul Maxim recursiv de numarare documente/foldere', @@ -1326,6 +1328,7 @@ URL: [url]', 'status_revisor_removed' => 'Revizuitor eliminat din lista', 'status_unknown' => 'Necunoscut', 'storage_size' => 'Dimensiunea de stocare', +'submit_2_fact_auth' => '', 'submit_approval' => 'Trimite aprobare', 'submit_login' => 'Sign in', 'submit_password' => 'Setare parolă nouă', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 143333caa..4d1e34acb 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1543) +// Translators: Admin (1544) $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => 'Принять', 'access_control' => '', 'access_control_is_off' => '', @@ -1154,7 +1156,7 @@ URL: [url]', 'settings_luceneDir' => 'Каталог полнотекстового индекса Lucene', 'settings_luceneDir_desc' => 'Путь, куда Lucene будет записывать свой индекс.', 'settings_maxDirID' => 'Максимальный ID каталога', -'settings_maxDirID_desc' => 'Максимум каталогов в родительском каталоге. По умолчанию 32700.', +'settings_maxDirID_desc' => 'Максимум каталогов в родительском каталоге. По умолчанию 0.', 'settings_maxExecutionTime' => 'Максимальное время выполнения, с', 'settings_maxExecutionTime_desc' => 'Устанавливает максимальное время выполнения скрипта, перед тем как он будет завершён.', 'settings_maxRecursiveCount' => 'Ограничение рекурсивного подсчёта
документов и каталогов', @@ -1333,6 +1335,7 @@ URL: [url]', 'status_revisor_removed' => 'Ревизор удален из списка', 'status_unknown' => 'Неизвестный', 'storage_size' => 'Размер хранилища', +'submit_2_fact_auth' => '', 'submit_approval' => 'Утвердить', 'submit_login' => 'Войти', 'submit_password' => 'Установить новый пароль', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index ff3af7643..868ef5401 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (499), destinqo (19) +// Translators: Admin (512), destinqo (19) $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => 'Prijať', 'access_control' => '', 'access_control_is_off' => '', @@ -204,14 +206,14 @@ URL: [url]', 'choose_role' => '', 'choose_target_category' => '', 'choose_target_document' => 'Vyberte dokument', -'choose_target_file' => '', +'choose_target_file' => 'Vyberte súbor', 'choose_target_folder' => 'Vyberte cieľovú zložku', 'choose_user' => '--Vyberte používateľa--', 'choose_workflow' => '', 'choose_workflow_action' => '', 'choose_workflow_state' => '', 'class_name' => '', -'clear_cache' => '', +'clear_cache' => 'Vyčistiť pamäť cache', 'clear_clipboard' => '', 'clear_password' => '', 'clipboard' => 'Schránka', @@ -384,7 +386,7 @@ URL: [url]', 'files' => 'Súbory', 'files_deletion' => 'Odstránenie súboru', 'files_deletion_warning' => 'Touto akciou môžete odstrániť celú DMS zložku. Verziovacie informácie zostanú viditeľné.', -'files_loading' => '', +'files_loading' => 'Prosím počkajte, kým sa načíta zoznam súborov ...', 'file_size' => 'Veľkosť súboru', 'filter_for_documents' => '', 'filter_for_folders' => '', @@ -505,7 +507,7 @@ URL: [url]', 'keep' => '', 'keep_doc_status' => '', 'keywords' => 'Kľúčové slová', -'keywords_loading' => '', +'keywords_loading' => 'Prosím počkajte, kým sa načíta zoznam kľúčových slov ...', 'keyword_exists' => 'Kľúčové slovo už existuje', 'ko_KR' => 'Kórejčina', 'language' => 'Jazyk', @@ -811,7 +813,7 @@ URL: [url]', 'settings_activate_php_extension' => '', 'settings_adminIP' => '', 'settings_adminIP_desc' => '', -'settings_Advanced' => '', +'settings_Advanced' => 'Rozšírené', 'settings_advancedAcl' => '', 'settings_advancedAcl_desc' => '', 'settings_apache_mod_rewrite' => '', @@ -885,8 +887,8 @@ URL: [url]', 'settings_enableDropUpload_desc' => '', 'settings_enableDuplicateDocNames' => '', 'settings_enableDuplicateDocNames_desc' => '', -'settings_enableEmail' => '', -'settings_enableEmail_desc' => '', +'settings_enableEmail' => 'Povoliť e-mail', +'settings_enableEmail_desc' => 'Povoliť/zakázať automatické emailové upozornenie', 'settings_enableFolderTree' => '', 'settings_enableFolderTree_desc' => '', 'settings_enableFullSearch' => '', @@ -964,7 +966,7 @@ URL: [url]', 'settings_install_welcome_text' => '', 'settings_install_welcome_title' => '', 'settings_install_zendframework' => '', -'settings_language' => '', +'settings_language' => 'Predvolený jazyk', 'settings_language_desc' => '', 'settings_libraryFolder' => '', 'settings_libraryFolder_desc' => '', @@ -1032,11 +1034,11 @@ URL: [url]', 'settings_Server' => '', 'settings_showMissingTranslations' => '', 'settings_showMissingTranslations_desc' => '', -'settings_Site' => '', +'settings_Site' => 'Stránka', 'settings_siteDefaultPage' => '', 'settings_siteDefaultPage_desc' => '', -'settings_siteName' => '', -'settings_siteName_desc' => '', +'settings_siteName' => 'Názov stránky', +'settings_siteName_desc' => 'Názov stránky používaný v nadpisoch. Predvolený: SeedDMS', 'settings_SMTP' => '', 'settings_smtpPassword' => '', 'settings_smtpPassword_desc' => '', @@ -1158,6 +1160,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => 'Neznámy', 'storage_size' => 'Objem dát', +'submit_2_fact_auth' => '', 'submit_approval' => 'Poslať schválenie', 'submit_login' => 'Prihlásiť sa', 'submit_password' => '', @@ -1265,7 +1268,7 @@ URL: [url]', 'user_login' => 'ID používateľa', 'user_management' => 'Používatelia', 'user_name' => 'Plné meno', -'use_comment_of_document' => '', +'use_comment_of_document' => 'Použite komentár dokumentu', 'use_default_categories' => '', 'use_default_keywords' => 'Použiť preddefinované kľúčové slová', 'version' => 'Verzia', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index e87e3d976..b2c7275ed 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1129), tmichelfelder (106) +// Translators: Admin (1130), tmichelfelder (106) $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => 'Godkänn', 'access_control' => '', 'access_control_is_off' => '', @@ -1110,7 +1112,7 @@ URL: [url]', 'settings_luceneDir' => 'Mapp för fulltext-index', 'settings_luceneDir_desc' => 'Sökväg till Lucene-index', 'settings_maxDirID' => 'Max. mapp-ID', -'settings_maxDirID_desc' => 'Högsta antal undermappar per överordnade mapp. Standard: 32700.', +'settings_maxDirID_desc' => 'Högsta antal undermappar per överordnade mapp. Standard: 0.', 'settings_maxExecutionTime' => 'Max. exekveringstid (s)', 'settings_maxExecutionTime_desc' => 'Detta sätter hösta tillåtna tiden i sekunder som ett skript får på sig att utföras innan det avslutas.', 'settings_maxRecursiveCount' => 'Max antal rekursiva dokument/katalog', @@ -1289,6 +1291,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => 'Okänd', 'storage_size' => 'Platsstorlek', +'submit_2_fact_auth' => '', 'submit_approval' => 'Skicka godkännande', 'submit_login' => 'Logga in', 'submit_password' => 'Sätt nytt lösenord', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 1a429e969..487d9e039 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1038), aydin (83) +// Translators: Admin (1039), aydin (83) $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => 'Kabul', 'access_control' => '', 'access_control_is_off' => '', @@ -1126,7 +1128,7 @@ URL: [url]', 'settings_luceneDir' => 'Tam metin dizini', 'settings_luceneDir_desc' => 'Lucene indeks dizini yolu', 'settings_maxDirID' => 'Maks Dizin ID', -'settings_maxDirID_desc' => 'Klasör altında oluşturulabilecek maksimum alt klasör sayısı Varsayılan: 32700.', +'settings_maxDirID_desc' => 'Klasör altında oluşturulabilecek maksimum alt klasör sayısı Varsayılan: 0.', 'settings_maxExecutionTime' => 'Maksimum çalışma zamanı (s)', 'settings_maxExecutionTime_desc' => 'Durdurulmadan önce bir betikin en fazla kaç saniye çalışabileceğini ayarlar', 'settings_maxRecursiveCount' => 'Maks. özyinelemeli doküman/klasör sayısı', @@ -1305,6 +1307,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => 'Bilinmeyen', 'storage_size' => 'Depo boyutu', +'submit_2_fact_auth' => '', 'submit_approval' => 'Onay ver', 'submit_login' => 'Giriş', 'submit_password' => 'Yeni parola ayarla', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index b380e52e0..01348dfd0 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1324) +// Translators: Admin (1325) $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => 'Прийняти', 'access_control' => '', 'access_control_is_off' => '', @@ -1147,7 +1149,7 @@ URL: [url]', 'settings_luceneDir' => 'Каталог повнотекстового індексу Lucene', 'settings_luceneDir_desc' => 'Шлях, куди Lucene буде записувати свій індекс.', 'settings_maxDirID' => 'Максимальний ID каталогу', -'settings_maxDirID_desc' => 'Максимум каталогів у батьківському каталозі. По замовчуванню 32700.', +'settings_maxDirID_desc' => 'Максимум каталогів у батьківському каталозі. По замовчуванню 0.', 'settings_maxExecutionTime' => 'Максимальний час виконання, с', 'settings_maxExecutionTime_desc' => 'Встановлює максимальний час виконання скрипта, перед тим як він буде завершений.', 'settings_maxRecursiveCount' => 'Обмеження рекурсивного підрахунку
документів і каталогів', @@ -1326,6 +1328,7 @@ URL: [url]', 'status_revisor_removed' => 'Ревізора видалено зі списку', 'status_unknown' => 'Невідомий', 'storage_size' => 'Розмір сховища', +'submit_2_fact_auth' => '', 'submit_approval' => 'Затвердити', 'submit_login' => 'Увійти', 'submit_password' => 'Встановити новий пароль', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 23f41ba59..b45f42309 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (637), fengjohn (5) +// Translators: Admin (638), fengjohn (5) $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => '接受', 'access_control' => '', 'access_control_is_off' => '', @@ -981,7 +983,7 @@ URL: [url]', 'settings_luceneDir' => '', 'settings_luceneDir_desc' => '', 'settings_maxDirID' => '最大目录编号', -'settings_maxDirID_desc' => '每个父目录的子目录的最大数目。默认值：32700。', +'settings_maxDirID_desc' => '每个父目录的子目录的最大数目。默认值：0。', 'settings_maxExecutionTime' => '最大执行时间（秒）', 'settings_maxExecutionTime_desc' => '此设置最长时间，以秒为脚本允许运行之前它是由解析终止', 'settings_maxRecursiveCount' => '', @@ -1160,6 +1162,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => '未知', 'storage_size' => '存储大小', +'submit_2_fact_auth' => '', 'submit_approval' => '提交审核', 'submit_login' => '登录', 'submit_password' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index ced16d3ea..2d5cb8085 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -19,10 +19,12 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (2369) +// Translators: Admin (2370) $text = array( '2_factor_auth' => '', +'2_factor_auth_info' => '', +'2_fact_auth_secret' => '', 'accept' => '接受', 'access_control' => '', 'access_control_is_off' => '', @@ -979,7 +981,7 @@ URL: [url]', 'settings_luceneDir' => '', 'settings_luceneDir_desc' => '', 'settings_maxDirID' => '最大目錄編號', -'settings_maxDirID_desc' => '每個父目錄的子目錄的最大數目。預設值：32700。', +'settings_maxDirID_desc' => '每個父目錄的子目錄的最大數目。預設值：0。', 'settings_maxExecutionTime' => '最大執行時間（秒）', 'settings_maxExecutionTime_desc' => '此設置最長時間，以秒為腳本允許運行之前它是由解析終止', 'settings_maxRecursiveCount' => '', @@ -1158,6 +1160,7 @@ URL: [url]', 'status_revisor_removed' => '', 'status_unknown' => '未知', 'storage_size' => '存儲大小', +'submit_2_fact_auth' => '', 'submit_approval' => '提交審核', 'submit_login' => '登錄', 'submit_password' => '', From 506e63f8d6dd91d571b815db2a52534eeb6cb90f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 27 Jul 2016 08:29:52 +0200 Subject: [PATCH 06/65] add fold marks --- SeedDMS_Core/Core/inc.ClassGroup.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php index eddc7630a..54fc3c88f 100644 --- a/SeedDMS_Core/Core/inc.ClassGroup.php +++ b/SeedDMS_Core/Core/inc.ClassGroup.php @@ -21,7 +21,7 @@ * @copyright Copyright (C) 2002-2005 Markus Westphal, 2006-2008 Malcolm Cowe, 2010 Uwe Steinmann * @version Release: @package_version@ */ -class SeedDMS_Core_Group { +class SeedDMS_Core_Group { /* {{{ */ /** * The id of the user group * @@ -379,5 +379,5 @@ class SeedDMS_Core_Group { return $notifications; } /* }}} */ -} +} /* }}} */ ?> From d167c565ced266600d7ccc11d36ef6a7a2720a0a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 27 Jul 2016 08:57:51 +0200 Subject: [PATCH 07/65] include Utils.php earlier --- op/op.OverrideContentStatus.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op/op.OverrideContentStatus.php b/op/op.OverrideContentStatus.php index 6aa0a58bf..caba75318 100644 --- a/op/op.OverrideContentStatus.php +++ b/op/op.OverrideContentStatus.php @@ -20,10 +20,10 @@ include("../inc/inc.Settings.php"); include("../inc/inc.LogInit.php"); +include("../inc/inc.Utils.php"); include("../inc/inc.Language.php"); include("../inc/inc.Init.php"); include("../inc/inc.Extension.php"); -include("../inc/inc.Utils.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.ClassUI.php"); include("../inc/inc.Authentication.php"); From 953ccc1eb0fb69e24ca64ce29c163f13aaed1412 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 27 Jul 2016 21:08:15 +0200 Subject: [PATCH 08/65] add expiration date to list of documents --- views/bootstrap/class.Bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index e7d9c103c..2b5e13304 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1717,7 +1717,7 @@ $(document).ready( function() { $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; $content .= "" . htmlspecialchars($document->getName()) . ""; - $content .= "
".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".date('Y-m-d', $document->getDate()).", ".getMLText('version')." ".$version." - ".date('Y-m-d', $latestContent->getDate()).""; + $content .= "
".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".date('Y-m-d', $document->getDate()).", ".getMLText('version')." ".$version." - ".date('Y-m-d', $latestContent->getDate())."".($document->expires() ? ", ".getMLText('expires').": ".getReadableDate($document->getExpires())."" : "").""; if($comment) { $content .= "
".htmlspecialchars($comment).""; } From f6c9b35def702a79d4c611081b1f76936d5cc33c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 27 Jul 2016 21:08:26 +0200 Subject: [PATCH 09/65] add entry for 4.3.28 --- CHANGELOG | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 0af714074..c427f64e7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +-------------------------------------------------------------------------------- + Changes in version 4.3.28 +-------------------------------------------------------------------------------- +- add expiration in list of documents + -------------------------------------------------------------------------------- Changes in version 4.3.27 -------------------------------------------------------------------------------- From 398244ab68bd506d1f453fc6a34675f9026e8113 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 28 Jul 2016 08:05:40 +0200 Subject: [PATCH 10/65] add $_comment as protected var, add some more documentation --- SeedDMS_Core/Core/inc.ClassGroup.php | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php index 54fc3c88f..bd092e226 100644 --- a/SeedDMS_Core/Core/inc.ClassGroup.php +++ b/SeedDMS_Core/Core/inc.ClassGroup.php @@ -36,6 +36,13 @@ class SeedDMS_Core_Group { /* {{{ */ */ protected $_name; + /** + * The comment of the user group + * + * @var string + */ + protected $_comment; + /** * Back reference to DMS this user group belongs to * @@ -145,8 +152,14 @@ class SeedDMS_Core_Group { /* {{{ */ return true; } /* }}} */ - // $asManager=false: verify if user is in group - // $asManager=true : verify if user is in group as manager + /** + * Check if user is member of group + * + * @param object $user user to be checked + * @param boolean $asManager also check whether user is manager of group if + * set to true, otherwise does not care about manager status + * @return boolean true if user is member, otherwise false + */ function isMember($user,$asManager=false) { /* {{{ */ if (isset($this->_users)&&!$asManager) { foreach ($this->_users as $usr) @@ -167,6 +180,12 @@ class SeedDMS_Core_Group { /* {{{ */ return true; } /* }}} */ + /** + * Toggle manager status of user + * + * @param object $user + * @return boolean true if operation was successful, otherwise false + */ function toggleManager($user) { /* {{{ */ $db = $this->_dms->getDB(); From d9ffaad68877e5fae17c28141c17448c863a5650 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 29 Jul 2016 08:00:43 +0200 Subject: [PATCH 11/65] new translations for attritbute groups --- languages/ar_EG/lang.inc | 13 +++++++++++-- languages/bg_BG/lang.inc | 9 +++++++++ languages/ca_ES/lang.inc | 9 +++++++++ languages/cs_CZ/lang.inc | 9 +++++++++ languages/de_DE/lang.inc | 21 +++++++++++++++------ languages/en_GB/lang.inc | 11 ++++++++++- languages/es_ES/lang.inc | 9 +++++++++ languages/fr_FR/lang.inc | 17 +++++++++++++---- languages/hr_HR/lang.inc | 9 +++++++++ languages/hu_HU/lang.inc | 9 +++++++++ languages/it_IT/lang.inc | 9 +++++++++ languages/ko_KR/lang.inc | 9 +++++++++ languages/nl_NL/lang.inc | 9 +++++++++ languages/pl_PL/lang.inc | 9 +++++++++ languages/pt_BR/lang.inc | 9 +++++++++ languages/ro_RO/lang.inc | 9 +++++++++ languages/ru_RU/lang.inc | 9 +++++++++ languages/sk_SK/lang.inc | 9 +++++++++ languages/sv_SE/lang.inc | 9 +++++++++ languages/tr_TR/lang.inc | 9 +++++++++ languages/uk_UA/lang.inc | 9 +++++++++ languages/zh_CN/lang.inc | 15 ++++++++++++--- languages/zh_TW/lang.inc | 13 +++++++++++-- 23 files changed, 225 insertions(+), 18 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 7d05b2e68..4596e5c60 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/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 (1267) +// Translators: Admin (1268) $text = array( '2_factor_auth' => '', @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => 'تنقيح', 'add' => 'إضافة', 'add_approval' => 'ادخال موافقة', +'add_attrdefgroup' => '', 'add_document' => 'إضافة مستند', 'add_document_link' => 'إضافة رابط', 'add_document_notify' => 'ﺖﺨﺼﻴﺻ ﺎﺸﻋﺍﺭ', @@ -118,6 +119,10 @@ URL: [url]', 'assign_reviewers' => 'تخصيص مراجعون', 'assign_user_property_to' => 'تخصيص خصائص المستخدم الى', 'assumed_released' => 'يعتبر تم نشره', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => 'تعريف السمة بالفعل موجود', 'attrdef_info' => '', 'attrdef_in_use' => 'تعريف السمة مشغول حاليا', @@ -212,6 +217,7 @@ URL: [url]', 'checkout_document' => '', 'checkout_is_disabled' => '', 'choose_attrdef' => 'من فضلك اختر تعريف السمة', +'choose_attrdefgroup' => '', 'choose_category' => 'من فضلك اختر', 'choose_group' => 'اختر المجموعة', 'choose_role' => '', @@ -480,6 +486,7 @@ URL: [url]', 'fullsearch' => 'البحث النصي الكامل', 'fullsearch_hint' => 'استخدم فهرس النص الكامل', 'fulltext_info' => 'معلومات فهرس النص الكامل', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => 'سمات', 'global_default_keywords' => 'كلمات بحثية عامة', 'global_document_categories' => 'اقسام', @@ -710,7 +717,7 @@ URL: [url]', 'no_update_cause_locked' => 'لايمكنك تعديل المستند. قم بمخاطبة المستخدم الذي قام بحمايته من التعديل', 'no_user_image' => 'لا يوجد صورة متاحة', 'no_version_check' => '', -'no_version_modification' => '', +'no_version_modification' => 'ﻻ ﺖﻋﺪﻴﻟ ﻊﻠﻳ ﺎﻠﻨﺴﺧﺓ', 'no_workflow_available' => '', 'objectcheck' => 'التحقق من مستند/مجلد', 'obsolete' => 'مهمل', @@ -856,6 +863,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: [name] - اعادة بدء مسار العمل', 'rewind_workflow_warning' => 'لو قمت باعادة تشغيل مسار العمل لحالته الاصلية، سيتم مسح سجلات مسار العمل للمستند ولايمكن استعادته', 'rm_attrdef' => 'ازالة تعريف سمة', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => 'ازالة القسم', 'rm_document' => 'ازالة المستند', 'rm_document_category' => 'ازالة القسم', @@ -913,6 +921,7 @@ URL: [url]', 'search_time' => 'الوقت المتبقي: [time] sec.', 'seconds' => 'ثواني', 'selection' => 'اختيار', +'select_attrdefgrp_show' => '', 'select_category' => 'اضغط لاختيار قسم', 'select_groups' => 'اضغط لاختيار مجموعة', 'select_grp_approvers' => 'اضغط لاختيار مجموعة الموافقون', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 79a65c330..d0c54d687 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -50,6 +50,7 @@ $text = array( 'action_revise' => 'Ревизия', 'add' => 'Добави', 'add_approval' => 'Утвърди', +'add_attrdefgroup' => '', 'add_document' => 'Добави документ', 'add_document_link' => 'Добави препратка', 'add_document_notify' => '', @@ -109,6 +110,10 @@ $text = array( 'assign_reviewers' => 'Назначи рецензенти', 'assign_user_property_to' => 'Назначи свойства на потребителя', 'assumed_released' => 'Утверден', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => 'Тази дефиниция на атрибути вече съществува', 'attrdef_info' => '', 'attrdef_in_use' => 'Тази дефиниция на атрибути все още се ползва', @@ -197,6 +202,7 @@ $text = array( 'checkout_document' => '', 'checkout_is_disabled' => '', 'choose_attrdef' => 'Изберете attribute definition', +'choose_attrdefgroup' => '', 'choose_category' => 'Изберете', 'choose_group' => 'Изберете група', 'choose_role' => '', @@ -411,6 +417,7 @@ $text = array( 'fullsearch' => 'Пълнотекстово търсене', 'fullsearch_hint' => 'Използвай пълнотекстов индекс', 'fulltext_info' => 'Информация за пълнотекстов индексе', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => 'атрибути', 'global_default_keywords' => 'Глобални ключови думи', 'global_document_categories' => 'Категории', @@ -728,6 +735,7 @@ $text = array( 'rewind_workflow_email_subject' => '', 'rewind_workflow_warning' => 'Ако превъртите процеса до неговото начало, целия log на процеса за този документ ще бъде изтрит и нема връщане.', 'rm_attrdef' => 'Премахни дефиниция на атрибути', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => 'Премахни категория', 'rm_document' => 'Премахни документ', 'rm_document_category' => 'Премахни категория', @@ -778,6 +786,7 @@ $text = array( 'search_time' => 'Изминаха: [time] sec.', 'seconds' => 'секунди', 'selection' => 'Избор', +'select_attrdefgrp_show' => '', 'select_category' => '', 'select_groups' => 'Кликни да избереш групи', 'select_grp_approvers' => 'Кликни да избереш група утвърждаващи', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index fef9204b4..bbc4be098 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -50,6 +50,7 @@ $text = array( 'action_revise' => '', 'add' => 'Afegir', 'add_approval' => 'Enviar aprovació', +'add_attrdefgroup' => '', 'add_document' => 'Afegir document', 'add_document_link' => 'Afegir vincle', 'add_document_notify' => '', @@ -114,6 +115,10 @@ URL: [url]', 'assign_reviewers' => 'Assignar revisors', 'assign_user_property_to' => 'Assignar propietats d\'usuari a', 'assumed_released' => 'Se suposa com a publicat', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => '', 'attrdef_info' => '', 'attrdef_in_use' => '', @@ -202,6 +207,7 @@ URL: [url]', 'checkout_document' => '', 'checkout_is_disabled' => '', 'choose_attrdef' => '', +'choose_attrdefgroup' => '', 'choose_category' => '--Elegir categoria--', 'choose_group' => '--Seleccionar grup--', 'choose_role' => '', @@ -416,6 +422,7 @@ URL: [url]', 'fullsearch' => '', 'fullsearch_hint' => '', 'fulltext_info' => '', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => '', 'global_default_keywords' => 'Mots clau globals', 'global_document_categories' => 'Categories', @@ -733,6 +740,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '', 'rewind_workflow_warning' => '', 'rm_attrdef' => '', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => 'Eliminar categoria', 'rm_document' => 'Eliminar document', 'rm_document_category' => '', @@ -783,6 +791,7 @@ URL: [url]', 'search_time' => 'Temps transcorregut: [time] seg.', 'seconds' => '', 'selection' => 'Selecció', +'select_attrdefgrp_show' => '', 'select_category' => '', 'select_groups' => '', 'select_grp_approvers' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 42d3d203a..7b556cba1 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => 'Revidovat', 'add' => 'Přidat', 'add_approval' => 'Poslat ke schválení', +'add_attrdefgroup' => '', 'add_document' => 'Přidat dokument', 'add_document_link' => 'Přidat odkaz', 'add_document_notify' => 'Přiřaďte oznámení', @@ -125,6 +126,10 @@ URL: [url]', 'assign_reviewers' => 'Přiřazení kontroloři', 'assign_user_property_to' => 'Přiřazení uživatelských vlastností', 'assumed_released' => 'Pokládá se za zveřejněné', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => 'Definice atributů již existuje', 'attrdef_info' => '', 'attrdef_in_use' => 'Definice atributů je ještě užívána', @@ -219,6 +224,7 @@ URL: [url]', 'checkout_document' => '', 'checkout_is_disabled' => '', 'choose_attrdef' => 'Zvolte definici atributů', +'choose_attrdefgroup' => '', 'choose_category' => '--Vyberte prosím--', 'choose_group' => '--Vyberte skupinu--', 'choose_role' => '', @@ -487,6 +493,7 @@ URL: [url]', 'fullsearch' => 'Fulltextové vyhledávání', 'fullsearch_hint' => 'Použijte fultext index', 'fulltext_info' => 'Fulltext index info', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => 'Atributy', 'global_default_keywords' => 'Globální klíčová slova', 'global_document_categories' => 'Globální kategorie', @@ -865,6 +872,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: [name] - Nové spuštění pracovního postupu', 'rewind_workflow_warning' => 'Pokud spustíte znovu pracovní postup, potom záznam o dosavadním průběhu bude trvale smazán', 'rm_attrdef' => 'Odstranit definici atributu', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => 'Smazat kategorii', 'rm_document' => 'Odstranit dokument', 'rm_document_category' => 'Vymazat kategorii', @@ -922,6 +930,7 @@ URL: [url]', 'search_time' => 'Uplynulý čas: [time] sek', 'seconds' => 'sekundy', 'selection' => 'Výběr', +'select_attrdefgrp_show' => '', 'select_category' => 'Kliknutím vyberte kategorii', 'select_groups' => 'Kliknutím vyberte skupiny', 'select_grp_approvers' => 'Kliknutím vyberte skupinu schvalovatele', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 3bb856412..aeb8de847 100644 --- a/languages/de_DE/lang.inc +++ b/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 (2247), dgrutsch (21) +// Translators: Admin (2263), dgrutsch (21) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => 'Erneut prüfen', 'add' => 'Anlegen', 'add_approval' => 'Freigabe hinzufügen', +'add_attrdefgroup' => 'Neue Attributgruppe anlegen', 'add_document' => 'Dokument anlegen', 'add_document_link' => 'Verweis hinzufügen', 'add_document_notify' => 'Beobachter zuweisen', @@ -130,6 +131,10 @@ URL: [url]', 'assign_reviewers' => 'Prüfer zuweisen', 'assign_user_property_to' => 'Dokumente einem anderen Benutzer zuweisen', 'assumed_released' => 'Angenommen, freigegeben', +'attrdefgroup_management' => 'Attributgruppenverwaltung', +'attrdefgrp_show_detail' => 'Details', +'attrdefgrp_show_list' => 'Liste', +'attrdefgrp_show_search' => 'Suche', 'attrdef_exists' => 'Attributdefinition existiert bereits', 'attrdef_info' => 'Information', 'attrdef_in_use' => 'Definition des Attributs noch in Gebrauch', @@ -223,15 +228,16 @@ URL: [url]', 'checkin_document' => 'Einchecken', 'checkout_document' => 'Auschecken', 'checkout_is_disabled' => 'Auschecken von Dokumenten ist in der Konfiguration ausgeschaltet.', -'choose_attrdef' => '--Attributdefinition wählen--', -'choose_category' => '--Kategorie wählen--', -'choose_group' => '--Gruppe wählen--', -'choose_role' => '--Role wählen--', +'choose_attrdef' => 'Attributdefinition wählen', +'choose_attrdefgroup' => 'Attributgruppe wählen', +'choose_category' => 'Kategorie wählen', +'choose_group' => 'Gruppe wählen', +'choose_role' => 'Role wählen', 'choose_target_category' => 'Kategorie wählen', 'choose_target_document' => 'Dokument wählen', 'choose_target_file' => 'Datei wählen', 'choose_target_folder' => 'Zielordner wählen', -'choose_user' => '--Benutzer wählen--', +'choose_user' => 'Benutzer wählen', 'choose_workflow' => 'Workflow wählen', 'choose_workflow_action' => 'Workflow-Aktion wählen', 'choose_workflow_state' => 'Workflow-Status wählen', @@ -492,6 +498,7 @@ URL: [url]', 'fullsearch' => 'Volltext', 'fullsearch_hint' => 'Volltextindex benutzen', 'fulltext_info' => 'Volltext-Index Info', +'global_attributedefinitiongroups' => 'Attributgruppen', 'global_attributedefinitions' => 'Attribute', 'global_default_keywords' => 'Globale Stichwortlisten', 'global_document_categories' => 'Kategorien', @@ -902,6 +909,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: [name] - Workflow wurde zurückgestellt', 'rewind_workflow_warning' => 'Wenn Sie einen Workflow in den Anfangszustand zurückversetzen, dann werden alle bisherigen Aktionen und Kommentare unwiederbringlich gelöscht.', 'rm_attrdef' => 'Attributdefinition löschen', +'rm_attrdefgroup' => 'Diese Attributgruppe löschen', 'rm_default_keyword_category' => 'Kategorie löschen', 'rm_document' => 'Löschen', 'rm_document_category' => 'Lösche Kategorie', @@ -959,6 +967,7 @@ URL: [url]', 'search_time' => 'Dauer: [time] sek.', 'seconds' => 'Sekunden', 'selection' => 'Auswahl', +'select_attrdefgrp_show' => 'Anzeigeort auswählen', 'select_category' => 'Klicken zur Auswahl einer Kategorie', 'select_groups' => 'Klicken zur Auswahl einer Gruppe', 'select_grp_approvers' => 'Klicken zur Auswahl einer Freigabegruppe', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 165271dba..e243e345b 100644 --- a/languages/en_GB/lang.inc +++ b/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 (1399), dgrutsch (7), netixw (14) +// Translators: Admin (1410), dgrutsch (7), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => 'Revise', 'add' => 'Add', 'add_approval' => 'Add approval', +'add_attrdefgroup' => 'Add new attribute group', 'add_document' => 'Add document', 'add_document_link' => 'Add link', 'add_document_notify' => 'Assign notification', @@ -130,6 +131,10 @@ URL: [url]', 'assign_reviewers' => 'Assign Reviewers', 'assign_user_property_to' => 'Assign user\'s properties to', 'assumed_released' => 'Assumed released', +'attrdefgroup_management' => 'Attribute groups managament', +'attrdefgrp_show_detail' => 'Details', +'attrdefgrp_show_list' => 'list', +'attrdefgrp_show_search' => 'Search', 'attrdef_exists' => 'Attribute definition already exists', 'attrdef_info' => 'Information', 'attrdef_in_use' => 'Attribute definition still in use', @@ -224,6 +229,7 @@ URL: [url]', 'checkout_document' => 'Check out', 'checkout_is_disabled' => 'Check out of documents is disabled in the configuration.', 'choose_attrdef' => 'Please choose attribute definition', +'choose_attrdefgroup' => 'Choose attribute group', 'choose_category' => 'Please choose', 'choose_group' => 'Choose group', 'choose_role' => '--Choose role--', @@ -492,6 +498,7 @@ URL: [url]', 'fullsearch' => 'Full text search', 'fullsearch_hint' => 'Use fulltext index', 'fulltext_info' => 'Fulltext index info', +'global_attributedefinitiongroups' => 'Attribute groups', 'global_attributedefinitions' => 'Attributes', 'global_default_keywords' => 'Global keywords', 'global_document_categories' => 'Categories', @@ -903,6 +910,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: [name] - Workflow was rewinded', 'rewind_workflow_warning' => 'If you rewind a workflow to its initial state, then the whole workflow log for this document will be deleted and cannot be recovered.', 'rm_attrdef' => 'Remove attribute definition', +'rm_attrdefgroup' => 'Remove this attribute group', 'rm_default_keyword_category' => 'Remove category', 'rm_document' => 'Remove document', 'rm_document_category' => 'Remove category', @@ -960,6 +968,7 @@ URL: [url]', 'search_time' => 'Elapsed time: [time] sec.', 'seconds' => 'seconds', 'selection' => 'Selection', +'select_attrdefgrp_show' => 'Choose when to show', 'select_category' => 'Click to select category', 'select_groups' => 'Click to select groups', 'select_grp_approvers' => 'Click to select group approver', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index e14373269..e75977c3e 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => 'Revisar', 'add' => 'Añadir', 'add_approval' => 'Enviar aprobación', +'add_attrdefgroup' => '', 'add_document' => 'Añadir documento', 'add_document_link' => 'Añadir vínculo', 'add_document_notify' => 'Asignar notificación', @@ -125,6 +126,10 @@ URL: [url]', 'assign_reviewers' => 'Asignar revisores', 'assign_user_property_to' => 'Asignar propiedades de usuario a', 'assumed_released' => 'Supuestamente publicado', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => 'Definición de atributos ya existe', 'attrdef_info' => '', 'attrdef_in_use' => 'Definición de atributo en uso', @@ -219,6 +224,7 @@ URL: [url]', 'checkout_document' => '', 'checkout_is_disabled' => '', 'choose_attrdef' => 'Por favor, seleccione definición de atributo', +'choose_attrdefgroup' => '', 'choose_category' => 'Seleccione categoría', 'choose_group' => 'Seleccione grupo', 'choose_role' => '', @@ -487,6 +493,7 @@ URL: [url]', 'fullsearch' => 'Búsqueda en texto completo', 'fullsearch_hint' => 'Utilizar índice de texto completo', 'fulltext_info' => 'Información de índice de texto completo', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => 'Definición de atributos', 'global_default_keywords' => 'Palabras clave globales', 'global_document_categories' => 'Categorías', @@ -871,6 +878,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: [name] - El flujo de trabajo fue retrocedido', 'rewind_workflow_warning' => 'Si su flujo de trabajo fue retrocedido a su estado inicial, todo el log del flujo de trabajo de este documento será borrado y no se podrá recuperar.', 'rm_attrdef' => 'Eliminar definición de atributo', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => 'Eliminar categoría', 'rm_document' => 'Eliminar documento', 'rm_document_category' => 'Eliminar categoría', @@ -928,6 +936,7 @@ URL: [url]', 'search_time' => 'Tiempo transcurrido: [time] seg.', 'seconds' => 'segundos', 'selection' => 'Selección', +'select_attrdefgrp_show' => '', 'select_category' => 'Haga Click para seleccionar categoría', 'select_groups' => 'Haga Click para seleccionar grupos', 'select_grp_approvers' => 'Haga Click para seleccionar grupo de aprobadores', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index bbae6fb42..2e2224b1d 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/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 (1033), jeromerobert (50), lonnnew (9) +// Translators: Admin (1038), jeromerobert (50), lonnnew (9) $text = array( '2_factor_auth' => '', @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => 'Réviser', 'add' => 'Ajouter', 'add_approval' => 'Soumettre approbation', +'add_attrdefgroup' => '', 'add_document' => 'Ajouter un document', 'add_document_link' => 'Ajouter un lien', 'add_document_notify' => 'Assigner une notification', @@ -125,6 +126,10 @@ URL : [url]', 'assign_reviewers' => 'Correcteurs désignés', 'assign_user_property_to' => 'Assigner les propriétés de l\'utilisateur à', 'assumed_released' => 'Supposé publié', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => 'La définition d\'attribut existe déjà', 'attrdef_info' => '', 'attrdef_in_use' => 'La définition d\'attribut est en cours d\'utilisation', @@ -219,6 +224,7 @@ URL: [url]', 'checkout_document' => '', 'checkout_is_disabled' => '', 'choose_attrdef' => 'Choisissez une définition d\'attribut', +'choose_attrdefgroup' => '', 'choose_category' => 'SVP choisir', 'choose_group' => 'Choisir un groupe', 'choose_role' => '', @@ -487,6 +493,7 @@ URL: [url]', 'fullsearch' => 'Recherche dans le contenu', 'fullsearch_hint' => 'Utiliser la recherche plein texte', 'fulltext_info' => 'Information sur l\'index plein texte', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => 'Définitions d\'attributs', 'global_default_keywords' => 'Mots-clés globaux', 'global_document_categories' => 'Catégories', @@ -516,7 +523,7 @@ URL: [url]', 'identical_version' => 'Nouvelle version identique à l\'actuelle.', 'import' => '', 'importfs' => '', -'import_fs' => '', +'import_fs' => 'Importer depuis le système de fichiers', 'import_fs_warning' => '', 'include_content' => '', 'include_documents' => 'Inclure les documents', @@ -609,8 +616,8 @@ URL: [url]', 'manager_of_group' => 'Vous êtes le gestionnaire de ce groupe', 'mandatory_approvergroups' => 'Obligatoire : groupes de valideurs', 'mandatory_approvergroup_no_access' => 'Groupe requis d\'approbateurs \'[group]\' ne dispose pas des droits suffisants', -'mandatory_approvers' => '', -'mandatory_approver_no_access' => '', +'mandatory_approvers' => 'Approbateurs désignés', +'mandatory_approver_no_access' => 'L\'approbateur désigné \'[user]\' ne dispose pas des droits d\'accès suffisants.', 'mandatory_reviewergroups' => 'Obligatoire : groupe des relecteurs', 'mandatory_reviewergroup_no_access' => 'Groupe d\'examinateurs \'[group]\' ne dispose pas des droits suffisants', 'mandatory_reviewers' => 'Examinateurs', @@ -854,6 +861,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: [name] - Le workflow a été réinitialisé', 'rewind_workflow_warning' => 'Si vous remonter à l\'état initial du workflow, le log de workflow de ce document sera supprimé et impossible à récupérer.', 'rm_attrdef' => 'Retirer définition d\'attribut', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => 'Supprimer la catégorie', 'rm_document' => 'Supprimer le document', 'rm_document_category' => 'Supprimer la catégorie', @@ -904,6 +912,7 @@ URL: [url]', 'search_time' => 'Temps écoulé: [time] sec.', 'seconds' => 'secondes', 'selection' => 'Sélection', +'select_attrdefgrp_show' => '', 'select_category' => 'Cliquer pour choisir une catégorie', 'select_groups' => 'Cliquer pour choisir un groupe', 'select_grp_approvers' => 'Cliquer pour choisir un groupe d\'approbateur', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 9275bd4fe..77299c3d6 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -54,6 +54,7 @@ Internet poveznica: [url]', 'action_revise' => 'Izmijeni', 'add' => 'Dodaj', 'add_approval' => 'Dodaj odobrenje', +'add_attrdefgroup' => '', 'add_document' => 'Dodaj dokument', 'add_document_link' => 'Dodaj poveznicu', 'add_document_notify' => 'Dodijeli obavještavanje', @@ -130,6 +131,10 @@ Internet poveznica: [url]', 'assign_reviewers' => 'Dodijeli recezente', 'assign_user_property_to' => 'Dodijeli svojstva korisnika za', 'assumed_released' => 'Podrazumijevano obrađeno', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => 'Definicija atributa već postoji', 'attrdef_info' => '', 'attrdef_in_use' => 'Definicija atributa se već koristi', @@ -224,6 +229,7 @@ Internet poveznica: [url]', 'checkout_document' => 'Odjava', 'checkout_is_disabled' => 'Odjava dokumenata je onemogućena u konfiguraciji.', 'choose_attrdef' => 'Molim odaberite definiciju atributa', +'choose_attrdefgroup' => '', 'choose_category' => 'Molim odaberite', 'choose_group' => 'Odaberite grupu', 'choose_role' => '', @@ -492,6 +498,7 @@ Internet poveznica: [url]', 'fullsearch' => 'Pretraživanje cijelog teksta', 'fullsearch_hint' => 'Koristi indeks cijelog teksta', 'fulltext_info' => 'Informacije cijelog teksta', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => 'Atributi', 'global_default_keywords' => 'Globalne ključne riječi', 'global_document_categories' => 'Kategorije', @@ -892,6 +899,7 @@ Internet poveznica: [url]', 'rewind_workflow_email_subject' => '[sitename]: [name] - Tok rada je vraćen na početak', 'rewind_workflow_warning' => 'Ako vratite tok radan u njegovo početno, prijašnji zapisi o tijeku rada za ovaj dokument bit će izbrisani i ne mogu se vratiti.', 'rm_attrdef' => 'Uklonite definiciju atributa', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => 'Uklonite kategoriju', 'rm_document' => 'Ukloni dokument', 'rm_document_category' => 'Uklonite kategoriju', @@ -949,6 +957,7 @@ Internet poveznica: [url]', 'search_time' => 'Proteklo vrijeme: [time] sek.', 'seconds' => 'sekunde', 'selection' => 'Odabir', +'select_attrdefgrp_show' => '', 'select_category' => 'Kliknite za odabir kategorije', 'select_groups' => 'Kliknite za odabir grupa', 'select_grp_approvers' => 'Kliknite za odabir validatora grupe', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 1f6113650..672561adb 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => 'Felülvizsgálat', 'add' => 'Hozzáad', 'add_approval' => 'Jóváhagyás küldése', +'add_attrdefgroup' => '', 'add_document' => 'Dokumentum hozzáadása', 'add_document_link' => 'Hivatkozás hozzáadása', 'add_document_notify' => 'Hozzárendelés értesítés', @@ -125,6 +126,10 @@ URL: [url]', 'assign_reviewers' => 'Felülvizsgálók hozzárendelése', 'assign_user_property_to' => 'Felhasználói tulajdonságok hozzárendelése', 'assumed_released' => 'Feltételesen kiadott', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => 'Jellemző meghatározás már létezik', 'attrdef_info' => '', 'attrdef_in_use' => 'Jellemző meghatározás még használatban van', @@ -219,6 +224,7 @@ URL: [url]', 'checkout_document' => '', 'checkout_is_disabled' => '', 'choose_attrdef' => 'Kérem válasszon jellemző meghatározást', +'choose_attrdefgroup' => '', 'choose_category' => 'Kérjük válasszon', 'choose_group' => 'Válasszon csoportot', 'choose_role' => '', @@ -487,6 +493,7 @@ URL: [url]', 'fullsearch' => 'Keresés a teljes szövegben', 'fullsearch_hint' => 'Használja a teljes szöveg indexet', 'fulltext_info' => 'Teljes szöveg index információ', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => 'Jellemzők', 'global_default_keywords' => 'Globális kulcsszavak', 'global_document_categories' => 'Kategóriák', @@ -871,6 +878,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: [name] - Munkafolyamat visszajátszva', 'rewind_workflow_warning' => 'Ha visszajátssza a munkafolyamatot a kezdeti állapotába, akkor a teljes munkafolyamat napló törlésre kerül és többé nem lehet helyreállítani.', 'rm_attrdef' => 'Jellemző meghatározás eltávolítása', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => 'Kategória eltávolítása', 'rm_document' => 'Dokumentum eltávolítása', 'rm_document_category' => 'Kategória eltávolítása', @@ -927,6 +935,7 @@ URL: [url]', 'search_time' => 'Felhasznßlt id: [time] mßsodperc.', 'seconds' => 'másodperc', 'selection' => 'Selection', +'select_attrdefgrp_show' => '', 'select_category' => 'Kattintson a kategória kiválasztásához', 'select_groups' => 'Kattintson a csoportok kijelöléséhez', 'select_grp_approvers' => 'Kattintson a csoport jóváhagyó kijelöléséhez', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 0d477efda..7a6a418a1 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => 'Revisiona', 'add' => 'Aggiungi', 'add_approval' => 'Invio approvazione', +'add_attrdefgroup' => '', 'add_document' => 'Aggiungi documento', 'add_document_link' => 'Aggiungi collegamento', 'add_document_notify' => 'Notifica a', @@ -130,6 +131,10 @@ URL: [url]', 'assign_reviewers' => 'Assegna Revisori', 'assign_user_property_to' => 'Assegna le proprietà dell\'utente a', 'assumed_released' => 'Rilascio acquisito', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => 'Definizione di Attributo già esistente', 'attrdef_info' => '', 'attrdef_in_use' => 'Definizione di Attributo ancora in uso', @@ -225,6 +230,7 @@ URL: [url]', 'checkout_document' => 'Approvato', 'checkout_is_disabled' => 'Approvazione dei documenti disabilitata', 'choose_attrdef' => 'Seleziona l\'Attributo', +'choose_attrdefgroup' => '', 'choose_category' => 'Seleziona', 'choose_group' => 'Seleziona il gruppo', 'choose_role' => '', @@ -493,6 +499,7 @@ URL: [url]', 'fullsearch' => 'Ricerca Fulltext', 'fullsearch_hint' => 'Usa l\'indice fulltext', 'fulltext_info' => 'Info indice Fulltext', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => 'Definizione attributi', 'global_default_keywords' => 'Parole-chiave globali', 'global_document_categories' => 'Categorie', @@ -894,6 +901,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: [name] - Il flusso di lavoro è stato invertito', 'rewind_workflow_warning' => 'Se si inverte un flusso di lavoro al suo stato iniziale ogni traccia del flusso di lavoro originale per questo documento sarà cancellata permanentemente.', 'rm_attrdef' => 'Rimuovi attributo', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => 'Rimuovi categoria', 'rm_document' => 'Rimuovi documento', 'rm_document_category' => 'Rimuovi categoria', @@ -951,6 +959,7 @@ URL: [url]', 'search_time' => 'Tempo trascorso: [time] secondi.', 'seconds' => 'secondi', 'selection' => 'Selezione', +'select_attrdefgrp_show' => '', 'select_category' => 'Clicca per selezionare la categoria', 'select_groups' => 'Clicca per selezionare i gruppi', 'select_grp_approvers' => 'Seleziona gruppo approvatore', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index f64546c25..087261953 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => '수정', 'add' => '추가', 'add_approval' => '승인 추가', +'add_attrdefgroup' => '', 'add_document' => '문서 추가', 'add_document_link' => '링크 추가', 'add_document_notify' => '알림 추가', @@ -130,6 +131,10 @@ URL: [url]', 'assign_reviewers' => '검토자 지정', 'assign_user_property_to' => '사용자 속성에 할당', 'assumed_released' => '가정한 출시', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => '이미 존재하는 속성', 'attrdef_info' => '속성정보', 'attrdef_in_use' => '사용중인 속성 정의', @@ -226,6 +231,7 @@ URL: [url]', 'checkout_document' => '체크아웃', 'checkout_is_disabled' => '체크아웃된 문서는 설정에서 비활성화됩니다.', 'choose_attrdef' => '속성의 정의를 선택하세요', +'choose_attrdefgroup' => '', 'choose_category' => '선택하세요', 'choose_group' => '그룹을 선택', 'choose_role' => '', @@ -492,6 +498,7 @@ URL: [url]', 'fullsearch' => '전체 텍스트 검색', 'fullsearch_hint' => '전체 텍스트 색인 사용', 'fulltext_info' => '전체 텍스트 색인 정보', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => '속성', 'global_default_keywords' => '글로벌 키워드', 'global_document_categories' => '카테고리', @@ -885,6 +892,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename] : [name] - 워크플로우 되돌림', 'rewind_workflow_warning' => '당신이 초기 상태로 워크플로를 뒤로 경우, 이 문서의 전체 워크플로우 로그가 삭제되며 복구 할 수 없습니다.', 'rm_attrdef' => '속성 정의 제거', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => '범주 제거', 'rm_document' => '문서 제거', 'rm_document_category' => '카테고리 제거', @@ -942,6 +950,7 @@ URL : [url]', 'search_time' => '경과 시간 : [time] 초', 'seconds' => '초', 'selection' => '선택', +'select_attrdefgrp_show' => '', 'select_category' => '범주를 선택합니다', 'select_groups' => '그룹을 선택합니다', 'select_grp_approvers' => '그룹 승인을 선택합니다', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index a9bc0c0ad..1288a7bc2 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => 'Herzie', 'add' => 'Toevoegen', 'add_approval' => 'Verzend [Goedkeuring]', +'add_attrdefgroup' => '', 'add_document' => 'Document toevoegen', 'add_document_link' => 'Link toevoegen', 'add_document_notify' => 'Notificatie toekennen', @@ -123,6 +124,10 @@ URL: [url]', 'assign_reviewers' => 'Aangewezen [Controleurs]', 'assign_user_property_to' => 'Wijs gebruikers machtigingen toe aan', 'assumed_released' => 'aangenomen status: Gepubliceerd', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => 'Kenmerk definitie bestaat al', 'attrdef_info' => 'Kenmerk info', 'attrdef_in_use' => 'Kenmerk definitie nog in gebruikt', @@ -217,6 +222,7 @@ URL: [url]', 'checkout_document' => 'Checkout-document', 'checkout_is_disabled' => 'Checkout is niet mogelijk', 'choose_attrdef' => 'Selecteer een kenmerk definitie', +'choose_attrdefgroup' => '', 'choose_category' => 'Selecteer a.u.b.', 'choose_group' => 'Selecteer Groep', 'choose_role' => 'Selecteer een rol', @@ -485,6 +491,7 @@ URL: [url]', 'fullsearch' => 'Zoek in volledige tekst', 'fullsearch_hint' => 'Volledige tekst index', 'fulltext_info' => 'Volledige tekst index info', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => 'Kenmerk definities', 'global_default_keywords' => 'Algemene sleutelwoorden', 'global_document_categories' => 'Categorieen', @@ -894,6 +901,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: [name] - Workflow is teruggezet', 'rewind_workflow_warning' => 'Als u de workflow terugzet naar oorspronkelijke staat, dan wordt de workflow historie voor dit document verwijderd en onherstelbaar.', 'rm_attrdef' => 'Verwijder kenmerk definitie', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => 'Verwijder Categorie', 'rm_document' => 'Verwijder Document', 'rm_document_category' => 'Verwijder categorie', @@ -951,6 +959,7 @@ URL: [url]', 'search_time' => 'Verstreken tijd: [time] sec.', 'seconds' => 'seconden', 'selection' => 'Selectie', +'select_attrdefgrp_show' => '', 'select_category' => 'klik om categorie te selecteren', 'select_groups' => 'Klik om groep te selecteren', 'select_grp_approvers' => 'Klik om beoordelaars te selecteren', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index f8d1a9095..d3f71b3b2 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => 'Korekta', 'add' => 'Dodaj', 'add_approval' => 'Zaakceptuj', +'add_attrdefgroup' => '', 'add_document' => 'Dodaj dokument', 'add_document_link' => 'Dodaj link', 'add_document_notify' => 'Przypisz powiadomienia', @@ -118,6 +119,10 @@ URL: [url]', 'assign_reviewers' => 'Przypisz recenzentów', 'assign_user_property_to' => 'Przypisz właściwości użytkownika do', 'assumed_released' => 'Assumed released', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => 'Definicja atrybutu już istnieje', 'attrdef_info' => '', 'attrdef_in_use' => 'Definicja atrybutu nadal jest w użyciu', @@ -212,6 +217,7 @@ URL: [url]', 'checkout_document' => '', 'checkout_is_disabled' => '', 'choose_attrdef' => 'Proszę wybrać definicję atrybutu', +'choose_attrdefgroup' => '', 'choose_category' => 'Proszę wybrać', 'choose_group' => 'Wybierz grupę', 'choose_role' => '', @@ -480,6 +486,7 @@ URL: [url]', 'fullsearch' => 'Przeszukiwanie treści dokumentów', 'fullsearch_hint' => 'Przeszukuj treść dokumentów', 'fulltext_info' => 'Informacje o indeksie pełnotekstowym', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => 'Definicje atrybutów', 'global_default_keywords' => 'Globalne słowa kluczowe', 'global_document_categories' => 'Kategorie', @@ -850,6 +857,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: [name] - Przewinięto proces', 'rewind_workflow_warning' => 'Jeżeli przewiniesz proces do stanu początkowego, to cały log dla tego dokumentu zostanie usunięty bezpowrotnie.', 'rm_attrdef' => 'Usuń definicję atrybutu', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => 'Usuń kategorię', 'rm_document' => 'Usuń dokument', 'rm_document_category' => 'Usuń kategorię', @@ -907,6 +915,7 @@ URL: [url]', 'search_time' => 'Upływający czas: [time] sec.', 'seconds' => 'sekund', 'selection' => 'Wybierz', +'select_attrdefgrp_show' => '', 'select_category' => 'Kliknij by wybrać kategorię', 'select_groups' => 'Kliknij by wybrać grupy', 'select_grp_approvers' => 'Kliknij by wybrać grupę zatwierdzającą', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 06d41fb30..ce2327cff 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => 'Revisão', 'add' => 'Add', 'add_approval' => '', +'add_attrdefgroup' => '', 'add_document' => 'Novo documento', 'add_document_link' => 'Adicionar link', 'add_document_notify' => 'Definir Notificações', @@ -125,6 +126,10 @@ URL: [url]', 'assign_reviewers' => 'Assign Reviewers', 'assign_user_property_to' => 'Assign user\'s properties to', 'assumed_released' => 'Assumed released', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => 'Definição de atributo já existe', 'attrdef_info' => '', 'attrdef_in_use' => 'Definição de atributo ainda em uso', @@ -219,6 +224,7 @@ URL: [url]', 'checkout_document' => '', 'checkout_is_disabled' => '', 'choose_attrdef' => 'Por favor escolha a definição de atributo', +'choose_attrdefgroup' => '', 'choose_category' => '--Por favor escolha--', 'choose_group' => '--Escolher grupo--', 'choose_role' => '', @@ -486,6 +492,7 @@ URL: [url]', 'fullsearch' => 'Pesquisa de texto completo', 'fullsearch_hint' => 'Use índice de texto completo', 'fulltext_info' => 'Informações índice Texto completo', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => 'Atributos', 'global_default_keywords' => 'palavras-chave globais', 'global_document_categories' => 'Categorias', @@ -868,6 +875,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: [name] - Fluxo de processo foi revisto', 'rewind_workflow_warning' => 'Se você voltar um fluxo de trabalho ao seu estado inicial, então o log todo o fluxo de trabalho para este documento será eliminado e não poderá ser recuperado.', 'rm_attrdef' => 'Remover definição de atributo', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => 'Apague esta categoria', 'rm_document' => 'Remove documento', 'rm_document_category' => 'Remover categoria', @@ -925,6 +933,7 @@ URL: [url]', 'search_time' => 'Tempo decorrido: [time] sec.', 'seconds' => 'segundos', 'selection' => 'Selection', +'select_attrdefgrp_show' => '', 'select_category' => 'Clique para selecionar a categoria', 'select_groups' => 'Clique para selecionar os grupos', 'select_grp_approvers' => 'Clique para selecionar o grupo aprovador', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 8aabc3717..1e8b3bf51 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => 'Revizui', 'add' => 'Adauga', 'add_approval' => 'Trimite aprobare', +'add_attrdefgroup' => '', 'add_document' => 'Adaugă document', 'add_document_link' => 'Adauga link', 'add_document_notify' => 'Alocati notificare', @@ -130,6 +131,10 @@ URL: [url]', 'assign_reviewers' => 'Atribuire revizuitori(reviwers)', 'assign_user_property_to' => 'Atribuire proprietati utilizator la', 'assumed_released' => 'Assumed released', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => 'Definitie atribut exista deja', 'attrdef_info' => '', 'attrdef_in_use' => 'Definitie atribut inca in utilizare', @@ -224,6 +229,7 @@ URL: [url]', 'checkout_document' => 'Verifica', 'checkout_is_disabled' => 'Verificarea documentelor este dezactivata in configurari.', 'choose_attrdef' => 'Vă rugăm să alegeți definiția atributului', +'choose_attrdefgroup' => '', 'choose_category' => 'Vă rugăm să alegeți', 'choose_group' => 'Alege grup', 'choose_role' => '', @@ -492,6 +498,7 @@ URL: [url]', 'fullsearch' => 'Căutare text complet', 'fullsearch_hint' => 'Foloseste indexarea intregului text', 'fulltext_info' => 'Info indexarea intregului text', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => 'Atribute', 'global_default_keywords' => 'Cuvinte cheie globale', 'global_document_categories' => 'Categorii', @@ -893,6 +900,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: [name] - Workflow derulat', 'rewind_workflow_warning' => 'Dacă derulati înapoi un workflow la starea inițială, atunci tot log-ul workflow-ului pentru acest document vor fi șters și nu va mai putea fi recuperat.', 'rm_attrdef' => 'Eliminați definiție atribut', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => 'Eliminați categorie', 'rm_document' => 'Eliminați document', 'rm_document_category' => 'Eliminați categorie', @@ -950,6 +958,7 @@ URL: [url]', 'search_time' => 'Timp scurs: [time] sec.', 'seconds' => 'secunde', 'selection' => 'Selecție', +'select_attrdefgrp_show' => '', 'select_category' => 'Click pentru a selecta categoria', 'select_groups' => 'Click pentru a selecta grupuri', 'select_grp_approvers' => 'Click pentru a selecta grupul de aprobatori', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 4d1e34acb..746e1315a 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => 'Ревизировать', 'add' => 'Добавить', 'add_approval' => 'Утвердить', +'add_attrdefgroup' => '', 'add_document' => 'Добавить документ', 'add_document_link' => 'Добавить ссылку', 'add_document_notify' => 'Добавить Уведомления', @@ -130,6 +131,10 @@ URL: [url]', 'assign_reviewers' => 'Назначить рецензентов', 'assign_user_property_to' => 'Назначить свойства пользователя', 'assumed_released' => 'Утверждён', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => 'Определение атрибута уже существует', 'attrdef_info' => 'Информация', 'attrdef_in_use' => 'Определение этого атрибута используется', @@ -224,6 +229,7 @@ URL: [url]', 'checkout_document' => 'Загрузка', 'checkout_is_disabled' => 'Загрузка отключена.', 'choose_attrdef' => 'Выберите атрибут', +'choose_attrdefgroup' => '', 'choose_category' => 'Выберите категорию', 'choose_group' => 'Выберите группу', 'choose_role' => '', @@ -492,6 +498,7 @@ URL: [url]', 'fullsearch' => 'Полнотекстовый поиск', 'fullsearch_hint' => 'Использовать полнотекстовый индекс', 'fulltext_info' => 'Информация о полнотекстовом индексе', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => 'Атрибуты', 'global_default_keywords' => 'Глобальные метки', 'global_document_categories' => 'Категории', @@ -900,6 +907,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: процесс начат с начала для «[name]»', 'rewind_workflow_warning' => 'Если вы начнёте процесс с начала, то весь журнал процесса для этого документа будет очищен и его невозможно будет восстановить.', 'rm_attrdef' => 'Удалить определение атрибута', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => 'Удалить метку', 'rm_document' => 'Удалить документ', 'rm_document_category' => 'Удалить категорию', @@ -957,6 +965,7 @@ URL: [url]', 'search_time' => 'Прошло: [time] с', 'seconds' => 'секунды', 'selection' => 'Выбор', +'select_attrdefgrp_show' => '', 'select_category' => 'Выберите категорию', 'select_groups' => 'Выберите группы', 'select_grp_approvers' => 'Выберите утверждающую группу', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 868ef5401..883506a5c 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => 'Revidovať', 'add' => 'Pridať', 'add_approval' => 'Poslať schválenie', +'add_attrdefgroup' => '', 'add_document' => 'Pridať dokument', 'add_document_link' => 'Pridať odkaz', 'add_document_notify' => 'Pridať notifikáciu', @@ -113,6 +114,10 @@ URL: [url]', 'assign_reviewers' => 'Určiť recenzentov', 'assign_user_property_to' => 'Assign user\'s properties to', 'assumed_released' => 'Pokladá sa za zverejnené', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => '', 'attrdef_info' => 'Informácia', 'attrdef_in_use' => '', @@ -201,6 +206,7 @@ URL: [url]', 'checkout_document' => '', 'checkout_is_disabled' => '', 'choose_attrdef' => '', +'choose_attrdefgroup' => '', 'choose_category' => '--Vyberte prosím--', 'choose_group' => '--Vyberte skupinu--', 'choose_role' => '', @@ -415,6 +421,7 @@ URL: [url]', 'fullsearch' => 'Fulltext index vyhľadávanie', 'fullsearch_hint' => 'Použiť fulltext index', 'fulltext_info' => 'Informácie o fulltext indexe', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => 'Atribúty', 'global_default_keywords' => 'Globálne kľúčové slová', 'global_document_categories' => 'Kategórie', @@ -732,6 +739,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '', 'rewind_workflow_warning' => '', 'rm_attrdef' => '', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => 'Zmazať kategóriu', 'rm_document' => 'Odstrániť dokument', 'rm_document_category' => '', @@ -782,6 +790,7 @@ URL: [url]', 'search_time' => 'Uplynulý čas: [time] sek', 'seconds' => '', 'selection' => 'Výber', +'select_attrdefgrp_show' => '', 'select_category' => 'Vyber kategóriu', 'select_groups' => '', 'select_grp_approvers' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index b2c7275ed..899544cbe 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => 'Revidera', 'add' => 'Lägg till', 'add_approval' => 'Skicka godkännande', +'add_attrdefgroup' => '', 'add_document' => 'Lägg till dokument', 'add_document_link' => 'Lägg till länkat dokument', 'add_document_notify' => '', @@ -118,6 +119,10 @@ URL: [url]', 'assign_reviewers' => 'Ge uppdrag till personer/grupper att granska dokumentet', 'assign_user_property_to' => 'Sätt användarens egenskaper till', 'assumed_released' => 'Antas klart för användning', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => 'Attributdefinitionen finns redan', 'attrdef_info' => '', 'attrdef_in_use' => 'Attributdefinitionen används', @@ -212,6 +217,7 @@ URL: [url]', 'checkout_document' => '', 'checkout_is_disabled' => '', 'choose_attrdef' => 'Välj attributdefinition', +'choose_attrdefgroup' => '', 'choose_category' => 'Välj', 'choose_group' => 'Välj grupp', 'choose_role' => '', @@ -480,6 +486,7 @@ URL: [url]', 'fullsearch' => 'Fulltext-sökning', 'fullsearch_hint' => 'Använd fulltext-index', 'fulltext_info' => 'Fulltext-indexinfo', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => 'Attributdefinitioner', 'global_default_keywords' => 'Globala nyckelord', 'global_document_categories' => 'Kategorier', @@ -856,6 +863,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: [name] - Återställ arbetsflödet', 'rewind_workflow_warning' => 'Om du återställer ett arbetsflöde till sin ursprungliga status, kommer hela loggboken för dokumentets arbetsflöde att raderas och kan då inte återställas.', 'rm_attrdef' => 'Ta bort attributdefinition', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => 'Ta bort kategori', 'rm_document' => 'Ta bort', 'rm_document_category' => 'Ta bort kategori', @@ -913,6 +921,7 @@ URL: [url]', 'search_time' => 'Förfluten tid: [time] sek', 'seconds' => 'sekunder', 'selection' => 'Urval', +'select_attrdefgrp_show' => '', 'select_category' => 'Klicka för att välja en kategori', 'select_groups' => 'Välj grupper', 'select_grp_approvers' => 'Välj en grupp som ska godkänna', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 487d9e039..1e2013838 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -53,6 +53,7 @@ URL: [url]', 'action_revise' => 'Revize et', 'add' => 'Ekle', 'add_approval' => 'Onay ver', +'add_attrdefgroup' => '', 'add_document' => 'Doküman ekle', 'add_document_link' => 'Link ekle', 'add_document_notify' => 'Hatırlatma ekte', @@ -124,6 +125,10 @@ URL: [url]', 'assign_reviewers' => 'Kontrol Eden Tanımla', 'assign_user_property_to' => 'Kullanıcının özelliklerini ata', 'assumed_released' => 'Yayınlandı kabul edilmekte', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => 'Nitelik tanımı zaten mevcut', 'attrdef_info' => '', 'attrdef_in_use' => 'Nitelik tanımı halen kullanımda', @@ -218,6 +223,7 @@ URL: [url]', 'checkout_document' => '', 'checkout_is_disabled' => '', 'choose_attrdef' => 'Lütfen nitelik tanımını seçiniz', +'choose_attrdefgroup' => '', 'choose_category' => 'Lütfen seçiniz', 'choose_group' => 'Grup seçiniz', 'choose_role' => '', @@ -486,6 +492,7 @@ URL: [url]', 'fullsearch' => 'Tam metinde ara', 'fullsearch_hint' => 'Tam metin indeks kullan', 'fulltext_info' => 'Tam metin indeks bilgi', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => 'Nitelikler', 'global_default_keywords' => 'Global anahtar kelimeler', 'global_document_categories' => 'Kategoriler', @@ -872,6 +879,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: [name] - İş akışı geri alındı', 'rewind_workflow_warning' => 'İş akışını başlangıç durumuna geri alırsanız tüm iş akış kayıtları geri dönüşümü olmadan silinecektir.', 'rm_attrdef' => 'Nitelik tanımını sil', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => 'Kategoriyi sil', 'rm_document' => 'Dokümanı sil', 'rm_document_category' => 'Kategoriyi sil', @@ -929,6 +937,7 @@ URL: [url]', 'search_time' => 'Arama süresi: [time] sn.', 'seconds' => 'saniye', 'selection' => 'Seçim', +'select_attrdefgrp_show' => '', 'select_category' => 'Kategori seçmek için tıklayın', 'select_groups' => 'Grup seçmek için tıklayın', 'select_grp_approvers' => 'Grup onaylayıcı seçmek için tıklayın', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 01348dfd0..32e64bff1 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => 'На ревізію', 'add' => 'Додати', 'add_approval' => 'Затвердити', +'add_attrdefgroup' => '', 'add_document' => 'Додати документ', 'add_document_link' => 'Додати посилання', 'add_document_notify' => 'Призначити сповіщення', @@ -130,6 +131,10 @@ URL: [url]', 'assign_reviewers' => 'Призначити рецензентів', 'assign_user_property_to' => 'Призначити властивості користувача', 'assumed_released' => 'Затверджено', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => 'Визначення атрибуту вже існує', 'attrdef_info' => 'Інформація', 'attrdef_in_use' => 'Визначення цього атрибуту вже використовується', @@ -224,6 +229,7 @@ URL: [url]', 'checkout_document' => 'Завантаження', 'checkout_is_disabled' => 'Завантаження відключене', 'choose_attrdef' => 'Оберіть атрибут', +'choose_attrdefgroup' => '', 'choose_category' => 'Оберіть категорію', 'choose_group' => 'Оберіть групу', 'choose_role' => '', @@ -492,6 +498,7 @@ URL: [url]', 'fullsearch' => 'Повнотекстовий пошук', 'fullsearch_hint' => 'Використовувати повнотекстовий індекс', 'fulltext_info' => 'Інформація про повнотекстовий індекс', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => 'Атрибути', 'global_default_keywords' => 'Глобальні ключові слова', 'global_document_categories' => 'Категорії', @@ -893,6 +900,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: процес перезапущено для «[name]»', 'rewind_workflow_warning' => 'Якщо ви почнете процес спочатку, то весь журнал процесу для цього процесу буде очищено і його неможливо буде відновити.', 'rm_attrdef' => 'Видалити визначення атрибуту', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => 'Видалити категорію', 'rm_document' => 'Видалити документ', 'rm_document_category' => 'Видалити категорію', @@ -950,6 +958,7 @@ URL: [url]', 'search_time' => 'Пройшло: [time] с', 'seconds' => 'секунди', 'selection' => 'Вибір', +'select_attrdefgrp_show' => '', 'select_category' => 'Оберіть категорію', 'select_groups' => 'Оберіть групи', 'select_grp_approvers' => 'Оберіть групу затверджувачів', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index b45f42309..cda733cff 100644 --- a/languages/zh_CN/lang.inc +++ b/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 (638), fengjohn (5) +// Translators: Admin (640), fengjohn (5) $text = array( '2_factor_auth' => '', @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => '', 'add' => '添加', 'add_approval' => '提交审核', +'add_attrdefgroup' => '', 'add_document' => '添加文档', 'add_document_link' => '添加链接', 'add_document_notify' => '派发通知', @@ -113,6 +114,10 @@ URL: [url]', 'assign_reviewers' => '指派校对人', 'assign_user_property_to' => '分配用户属性给', 'assumed_released' => '假定发布', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => '', 'attrdef_info' => '', 'attrdef_in_use' => '属性定义仍在使用中', @@ -201,6 +206,7 @@ URL: [url]', 'checkout_document' => '', 'checkout_is_disabled' => '', 'choose_attrdef' => '请选择属性', +'choose_attrdefgroup' => '', 'choose_category' => '请选择', 'choose_group' => '选择组别', 'choose_role' => '', @@ -328,7 +334,7 @@ URL: [url]', 'drag_icon_here' => '拖动图标到这里', 'dropfolderdir_missing' => '', 'dropfolder_file' => '所选文件夹的文件', -'dropfolder_folder' => '', +'dropfolder_folder' => '从下拉菜单中选择文件夹', 'dropupload' => '快速上传', 'drop_files_here' => '拖入这里', 'dump_creation' => '转储数据', @@ -417,6 +423,7 @@ URL: [url]', 'fullsearch' => '全文搜索', 'fullsearch_hint' => '使用全文索引', 'fulltext_info' => '全文索引信息', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => '属性', 'global_default_keywords' => '全局关键字', 'global_document_categories' => '分类', @@ -444,7 +451,7 @@ URL: [url]', 'hu_HU' => '匈牙利语', 'id' => '序号', 'identical_version' => '', -'import' => '', +'import' => '导入', 'importfs' => '', 'import_fs' => '从文件系统导入', 'import_fs_warning' => '', @@ -734,6 +741,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '', 'rewind_workflow_warning' => '', 'rm_attrdef' => '去掉属性定义', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => '删除类别', 'rm_document' => '删除文档', 'rm_document_category' => '删除分类', @@ -784,6 +792,7 @@ URL: [url]', 'search_time' => '耗时:[time]秒', 'seconds' => '', 'selection' => '选择', +'select_attrdefgrp_show' => '', 'select_category' => '选中分类', 'select_groups' => '点击选择组', 'select_grp_approvers' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 2d5cb8085..a8b9370d4 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/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 (2370) +// Translators: Admin (2371) $text = array( '2_factor_auth' => '', @@ -54,6 +54,7 @@ URL: [url]', 'action_revise' => '', 'add' => '添加', 'add_approval' => '提交審核', +'add_attrdefgroup' => '', 'add_document' => '添加文檔', 'add_document_link' => '添加連結', 'add_document_notify' => '', @@ -113,6 +114,10 @@ URL: [url]', 'assign_reviewers' => '指派校對人', 'assign_user_property_to' => '分配使用者屬性給', 'assumed_released' => '假定發佈', +'attrdefgroup_management' => '', +'attrdefgrp_show_detail' => '', +'attrdefgrp_show_list' => '', +'attrdefgrp_show_search' => '', 'attrdef_exists' => '', 'attrdef_info' => '', 'attrdef_in_use' => '', @@ -201,6 +206,7 @@ URL: [url]', 'checkout_document' => '', 'checkout_is_disabled' => '', 'choose_attrdef' => '請選擇屬性', +'choose_attrdefgroup' => '', 'choose_category' => '請選擇', 'choose_group' => '選擇組別', 'choose_role' => '', @@ -415,6 +421,7 @@ URL: [url]', 'fullsearch' => '全文檢索搜尋', 'fullsearch_hint' => '使用全文索引', 'fulltext_info' => '全文索引資訊', +'global_attributedefinitiongroups' => '', 'global_attributedefinitions' => '屬性', 'global_default_keywords' => '全域關鍵字', 'global_document_categories' => '分類', @@ -732,6 +739,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '', 'rewind_workflow_warning' => '', 'rm_attrdef' => '', +'rm_attrdefgroup' => '', 'rm_default_keyword_category' => '刪除類別', 'rm_document' => '刪除文檔', 'rm_document_category' => '刪除分類', @@ -782,6 +790,7 @@ URL: [url]', 'search_time' => '耗時:[time]秒', 'seconds' => '', 'selection' => '選擇', +'select_attrdefgrp_show' => '', 'select_category' => '選中分類', 'select_groups' => '點擊選擇組', 'select_grp_approvers' => '請點選審核人員群組', @@ -1190,7 +1199,7 @@ URL: [url]', 'thursday' => 'Thursday', 'thursday_abbr' => '', 'timeline' => '時間軸', -'timeline_add_file' => '', +'timeline_add_file' => '新附件', 'timeline_add_version' => '', 'timeline_full_add_file' => '', 'timeline_full_add_version' => '', From 04c0b62b8c3c82a9fc4b47ecaa159bb91c487501 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 2 Aug 2016 11:33:21 +0200 Subject: [PATCH 12/65] fix setting reviewer/approver for admins/owners --- op/op.SetReviewersApprovers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op/op.SetReviewersApprovers.php b/op/op.SetReviewersApprovers.php index 4e69ca64d..baa84a0e7 100644 --- a/op/op.SetReviewersApprovers.php +++ b/op/op.SetReviewersApprovers.php @@ -62,7 +62,7 @@ $folder = $document->getFolder(); // Retrieve a list of all users and groups that have review / approve // privileges. -$docAccess = $document->getReadAccessList(); +$docAccess = $document->getReadAccessList($settings->_enableAdminRevApp, $settings->_enableOwnerRevApp); $accessIndex = array("i"=>array(), "g"=>array()); foreach ($docAccess["users"] as $i=>$da) { $accessIndex["i"][$da->getID()] = $i; From fa4dddd4036b88d1b1ae077728a20b446b8e6ee0 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 2 Aug 2016 11:33:46 +0200 Subject: [PATCH 13/65] add entry for 4.3.28 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index c427f64e7..0120147ae 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ Changes in version 4.3.28 -------------------------------------------------------------------------------- - add expiration in list of documents +- fix SetReviewersApprovers if reviewer/approver is an admin or the owner -------------------------------------------------------------------------------- Changes in version 4.3.27 From 8770aaecb3b32cdfacd9124de8a39a1b9cb24acd Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 2 Aug 2016 17:08:54 +0200 Subject: [PATCH 14/65] add new paramter maxSizeForFullText --- inc/inc.ClassSettings.php | 6 +++++- op/op.Settings.php | 11 ++++++----- views/bootstrap/class.Settings.php | 4 ++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index af8c14ccc..e2cac868d 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -91,6 +91,8 @@ class Settings { /* {{{ */ var $_stopWordsFile = null; // enable/disable lucene fulltext search var $_enableFullSearch = true; + // max size of documents for direct indexing + var $_maxSizeForFullText = 0; // fulltext search engine var $_fullSearchEngine = 'lucene'; // default search method @@ -186,7 +188,7 @@ class Settings { /* {{{ */ var $_sortUsersInList = ''; // Sort method for forders and documents ('n' (name) or '') var $_sortFoldersDefault = ''; - // enable/disable lucene fulltext search + // Set valid IP for admin logins // if enabled admin can login only by specified IP addres var $_adminIP = ""; // Max Execution Time @@ -382,6 +384,7 @@ class Settings { /* {{{ */ $this->_enableLanguageSelector = Settings::boolVal($tab["enableLanguageSelector"]); $this->_enableThemeSelector = Settings::boolVal($tab["enableThemeSelector"]); $this->_enableFullSearch = Settings::boolVal($tab["enableFullSearch"]); + $this->_maxSizeForFullText = intval($tab["maxSizeForFullText"]); $this->_fullSearchEngine = strval($tab["fullSearchEngine"]); $this->_defaultSearchMethod = strval($tab["defaultSearchMethod"]); $this->_stopWordsFile = strval($tab["stopWordsFile"]); @@ -662,6 +665,7 @@ class Settings { /* {{{ */ $this->setXMLAttributValue($node, "enableLanguageSelector", $this->_enableLanguageSelector); $this->setXMLAttributValue($node, "enableThemeSelector", $this->_enableThemeSelector); $this->setXMLAttributValue($node, "enableFullSearch", $this->_enableFullSearch); + $this->setXMLAttributValue($node, "maxSizeForFullText", $this->_maxSizeForFullText); $this->setXMLAttributValue($node, "fullSearchEngine", $this->_fullSearchEngine); $this->setXMLAttributValue($node, "defaultSearchMethod", $this->_defaultSearchMethod); $this->setXMLAttributValue($node, "expandFolderTree", $this->_expandFolderTree); diff --git a/op/op.Settings.php b/op/op.Settings.php index e152e0545..e5325d967 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -68,8 +68,9 @@ if ($action == "saveSettings") $settings->_enableEmail =getBoolValue("enableEmail"); $settings->_enableUsersView = getBoolValue("enableUsersView"); $settings->_enableFullSearch = getBoolValue("enableFullSearch"); - $settings->_fullSearchEngine = $_POST["fullSearchEngine"]; - $settings->_defaultSearchMethod = $_POST["defaultSearchMethod"]; + $settings->_maxSizeForFullText = intval($_POST["maxSizeForFullText"]); + $settings->_fullSearchEngine = $_POST["fullSearchEngine"]; + $settings->_defaultSearchMethod = $_POST["defaultSearchMethod"]; $settings->_enableClipboard = getBoolValue("enableClipboard"); $settings->_enableDropUpload = getBoolValue("enableDropUpload"); $settings->_enableFolderTree = getBoolValue("enableFolderTree"); @@ -79,9 +80,9 @@ if ($action == "saveSettings") $settings->_enableHelp = getBoolValue("enableHelp"); $settings->_enableThemeSelector = getBoolValue("enableThemeSelector"); $settings->_expandFolderTree = intval($_POST["expandFolderTree"]); - $settings->_stopWordsFile = $_POST["stopWordsFile"]; - $settings->_sortUsersInList = $_POST["sortUsersInList"]; - $settings->_sortFoldersDefault = $_POST["sortFoldersDefault"]; + $settings->_stopWordsFile = $_POST["stopWordsFile"]; + $settings->_sortUsersInList = $_POST["sortUsersInList"]; + $settings->_sortFoldersDefault = $_POST["sortFoldersDefault"]; // SETTINGS - SITE - CALENDAR $settings->_enableCalendar = getBoolValue("enableCalendar"); diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 2d15782b9..181fc97a5 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -186,6 +186,10 @@ if(!is_writeable($settings->_configFilePath)) { : _enableFullSearch) echo "checked" ?> /> + "> + : + showTextField("maxSizeForFullText", $settings->_maxSizeForFullText); ?> + "> : From 04d7fdf258dd3b8c15bb362f5f9bf7249b4cce58 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 2 Aug 2016 17:09:49 +0200 Subject: [PATCH 15/65] update full text engine also index content if file size is less the a configured size (Closes: #270) --- op/op.AddDocument.php | 3 ++- op/op.RemoveVersion.php | 27 ++++++++++++++++++++++ op/op.UpdateDocument.php | 14 ++++++++++++ op/op.UpdateDocument2.php | 47 ++++++++++++--------------------------- 4 files changed, 57 insertions(+), 34 deletions(-) diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php index d808ed727..95ef13b53 100644 --- a/op/op.AddDocument.php +++ b/op/op.AddDocument.php @@ -285,6 +285,7 @@ for ($file_num=0;$file_numaddDocument($name, $comment, $expires, $user, $keywords, $cats, $userfiletmp, basename($userfilename), $fileType, $userfiletype, $sequence, @@ -306,7 +307,7 @@ for ($file_num=0;$file_num_luceneDir); if($index) { $indexconf['Indexer']::init($settings->_stopWordsFile); - $index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, true)); + $index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText))); } } diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php index c1d8390cd..99aca31d7 100644 --- a/op/op.RemoveVersion.php +++ b/op/op.RemoveVersion.php @@ -67,6 +67,18 @@ if (count($document->getContent())==1) { if (!$document->remove()) { UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured")); } else { + /* Remove the document from the fulltext index */ + if($settings->_enableFullSearch) { + $index = $indexconf['Indexer']::open($settings->_luceneDir); + if($index) { + $lucenesearch = new $indexconf['Search']($index); + if($hit = $lucenesearch->getDocument($documentid)) { + $index->delete($hit->id); + $index->commit(); + } + } + } + if ($notifier){ $subject = "document_deleted_email_subject"; $message = "document_deleted_email_body"; @@ -115,6 +127,21 @@ else { if (!$document->removeContent($version)) { UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured")); } else { + /* Remove the document from the fulltext index and reindex latest version */ + if($settings->_enableFullSearch) { + $index = $indexconf['Indexer']::open($settings->_luceneDir); + if($index) { + $lucenesearch = new $indexconf['Search']($index); + if($hit = $lucenesearch->getDocument($document->getID())) { + $index->delete($hit->id); + } + $version = $document->getLatestContent(); + $indexconf['Indexer']::init($settings->_stopWordsFile); + $index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($version->getFileSize() < $settings->_maxSizeForFullText))); + $index->commit(); + } + } + // Notify affected users. if ($notifier){ $nl=$document->getNotifyList(); diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php index 18d060cc6..78c992a07 100644 --- a/op/op.UpdateDocument.php +++ b/op/op.UpdateDocument.php @@ -227,11 +227,25 @@ if ($_FILES['userfile']['error'] == 0) { $attributes = array(); } + $filesize = SeedDMS_Core_File::fileSize($userfiletmp); $contentResult=$document->addContent($comment, $user, $userfiletmp, basename($userfilename), $fileType, $userfiletype, $reviewers, $approvers, $version=0, $attributes, $workflow); if (is_bool($contentResult) && !$contentResult) { UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured")); } else { + if($settings->_enableFullSearch) { + $index = $indexconf['Indexer']::open($settings->_luceneDir); + if($index) { + $lucenesearch = new $indexconf['Search']($index); + if($hit = $lucenesearch->getDocument((int) $document->getId())) { + $index->delete($hit->id); + } + $indexconf['Indexer']::init($settings->_stopWordsFile); + $index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText))); + $index->commit(); + } + } + // Send notification to subscribers. if ($notifier){ $notifyList = $document->getNotifyList(); diff --git a/op/op.UpdateDocument2.php b/op/op.UpdateDocument2.php index 38504df4c..3922069d6 100644 --- a/op/op.UpdateDocument2.php +++ b/op/op.UpdateDocument2.php @@ -150,34 +150,29 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) { } } - + $filesize = SeedDMS_Core_File::fileSize($userfiletmp); $contentResult=$document->addContent($comment, $user, $userfiletmp, basename($userfilename), $fileType, $userfiletype, $reviewers, $approvers); unlink($userfiletmp); if (is_bool($contentResult) && !$contentResult) { echo getMLText("error_occured"); } else { + if($settings->_enableFullSearch) { + $index = $indexconf['Indexer']::open($settings->_luceneDir); + if($index) { + $lucenesearch = new $indexconf['Search']($index); + if($hit = $lucenesearch->getDocument((int) $document->getId())) { + $index->delete($hit->id); + } + $indexconf['Indexer']::init($settings->_stopWordsFile); + $index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText))); + $index->commit(); + } + } + // Send notification to subscribers. if ($notifier){ $notifyList = $document->getNotifyList(); $folder = $document->getFolder(); -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_updated_email"); - $message = getMLText("document_updated_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toList($user, $document->_notifyList["users"], $subject, $message); - foreach ($document->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } - - // if user is not owner send notification to owner - if ($user->getID()!= $document->getOwner()->getID()) - $notifier->toIndividual($user, $document->getOwner(), $subject, $message); -*/ $subject = "document_updated_email_subject"; $message = "document_updated_email_body"; $params = array(); @@ -205,20 +200,6 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) { $notifyList = $document->getNotifyList(); $folder = $document->getFolder(); // Send notification to subscribers. -/* - $subject = "###SITENAME###: ".$document->getName()." - ".getMLText("expiry_changed_email"); - $message = getMLText("expiry_changed_email")."\r\n"; - $message .= - getMLText("document").": ".$document->getName()."\r\n". - getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n". - getMLText("comment").": ".$document->getComment()."\r\n". - "URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n"; - - $notifier->toList($user, $document->_notifyList["users"], $subject, $message); - foreach ($document->_notifyList["groups"] as $grp) { - $notifier->toGroup($user, $grp, $subject, $message); - } -*/ $subject = "expiry_changed_email_subject"; $message = "expiry_changed_email_body"; $params = array(); From 8cc7da6679e5da11542c5cc26e8493f640c59b7c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 2 Aug 2016 17:19:06 +0200 Subject: [PATCH 16/65] add new phrases for maxSizeForFullText config var --- languages/ar_EG/lang.inc | 5 +++++ languages/bg_BG/lang.inc | 5 +++++ languages/ca_ES/lang.inc | 5 +++++ languages/cs_CZ/lang.inc | 5 +++++ languages/de_DE/lang.inc | 7 ++++++- languages/en_GB/lang.inc | 9 +++++++-- languages/es_ES/lang.inc | 5 +++++ languages/fr_FR/lang.inc | 5 +++++ languages/hr_HR/lang.inc | 5 +++++ languages/hu_HU/lang.inc | 5 +++++ languages/it_IT/lang.inc | 5 +++++ languages/ko_KR/lang.inc | 5 +++++ languages/nl_NL/lang.inc | 5 +++++ languages/pl_PL/lang.inc | 5 +++++ languages/pt_BR/lang.inc | 5 +++++ languages/ro_RO/lang.inc | 5 +++++ languages/ru_RU/lang.inc | 5 +++++ languages/sk_SK/lang.inc | 5 +++++ languages/sv_SE/lang.inc | 5 +++++ languages/tr_TR/lang.inc | 5 +++++ languages/uk_UA/lang.inc | 5 +++++ languages/zh_CN/lang.inc | 5 +++++ languages/zh_TW/lang.inc | 5 +++++ 23 files changed, 118 insertions(+), 3 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 4596e5c60..47b3fc05e 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -390,8 +390,10 @@ URL: [url]', 'edit_document_props' => 'تعديل مستند', 'edit_event' => 'تعديل الحدث', 'edit_existing_access' => 'تعديل قائمة الصلاحيات', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'تعديل قائمة التنبيهات', 'edit_folder_access' => 'تعديل صلاحيات', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'تعديل قائمة التنبيهات', 'edit_folder_props' => 'تعديل مجلد', 'edit_group' => 'تعديل مجموعة', @@ -405,6 +407,7 @@ URL: [url]', 'email_footer' => 'يمكنك دائما تغيير اعدادات بريدك الالكتروني من خلال خاصية - مستنداتي', 'email_header' => 'هذا رسالة تلقائية من نظام ادارة المستندات!', 'email_not_given' => 'من فضلك ادخل بريد الكتروني صحيح.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'لايوجد مستندات او مجلدات', 'empty_notify_list' => 'لايوجد مدخلات', 'en_GB' => 'الإنكليزية (GB)', @@ -1126,6 +1129,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => '', 'settings_maxRecursiveCount' => '', 'settings_maxRecursiveCount_desc' => '', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => '', 'settings_notfound' => '', 'settings_Notification' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index d0c54d687..023e3b225 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -345,8 +345,10 @@ $text = array( 'edit_document_props' => 'Редактирай документ', 'edit_event' => 'Редактирай събитие', 'edit_existing_access' => 'Редактирай списъкът за достъп', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Редактирай списъкът с уведомявания', 'edit_folder_access' => 'Редактирай достъп', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Списък с уведомявания за папка', 'edit_folder_props' => 'Редактирай папка', 'edit_group' => 'Редактирай група', @@ -360,6 +362,7 @@ $text = array( 'email_footer' => 'Винаги можете да измените e-mail исползвайки функцията \'Моя учетка\'', 'email_header' => 'Това е автоматично уведомяване от сървъра за документооборот', 'email_not_given' => 'Въведете настоящ email.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Няма документи или папки', 'empty_notify_list' => 'Няма записи', 'en_GB' => '', @@ -991,6 +994,8 @@ $text = array( 'settings_maxExecutionTime_desc' => 'Установява максимално време за изпълнение на скрипта, преди да бъде прибит от парсера', 'settings_maxRecursiveCount' => '', 'settings_maxRecursiveCount_desc' => '', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Още настройки. Логин по подразбиране: admin/admin', 'settings_notfound' => 'Не е намерено', 'settings_Notification' => 'Настройка за известяване', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index bbc4be098..0210bb706 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -350,8 +350,10 @@ URL: [url]', 'edit_document_props' => 'Editar document', 'edit_event' => 'Editar event', 'edit_existing_access' => 'Editar llista d\'accés', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Editar llista de notificació', 'edit_folder_access' => 'Editar accés', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Llista de notificació', 'edit_folder_props' => 'Editar directori', 'edit_group' => 'Editar grup...', @@ -365,6 +367,7 @@ URL: [url]', 'email_footer' => 'Sempre es pot canviar la configuració de correu electrònic utilitzant les funcions de «El meu compte»', 'email_header' => 'Aquest es un missatge automàtic del servidor de DMS.', 'email_not_given' => '', +'empty_attribute_group_list' => '', 'empty_folder_list' => '', 'empty_notify_list' => 'No hi ha entrades', 'en_GB' => 'Anglès (Regne Unit)', @@ -996,6 +999,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => '', 'settings_maxRecursiveCount' => '', 'settings_maxRecursiveCount_desc' => '', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => '', 'settings_notfound' => '', 'settings_Notification' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 7b556cba1..9f8220029 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -397,8 +397,10 @@ URL: [url]', 'edit_document_props' => 'Upravit dokument', 'edit_event' => 'Upravit akci', 'edit_existing_access' => 'Upravit seznam řízení přístupu', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Upravit seznam upozornění', 'edit_folder_access' => 'Upravit přístup', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Seznam upozornění', 'edit_folder_props' => 'Upravit adresář', 'edit_group' => 'Upravit skupinu', @@ -412,6 +414,7 @@ URL: [url]', 'email_footer' => 'Změnu nastavení e-mailu můžete kdykoliv provést pomocí funkce\'Můj účet\'', 'email_header' => 'Toto je automatická zpráva ze serveru DMS.', 'email_not_given' => 'Zadejte prosím platnou emailovou adresu.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Žádné dokumenty nebo složky', 'empty_notify_list' => 'Žádné položky', 'en_GB' => 'Angličtina (GB)', @@ -1135,6 +1138,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => '', 'settings_maxRecursiveCount' => 'Max. počet rekurzívních počítání dokumentů/složek', 'settings_maxRecursiveCount_desc' => 'Toto je max. počet dokumentů a složek, kterým bude kontrolováno přístupové právo při rekurzivním počítání objektů. Po jeho překročení bude počet složek a dokumentů odhadnut.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Configure more settings. Default login: admin/admin', 'settings_notfound' => '', 'settings_Notification' => 'Nastavení upozornění', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index aeb8de847..5fd8f1d11 100644 --- a/languages/de_DE/lang.inc +++ b/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 (2263), dgrutsch (21) +// Translators: Admin (2269), dgrutsch (21) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -402,8 +402,10 @@ URL: [url]', 'edit_document_props' => 'Bearbeiten', 'edit_event' => 'Ereignis editieren', 'edit_existing_access' => 'Bestehende Berechtigungen bearbeiten', +'edit_existing_attribute_groups' => 'Attributgruppen bearbeiten', 'edit_existing_notify' => 'Beobachter bearbeiten', 'edit_folder_access' => 'Zugriffsrechte bearbeiten', +'edit_folder_attrdefgrp' => 'Attributgruppen bearbeiten', 'edit_folder_notify' => 'Beobachtung von Ordnern', 'edit_folder_props' => 'Bearbeiten', 'edit_group' => 'Gruppe bearbeiten', @@ -417,6 +419,7 @@ URL: [url]', 'email_footer' => 'Sie können zu jeder Zeit Ihre E-Mail-Adresse über \'Mein Profil\' ändern.', 'email_header' => 'Dies ist eine automatische Nachricht des DMS-Servers.', 'email_not_given' => 'Bitte geben Sie eine gültige E-Mail-Adresse ein.', +'empty_attribute_group_list' => 'Keine Attributgruppen', 'empty_folder_list' => 'Keine Dokumente oder Ordner', 'empty_notify_list' => 'Keine Beobachter', 'en_GB' => 'Englisch (GB)', @@ -1172,6 +1175,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Maximale Zeit in Sekunden bis ein Skript beendet wird.', 'settings_maxRecursiveCount' => 'Max. Anzahl Anzahl rekursiver Dokumente/Ordner.', 'settings_maxRecursiveCount_desc' => 'Dies ist die maximale Anzahl der Dokumente und Ordner die auf Zugriffsrechte geprüft werden, wenn rekursiv gezählt wird. Wenn diese Anzahl überschritten wird, wird die Anzahl der Dokumente und Unterordner in der Ordner Ansicht geschätzt.', +'settings_maxSizeForFullText' => 'Maximale Dateigröße für sofortige Indezierung', +'settings_maxSizeForFullText_desc' => 'Alle neue Version eines Dokuments, die kleiner als die die konfigurierte Dateigröße sind, werden sofort indiziert. In allen anderen Fällen werden nur die Metadaten erfasst.', 'settings_more_settings' => 'Weitere Einstellungen. Login mit admin/admin', 'settings_notfound' => 'Nicht gefunden', 'settings_Notification' => 'Benachrichtigungen-Einstellungen', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index e243e345b..e01c14b67 100644 --- a/languages/en_GB/lang.inc +++ b/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 (1410), dgrutsch (7), netixw (14) +// Translators: Admin (1417), dgrutsch (7), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -133,7 +133,7 @@ URL: [url]', 'assumed_released' => 'Assumed released', 'attrdefgroup_management' => 'Attribute groups managament', 'attrdefgrp_show_detail' => 'Details', -'attrdefgrp_show_list' => 'list', +'attrdefgrp_show_list' => 'List', 'attrdefgrp_show_search' => 'Search', 'attrdef_exists' => 'Attribute definition already exists', 'attrdef_info' => 'Information', @@ -402,8 +402,10 @@ URL: [url]', 'edit_document_props' => 'Edit document', 'edit_event' => 'Edit event', 'edit_existing_access' => 'Edit Access List', +'edit_existing_attribute_groups' => 'Edit attribute groups', 'edit_existing_notify' => 'Edit notification list', 'edit_folder_access' => 'Edit access', +'edit_folder_attrdefgrp' => 'Edit attribute groups', 'edit_folder_notify' => 'Folder Notification List', 'edit_folder_props' => 'Edit folder', 'edit_group' => 'Edit group', @@ -417,6 +419,7 @@ URL: [url]', 'email_footer' => 'You can always change your e-mail settings using \'My Account\' functions', 'email_header' => 'This is an automatic message from the DMS server.', 'email_not_given' => 'Please enter a valid email address.', +'empty_attribute_group_list' => 'No attribute groups', 'empty_folder_list' => 'No documents or folders', 'empty_notify_list' => 'No entries', 'en_GB' => 'English (GB)', @@ -1173,6 +1176,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'This sets the maximum time in seconds a script is allowed to run before it is terminated by the parse', 'settings_maxRecursiveCount' => 'Max. number of recursive document/folder count', 'settings_maxRecursiveCount_desc' => 'This is the maximum number of documents or folders that will be checked for access rights, when recursively counting objects. If this number is exceeded, the number of documents and folders in the folder view will be estimated.', +'settings_maxSizeForFullText' => 'Maximum filesize for instant indexing', +'settings_maxSizeForFullText_desc' => 'All new document vresion smaller than the configured size will be fully indexed right after uploading. In all other cases only the metadata will be indexed.', 'settings_more_settings' => 'Configure more settings. Default login: admin/admin', 'settings_notfound' => 'Not found', 'settings_Notification' => 'Notification settings', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index e75977c3e..a0823431f 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -397,8 +397,10 @@ URL: [url]', 'edit_document_props' => 'Editar propiedades de documento', 'edit_event' => 'Editar evento', 'edit_existing_access' => 'Editar lista de acceso', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Editar lista de notificación', 'edit_folder_access' => 'Editar acceso', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Lista de notificación', 'edit_folder_props' => 'Editar carpeta', 'edit_group' => 'Editar grupo...', @@ -412,6 +414,7 @@ URL: [url]', 'email_footer' => 'Siempre se puede cambiar la configuración de correo electrónico utilizando las funciones de «Mi cuenta»', 'email_header' => 'Este es un mensaje automático del servidor de DMS.', 'email_not_given' => 'Por favor, introduzca una dirección de correo válida.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Sin documentos o carpetas', 'empty_notify_list' => 'Sin entradas', 'en_GB' => 'Ingless (GB)', @@ -1141,6 +1144,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Esto configura el tiempo máximo en segundos que un script puede estar ejectutándose antes de que el analizador lo pare', 'settings_maxRecursiveCount' => 'Número máximo del contador de carpetas/documentos recursivos', 'settings_maxRecursiveCount_desc' => 'Este es el número máximo de documentos o carpetas que pueden ser revisados con derechos de acceso, contando objetos recursivos. Si este número es excedido , el número de carpetas y documentos en la vista de carpeta será estimado.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Configure más parámetros. Acceso por defecto: admin/admin', 'settings_notfound' => 'No encontrado', 'settings_Notification' => 'Parámetros de notificación', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 2e2224b1d..95dde7918 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -397,8 +397,10 @@ URL: [url]', 'edit_document_props' => 'Modifier le document', 'edit_event' => 'Modifier l\'événement', 'edit_existing_access' => 'Modifier la liste des droits d\'accès', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Modifier les notifications', 'edit_folder_access' => 'Modifier les droits d\'accès', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Liste de notification de dossiers', 'edit_folder_props' => 'Modifier le dossier', 'edit_group' => 'Modifier un groupe', @@ -412,6 +414,7 @@ URL: [url]', 'email_footer' => 'Vous pouvez modifier les paramètres de messagerie via \'Mon compte\'.', 'email_header' => 'Ceci est un message automatique généré par le serveur DMS.', 'email_not_given' => 'SVP Entrer une adresse email valide.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Pas de documents ou de dossier', 'empty_notify_list' => 'Aucune entrée', 'en_GB' => 'Anglais (RU)', @@ -1117,6 +1120,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Ceci définit la durée maximale en secondes q\'un script est autorisé à exécuter avant de se terminer par l\'analyse syntaxique', 'settings_maxRecursiveCount' => 'Nombre maximal de document/dossier récursif', 'settings_maxRecursiveCount_desc' => 'Nombre maximum de documents et répertoires dont l\'accès sera vérifié, lors d\'un décompte récursif. Si ce nombre est dépassé, le nombre de documents et répertoires affichés sera approximé.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Configurer d\'autres paramètres. Connexion par défaut: admin/admin', 'settings_notfound' => 'Introuvable', 'settings_Notification' => 'Notifications', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 77299c3d6..00092d650 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -402,8 +402,10 @@ Internet poveznica: [url]', 'edit_document_props' => 'Uredi dokument', 'edit_event' => 'Uredi događaj', 'edit_existing_access' => 'Uredi popis pristupa', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Uredi popis za primanje obavijesti', 'edit_folder_access' => 'Uredi pristup', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Popis za obavijesti o mapi', 'edit_folder_props' => 'Uredi mapu', 'edit_group' => 'Uredi mapu', @@ -417,6 +419,7 @@ Internet poveznica: [url]', 'email_footer' => 'Koristeći funckcije \'Moj račun\' možete promijeniti postavke email obavještavanja.', 'email_header' => 'Ovo je automatski generirana poruka iz DMS sustava', 'email_not_given' => 'Molimo unesite valjanu email adresu.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Nema dokumenata ili mapa', 'empty_notify_list' => 'Nema zapisa', 'en_GB' => 'Engleski (GB)', @@ -1162,6 +1165,8 @@ Internet poveznica: [url]', 'settings_maxExecutionTime_desc' => 'Ovo postavlja maksimalno vrijeme u sekundama u kojem je skripti dopušteno da se pokrene prije nego se prekine rasčlanjivanjem', 'settings_maxRecursiveCount' => 'Max. broj rekurzivnog dokumenta/mape', 'settings_maxRecursiveCount_desc' => 'To je maksimalni broj dokumenata ili mapa koji će biti označen pristupnim pravima, pri rekurzivnom brojanju objekata. Ako se taj broj premaši, broj dokumenata i mapa u pregledu mape će biti procjenjen.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Konfiguriraj više postavki. Zadana prijava: admin/admin', 'settings_notfound' => 'Nije pronađeno', 'settings_Notification' => 'Postavke bilježenja', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 672561adb..2d3c8e7ea 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -397,8 +397,10 @@ URL: [url]', 'edit_document_props' => 'Dokumentum szerkesztése', 'edit_event' => 'Esemény szerkesztése', 'edit_existing_access' => 'Hozzáférési lista szerkesztése', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Értesítési lista szerkesztése', 'edit_folder_access' => 'Hozzáférés szerkesztése', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Mappa értesítési lista', 'edit_folder_props' => 'Mappa szerkesztése', 'edit_group' => 'Csoport szerkesztése', @@ -412,6 +414,7 @@ URL: [url]', 'email_footer' => 'Bármikor módosíthatja email beállításait a \'My Account\' funkcióval', 'email_header' => 'Ez egy automatikus üzenet a DMS kiszolgálótól.', 'email_not_given' => 'Kérem adjon meg egy érvényes email címet.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Mappa vagy dokumentum nem található', 'empty_notify_list' => 'Nincsenek bejegyzések', 'en_GB' => 'Angol (GB)', @@ -1140,6 +1143,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Beállítja a szkript maximális engedélyezett futási idejét másodpercben mielőtt megszakítja az értelmező', 'settings_maxRecursiveCount' => 'Rekurzív dokumentum/mappa számláló legnagyobb értéke', 'settings_maxRecursiveCount_desc' => 'A dokumentumok és mappák maximális mennyisége amelyeken ellenőrizni fogják a hozzáférési jogokat, ha rekurzívan számláló tárgyakat. Ha ezt az értéket túllépik, a dokumentumok számát és mappák a Mappa nézetben is becsülhetők.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'További beállítások konfigurálása. Alapértelmezett bejelentkezés: admin/admin', 'settings_notfound' => 'Nem található', 'settings_Notification' => 'Értesítés beállításai', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 7a6a418a1..3ccc0f428 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -403,8 +403,10 @@ URL: [url]', 'edit_document_props' => 'Modifica le proprietà del documento', 'edit_event' => 'Modifica l\'evento', 'edit_existing_access' => 'Modifica i permessi', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Gestione lista di notifica', 'edit_folder_access' => 'Modifica permessi', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Modifica la lista di notifica per la cartella', 'edit_folder_props' => 'Modifica proprietà cartella', 'edit_group' => 'Modifica il gruppo', @@ -418,6 +420,7 @@ URL: [url]', 'email_footer' => 'Puoi cambiare l\'impostazione della tua email utilizzando le funzioni del menu \'Account personale\'', 'email_header' => 'Questo è un messaggio automatico inviato dal server DMS', 'email_not_given' => 'Inserisci un indirizzo email valido.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Cartella vuota', 'empty_notify_list' => 'Nessun record', 'en_GB' => 'Inglese (GB)', @@ -1164,6 +1167,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Imposta il tempo limite per l\'esecuzione di uno script prima che il parser lo termini.', 'settings_maxRecursiveCount' => 'Conteggio ricursivo Max di files e cartelle', 'settings_maxRecursiveCount_desc' => 'Numero massimo di documenti e cartelle considerati dal conteggio ricursivo per il controllo dei diritti d\'accesso. Se tale valore dovesse essere superato, il risultato del conteggio sarà stimato.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Ulteriori configurazioni. Login di default: admin/admin', 'settings_notfound' => 'Non trovato', 'settings_Notification' => 'Impostazioni di notifica', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 087261953..7c6bd2b8f 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -402,8 +402,10 @@ URL: [url]', 'edit_document_props' => '문서 편집', 'edit_event' => '편집 이벤트', 'edit_existing_access' => '편집 액세스 목록', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => '편집 알림 리스트', 'edit_folder_access' => '액세스 편집', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => '폴더 알림 목록', 'edit_folder_props' => '폴더 편집', 'edit_group' => '편집 그룹', @@ -417,6 +419,7 @@ URL: [url]', 'email_footer' => '내 계정\'을 사용하여 전자 메일 설정을 변경 할 수 있습니다', 'email_header' => 'DMS 서버에서 자동 생성된 메시지 입니다.', 'email_not_given' => '유효한 이메일 주소를 입력하십시오.', +'empty_attribute_group_list' => '', 'empty_folder_list' => '문서 또는 폴더 입력', 'empty_notify_list' => '항목을 입력하세요', 'en_GB' => '영어 (GB)', @@ -1155,6 +1158,8 @@ URL : [url]', 'settings_maxExecutionTime_desc' => '종료되기 전 스크립트의 구문 분석 할 수있는 최대 시간을 초 단위로 설정', 'settings_maxRecursiveCount' => '최대 재귀 문서 / 폴더의 수', 'settings_maxRecursiveCount_desc' => '이것은 재귀적으로 개체를 셀 때 사용 권한이 확인됩니다 문서 및 폴더의 최대 수입니다. 이 수를 초과하면 폴더보기에서 문서 나 폴더의 수가 추정됩니다.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => '기타 설정을 구성합니다. 기본 로그인 : admin/admin', 'settings_notfound' => '찾을 수 없음', 'settings_Notification' => '알림 설정', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 1288a7bc2..04cb3258b 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -395,8 +395,10 @@ URL: [url]', 'edit_document_props' => 'Wijzig document', 'edit_event' => 'Activiteit wijzigen', 'edit_existing_access' => 'Wijzig toegangslijst', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Wijzig Notificatie lijst', 'edit_folder_access' => 'Wijzig toegang', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Map Notificatie Lijst', 'edit_folder_props' => 'Wijzig Map eigenschappen', 'edit_group' => 'Wijzig Groep', @@ -410,6 +412,7 @@ URL: [url]', 'email_footer' => 'U kunt altijd uw e-mail instellingen wijzigen via de \'Mijn Account\' opties', 'email_header' => 'Dit is een automatisch gegenereerd bericht van de DMS server.', 'email_not_given' => 'Voer aub een geldig email adres in.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Geen documenten of mappen', 'empty_notify_list' => 'Geen gegevens', 'en_GB' => 'Engels (GB)', @@ -1168,6 +1171,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Dit bepaald de maximale tijd in seconden waarin een script mag worden uitgevoerd, voordat het afgebroken wordt', 'settings_maxRecursiveCount' => 'Max. nummers of recursieve document/map telling', 'settings_maxRecursiveCount_desc' => 'Dit is het maximum aantal documenten of mappen dat zal worden gecontroleerd voor toegangsrechten bij recursieve objecten telling. Als dit aantal is overschreden, zal het aantal documenten en mappen in de het map overzicht worden geschat.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Meer instellingen. Standaard login: admin/admin', 'settings_notfound' => 'Niet gevonden', 'settings_Notification' => 'Notificatie instellingen', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index d3f71b3b2..888f4dd07 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -390,8 +390,10 @@ URL: [url]', 'edit_document_props' => 'Edytuj dokument', 'edit_event' => 'Edytuj zdarzenie', 'edit_existing_access' => 'Edytuj listę dostępu', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Edytuj listę powiadomień', 'edit_folder_access' => 'Edytuj dostęp', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Lista powiadomień dla folderu', 'edit_folder_props' => 'Edytuj folder', 'edit_group' => 'Edytuj grupę', @@ -405,6 +407,7 @@ URL: [url]', 'email_footer' => 'W każdej chwili możesz zmienić swój email używając zakładki \'Moje konto\'.', 'email_header' => 'To jest automatyczne powiadomienie serwera DMS.', 'email_not_given' => 'Proszę podać poprawny adres email.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Nie ma dokumentów lub folderów', 'empty_notify_list' => 'Brak elementów', 'en_GB' => 'Angielski (GB)', @@ -1120,6 +1123,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Ustawia maksymalny czas, liczony w sekundach, jaki ma na wykonanie skrypt zanim zostanie zakończony.', 'settings_maxRecursiveCount' => 'Max. liczba rekurencji dokumentów/folderów', 'settings_maxRecursiveCount_desc' => 'Jest to maksymalna liczba dokumentów i folderów, które będą sprawdzane pod kątem praw dostępu, gdy włączone jest rekurencyjnie liczenie obiektów. Jeżeli liczba ta zostanie przekroczona to ilości dokumentów i folderów w widoku zostaną oszacowane.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Wykonaj dalszą konfigurację. Domyślny login/hasło: admin/admin', 'settings_notfound' => 'Nie znaleziono', 'settings_Notification' => 'Ustawienia powiadomień', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index ce2327cff..0d6f16b30 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -396,8 +396,10 @@ URL: [url]', 'edit_document_props' => 'Editar documento', 'edit_event' => 'Edit event', 'edit_existing_access' => 'Editar lista de acesso.', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Editar lista de notificação', 'edit_folder_access' => 'Editar permissões da pasta', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Lista de notificação', 'edit_folder_props' => 'Editar pasta', 'edit_group' => 'Editar grupo', @@ -411,6 +413,7 @@ URL: [url]', 'email_footer' => 'You can always change your e-mail settings using \'My Account\' functions', 'email_header' => 'This is an automatic menager from the DMS server.', 'email_not_given' => 'Por favor insira um endereço de e-mail válido.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Nenhum documento ou pasta', 'empty_notify_list' => 'Sem entradas', 'en_GB' => 'Inglês (GB)', @@ -1138,6 +1141,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Isso define o tempo máximo em segundos que é permitido executar antes de ser finalizado pelo parse', 'settings_maxRecursiveCount' => 'Max. número de contagem de documentos/pasta recursiva', 'settings_maxRecursiveCount_desc' => 'Este é o número máximo de documentos ou pastas que serão verificados por direitos de acesso, quando recursivamente contar objetos. Se esse número for ultrapassado, será estimado o número de documentos e pastas na visualização da pasta.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Configurar outras configurações. Login padrão: admin/admin', 'settings_notfound' => 'Não encontrado', 'settings_Notification' => 'Configurações de notificação', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 1e8b3bf51..10e7f1906 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -402,8 +402,10 @@ URL: [url]', 'edit_document_props' => 'Editează document', 'edit_event' => 'Editează eveniment', 'edit_existing_access' => 'Editează Lista acces', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Editează lista de notificări', 'edit_folder_access' => 'Editează acces', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Listă de notificare pentru folder', 'edit_folder_props' => 'Editează folder', 'edit_group' => 'Editează grup', @@ -417,6 +419,7 @@ URL: [url]', 'email_footer' => 'Puteți schimba oricând setările de e-mail folosind functionalitatile din \'Contul meu\'', 'email_header' => 'Acesta este un mesaj automat de la serverul DMS.', 'email_not_given' => 'Vă rugăm să introduceți o adresă de email validă.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Nu există documente sau foldere', 'empty_notify_list' => 'Nu există înregistrări', 'en_GB' => 'Engleza (GB)', @@ -1163,6 +1166,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Acesta stabilește timpul maxim în secunde în care un script este permis să ruleze înainte de a fi oprit', 'settings_maxRecursiveCount' => 'Numarul Maxim recursiv de numarare documente/foldere', 'settings_maxRecursiveCount_desc' => 'Acesta este numărul maxim de documente sau foldere care vor fi verificate pentru drepturile de acces, atunci când se numără recursiv obiectele. Dacă acest număr este depășit, numărul de documente și foldere în vizualizarea directorului va fi estimat.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Configurare mai multe setări. Autentificare implicită: admin/admin', 'settings_notfound' => 'Nu a fost găsit', 'settings_Notification' => 'Setările de notificare', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 746e1315a..6055744b7 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -402,8 +402,10 @@ URL: [url]', 'edit_document_props' => 'Изменить документ', 'edit_event' => 'Изменить событие', 'edit_existing_access' => 'Изменить доступ', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Изменить уведомления', 'edit_folder_access' => 'Изменить доступ', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Список уведомления каталога', 'edit_folder_props' => 'Изменить каталог', 'edit_group' => 'Изменить группу', @@ -417,6 +419,7 @@ URL: [url]', 'email_footer' => 'Вы можете изменить e-mail используя меню «Моя учётка».', 'email_header' => 'Это автоматическое уведомление сервера документооборота.', 'email_not_given' => 'Введите настоящий адрес e-mail.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Нет документов или каталогов', 'empty_notify_list' => 'Нет записей', 'en_GB' => 'English (GB)', @@ -1170,6 +1173,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Устанавливает максимальное время выполнения скрипта, перед тем как он будет завершён.', 'settings_maxRecursiveCount' => 'Ограничение рекурсивного подсчёта
документов и каталогов', 'settings_maxRecursiveCount_desc' => 'Максимальное количество документов или каталогов, которые будут проверены на права доступа при рекурсивном подсчёте объектов. При превышении этого количества, будет оценено количество документов и каталогов в виде каталога.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Прочие настройки. Логин по умолчанию: admin/admin', 'settings_notfound' => 'Не найден', 'settings_Notification' => 'Настройки извещения', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 883506a5c..d8a330ae1 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -349,8 +349,10 @@ URL: [url]', 'edit_document_props' => 'Upraviť dokument', 'edit_event' => 'Upraviť udalosť', 'edit_existing_access' => 'Upraviť zoznam riadenia prístupu', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Upraviť zoznam upozornení', 'edit_folder_access' => 'Upraviť prístup', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Zoznam upozornení', 'edit_folder_props' => 'Uprav priečinok', 'edit_group' => 'Upraviť skupinu', @@ -364,6 +366,7 @@ URL: [url]', 'email_footer' => 'Nastavenia e-mailu si kedykoľvek môžete zmeniť cez \'Môj účet\'', 'email_header' => 'Toto je automatická správa od DMS servera.', 'email_not_given' => '', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Žiadne dokumenty alebo priečinky', 'empty_notify_list' => 'Žiadne položky', 'en_GB' => 'Angličtina (UK)', @@ -995,6 +998,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => '', 'settings_maxRecursiveCount' => '', 'settings_maxRecursiveCount_desc' => '', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => '', 'settings_notfound' => '', 'settings_Notification' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 899544cbe..eec4bd2bc 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -390,8 +390,10 @@ URL: [url]', 'edit_document_props' => 'Ändra', 'edit_event' => 'Ändra händelse', 'edit_existing_access' => 'Ändra lista med behörigheter', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Ändra lista med meddelanden', 'edit_folder_access' => 'Ändra behörighet', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Katalog-meddelandelista', 'edit_folder_props' => 'Ändra katalog', 'edit_group' => 'Ändra grupp', @@ -405,6 +407,7 @@ URL: [url]', 'email_footer' => 'Du kan alltid ändra dina e-postinställningar genom att gå till \'Min Sida\'', 'email_header' => 'Detta meddelande skapades automatiskt från dokumentservern.', 'email_not_given' => 'Skriv in en giltig e-postadress.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Inga dokument eller mappar', 'empty_notify_list' => 'Inga meddelanden', 'en_GB' => 'engelska (GB)', @@ -1126,6 +1129,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Detta sätter hösta tillåtna tiden i sekunder som ett skript får på sig att utföras innan det avslutas.', 'settings_maxRecursiveCount' => 'Max antal rekursiva dokument/katalog', 'settings_maxRecursiveCount_desc' => 'Detta är maximum antal av dokument eller katalog som kommer att testas om att det har korrekt rättigheter, när objekt räknas rekursiv. Om detta nummer överskrids, kommer antalet av dokument och katalog i katalogvyn bara bli uppskattat.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Konfigurera flera inställningar. Standard-inloggning: admin/admin', 'settings_notfound' => 'Hittades inte', 'settings_Notification' => 'Meddelandeinställningar', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 1e2013838..0a587dc76 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -396,8 +396,10 @@ URL: [url]', 'edit_document_props' => 'Dokümanı düzenle', 'edit_event' => 'Etkinliği düzenle', 'edit_existing_access' => 'Erişim Listesini Düzenle', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Bildirim listesini düzenle', 'edit_folder_access' => 'Erişimi düzenle', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Klasör Bildirim Listesi', 'edit_folder_props' => 'Klasörü düzenle', 'edit_group' => 'Grubu düzenle', @@ -411,6 +413,7 @@ URL: [url]', 'email_footer' => '\'My Account\' özelliklerini kullanarak her zaman e-posta ayarlarınızı değiştirebilirsiniz', 'email_header' => 'Bu DYS sunucusu tarafından gönderilen otomatik bir mesajdır.', 'email_not_given' => 'Lütfen geçerli bir e-posta adresi giriniz.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Hiç klasör veya doküman yok', 'empty_notify_list' => 'Giriş yok', 'en_GB' => 'İngilizce', @@ -1142,6 +1145,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Durdurulmadan önce bir betikin en fazla kaç saniye çalışabileceğini ayarlar', 'settings_maxRecursiveCount' => 'Maks. özyinelemeli doküman/klasör sayısı', 'settings_maxRecursiveCount_desc' => 'Nesneleri özyinelemeli olarak erişim hakkı kontrolü için sayarken bu değer en fazla sayılacak doküman ve klasör sayısını belirler. Bu sayı aşıldığında klasörün içindeki dosya ve diğer klasörlerin sayısı tahmin yolu ile belirlenecektir.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Daha fazla ayar yapın. Varsayılan kullanıcı adı/parola: admin/admin', 'settings_notfound' => 'Bulunamadı', 'settings_Notification' => 'Bildirim ayarları', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 32e64bff1..b1d969d21 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -402,8 +402,10 @@ URL: [url]', 'edit_document_props' => 'Змінити документ', 'edit_event' => 'Змінити подію', 'edit_existing_access' => 'Змінити доступ', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => 'Змінити сповіщення', 'edit_folder_access' => 'Змінити доступ', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => 'Список сповіщення каталогу', 'edit_folder_props' => 'Змінити каталог', 'edit_group' => 'Змінити групу', @@ -417,6 +419,7 @@ URL: [url]', 'email_footer' => 'Ви можете змінити e-mail використовуючи меню «Мій обліковий запис».', 'email_header' => 'Це автоматичне сповіщення сервера документообігу', 'email_not_given' => 'Введіть справжній e-mail.', +'empty_attribute_group_list' => '', 'empty_folder_list' => 'Немає документів або каталогів', 'empty_notify_list' => 'Немає записів', 'en_GB' => 'English (GB)', @@ -1163,6 +1166,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Встановлює максимальний час виконання скрипта, перед тим як він буде завершений.', 'settings_maxRecursiveCount' => 'Обмеження рекурсивного підрахунку
документів і каталогів', 'settings_maxRecursiveCount_desc' => 'Максимальна кількість документів і каталогів, які будуть перевірені на права доступу при рекурсивному підрахунку об\'єктів. При перевищенні цієї кількості, буде оцінено кількість документів і каталогів у вигляді каталогу.', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => 'Інші налаштування. Логін по замовчуванню: admin/admin', 'settings_notfound' => 'Не знайдено', 'settings_Notification' => 'Налаштування сповіщення', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index cda733cff..31d13c264 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -351,8 +351,10 @@ URL: [url]', 'edit_document_props' => '编辑文档', 'edit_event' => '编辑事件', 'edit_existing_access' => '编辑访问列表', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => '编辑通知列表', 'edit_folder_access' => '编辑访问权限', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => '文件夹通知列表', 'edit_folder_props' => '编辑文件夹', 'edit_group' => '编辑组别', @@ -366,6 +368,7 @@ URL: [url]', 'email_footer' => '您可以用‘我的账户’选项来改变您的e-mail设置', 'email_header' => '这是来自于DMS(文档管理系统)的自动发送消息', 'email_not_given' => '', +'empty_attribute_group_list' => '', 'empty_folder_list' => '没有文件或子目录', 'empty_notify_list' => '没有条目', 'en_GB' => '英语', @@ -997,6 +1000,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => '此设置最长时间，以秒为脚本允许运行之前它是由解析终止', 'settings_maxRecursiveCount' => '', 'settings_maxRecursiveCount_desc' => '', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => '', 'settings_notfound' => '', 'settings_Notification' => '通知设置', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index a8b9370d4..20e66e97a 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -349,8 +349,10 @@ URL: [url]', 'edit_document_props' => '編輯文檔', 'edit_event' => '編輯事件', 'edit_existing_access' => '編輯訪問列表', +'edit_existing_attribute_groups' => '', 'edit_existing_notify' => '編輯通知列表', 'edit_folder_access' => '編輯存取權限', +'edit_folder_attrdefgrp' => '', 'edit_folder_notify' => '資料夾通知列表', 'edit_folder_props' => '編輯資料夾', 'edit_group' => '編輯組別', @@ -364,6 +366,7 @@ URL: [url]', 'email_footer' => '您可以用‘我的帳戶’選項來改變您的e-mail設置', 'email_header' => '這是來自于DMS(文檔管理系統)的自動發送消息', 'email_not_given' => '', +'empty_attribute_group_list' => '', 'empty_folder_list' => '沒有檔或子目錄', 'empty_notify_list' => '沒有條目', 'en_GB' => '英語', @@ -995,6 +998,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => '此設置最長時間，以秒為腳本允許運行之前它是由解析終止', 'settings_maxRecursiveCount' => '', 'settings_maxRecursiveCount_desc' => '', +'settings_maxSizeForFullText' => '', +'settings_maxSizeForFullText_desc' => '', 'settings_more_settings' => '', 'settings_notfound' => '', 'settings_Notification' => '通知設置', From 97e288d054e3f522fccda79c18ae3b80f1c20caf Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 2 Aug 2016 17:21:27 +0200 Subject: [PATCH 17/65] fix typo --- languages/en_GB/lang.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index e01c14b67..5a6f0c10b 100644 --- a/languages/en_GB/lang.inc +++ b/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 (1417), dgrutsch (7), netixw (14) +// Translators: Admin (1418), dgrutsch (7), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -1177,7 +1177,7 @@ URL: [url]', 'settings_maxRecursiveCount' => 'Max. number of recursive document/folder count', 'settings_maxRecursiveCount_desc' => 'This is the maximum number of documents or folders that will be checked for access rights, when recursively counting objects. If this number is exceeded, the number of documents and folders in the folder view will be estimated.', 'settings_maxSizeForFullText' => 'Maximum filesize for instant indexing', -'settings_maxSizeForFullText_desc' => 'All new document vresion smaller than the configured size will be fully indexed right after uploading. In all other cases only the metadata will be indexed.', +'settings_maxSizeForFullText_desc' => 'All new document version smaller than the configured size will be fully indexed right after uploading. In all other cases only the metadata will be indexed.', 'settings_more_settings' => 'Configure more settings. Default login: admin/admin', 'settings_notfound' => 'Not found', 'settings_Notification' => 'Notification settings', From ba10acc14cb9aec86228b50bafbd7f3674024fd3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 3 Aug 2016 08:06:25 +0200 Subject: [PATCH 18/65] show group only if admin or a member of that group --- views/bootstrap/class.GroupView.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/views/bootstrap/class.GroupView.php b/views/bootstrap/class.GroupView.php index 279fcdbe5..44b89fddf 100644 --- a/views/bootstrap/class.GroupView.php +++ b/views/bootstrap/class.GroupView.php @@ -60,6 +60,8 @@ $(document).ready( function() { foreach ($allGroups as $group){ + if(!$group->isMember($user) && !$user->isAdmin()) + continue; $members = $group->getUsers(); $managers = $group->getManagers(); $ismanager = false; /* set to true if current user is manager */ @@ -67,11 +69,9 @@ $(document).ready( function() { echo "
  • ".htmlspecialchars($group->getName()); if($group->getComment()) echo " : ".htmlspecialchars($group->getComment()); - foreach($managers as $manager) - if($manager->getId() == $user->getId()) { - echo " : ".getMLText("manager_of_group"); - $ismanager = true; - } + $ismanager = $group->isMember($user, 1); + if($ismanager) + echo " : ".getMLText("manager_of_group"); echo "
    • "; echo "
      \n"; From 7b73a442c2567769185f7f9c93f16bcfb07563cb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 3 Aug 2016 08:06:53 +0200 Subject: [PATCH 19/65] set user image to 100px wide --- views/bootstrap/class.UserList.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/bootstrap/class.UserList.php b/views/bootstrap/class.UserList.php index 6d57fcf18..8873c0f09 100644 --- a/views/bootstrap/class.UserList.php +++ b/views/bootstrap/class.UserList.php @@ -56,7 +56,7 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style { echo ""; echo ""; if ($currUser->hasImage()) - print ""; + print ""; echo ""; echo ""; echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")
      "; From 6cd0e98618a3eced852ad999a7e2e44cd36ed87c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 3 Aug 2016 08:07:38 +0200 Subject: [PATCH 20/65] make list look like UserList --- views/bootstrap/class.UsrView.php | 36 ++++++++++++++----------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/views/bootstrap/class.UsrView.php b/views/bootstrap/class.UsrView.php index 1c7953c82..d091d5db4 100644 --- a/views/bootstrap/class.UsrView.php +++ b/views/bootstrap/class.UsrView.php @@ -46,36 +46,32 @@ class SeedDMS_View_UsrView extends SeedDMS_Bootstrap_Style { $this->contentHeading(getMLText("users")); $this->contentContainerStart(); - echo "\n"; + echo "
      \n"; echo "\n\n"; + if($enableuserimage) echo "\n"; echo "\n"; - echo "\n"; - echo "\n"; - if ($enableuserimage) echo "\n"; echo "\n\n"; foreach ($users as $currUser) { if ($currUser->isGuest()) continue; - + if ($currUser->isHidden()=="1") continue; - - echo "\n"; - - print ""; - - print ""; - print ""; - - if ($enableuserimage){ - print ""; + + echo ""; + if($enableuserimage) { + echo ""; } - - echo "\n"; + echo ""; + echo ""; } echo "
      ".getMLText("name")."".getMLText("email")."".getMLText("comment")."".getMLText("user_image")."
      ".htmlspecialchars($currUser->getFullName())."getEmail())."\">".htmlspecialchars($currUser->getEmail())."".htmlspecialchars($currUser->getComment()).""; - if ($currUser->hasImage()) print ""; - else printMLText("no_user_image"); - print "
      "; + if ($currUser->hasImage()) + print ""; + echo "
      "; + echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")
      "; + echo "getEmail()."\">".htmlspecialchars($currUser->getEmail())."
      "; + echo "".htmlspecialchars($currUser->getComment()).""; + echo "
      \n"; From fdd369f8ec7f532d0dfbe660f5593549d9040a09 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 3 Aug 2016 08:07:51 +0200 Subject: [PATCH 21/65] add entries for 4.3.28 --- CHANGELOG | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 0120147ae..b20967bcd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,13 @@ -------------------------------------------------------------------------------- - add expiration in list of documents - fix SetReviewersApprovers if reviewer/approver is an admin or the owner +- full text index documents after upload if they are smaller than a configured + size +- reindex documents when versions were added or removed in order to keep the + full text index up to date +- show only those groups in GroupView the current user is a member of (partly + fixes #239) +- make UserView look similar to UserList -------------------------------------------------------------------------------- Changes in version 4.3.27 From 06347ff2125343dda7a3ac315a63523f21d38f02 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 3 Aug 2016 08:53:14 +0200 Subject: [PATCH 22/65] check for HTTP_X_FORWARDED_FOR in add_log_line() use it instead of REMOTE_ADDR --- inc/inc.Utils.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php index 08b10bc35..25e6f47e2 100644 --- a/inc/inc.Utils.php +++ b/inc/inc.Utils.php @@ -322,10 +322,14 @@ function add_log_line($msg="", $priority=null) { /* {{{ */ if(!$logger) return; - if($user) - $logger->log($user->getLogin()." (".$_SERVER['REMOTE_ADDR'].") ".basename($_SERVER["REQUEST_URI"], ".php").$msg, $priority); + if(!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) + $ip = $_SERVER['HTTP_X_FORWARDED_FOR']; else - $logger->log("-- (".$_SERVER['REMOTE_ADDR'].") ".basename($_SERVER["REQUEST_URI"], ".php").$msg, $priority); + $ip = $_SERVER['REMOTE_ADDR']; + if($user) + $logger->log($user->getLogin()." (".$ip.") ".basename($_SERVER["REQUEST_URI"], ".php").$msg, $priority); + else + $logger->log("-- (".$ip.") ".basename($_SERVER["REQUEST_URI"], ".php").$msg, $priority); } /* }}} */ function _add_log_line($msg="") { /* {{{ */ From 0fdc68e7f7a78c52de93b676464168301becc70a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 3 Aug 2016 08:53:58 +0200 Subject: [PATCH 23/65] add entry for 4.3.28 (fix for #206) --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index b20967bcd..3c870e46b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,7 @@ - show only those groups in GroupView the current user is a member of (partly fixes #239) - make UserView look similar to UserList +- log correct ip even after a reverse proxy (Closes #206) -------------------------------------------------------------------------------- Changes in version 4.3.27 From 03ff5dfc505973c94045a12983059d8a8cf83fa7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 3 Aug 2016 12:16:51 +0200 Subject: [PATCH 24/65] remove unneeded echo statement --- views/bootstrap/class.ViewDocument.php | 1 - 1 file changed, 1 deletion(-) diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index 02c0534e1..e27a3af5c 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -370,7 +370,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { foreach($attributes as $attribute) { $arr = $this->callHook('showDocumentAttribute', $document, $attribute); if(is_array($arr)) { - echo $txt; echo ""; echo "".$arr[0].":"; echo "".$arr[1].""; From 3a006be5bf48d22382462ed1af00f2916716b02c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 3 Aug 2016 12:32:12 +0200 Subject: [PATCH 25/65] make folderListRow() a bit more efficient get subfolders and documents only, if enablerecursivecount is turned on --- views/bootstrap/class.Bootstrap.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 2b5e13304..2a15a4af5 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1778,10 +1778,6 @@ $(document).ready( function() { $owner = $subFolder->getOwner(); $comment = $subFolder->getComment(); if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; - $subsub = $subFolder->getSubFolders(); - $subsub = SeedDMS_Core_DMS::filterAccess($subsub, $user, M_READ); - $subdoc = $subFolder->getDocuments(); - $subdoc = SeedDMS_Core_DMS::filterAccess($subdoc, $user, M_READ); $content = ''; $content .= "getID()."\" draggable=\"true\" rel=\"folder_".$subFolder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; @@ -1811,6 +1807,14 @@ $(document).ready( function() { $content .= (!$cc['folder_precise'] ? '~'.(round($cc['folder_count']/$rr)*$rr) : $cc['folder_count'])." ".getMLText("folders")."
      ".(!$cc['document_precise'] ? '~'.(round($cc['document_count']/$rr)*$rr) : $cc['document_count'])." ".getMLText("documents"); } } else { + /* FIXME: the following is very inefficient for just getting the number of + * subfolders and documents. Making it more efficient is difficult, because + * the access rights need to be checked. + */ + $subsub = $subFolder->getSubFolders(); + $subsub = SeedDMS_Core_DMS::filterAccess($subsub, $user, M_READ); + $subdoc = $subFolder->getDocuments(); + $subdoc = SeedDMS_Core_DMS::filterAccess($subdoc, $user, M_READ); $content .= count($subsub)." ".getMLText("folders")."
      ".count($subdoc)." ".getMLText("documents"); } $content .= ""; From 284ee2bba1fe5d705cd90bff8fb2c47cc8e8ae84 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Aug 2016 08:03:38 +0200 Subject: [PATCH 26/65] set field of type 'text' to NULL instead of '' mysql doesn't support setting '' in STRICT_TRANS_MODE --- install/create_tables-innodb.sql | 4 ++-- install/create_tables-sqlite3.sql | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install/create_tables-innodb.sql b/install/create_tables-innodb.sql index cd065b66f..292537e88 100644 --- a/install/create_tables-innodb.sql +++ b/install/create_tables-innodb.sql @@ -490,9 +490,9 @@ CREATE TABLE `tblSessions` ( `lastAccess` int(11) NOT NULL default '0', `theme` varchar(30) NOT NULL default '', `language` varchar(30) NOT NULL default '', - `clipboard` text default '', + `clipboard` text default NULL, `su` INTEGER DEFAULT NULL, - `splashmsg` text default '', + `splashmsg` text default NULL, PRIMARY KEY (`id`), CONSTRAINT `tblSessions_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql index 13378361e..e80406b0e 100644 --- a/install/create_tables-sqlite3.sql +++ b/install/create_tables-sqlite3.sql @@ -427,9 +427,9 @@ CREATE TABLE `tblSessions` ( `lastAccess` INTEGER NOT NULL default '0', `theme` varchar(30) NOT NULL default '', `language` varchar(30) NOT NULL default '', - `clipboard` text default '', + `clipboard` text default NULL, `su` INTEGER DEFAULT NULL, - `splashmsg` text default '' + `splashmsg` text default NULL ) ; -- -------------------------------------------------------- From 5f1d38bba314a31556af4a758760929fb3027b80 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Aug 2016 08:09:01 +0200 Subject: [PATCH 27/65] do not set TEXT field to default ''. Use NULL instead mysql STRICT_TRANS_MODE does not allow it --- install/create_tables-sqlite3.sql | 2 +- install/update-4.0.0/update.sql | 2 +- install/update-4.3.0/update-sqlite3.sql | 4 ++-- install/update-4.3.0/update.sql | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/install/create_tables-sqlite3.sql b/install/create_tables-sqlite3.sql index e80406b0e..abd977de6 100644 --- a/install/create_tables-sqlite3.sql +++ b/install/create_tables-sqlite3.sql @@ -37,7 +37,7 @@ CREATE TABLE `tblAttributeDefinitions` ( `minvalues` INTEGER NOT NULL default '0', `maxvalues` INTEGER NOT NULL default '0', `valueset` TEXT default NULL, - `regex` TEXT DEFAULT '', + `regex` TEXT DEFAULT NULL, UNIQUE(`name`) ) ; diff --git a/install/update-4.0.0/update.sql b/install/update-4.0.0/update.sql index 385dd2199..bb9c5229b 100644 --- a/install/update-4.0.0/update.sql +++ b/install/update-4.0.0/update.sql @@ -12,7 +12,7 @@ ALTER TABLE tblDocumentContent ADD COLUMN `checksum` char(32); ALTER TABLE tblUsers ADD COLUMN `quota` bigint; -ALTER TABLE tblSessions ADD COLUMN `clipboard` text DEFAULT ''; +ALTER TABLE tblSessions ADD COLUMN `clipboard` text DEFAULT NULL; CREATE TABLE tblWorkflowStates ( `id` int(11) NOT NULL auto_increment, diff --git a/install/update-4.3.0/update-sqlite3.sql b/install/update-4.3.0/update-sqlite3.sql index 8589754cd..45ce3ba66 100644 --- a/install/update-4.3.0/update-sqlite3.sql +++ b/install/update-4.3.0/update-sqlite3.sql @@ -1,8 +1,8 @@ BEGIN; -ALTER TABLE tblSessions ADD COLUMN `splashmsg` TEXT DEFAULT ''; +ALTER TABLE tblSessions ADD COLUMN `splashmsg` TEXT DEFAULT NULL; -ALTER TABLE tblAttributeDefinitions ADD COLUMN `regex` TEXT DEFAULT ''; +ALTER TABLE tblAttributeDefinitions ADD COLUMN `regex` TEXT DEFAULT NULL; UPDATE tblVersion set major=4, minor=3, subminor=0; diff --git a/install/update-4.3.0/update.sql b/install/update-4.3.0/update.sql index 9ad72c978..c21cb71fc 100644 --- a/install/update-4.3.0/update.sql +++ b/install/update-4.3.0/update.sql @@ -1,8 +1,8 @@ START TRANSACTION; -ALTER TABLE tblSessions ADD COLUMN `splashmsg` TEXT DEFAULT ''; +ALTER TABLE tblSessions ADD COLUMN `splashmsg` TEXT DEFAULT NULL; -ALTER TABLE tblAttributeDefinitions ADD COLUMN `regex` TEXT DEFAULT ''; +ALTER TABLE tblAttributeDefinitions ADD COLUMN `regex` TEXT DEFAULT NULL; UPDATE tblVersion set major=4, minor=3, subminor=0; From bdb448e7e88b6f3bb24762b1168164b7424a7d50 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Aug 2016 11:41:07 +0200 Subject: [PATCH 28/65] add entry for 4.3.28 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 3c870e46b..656520d9b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,7 @@ fixes #239) - make UserView look similar to UserList - log correct ip even after a reverse proxy (Closes #206) +- fix sql error in table creation if sql mode is set to STRICT_TRANS_TABLE -------------------------------------------------------------------------------- Changes in version 4.3.27 From 176fb7967b659286cad8bb7f6ce9fb3ead70d3e9 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Aug 2016 12:58:06 +0200 Subject: [PATCH 29/65] use getCurrentDatetime() instead of CURRENT_TIMESTAMP --- inc/inc.ClassPasswordHistoryManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/inc.ClassPasswordHistoryManager.php b/inc/inc.ClassPasswordHistoryManager.php index 7579b1c10..6c8b8f1f5 100644 --- a/inc/inc.ClassPasswordHistoryManager.php +++ b/inc/inc.ClassPasswordHistoryManager.php @@ -48,7 +48,7 @@ class SeedDMS_PasswordHistoryManager { function add($user, $pwd) { /* {{{ */ $queryStr = "INSERT INTO tblUserPasswordHistory (userID, pwd, `date`) ". - "VALUES (".$this->db->qstr($user->getId()).", ".$this->db->qstr($pwd).", CURRENT_TIMESTAMP)"; + "VALUES (".$this->db->qstr($user->getId()).", ".$this->db->qstr($pwd).", ".$this->db->getCurrentDatetime().")"; if (!$this->db->getResult($queryStr)) { return false; } From e4d589e9a705790653a259dcd12eaa5eaebd8048 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Aug 2016 22:38:51 +0200 Subject: [PATCH 30/65] add missing containerEnd --- views/bootstrap/class.Settings.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 868453b5a..2c01d942d 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -711,7 +711,8 @@ if(!is_writeable($settings->_configFilePath)) { } ?> - +contentContainerEnd(); ?> + _configFilePath)) { From e4d2d7e56c14dda427b6afbd2dc94ac85d787b8c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Aug 2016 06:23:58 +0200 Subject: [PATCH 31/65] new version 5.0.5 --- SeedDMS_Core/package.xml | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 7fb7953a6..f1ba6b9f3 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,11 +12,11 @@ uwe@steinmann.cx yes - 2016-05-03 - + 2016-08-09 + - 5.0.4 - 5.0.4 + 5.0.5 + 5.0.5 stable @@ -24,7 +24,7 @@ GPL License -- all changes from 4.3.27 merged +- all changes from 4.3.28 merged @@ -1090,5 +1090,21 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated - all changes from 4.3.26 merged + + 2016-05-03 + + + 5.0.4 + 5.0.4 + + + stable + stable + + GPL License + +- all changes from 4.3.27 merged + + From f647796dcdea210f509cc783da21e50f6e8f4b20 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Aug 2016 06:51:43 +0200 Subject: [PATCH 32/65] check if $data is set before using it --- views/bootstrap/class.Charts.php | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/views/bootstrap/class.Charts.php b/views/bootstrap/class.Charts.php index 47940caf6..3df870c39 100644 --- a/views/bootstrap/class.Charts.php +++ b/views/bootstrap/class.Charts.php @@ -53,10 +53,11 @@ if(in_array($type, array('docspermonth'))) { ?> var data = [ $rec) { - $key = mktime(12, 0, 0, substr($rec['key'], 5, 2), 1, substr($rec['key'], 0, 4)) * 1000; - echo '["'.$rec['key'].'",'.$rec['total'].'],'."\n"; -// echo '['.$i.','.$rec['total'].'],'."\n"; + if($data) { + foreach($data as $i=>$rec) { + $key = mktime(12, 0, 0, substr($rec['key'], 5, 2), 1, substr($rec['key'], 0, 4)) * 1000; + echo '["'.$rec['key'].'",'.$rec['total'].'],'."\n"; + } } ?> ]; @@ -94,8 +95,10 @@ if(in_array($type, array('docspermonth'))) { ?> var data = [ ]; @@ -131,8 +134,10 @@ if(in_array($type, array('docspermonth'))) { ?> var data = [ ]; From b54b28e1f2d5f637786862e9f771f9150a946d21 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Aug 2016 07:08:00 +0200 Subject: [PATCH 33/65] fix runtime error, show splash message after execution --- op/op.ClearCache.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/op/op.ClearCache.php b/op/op.ClearCache.php index b5c00e5f0..6ecb46057 100644 --- a/op/op.ClearCache.php +++ b/op/op.ClearCache.php @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); +include("../inc/inc.Utils.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); @@ -29,7 +29,13 @@ if(!checkFormKey('clearcache')) { } $cmd = 'rm -rf '.$settings->_cacheDir.'/*'; -system($cmd); +$ret = null; +system($cmd, $ret); +if($ret) + $session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_clearcache'))); +else + $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_clearcache'))); + add_log_line(""); header("Location:../out/out.AdminTools.php"); From 974a5d4a80667cc9a153d03df235ab5ed202c4b4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Aug 2016 07:08:27 +0200 Subject: [PATCH 34/65] add missing copyright and license --- op/op.ImportFS.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/op/op.ImportFS.php b/op/op.ImportFS.php index d64ec17a1..ef8222578 100644 --- a/op/op.ImportFS.php +++ b/op/op.ImportFS.php @@ -1,4 +1,21 @@ Date: Tue, 9 Aug 2016 07:34:30 +0200 Subject: [PATCH 35/65] fix copyright in header --- op/op.AddDocument.php | 1 + op/op.AddDocumentLink.php | 1 + op/op.AddEvent.php | 1 + op/op.AddFile.php | 1 + op/op.AddFile2.php | 1 + op/op.AddMultiDocument.php | 2 +- op/op.AddSubFolder.php | 1 + op/op.AddToClipboard.php | 3 ++- op/op.AddTransitionToWorkflow.php | 2 ++ op/op.Ajax.php | 2 +- op/op.ApproveDocument.php | 2 +- op/op.AttributeMgr.php | 2 +- op/op.Categories.php | 1 + op/op.ChangePassword.php | 2 +- op/op.ClearCache.php | 2 +- op/op.ClearClipboard.php | 2 +- op/op.CreateDump.php | 1 + op/op.CreateFolderArchive.php | 1 + op/op.CreateSubFolderIndex.php | 1 + op/op.CreateVersioningFiles.php | 1 + op/op.DefaultKeywords.php | 1 + op/op.DocumentAccess.php | 1 + op/op.DocumentNotify.php | 1 + op/op.Download.php | 2 +- op/op.DropFolderPreview.php | 2 +- op/op.EditAttributes.php | 1 + op/op.EditComment.php | 1 + op/op.EditDocument.php | 1 + op/op.EditEvent.php | 1 + op/op.EditFolder.php | 1 + op/op.EditOnline.php | 1 + op/op.EditUserData.php | 2 +- op/op.FolderAccess.php | 1 + op/op.FolderNotify.php | 1 + op/op.GroupMgr.php | 1 + op/op.GroupView.php | 1 + op/op.ImportFS.php | 2 +- op/op.LockDocument.php | 1 + op/op.Login.php | 1 + op/op.Logout.php | 2 +- op/op.ManageNotify.php | 1 + op/op.MoveClipboard.php | 1 + op/op.MoveDocument.php | 1 + op/op.MoveFolder.php | 1 + op/op.OverrideContentStatus.php | 2 +- op/op.PasswordForgotten.php | 2 +- op/op.Preview.php | 2 +- op/op.RemoveArchive.php | 1 + op/op.RemoveDocument.php | 1 + op/op.RemoveDocumentFile.php | 1 + op/op.RemoveDocumentLink.php | 1 + op/op.RemoveDump.php | 1 + op/op.RemoveEvent.php | 1 + op/op.RemoveFolder.php | 1 + op/op.RemoveFolderFiles.php | 1 + op/op.RemoveFromClipboard.php | 2 +- op/op.RemoveLog.php | 1 + op/op.RemoveTransitionFromWorkflow.php | 1 + op/op.RemoveVersion.php | 1 + op/op.RemoveWorkflow.php | 1 + op/op.RemoveWorkflowAction.php | 1 + op/op.RemoveWorkflowFromDocument.php | 1 + op/op.RemoveWorkflowState.php | 1 + op/op.ResetSu.php | 2 +- op/op.ReturnFromSubWorkflow.php | 1 + op/op.ReviewDocument.php | 1 + op/op.RewindWorkflow.php | 1 + op/op.RunSubWorkflow.php | 1 + op/op.SearchFulltext.php | 2 +- op/op.SetExpires.php | 1 + op/op.SetLanguage.php | 1 + op/op.SetReviewersApprovers.php | 1 + op/op.SetWorkflow.php | 1 + op/op.Settings.php | 1 + op/op.SubstituteUser.php | 2 +- op/op.TriggerWorkflow.php | 1 + op/op.UnlockDocument.php | 1 + op/op.UpdateDocument.php | 1 + op/op.UpdateDocument2.php | 1 + op/op.UserDefaultKeywords.php | 1 + op/op.UsrMgr.php | 2 +- op/op.ViewOnline.php | 2 +- op/op.WorkflowActionsMgr.php | 2 +- op/op.WorkflowMgr.php | 2 +- op/op.WorkflowStatesMgr.php | 2 +- 85 files changed, 87 insertions(+), 25 deletions(-) diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php index 95ef13b53..3ade3559a 100644 --- a/op/op.AddDocument.php +++ b/op/op.AddDocument.php @@ -3,6 +3,7 @@ // Copyright (C) 2002-2005 Markus Westphal // Copyright (C) 2006-2008 Malcolm Cowe // Copyright (C) 2010 Matteo Lucarelli +// Copyright (C) 2010-2106 Uwe Steinmann // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/op/op.AddDocumentLink.php b/op/op.AddDocumentLink.php index 1f33487aa..26107625d 100644 --- a/op/op.AddDocumentLink.php +++ b/op/op.AddDocumentLink.php @@ -3,6 +3,7 @@ // Copyright (C) 2002-2005 Markus Westphal // Copyright (C) 2006-2008 Malcolm Cowe // Copyright (C) 2010 Matteo Lucarelli +// Copyright (C) 2010-2106 Uwe Steinmann // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/op/op.AddEvent.php b/op/op.AddEvent.php index e315569a0..0383f60e2 100644 --- a/op/op.AddEvent.php +++ b/op/op.AddEvent.php @@ -3,6 +3,7 @@ // Copyright (C) 2002-2005 Markus Westphal // Copyright (C) 2006-2008 Malcolm Cowe // Copyright (C) 2010 Matteo Lucarelli +// Copyright (C) 2010-2106 Uwe Steinmann // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/op/op.AddFile.php b/op/op.AddFile.php index 589923437..89ff9e1a1 100644 --- a/op/op.AddFile.php +++ b/op/op.AddFile.php @@ -1,6 +1,7 @@ Date: Tue, 9 Aug 2016 07:36:05 +0200 Subject: [PATCH 36/65] fix line endings --- op/op.AddDocumentLink.php | 100 +++++++++++++++++++------------------- op/op.AddFile.php | 2 +- op/op.RemoveDump.php | 70 +++++++++++++------------- op/op.RemoveEvent.php | 68 +++++++++++++------------- 4 files changed, 120 insertions(+), 120 deletions(-) diff --git a/op/op.AddDocumentLink.php b/op/op.AddDocumentLink.php index 26107625d..12baa371e 100644 --- a/op/op.AddDocumentLink.php +++ b/op/op.AddDocumentLink.php @@ -1,67 +1,67 @@ - getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); -} - -$documentid = $_GET["documentid"]; + UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); +} + +$documentid = $_GET["documentid"]; $document = $dms->getDocument($documentid); - -if (!is_object($document)) { - UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); -} - -$folder = $document->getFolder(); + +if (!is_object($document)) { + UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id")); +} + +$folder = $document->getFolder(); $docPathHTML = getFolderPathHTML($folder, true). " / ".$document->getName().""; - + if ($document->getAccessMode($user) < M_READ) { - UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied")); -} - -$public = (isset($_GET["public"]) && $_GET["public"] == "true") ? true : false; -if ($public && ($document->getAccessMode($user) == M_READ)) { - $public = false; -} - + UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied")); +} + +$public = (isset($_GET["public"]) && $_GET["public"] == "true") ? true : false; +if ($public && ($document->getAccessMode($user) == M_READ)) { + $public = false; +} + if (!isset($_GET["docid"]) || !is_numeric($_GET["docid"]) || intval($_GET["docid"])<1) { UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_target_doc_id")); } - -$docid = $_GET["docid"]; + +$docid = $_GET["docid"]; $doc = $dms->getDocument($docid); - + if (!is_object($doc)) { - UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_doc_id")); + UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_doc_id")); } if (!$document->addDocumentLink($docid, $user->getID(), $public)){ - UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured")); + UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured")); } header("Location:../out/out.ViewDocument.php?documentid=".$documentid."¤ttab=links"); diff --git a/op/op.AddFile.php b/op/op.AddFile.php index 89ff9e1a1..befaf9ddc 100644 --- a/op/op.AddFile.php +++ b/op/op.AddFile.php @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); -include("../inc/inc.LogInit.php"); +include("../inc/inc.LogInit.php"); include("../inc/inc.Utils.php"); include("../inc/inc.DBInit.php"); include("../inc/inc.Language.php"); diff --git a/op/op.RemoveDump.php b/op/op.RemoveDump.php index a3dbe940d..e27e62ad9 100644 --- a/op/op.RemoveDump.php +++ b/op/op.RemoveDump.php @@ -1,47 +1,47 @@ -isAdmin()) { - UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); + UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); } - + /* Check if the form data comes for a trusted request */ if(!checkFormKey('removedump')) { UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token")); } -if (!isset($_POST["dumpname"]) || !file_exists($settings->_contentDir.$_POST["dumpname"]) ) { - UI::exitError(getMLText("admin_tools"),getMLText("unknown_id")); +if (!isset($_POST["dumpname"]) || !file_exists($settings->_contentDir.$_POST["dumpname"]) ) { + UI::exitError(getMLText("admin_tools"),getMLText("unknown_id")); } - -if (!SeedDMS_Core_File::removeFile($settings->_contentDir.$_POST["dumpname"])) { - UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); + +if (!SeedDMS_Core_File::removeFile($settings->_contentDir.$_POST["dumpname"])) { + UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); } - -add_log_line("?dumpname=".$_POST["dumpname"]); + +add_log_line("?dumpname=".$_POST["dumpname"]); header("Location:../out/out.BackupTools.php"); - -?> + +?> diff --git a/op/op.RemoveEvent.php b/op/op.RemoveEvent.php index d47d83273..81ce0a384 100644 --- a/op/op.RemoveEvent.php +++ b/op/op.RemoveEvent.php @@ -1,40 +1,40 @@ -getID()!=$event["userID"])&&(!$user->isAdmin())){ } $res = delEvent($_POST["eventid"]); - + if (is_bool($res) && !$res) { UI::exitError(getMLText("edit_event"),getMLText("error_occured")); } -add_log_line("?id=".$_POST["eventid"]); +add_log_line("?id=".$_POST["eventid"]); $dt=getdate($event["start"]); - -header("Location:../out/out.Calendar.php?mode=w&day=".$dt["mday"]."&year=".$dt["year"]."&month=".$dt["mon"]); - -?> + +header("Location:../out/out.Calendar.php?mode=w&day=".$dt["mday"]."&year=".$dt["year"]."&month=".$dt["mon"]); + +?> From 7c3e1c080797c8f0fe8fe9f4ea6b4af522930e85 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Aug 2016 07:53:15 +0200 Subject: [PATCH 37/65] fix copyright in header --- out/out.AddDocument.php | 3 ++- out/out.AddEvent.php | 1 + out/out.AddFile.php | 3 ++- out/out.AddFile2.php | 3 ++- out/out.AddMultiDocument.php | 3 ++- out/out.AddSubFolder.php | 4 ++-- out/out.AdminTools.php | 1 + out/out.ApprovalSummary.php | 3 ++- out/out.ApproveDocument.php | 3 ++- out/out.AttributeMgr.php | 2 +- out/out.BackupTools.php | 1 + out/out.Calendar.php | 1 + out/out.Categories.php | 3 ++- out/out.CategoryChooser.php | 3 ++- out/out.ChangePassword.php | 2 +- out/out.Charts.php | 1 + out/out.ClearCache.php | 3 ++- out/out.CreateIndex.php | 4 ++-- out/out.DefaultKeywords.php | 3 ++- out/out.DocumentAccess.php | 5 +++-- out/out.DocumentChooser.php | 5 +++-- out/out.DocumentNotify.php | 5 +++-- out/out.DocumentVersionDetail.php | 5 +++-- out/out.DropFolderChooser.php | 4 ++-- out/out.EditAttributes.php | 3 ++- out/out.EditComment.php | 3 ++- out/out.EditDocument.php | 3 ++- out/out.EditEvent.php | 1 + out/out.EditFolder.php | 3 ++- out/out.EditOnline.php | 4 ++-- out/out.EditUserData.php | 5 +++-- out/out.FolderAccess.php | 3 ++- out/out.FolderChooser.php | 3 ++- out/out.FolderNotify.php | 4 ++-- out/out.ForcePasswordChange.php | 19 +++++++++++++++++++ out/out.GroupMgr.php | 4 ++-- out/out.GroupView.php | 1 + out/out.Help.php | 1 + out/out.ImportFS.php | 1 + out/out.IndexInfo.php | 6 +++--- out/out.Indexer.php | 7 +++---- out/out.Info.php | 3 ++- out/out.KeywordChooser.php | 4 ++-- out/out.LogManagement.php | 1 + out/out.Login.php | 5 +++-- out/out.ManageNotify.php | 1 + out/out.MoveDocument.php | 3 ++- out/out.MoveFolder.php | 4 ++-- out/out.MyAccount.php | 3 ++- out/out.MyDocuments.php | 3 ++- out/out.ObjectCheck.php | 6 +++--- out/out.OverrideContentStatus.php | 4 ++-- out/out.PasswordForgotten.php | 2 +- out/out.PasswordSend.php | 2 +- out/out.RemoveArchive.php | 1 + out/out.RemoveDocument.php | 4 ++-- out/out.RemoveDocumentFile.php | 1 + out/out.RemoveDump.php | 1 + out/out.RemoveEvent.php | 1 + out/out.RemoveFolder.php | 3 ++- out/out.RemoveFolderFiles.php | 1 + out/out.RemoveGroup.php | 4 ++-- out/out.RemoveLog.php | 1 + out/out.RemoveUser.php | 4 ++-- out/out.RemoveVersion.php | 3 ++- out/out.RemoveWorkflow.php | 3 ++- out/out.RemoveWorkflowFromDocument.php | 3 ++- out/out.ReturnFromSubWorkflow.php | 3 ++- out/out.ReviewDocument.php | 3 ++- out/out.ReviewSummary.php | 4 ++-- out/out.RewindWorkflow.php | 3 ++- out/out.RunSubWorkflow.php | 3 ++- out/out.Search.php | 4 ++-- out/out.SearchForm.php | 3 ++- out/out.SetExpires.php | 3 ++- out/out.SetReviewersApprovers.php | 3 ++- out/out.SetWorkflow.php | 3 ++- out/out.Settings.php | 1 + out/out.Statistic.php | 1 + out/out.SubstituteUser.php | 2 +- out/out.Timeline.php | 1 + out/out.TriggerWorkflow.php | 3 ++- out/out.UpdateDocument.php | 3 ++- out/out.UpdateDocument2.php | 4 ++-- out/out.UserDefaultKeywords.php | 3 ++- out/out.UserImage.php | 3 ++- out/out.UserList.php | 1 + out/out.UsrMgr.php | 3 ++- out/out.UsrView.php | 1 + out/out.ViewDocument.php | 4 ++-- out/out.ViewEvent.php | 1 + out/out.ViewFolder.php | 3 ++- out/out.WorkflowActionsMgr.php | 4 ++-- out/out.WorkflowGraph.php | 4 ++-- out/out.WorkflowMgr.php | 4 ++-- out/out.WorkflowStatesMgr.php | 4 ++-- out/out.WorkflowSummary.php | 4 ++-- 97 files changed, 192 insertions(+), 107 deletions(-) diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php index 4332a1958..1601100b1 100644 --- a/out/out.AddDocument.php +++ b/out/out.AddDocument.php @@ -1,8 +1,9 @@ Date: Tue, 9 Aug 2016 08:01:30 +0200 Subject: [PATCH 38/65] fix runtime error --- op/op.ClearCache.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/op/op.ClearCache.php b/op/op.ClearCache.php index 9f62e75e8..a68e302fe 100644 --- a/op/op.ClearCache.php +++ b/op/op.ClearCache.php @@ -17,9 +17,11 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. include("../inc/inc.Settings.php"); +include("../inc/inc.LogInit.php"); +include("../inc/inc.Language.php"); +include("../inc/inc.Init.php"); include("../inc/inc.Utils.php"); include("../inc/inc.DBInit.php"); -include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); include("../inc/inc.Authentication.php"); From 8e97845beb22a3f0a406ad88319223856b110a3b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Aug 2016 13:27:34 +0200 Subject: [PATCH 39/65] new phrases and updated translations --- languages/ar_EG/lang.inc | 3 +++ languages/bg_BG/lang.inc | 3 +++ languages/ca_ES/lang.inc | 3 +++ languages/cs_CZ/lang.inc | 3 +++ languages/de_DE/lang.inc | 5 ++++- languages/en_GB/lang.inc | 5 ++++- languages/es_ES/lang.inc | 3 +++ languages/fr_FR/lang.inc | 21 ++++++++++++--------- languages/hr_HR/lang.inc | 3 +++ languages/hu_HU/lang.inc | 3 +++ languages/it_IT/lang.inc | 3 +++ languages/ko_KR/lang.inc | 3 +++ languages/nl_NL/lang.inc | 3 +++ languages/pl_PL/lang.inc | 3 +++ languages/pt_BR/lang.inc | 3 +++ languages/ro_RO/lang.inc | 3 +++ languages/ru_RU/lang.inc | 3 +++ languages/sk_SK/lang.inc | 3 +++ languages/sv_SE/lang.inc | 3 +++ languages/tr_TR/lang.inc | 3 +++ languages/uk_UA/lang.inc | 3 +++ languages/zh_CN/lang.inc | 9 ++++++--- languages/zh_TW/lang.inc | 3 +++ 23 files changed, 83 insertions(+), 14 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index 47b3fc05e..c5899170b 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -123,6 +123,7 @@ URL: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => 'تعريف السمة بالفعل موجود', 'attrdef_info' => '', 'attrdef_in_use' => 'تعريف السمة مشغول حاليا', @@ -415,6 +416,7 @@ URL: [url]', 'error' => 'خطأ', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => 'لم يتم اختيار مستند', 'error_no_folder_selected' => 'لم يتم اختيار مجلد', @@ -1252,6 +1254,7 @@ URL: [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => '', +'splash_clearcache' => '', 'splash_cleared_clipboard' => '', 'splash_document_added' => '', 'splash_document_checkedout' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 023e3b225..9a3e43c22 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -114,6 +114,7 @@ $text = array( 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => 'Тази дефиниция на атрибути вече съществува', 'attrdef_info' => '', 'attrdef_in_use' => 'Тази дефиниция на атрибути все още се ползва', @@ -370,6 +371,7 @@ $text = array( 'error' => 'Грешка', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => 'Няма избрани документи', 'error_no_folder_selected' => 'Няма избрани папки', @@ -1117,6 +1119,7 @@ $text = array( 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => '', +'splash_clearcache' => '', 'splash_cleared_clipboard' => '', 'splash_document_added' => '', 'splash_document_checkedout' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 0210bb706..1656864dd 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -119,6 +119,7 @@ URL: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => '', 'attrdef_info' => '', 'attrdef_in_use' => '', @@ -375,6 +376,7 @@ URL: [url]', 'error' => '', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => '', 'error_no_folder_selected' => '', @@ -1122,6 +1124,7 @@ URL: [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => '', +'splash_clearcache' => '', 'splash_cleared_clipboard' => '', 'splash_document_added' => '', 'splash_document_checkedout' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 9f8220029..9c038ca48 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -130,6 +130,7 @@ URL: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => 'Definice atributů již existuje', 'attrdef_info' => '', 'attrdef_in_use' => 'Definice atributů je ještě užívána', @@ -422,6 +423,7 @@ URL: [url]', 'error' => 'Error', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => 'Není vybrán žádný dokument.', 'error_no_folder_selected' => 'Není vybrána žádná složka', @@ -1261,6 +1263,7 @@ URL: [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => 'Přidán nový uživatel', +'splash_clearcache' => '', 'splash_cleared_clipboard' => 'Schránka vymazána', 'splash_document_added' => 'Dokument přidán', 'splash_document_checkedout' => '', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 5fd8f1d11..3fdb0ff09 100644 --- a/languages/de_DE/lang.inc +++ b/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 (2269), dgrutsch (21) +// Translators: Admin (2272), dgrutsch (21) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -135,6 +135,7 @@ URL: [url]', 'attrdefgrp_show_detail' => 'Details', 'attrdefgrp_show_list' => 'Liste', 'attrdefgrp_show_search' => 'Suche', +'attrdefgrp_show_searchlist' => 'Suchergebnis', 'attrdef_exists' => 'Attributdefinition existiert bereits', 'attrdef_info' => 'Information', 'attrdef_in_use' => 'Definition des Attributs noch in Gebrauch', @@ -427,6 +428,7 @@ URL: [url]', 'error' => 'Fehler', 'error_add_aro' => 'Fehler beim Hinzufügen des Zugriffsobjekt', 'error_add_permission' => 'Fehler beim Hinzufügen der Berechtigung', +'error_clearcache' => 'Fehler beim Löschen des Cache', 'error_importfs' => 'Fehler beim Importieren aus dem Dateisystem', 'error_no_document_selected' => 'Kein Dokument ausgewählt', 'error_no_folder_selected' => 'Kein Ordner ausgewählt', @@ -1298,6 +1300,7 @@ URL: [url]', 'splash_add_role' => 'Neue Rolle hinzugefügt', 'splash_add_to_transmittal' => 'Zur Dokumentenliste hinzugefügt', 'splash_add_user' => 'Neuen Benutzer hinzugefügt', +'splash_clearcache' => 'Cache geleert', 'splash_cleared_clipboard' => 'Zwischenablage geleert', 'splash_document_added' => 'Dokument hinzugefügt', 'splash_document_checkedout' => 'Dokument ausgecheckt', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 5a6f0c10b..ccbb39150 100644 --- a/languages/en_GB/lang.inc +++ b/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 (1418), dgrutsch (7), netixw (14) +// Translators: Admin (1421), dgrutsch (7), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -135,6 +135,7 @@ URL: [url]', 'attrdefgrp_show_detail' => 'Details', 'attrdefgrp_show_list' => 'List', 'attrdefgrp_show_search' => 'Search', +'attrdefgrp_show_searchlist' => 'Search result', 'attrdef_exists' => 'Attribute definition already exists', 'attrdef_info' => 'Information', 'attrdef_in_use' => 'Attribute definition still in use', @@ -427,6 +428,7 @@ URL: [url]', 'error' => 'Error', 'error_add_aro' => 'Error while adding access request object', 'error_add_permission' => 'Error while add permission', +'error_clearcache' => 'Error while clearing cache', 'error_importfs' => 'Error while importing form file system', 'error_no_document_selected' => 'No document selected', 'error_no_folder_selected' => 'No folder selected', @@ -1299,6 +1301,7 @@ URL: [url]', 'splash_add_role' => 'Added new role', 'splash_add_to_transmittal' => 'Add to transmittal', 'splash_add_user' => 'New user added', +'splash_clearcache' => 'Cache cleared', 'splash_cleared_clipboard' => 'Clipboard cleared', 'splash_document_added' => 'Document added', 'splash_document_checkedout' => 'Document checked out', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index a0823431f..8e8f94762 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -130,6 +130,7 @@ URL: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => 'Definición de atributos ya existe', 'attrdef_info' => '', 'attrdef_in_use' => 'Definición de atributo en uso', @@ -422,6 +423,7 @@ URL: [url]', 'error' => 'Error', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => 'Ningún documento seleccionado', 'error_no_folder_selected' => 'Ninguna carpeta seleccionada', @@ -1267,6 +1269,7 @@ URL: [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => 'Nuevo usuario agregado', +'splash_clearcache' => '', 'splash_cleared_clipboard' => 'Portapapeles limpiado', 'splash_document_added' => 'Documento añadido', 'splash_document_checkedout' => '', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 95dde7918..97c833135 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/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 (1038), jeromerobert (50), lonnnew (9) +// Translators: Admin (1046), jeromerobert (50), lonnnew (9) $text = array( '2_factor_auth' => '', @@ -130,6 +130,7 @@ URL : [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => 'La définition d\'attribut existe déjà', 'attrdef_info' => '', 'attrdef_in_use' => 'La définition d\'attribut est en cours d\'utilisation', @@ -422,6 +423,7 @@ URL: [url]', 'error' => 'Erreur', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => 'Aucun document sélectionné', 'error_no_folder_selected' => 'Aucun dossier sélectionné', @@ -430,7 +432,7 @@ URL: [url]', 'error_toogle_permission' => '', 'es_ES' => 'Espagnol', 'event_details' => 'Détails de l\'événement', -'exclude_items' => '', +'exclude_items' => 'Exclure des élements', 'expired' => 'Expiré', 'expires' => 'Expiration', 'expiry_changed_email' => 'Date d\'expiration modifiée', @@ -1243,6 +1245,7 @@ URL: [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => 'Nouvel utilisateur ajouté', +'splash_clearcache' => '', 'splash_cleared_clipboard' => 'Presse-papier vidé', 'splash_document_added' => 'Document ajouté', 'splash_document_checkedout' => '', @@ -1332,13 +1335,13 @@ URL: [url]', 'timeline_full_add_version' => '', 'timeline_full_status_change' => '', 'timeline_selected_item' => '', -'timeline_skip_add_file' => '', -'timeline_skip_status_change_-1' => '', -'timeline_skip_status_change_-3' => '', -'timeline_skip_status_change_0' => '', -'timeline_skip_status_change_1' => '', -'timeline_skip_status_change_2' => '', -'timeline_skip_status_change_3' => '', +'timeline_skip_add_file' => 'avec attachements', +'timeline_skip_status_change_-1' => 'rejetés', +'timeline_skip_status_change_-3' => 'expirés', +'timeline_skip_status_change_0' => 'en attente de revue', +'timeline_skip_status_change_1' => 'en attente d\'approbation', +'timeline_skip_status_change_2' => 'en mode release', +'timeline_skip_status_change_3' => 'encore dans un workflow', 'timeline_status_change' => 'Version [version] : [status]', 'to' => 'Au', 'toggle_manager' => 'Basculer \'Responsable\'', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index 00092d650..f866539c9 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -135,6 +135,7 @@ Internet poveznica: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => 'Definicija atributa već postoji', 'attrdef_info' => '', 'attrdef_in_use' => 'Definicija atributa se već koristi', @@ -427,6 +428,7 @@ Internet poveznica: [url]', 'error' => 'Greška', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => 'Nije odabran dokument', 'error_no_folder_selected' => 'Nije odabrana mapa', @@ -1288,6 +1290,7 @@ Internet poveznica: [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => 'Dodan novi korisnik', +'splash_clearcache' => '', 'splash_cleared_clipboard' => 'Očišćen međuspremnik', 'splash_document_added' => 'Dokument dodan', 'splash_document_checkedout' => 'Dokument odjavljen', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index 2d3c8e7ea..d78c2aa61 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -130,6 +130,7 @@ URL: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => 'Jellemző meghatározás már létezik', 'attrdef_info' => '', 'attrdef_in_use' => 'Jellemző meghatározás még használatban van', @@ -422,6 +423,7 @@ URL: [url]', 'error' => 'Hiba', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => 'Nincs kijelölt dokumentum', 'error_no_folder_selected' => 'Nincs kijelölt mappa', @@ -1266,6 +1268,7 @@ URL: [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => 'Új felhasználó hozzáadva', +'splash_clearcache' => '', 'splash_cleared_clipboard' => 'Vágólap törölve', 'splash_document_added' => '', 'splash_document_checkedout' => '', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index 3ccc0f428..d5e98459a 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -135,6 +135,7 @@ URL: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => 'Definizione di Attributo già esistente', 'attrdef_info' => '', 'attrdef_in_use' => 'Definizione di Attributo ancora in uso', @@ -428,6 +429,7 @@ URL: [url]', 'error' => 'Errore', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => 'Nessun documento selezionato', 'error_no_folder_selected' => 'Nessuna cartella selezionata', @@ -1290,6 +1292,7 @@ URL: [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => 'Utente aggiunto', +'splash_clearcache' => '', 'splash_cleared_clipboard' => 'Appunti cancellati', 'splash_document_added' => 'Documento aggiunto', 'splash_document_checkedout' => 'Documento approvato', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 7c6bd2b8f..7931de0df 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -135,6 +135,7 @@ URL: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => '이미 존재하는 속성', 'attrdef_info' => '속성정보', 'attrdef_in_use' => '사용중인 속성 정의', @@ -427,6 +428,7 @@ URL: [url]', 'error' => '오류', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => '선택되지 문서는', 'error_no_folder_selected' => '어떤 폴더를 선택하지', @@ -1281,6 +1283,7 @@ URL : [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => '새 사용자 추가', +'splash_clearcache' => '', 'splash_cleared_clipboard' => '클립 보드 비우기', 'splash_document_added' => '문서를 추가', 'splash_document_checkedout' => '문서 체크아웃', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index 04cb3258b..ff4e2015b 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -128,6 +128,7 @@ URL: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => 'Kenmerk definitie bestaat al', 'attrdef_info' => 'Kenmerk info', 'attrdef_in_use' => 'Kenmerk definitie nog in gebruikt', @@ -420,6 +421,7 @@ URL: [url]', 'error' => 'Fout', 'error_add_aro' => 'Verzoek om toegang toegevoegd', 'error_add_permission' => 'Voeg permissie toe', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => 'Geen document geselecteerd', 'error_no_folder_selected' => 'Geen map geselecteerd', @@ -1294,6 +1296,7 @@ URL: [url]', 'splash_add_role' => 'Nieuwe rol toegevoegd', 'splash_add_to_transmittal' => 'Toevoegen aan verzending', 'splash_add_user' => 'Nieuwe gebruiker toegevoegd', +'splash_clearcache' => '', 'splash_cleared_clipboard' => 'Klembord leeg gemaakt', 'splash_document_added' => 'Nieuw document toegevoegd', 'splash_document_checkedout' => 'Document in gebruik genomen', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index 888f4dd07..d2e07c909 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -123,6 +123,7 @@ URL: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => 'Definicja atrybutu już istnieje', 'attrdef_info' => '', 'attrdef_in_use' => 'Definicja atrybutu nadal jest w użyciu', @@ -415,6 +416,7 @@ URL: [url]', 'error' => 'Błąd', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => 'Brak wybranych dokumentów', 'error_no_folder_selected' => 'Brak wybranych katalogów', @@ -1246,6 +1248,7 @@ URL: [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => 'Dodano nowego użytkownika', +'splash_clearcache' => '', 'splash_cleared_clipboard' => 'Wyczyszczono schowek', 'splash_document_added' => '', 'splash_document_checkedout' => '', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 0d6f16b30..98bd205db 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -130,6 +130,7 @@ URL: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => 'Definição de atributo já existe', 'attrdef_info' => '', 'attrdef_in_use' => 'Definição de atributo ainda em uso', @@ -421,6 +422,7 @@ URL: [url]', 'error' => 'Erro', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => 'Nenhum documento selecionado', 'error_no_folder_selected' => 'Nenhuma pasta selecionada', @@ -1264,6 +1266,7 @@ URL: [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => 'Novo usuário adicionado', +'splash_clearcache' => '', 'splash_cleared_clipboard' => 'Área de transferência limpada', 'splash_document_added' => 'Documento inserido', 'splash_document_checkedout' => '', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 10e7f1906..380eb293f 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -135,6 +135,7 @@ URL: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => 'Definitie atribut exista deja', 'attrdef_info' => '', 'attrdef_in_use' => 'Definitie atribut inca in utilizare', @@ -427,6 +428,7 @@ URL: [url]', 'error' => 'Eroare', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => 'Nici un document selectat', 'error_no_folder_selected' => 'Nici un folder selectat', @@ -1289,6 +1291,7 @@ URL: [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => 'Utilizator nou adăugat', +'splash_clearcache' => '', 'splash_cleared_clipboard' => 'Clipboard golit', 'splash_document_added' => 'Document adăugat', 'splash_document_checkedout' => 'Document verificat', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 6055744b7..77f67ea13 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -135,6 +135,7 @@ URL: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => 'Определение атрибута уже существует', 'attrdef_info' => 'Информация', 'attrdef_in_use' => 'Определение этого атрибута используется', @@ -427,6 +428,7 @@ URL: [url]', 'error' => 'Ошибка', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => 'Нет выбранных документов', 'error_no_folder_selected' => 'Нет выбранных каталогов', @@ -1296,6 +1298,7 @@ URL: [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => 'Добавлен новый пользователь', +'splash_clearcache' => '', 'splash_cleared_clipboard' => 'Буфер обмена очищен', 'splash_document_added' => 'Добавлен документ', 'splash_document_checkedout' => 'Документ отправлен на обработку', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index d8a330ae1..251a6d211 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -118,6 +118,7 @@ URL: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => '', 'attrdef_info' => 'Informácia', 'attrdef_in_use' => '', @@ -374,6 +375,7 @@ URL: [url]', 'error' => 'Chyba', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => '', 'error_no_folder_selected' => '', @@ -1121,6 +1123,7 @@ URL: [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => '', +'splash_clearcache' => '', 'splash_cleared_clipboard' => '', 'splash_document_added' => '', 'splash_document_checkedout' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index eec4bd2bc..273f7423d 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -123,6 +123,7 @@ URL: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => 'Attributdefinitionen finns redan', 'attrdef_info' => '', 'attrdef_in_use' => 'Attributdefinitionen används', @@ -415,6 +416,7 @@ URL: [url]', 'error' => 'Fel', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => 'Inget dokument har valts', 'error_no_folder_selected' => 'Ingen katalog har valts', @@ -1252,6 +1254,7 @@ URL: [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => 'Ny användare tillagt', +'splash_clearcache' => '', 'splash_cleared_clipboard' => 'Urklipp rensat', 'splash_document_added' => '', 'splash_document_checkedout' => '', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 0a587dc76..0327e7352 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -129,6 +129,7 @@ URL: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => 'Nitelik tanımı zaten mevcut', 'attrdef_info' => '', 'attrdef_in_use' => 'Nitelik tanımı halen kullanımda', @@ -421,6 +422,7 @@ URL: [url]', 'error' => 'Hata', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => 'Hiçbir doküman seçilmedi', 'error_no_folder_selected' => 'Hiçbir klasör seçilmedi', @@ -1268,6 +1270,7 @@ URL: [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => 'Yeni kullanıcı eklendi', +'splash_clearcache' => '', 'splash_cleared_clipboard' => 'Pano temizlendi', 'splash_document_added' => 'Doküman eklendi', 'splash_document_checkedout' => '', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index b1d969d21..26b25c61a 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -135,6 +135,7 @@ URL: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => 'Визначення атрибуту вже існує', 'attrdef_info' => 'Інформація', 'attrdef_in_use' => 'Визначення цього атрибуту вже використовується', @@ -427,6 +428,7 @@ URL: [url]', 'error' => 'Помилка', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => 'Немає вибраних документів', 'error_no_folder_selected' => 'Немає вибраних каталогів', @@ -1289,6 +1291,7 @@ URL: [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => 'Додано нового користувача', +'splash_clearcache' => '', 'splash_cleared_clipboard' => 'Буфер обміну очищено', 'splash_document_added' => 'Додано документ', 'splash_document_checkedout' => 'Документ відправлено на опрацювання', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 31d13c264..65e4d8719 100644 --- a/languages/zh_CN/lang.inc +++ b/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 (640), fengjohn (5) +// Translators: Admin (642), fengjohn (5) $text = array( '2_factor_auth' => '', @@ -118,6 +118,7 @@ URL: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => '', 'attrdef_info' => '', 'attrdef_in_use' => '属性定义仍在使用中', @@ -257,7 +258,7 @@ URL: [url]', 认你的操作', 'creation_date' => '创建日期', 'cs_CZ' => '捷克语', -'current_password' => '', +'current_password' => '当前密码', 'current_quota' => '', 'current_state' => '', 'current_version' => '当前版本', @@ -376,6 +377,7 @@ URL: [url]', 'error' => '错误', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => '请选择文档', 'error_no_folder_selected' => '请选择文件夹', @@ -592,7 +594,7 @@ URL: [url]', 'new_file_email_body' => '', 'new_file_email_subject' => '', 'new_folder' => '新建文件夹', -'new_password' => '', +'new_password' => '新密码', 'new_subfolder_email' => '创建新文件夹', 'new_subfolder_email_body' => '', 'new_subfolder_email_subject' => '', @@ -1123,6 +1125,7 @@ URL: [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => '', +'splash_clearcache' => '', 'splash_cleared_clipboard' => '', 'splash_document_added' => '', 'splash_document_checkedout' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index 20e66e97a..a1b572912 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -118,6 +118,7 @@ URL: [url]', 'attrdefgrp_show_detail' => '', 'attrdefgrp_show_list' => '', 'attrdefgrp_show_search' => '', +'attrdefgrp_show_searchlist' => '', 'attrdef_exists' => '', 'attrdef_info' => '', 'attrdef_in_use' => '', @@ -374,6 +375,7 @@ URL: [url]', 'error' => '錯誤', 'error_add_aro' => '', 'error_add_permission' => '', +'error_clearcache' => '', 'error_importfs' => '', 'error_no_document_selected' => '請選擇文檔', 'error_no_folder_selected' => '請選擇資料夾', @@ -1121,6 +1123,7 @@ URL: [url]', 'splash_add_role' => '', 'splash_add_to_transmittal' => '', 'splash_add_user' => '', +'splash_clearcache' => '', 'splash_cleared_clipboard' => '', 'splash_document_added' => '', 'splash_document_checkedout' => '', From e8c15079ebe359364a50edfa3cfa36689400be2c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Aug 2016 14:05:52 +0200 Subject: [PATCH 40/65] replace ':' by '-' in dump file (Closes: #267) because MS-Windows has problems with ':' in a file name --- op/op.CreateDump.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op/op.CreateDump.php b/op/op.CreateDump.php index 9a44ce320..1408c8c5f 100644 --- a/op/op.CreateDump.php +++ b/op/op.CreateDump.php @@ -30,7 +30,7 @@ if (!$user->isAdmin()) { } $v = new SeedDMS_Version; -$dump_name = $settings->_contentDir.date('Y-m-d\TH:i:s')."_".$v->_number.".sql"; +$dump_name = $settings->_contentDir.date('Y-m-d\TH-i-s')."_".$v->_number.".sql"; if(!$dms->createDump($dump_name)) UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); From b110549972fe2170a00c40c33fe9e9937b7ba342 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Aug 2016 18:14:32 +0200 Subject: [PATCH 41/65] add command clearclipboard --- op/op.Ajax.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/op/op.Ajax.php b/op/op.Ajax.php index 16ef2650e..c792469a0 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -204,6 +204,14 @@ switch($command) { } break; /* }}} */ + case 'clearclipboard': /* {{{ */ + if($user) { + $session->clearClipboard(); + header('Content-Type: application/json'); + echo json_encode(array('success'=>true, 'message'=>getMLText('splash_cleared_clipboard'))); + } + break; /* }}} */ + case 'movefolder': /* {{{ */ if($user) { if(!checkFormKey('movefolder', 'GET')) { From b9c4e1a7752479697786b6f0acf1d650ae5cdb45 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Aug 2016 18:14:58 +0200 Subject: [PATCH 42/65] add js for click on .ajax-click --- styles/bootstrap/application.js | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js index f7a2002bf..46356deb3 100644 --- a/styles/bootstrap/application.js +++ b/styles/bootstrap/application.js @@ -375,8 +375,28 @@ $(document).ready( function() { url: url, dataType: 'json', success: function(data){ - for (var i = 0; i < data.length; i++) { - noty({text: data[i].text, type: data[i].type}); + if(data.success) { + if(element.data('param1') == 'command=clearclipboard') { + $("#main-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=mainclipboard') + $("#menu-clipboard").html('Loading').load('../op/op.Ajax.php?command=view&view=menuclipboard') + } + noty({ + text: data.message, + type: 'success', + dismissQueue: true, + layout: 'topRight', + theme: 'defaultTheme', + timeout: 1500, + }); + } else { + noty({ + text: data.message, + type: 'error', + dismissQueue: true, + layout: 'topRight', + theme: 'defaultTheme', + timeout: 3500, + }); } } }); From 1ae82da90e1bd809bc2240aaee50b16eed730d16 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Aug 2016 18:15:20 +0200 Subject: [PATCH 43/65] use new ajax command 'clearclipboard' --- views/bootstrap/class.Bootstrap.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 2a15a4af5..b3e4efca7 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -227,7 +227,8 @@ $(document).ready(function () { if(isset($this->params['folder']) && $this->params['folder']->getAccessMode($this->params['user']) >= M_READWRITE) { $content .= "
    • params['folder']->getID()."&refferer=".urlencode($this->params['refferer'])."\">".getMLText("move_clipboard")."
      • \n"; } - $content .= "
    • params['refferer'])."\">".getMLText("clear_clipboard")."
      • \n"; +// $content .= "
    • params['refferer'])."\">".getMLText("clear_clipboard")."kkk
      • \n"; + $content .= "
    • ".getMLText("clear_clipboard")."
      • \n"; $content .= "
    \n"; $content .= " \n"; $content .= " \n"; From 62c3d07842484023599b4aeb50912a021c8faca3 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 9 Aug 2016 18:16:30 +0200 Subject: [PATCH 44/65] add entry for 4.3.28 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 656520d9b..86eb805d2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,8 @@ - make UserView look similar to UserList - log correct ip even after a reverse proxy (Closes #206) - fix sql error in table creation if sql mode is set to STRICT_TRANS_TABLE +- menu entry 'Clear clipboard' will call ajax function and no longer + redirects to new page -------------------------------------------------------------------------------- Changes in version 4.3.27 From 5d05057774afb2e5628fb64d1c3b577cb09e0e0a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 10 Aug 2016 08:04:52 +0200 Subject: [PATCH 45/65] treat ldap auth like database auth count login failures, check for guest user, etc. --- op/op.Login.php | 59 ++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/op/op.Login.php b/op/op.Login.php index 019dea1da..2e9e5b1de 100644 --- a/op/op.Login.php +++ b/op/op.Login.php @@ -28,13 +28,12 @@ include("../inc/inc.ClassUI.php"); include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc"; -function _printMessage($heading, $message) { - +function _printMessage($heading, $message) { /* {{{ */ global $theme; $view = UI::factory($theme, 'ErrorDlg'); $view->exitError($heading, $message, true); return; -} +} /* }}} */ if (isset($_REQUEST["sesstheme"]) && strlen($_REQUEST["sesstheme"])>0 && is_numeric(array_search($_REQUEST["sesstheme"],UI::getStyles())) ) { $theme = $_REQUEST["sesstheme"]; @@ -58,6 +57,7 @@ if(isset($_POST['pwd'])) { } } +/* The password may only be empty if the guest user tries to log in */ if($settings->_enableGuestLogin && (int) $settings->_guestID) { $guestUser = $dms->getUser((int) $settings->_guestID); if ((!isset($pwd) || strlen($pwd)==0) && ($login != $guestUser->getLogin())) { @@ -66,16 +66,13 @@ if($settings->_enableGuestLogin && (int) $settings->_guestID) { } } -// -// LDAP Sign In -// - /* Initialy set $user to false. It will contain a valid user record * if authentication against ldap succeeds. * _ldapHost will only have a value if the ldap connector has been enabled */ $user = false; +/* Authenticate against LDAP server {{{ */ if (!$user && isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) { if (isset($settings->_ldapPort) && is_int($settings->_ldapPort)) { $ds = ldap_connect($settings->_ldapHost, $settings->_ldapPort); @@ -140,11 +137,11 @@ if (!$user && isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) { /* No do the actual authentication of the user */ $bind = @ldap_bind($ds, $dn, $pwd); + $user = $dms->getUserByLogin($login); if ($bind) { // Successfully authenticated. Now check to see if the user exists within // the database. If not, add them in if _restricted is not set, // but do not add their password. - $user = $dms->getUserByLogin($login); if (is_bool($user) && !$settings->_restricted) { // Retrieve the user's LDAP information. if (isset($settings->_ldapFilter) && strlen($settings->_ldapFilter) > 0) { @@ -160,45 +157,52 @@ if (!$user && isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) { } } } - if (!is_bool($user)) { - $userid = $user->getID(); + } elseif($user) { + $userid = $user->getID(); + if($settings->_loginFailure) { + $failures = $user->addLoginFailure(); + if($failures >= $settings->_loginFailure) + $user->setDisabled(true); } + $user = false; } ldap_close($ds); } -} +} /* }}} */ -if (is_bool($user)) { +/* Authenticate against SeedDMS database {{{ */ +else { // // LDAP Authentication did not succeed or is not configured. Try internal // authentication system. // // Try to find user with given login. - $user = $dms->getUserByLogin($login); - if (!$user) { - _printMessage(getMLText("login_error_title"), getMLText("login_error_text")); - exit; - } - - $userid = $user->getID(); - - if (($userid == $settings->_guestID) && (!$settings->_enableGuestLogin)) { - _printMessage(getMLText("login_error_title"), getMLText("guest_login_disabled")); - exit; - } + if($user = $dms->getUserByLogin($login)) { + $userid = $user->getID(); // Check if password matches (if not a guest user) // Assume that the password has been sent via HTTP POST. It would be careless // (and dangerous) for passwords to be sent via GET. if (($userid != $settings->_guestID) && (md5($pwd) != $user->getPwd()) || ($userid == $settings->_guestID) && $user->getPwd() && (md5($pwd) != $user->getPwd())) { - _printMessage(getMLText("login_error_title"), getMLText("login_error_text")); /* if counting of login failures is turned on, then increment its value */ if($settings->_loginFailure) { $failures = $user->addLoginFailure(); if($failures >= $settings->_loginFailure) $user->setDisabled(true); } + $user = false; + } + } +} /* }}} */ + +if(!$user) { + _printMessage(getMLText("login_error_title"), getMLText("login_error_text")); + exit; +} + + if (($userid == $settings->_guestID) && (!$settings->_enableGuestLogin)) { + _printMessage(getMLText("login_error_title"), getMLText("guest_login_disabled")); exit; } @@ -218,8 +222,6 @@ if (is_bool($user)) { /* Clear login failures if login was successful */ $user->clearLoginFailures(); -} - // Capture the user's language and theme settings. if (isset($_REQUEST["lang"]) && strlen($_REQUEST["lang"])>0 && is_numeric(array_search($_REQUEST["lang"],getLanguages())) ) { $lang = $_REQUEST["lang"]; @@ -310,7 +312,4 @@ else { header("Location: ".$settings->_httpRoot.(isset($settings->_siteDefaultPage) && strlen($settings->_siteDefaultPage)>0 ? $settings->_siteDefaultPage : "out/out.ViewFolder.php?folderid=".$settings->_rootFolderID)); } -//_printMessage(getMLText("login_ok"), -// "

    ".getMLText("continue")."

    "); - ?> From b8fd3b67f267cb611c5fe2cc9bf9aa48f8ff3e5f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 10 Aug 2016 08:45:58 +0200 Subject: [PATCH 46/65] fix line indenting --- op/op.Login.php | 56 ++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/op/op.Login.php b/op/op.Login.php index 2e9e5b1de..163af8060 100644 --- a/op/op.Login.php +++ b/op/op.Login.php @@ -181,18 +181,18 @@ else { if($user = $dms->getUserByLogin($login)) { $userid = $user->getID(); - // Check if password matches (if not a guest user) - // Assume that the password has been sent via HTTP POST. It would be careless - // (and dangerous) for passwords to be sent via GET. - if (($userid != $settings->_guestID) && (md5($pwd) != $user->getPwd()) || ($userid == $settings->_guestID) && $user->getPwd() && (md5($pwd) != $user->getPwd())) { - /* if counting of login failures is turned on, then increment its value */ - if($settings->_loginFailure) { - $failures = $user->addLoginFailure(); - if($failures >= $settings->_loginFailure) - $user->setDisabled(true); + // Check if password matches (if not a guest user) + // Assume that the password has been sent via HTTP POST. It would be careless + // (and dangerous) for passwords to be sent via GET. + if (($userid != $settings->_guestID) && (md5($pwd) != $user->getPwd()) || ($userid == $settings->_guestID) && $user->getPwd() && (md5($pwd) != $user->getPwd())) { + /* if counting of login failures is turned on, then increment its value */ + if($settings->_loginFailure) { + $failures = $user->addLoginFailure(); + if($failures >= $settings->_loginFailure) + $user->setDisabled(true); + } + $user = false; } - $user = false; - } } } /* }}} */ @@ -201,26 +201,26 @@ if(!$user) { exit; } - if (($userid == $settings->_guestID) && (!$settings->_enableGuestLogin)) { - _printMessage(getMLText("login_error_title"), getMLText("guest_login_disabled")); - exit; - } +if (($userid == $settings->_guestID) && (!$settings->_enableGuestLogin)) { + _printMessage(getMLText("login_error_title"), getMLText("guest_login_disabled")); + exit; +} - // Check if account is disabled - if($user->isDisabled()) { - _printMessage(getMLText("login_disabled_title"), getMLText("login_disabled_text")); - exit; - } +// Check if account is disabled +if($user->isDisabled()) { + _printMessage(getMLText("login_disabled_title"), getMLText("login_disabled_text")); + exit; +} - // control admin IP address if required - // TODO: extend control to LDAP autentication - if ($user->isAdmin() && ($_SERVER['REMOTE_ADDR'] != $settings->_adminIP ) && ( $settings->_adminIP != "") ){ - _printMessage(getMLText("login_error_title"), getMLText("invalid_user_id")); - exit; - } +// control admin IP address if required +// TODO: extend control to LDAP autentication +if ($user->isAdmin() && ($_SERVER['REMOTE_ADDR'] != $settings->_adminIP ) && ( $settings->_adminIP != "") ){ + _printMessage(getMLText("login_error_title"), getMLText("invalid_user_id")); + exit; +} - /* Clear login failures if login was successful */ - $user->clearLoginFailures(); +/* Clear login failures if login was successful */ +$user->clearLoginFailures(); // Capture the user's language and theme settings. if (isset($_REQUEST["lang"]) && strlen($_REQUEST["lang"])>0 && is_numeric(array_search($_REQUEST["lang"],getLanguages())) ) { From b3cbd5825c02185c859d35ecf297b4766c6e0270 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 10 Aug 2016 08:49:24 +0200 Subject: [PATCH 47/65] remove old comment --- op/op.Login.php | 1 - 1 file changed, 1 deletion(-) diff --git a/op/op.Login.php b/op/op.Login.php index 163af8060..f4a2ea1ca 100644 --- a/op/op.Login.php +++ b/op/op.Login.php @@ -213,7 +213,6 @@ if($user->isDisabled()) { } // control admin IP address if required -// TODO: extend control to LDAP autentication if ($user->isAdmin() && ($_SERVER['REMOTE_ADDR'] != $settings->_adminIP ) && ( $settings->_adminIP != "") ){ _printMessage(getMLText("login_error_title"), getMLText("invalid_user_id")); exit; From f7783b578ebad04cc4a8bb4be06e438b305dae80 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 10 Aug 2016 08:49:31 +0200 Subject: [PATCH 48/65] add entry for 4.3.28 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 86eb805d2..8b91b53f4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,8 @@ - fix sql error in table creation if sql mode is set to STRICT_TRANS_TABLE - menu entry 'Clear clipboard' will call ajax function and no longer redirects to new page +- apply all login restrictions like guest login, restrict to ip address, + disabled account when authenticating by ldap -------------------------------------------------------------------------------- Changes in version 4.3.27 From f890b23ccc3539c93ed32000369f3d40bf11bdcb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 10 Aug 2016 15:52:55 +0200 Subject: [PATCH 49/65] put authentication into its own class --- inc/inc.ClassAuthentication.php | 53 +++++++++ inc/inc.ClassDbAuthentication.php | 74 +++++++++++++ inc/inc.ClassLdapAuthentication.php | 163 ++++++++++++++++++++++++++++ op/op.Login.php | 123 ++------------------- 4 files changed, 297 insertions(+), 116 deletions(-) create mode 100644 inc/inc.ClassAuthentication.php create mode 100644 inc/inc.ClassDbAuthentication.php create mode 100644 inc/inc.ClassLdapAuthentication.php diff --git a/inc/inc.ClassAuthentication.php b/inc/inc.ClassAuthentication.php new file mode 100644 index 000000000..968b5d13e --- /dev/null +++ b/inc/inc.ClassAuthentication.php @@ -0,0 +1,53 @@ + + * @copyright Copyright (C) 2010-2016 Uwe Steinmann + * @version Release: @package_version@ + */ + +/** + * Abstract class to authenticate user + * + * @category DMS + * @package SeedDMS + * @author Uwe Steinmann + * @copyright Copyright (C) 2010-2016 Uwe Steinmann + * @version Release: @package_version@ + */ +abstract class SeedDMS_Authentication { + /** + * @var object $dms object of dms + * @access protected + */ + private $dms; + + /** + * @var object $settings SeedDMS Settings + * @access protected + */ + private $settings; + + function __construct($dms, $settings) { /* {{{ */ + $this->dms = $dms; + $this->settings = $settings; + } /* }}} */ + + /** + * Do Authentication + * + * This function must check the username and login. If authentication succeeds + * the user object otherwise false must be returned. If authentication fails + * the number of failed logins should be incremented and account disabled. + * + * @param string $username + * @param string $password + * @return object|boolean user object if authentication was successful otherwise false + */ + abstract function authenticate($username, $password); +} diff --git a/inc/inc.ClassDbAuthentication.php b/inc/inc.ClassDbAuthentication.php new file mode 100644 index 000000000..1750a6acc --- /dev/null +++ b/inc/inc.ClassDbAuthentication.php @@ -0,0 +1,74 @@ + + * @copyright Copyright (C) 2010-2016 Uwe Steinmann + * @version Release: @package_version@ + */ + +require_once "inc.ClassAuthentication.php"; + +/** + * Abstract class to authenticate user against ѕeeddms database + * + * @category DMS + * @package SeedDMS + * @author Uwe Steinmann + * @copyright Copyright (C) 2010-2016 Uwe Steinmann + * @version Release: @package_version@ + */ +class SeedDMS_DbAuthentication extends SeedDMS_Authentication { + /** + * @var object $dms object of dms + * @access protected + */ + private $dms; + + /** + * @var object $settings SeedDMS Settings + * @access protected + */ + private $settings; + + function __construct($dms, $settings) { /* {{{ */ + $this->dms = $dms; + $this->settings = $settings; + } /* }}} */ + + /** + * Do Authentication + * + * @param string $username + * @param string $password + * @return object|boolean user object if authentication was successful otherwise false + */ + public function authenticate($username, $password) { /* {{{ */ + $settings = $this->settings; + $dms = $this->dms; + + // Try to find user with given login. + if($user = $dms->getUserByLogin($username)) { + $userid = $user->getID(); + + // Check if password matches (if not a guest user) + // Assume that the password has been sent via HTTP POST. It would be careless + // (and dangerous) for passwords to be sent via GET. + if (($userid != $settings->_guestID) && (md5($password) != $user->getPwd()) || ($userid == $settings->_guestID) && $user->getPwd() && (md5($password) != $user->getPwd())) { + /* if counting of login failures is turned on, then increment its value */ + if($settings->_loginFailure) { + $failures = $user->addLoginFailure(); + if($failures >= $settings->_loginFailure) + $user->setDisabled(true); + } + $user = false; + } + } + + return $user; + } /* }}} */ +} diff --git a/inc/inc.ClassLdapAuthentication.php b/inc/inc.ClassLdapAuthentication.php new file mode 100644 index 000000000..7f876dc37 --- /dev/null +++ b/inc/inc.ClassLdapAuthentication.php @@ -0,0 +1,163 @@ + + * @copyright Copyright (C) 2010-2016 Uwe Steinmann + * @version Release: @package_version@ + */ + +require_once "inc.ClassAuthentication.php"; + +/** + * Abstract class to authenticate user against ldap server + * + * @category DMS + * @package SeedDMS + * @author Uwe Steinmann + * @copyright Copyright (C) 2010-2016 Uwe Steinmann + * @version Release: @package_version@ + */ +class SeedDMS_LdapAuthentication extends SeedDMS_Authentication { + /** + * @var object $dms object of dms + * @access protected + */ + private $dms; + + /** + * @var object $settings SeedDMS Settings + * @access protected + */ + private $settings; + + function __construct($dms, $settings) { /* {{{ */ + $this->dms = $dms; + $this->settings = $settings; + } /* }}} */ + + /** + * Do ldap authentication + * + * This method supports active directory and open ldap servers. Others may work but + * are not tested. + * The authentication is done in two steps. + * 1. First an anonymous bind is done and the user who wants to login is searched + * for. If it is found the cn of that user will be used for the bind in step 2. + * If the user cannot be found the second step will use a cn: cn=, + * 2. A second bind with a password and cn will be executed. This is the actuall + * authentication. If that succeeds the user is logged in. If the user doesn't + * exist in the database, it will be created. + * + * @param string $username + * @param string $password + * @return object|boolean user object if authentication was successful otherwise false + */ + public function authenticate($username, $password) { /* {{{ */ + $settings = $this->settings; + $dms = $this->dms; + + if (isset($settings->_ldapPort) && is_int($settings->_ldapPort)) { + $ds = ldap_connect($settings->_ldapHost, $settings->_ldapPort); + } else { + $ds = ldap_connect($settings->_ldapHost); + } + + if (!is_bool($ds)) { + /* Check if ldap base dn is set, and use ldap server if it is */ + if (isset($settings->_ldapBaseDN)) { + $ldapSearchAttribut = "uid="; + $tmpDN = "cn=".$username.",".$settings->_ldapBaseDN; + } + + /* Active directory has a different base dn */ + if (isset($settings->_ldapType)) { + if ($settings->_ldapType==1) { + $ldapSearchAttribut = "sAMAccountName="; + $tmpDN = $username.'@'.$settings->_ldapAccountDomainName; + // Add the following if authentication with an Active Dir doesn't work + // See https://sourceforge.net/p/seeddms/discussion/general/thread/19c70d8d/ + // and http://stackoverflow.com/questions/6222641/how-to-php-ldap-search-to-get-user-ou-if-i-dont-know-the-ou-for-base-dn + ldap_set_option($ds, LDAP_OPT_REFERRALS, 0); + } + } + + // Ensure that the LDAP connection is set to use version 3 protocol. + // Required for most authentication methods, including SASL. + ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3); + + // try an authenticated/anonymous bind first. + // If it succeeds, get the DN for the user and use it for an authentication + // with the users password. + $bind = false; + if (isset($settings->_ldapBindDN)) { + $bind = @ldap_bind($ds, $settings->_ldapBindDN, $settings->_ldapBindPw); + } else { + $bind = @ldap_bind($ds); + } + $dn = false; + /* If bind succeed, then get the dn of for the user */ + if ($bind) { + if (isset($settings->_ldapFilter) && strlen($settings->_ldapFilter) > 0) { + $search = ldap_search($ds, $settings->_ldapBaseDN, "(&(".$ldapSearchAttribut.$username.")".$settings->_ldapFilter.")"); + } else { + $search = ldap_search($ds, $settings->_ldapBaseDN, $ldapSearchAttribut.$username); + } + if (!is_bool($search)) { + $info = ldap_get_entries($ds, $search); + if (!is_bool($info) && $info["count"]>0) { + $dn = $info[0]['dn']; + } + } + } + + /* If the previous bind failed, try it with the users creditionals + * by simply setting $dn to a default string + */ + if (is_bool($dn)) { + $dn = $tmpDN; + } + + /* No do the actual authentication of the user */ + $bind = @ldap_bind($ds, $dn, $password); + $user = $dms->getUserByLogin($username); + if ($bind) { + // Successfully authenticated. Now check to see if the user exists within + // the database. If not, add them in if _restricted is not set, + // but do not add their password. + if (is_bool($user) && !$settings->_restricted) { + // Retrieve the user's LDAP information. + if (isset($settings->_ldapFilter) && strlen($settings->_ldapFilter) > 0) { + $search = ldap_search($ds, $settings->_ldapBaseDN, "(&(".$ldapSearchAttribut.$username.")".$settings->_ldapFilter.")"); + } else { + $search = ldap_search($ds, $settings->_ldapBaseDN, $ldapSearchAttribut.$username); + } + + if (!is_bool($search)) { + $info = ldap_get_entries($ds, $search); + if (!is_bool($info) && $info["count"]==1 && $info[0]["count"]>0) { + $user = $dms->addUser($username, null, $info[0]['cn'][0], $info[0]['mail'][0], $settings->_language, $settings->_theme, "", 1); + } + } + } + } elseif($user) { + $userid = $user->getID(); + if($settings->_loginFailure) { + $failures = $user->addLoginFailure(); + if($failures >= $settings->_loginFailure) + $user->setDisabled(true); + } + $user = false; + } + ldap_close($ds); + + return $user; + } else { + return false; + } + } /* }}} */ +} diff --git a/op/op.Login.php b/op/op.Login.php index f4a2ea1ca..f684f9254 100644 --- a/op/op.Login.php +++ b/op/op.Login.php @@ -74,126 +74,16 @@ $user = false; /* Authenticate against LDAP server {{{ */ if (!$user && isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) { - if (isset($settings->_ldapPort) && is_int($settings->_ldapPort)) { - $ds = ldap_connect($settings->_ldapHost, $settings->_ldapPort); - } else { - $ds = ldap_connect($settings->_ldapHost); - } - - if (!is_bool($ds)) { - /* Check if ldap base dn is set, and use ldap server if it is */ - if (isset($settings->_ldapBaseDN)) { - $ldapSearchAttribut = "uid="; - $tmpDN = "uid=".$login.",".$settings->_ldapBaseDN; - } - - /* Active directory has a different base dn */ - if (isset($settings->_ldapType)) { - if ($settings->_ldapType==1) { - $ldapSearchAttribut = "sAMAccountName="; - $tmpDN = $login.'@'.$settings->_ldapAccountDomainName; - // Add the following if authentication with an Active Dir doesn't work - // See https://sourceforge.net/p/seeddms/discussion/general/thread/19c70d8d/ - // and http://stackoverflow.com/questions/6222641/how-to-php-ldap-search-to-get-user-ou-if-i-dont-know-the-ou-for-base-dn - ldap_set_option($ds, LDAP_OPT_REFERRALS, 0); - } - } - - // Ensure that the LDAP connection is set to use version 3 protocol. - // Required for most authentication methods, including SASL. - ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3); - - // try an authenticated/anonymous bind first. - // If it succeeds, get the DN for the user and use it for an authentication - // with the users password. - $bind = false; - if (isset($settings->_ldapBindDN)) { - $bind = @ldap_bind($ds, $settings->_ldapBindDN, $settings->_ldapBindPw); - } else { - $bind = @ldap_bind($ds); - } - $dn = false; - /* If bind succeed, then get the dn of for the user */ - if ($bind) { - if (isset($settings->_ldapFilter) && strlen($settings->_ldapFilter) > 0) { - $search = ldap_search($ds, $settings->_ldapBaseDN, "(&(".$ldapSearchAttribut.$login.")".$settings->_ldapFilter.")"); - } else { - $search = ldap_search($ds, $settings->_ldapBaseDN, $ldapSearchAttribut.$login); - } - if (!is_bool($search)) { - $info = ldap_get_entries($ds, $search); - if (!is_bool($info) && $info["count"]>0) { - $dn = $info[0]['dn']; - } - } - } - - /* If the previous bind failed, try it with the users creditionals - * by simply setting $dn to a default string - */ - if (is_bool($dn)) { - $dn = $tmpDN; - } - - /* No do the actual authentication of the user */ - $bind = @ldap_bind($ds, $dn, $pwd); - $user = $dms->getUserByLogin($login); - if ($bind) { - // Successfully authenticated. Now check to see if the user exists within - // the database. If not, add them in if _restricted is not set, - // but do not add their password. - if (is_bool($user) && !$settings->_restricted) { - // Retrieve the user's LDAP information. - if (isset($settings->_ldapFilter) && strlen($settings->_ldapFilter) > 0) { - $search = ldap_search($ds, $settings->_ldapBaseDN, "(&(".$ldapSearchAttribut.$login.")".$settings->_ldapFilter.")"); - } else { - $search = ldap_search($ds, $settings->_ldapBaseDN, $ldapSearchAttribut.$login); - } - - if (!is_bool($search)) { - $info = ldap_get_entries($ds, $search); - if (!is_bool($info) && $info["count"]==1 && $info[0]["count"]>0) { - $user = $dms->addUser($login, null, $info[0]['cn'][0], $info[0]['mail'][0], $settings->_language, $settings->_theme, ""); - } - } - } - } elseif($user) { - $userid = $user->getID(); - if($settings->_loginFailure) { - $failures = $user->addLoginFailure(); - if($failures >= $settings->_loginFailure) - $user->setDisabled(true); - } - $user = false; - } - ldap_close($ds); - } + require_once("../inc/inc.ClassLdapAuthentication.php"); + $authobj = new SeedDMS_LdapAuthentication($dms, $settings); + $user = $authobj->authenticate($login, $pwd); } /* }}} */ /* Authenticate against SeedDMS database {{{ */ else { - // - // LDAP Authentication did not succeed or is not configured. Try internal - // authentication system. - // - - // Try to find user with given login. - if($user = $dms->getUserByLogin($login)) { - $userid = $user->getID(); - - // Check if password matches (if not a guest user) - // Assume that the password has been sent via HTTP POST. It would be careless - // (and dangerous) for passwords to be sent via GET. - if (($userid != $settings->_guestID) && (md5($pwd) != $user->getPwd()) || ($userid == $settings->_guestID) && $user->getPwd() && (md5($pwd) != $user->getPwd())) { - /* if counting of login failures is turned on, then increment its value */ - if($settings->_loginFailure) { - $failures = $user->addLoginFailure(); - if($failures >= $settings->_loginFailure) - $user->setDisabled(true); - } - $user = false; - } - } + require_once("../inc/inc.ClassDbAuthentication.php"); + $authobj = new SeedDMS_DbAuthentication($dms, $settings); + $user = $authobj->authenticate($login, $pwd); } /* }}} */ if(!$user) { @@ -201,6 +91,7 @@ if(!$user) { exit; } +$userid = $user->getID(); if (($userid == $settings->_guestID) && (!$settings->_enableGuestLogin)) { _printMessage(getMLText("login_error_title"), getMLText("guest_login_disabled")); exit; From 051cd2fc1d9eb433e477b53f717741d1792b730c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 10 Aug 2016 17:48:03 +0200 Subject: [PATCH 50/65] some more documentation of ldap settings --- conf/settings.xml.template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/conf/settings.xml.template b/conf/settings.xml.template index d43aa3ff6..e8dc40c6a 100644 --- a/conf/settings.xml.template +++ b/conf/settings.xml.template @@ -145,8 +145,8 @@ - URIs are supported, e.g.: ldaps://ldap.host.com - port: port of the authentification server - baseDN: top level of the LDAP directory tree - - bindDN: XXX - - bindPw: XXX + - bindDN: use this dn for a first step bind, leave empty for annonymous bind + - bindPw: use this password for a first step bind - filter: Additional filters which are to be checked --> Date: Wed, 10 Aug 2016 17:48:23 +0200 Subject: [PATCH 51/65] some more documentation of ldap settings --- inc/inc.ClassSettings.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index e2cac868d..604df1eea 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -221,14 +221,24 @@ class Settings { /* {{{ */ var $_smtpPort = null; // SMTP : send from var $_smtpSendFrom = null; - // LDAP - var $_ldapHost = ""; // URIs are supported, e.g.: ldaps://ldap.host.com - var $_ldapPort = 389; // Optional. + // LDAP Host, URIs are supported, e.g.: ldaps://ldap.host.com + var $_ldapHost = ""; + // Port of ldap server, optional. + var $_ldapPort = 389; + // Base dn for searching users, if set the user will be search below base dn var $_ldapBaseDN = ""; + // Use this dn for an initial bind for searching the user var $_ldapBindDN = ""; + // Use this password for an initial bind for searching the user var $_ldapBindPw = ""; + // Used only by AD @_ldapAccountDomainName will be used for a bind + // when the user is validated var $_ldapAccountDomainName = ""; - var $_ldapType = 1; // 0 = ldap; 1 = AD + // Type of Ldap server: 0 = ldap; 1 = AD + var $_ldapType = 1; + // Additional filter when searching for the user. If not set, the user will be searched + // below basedn and the search term 'uid=' or 'sAMAccountName=' + // if set the search will be (&(cn=)) var $_ldapFilter = ""; var $_converters = array(); // list of commands used to convert files to text for Indexer From 368343ade694968c44676f81bb6d6168d390d6b4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 10 Aug 2016 18:21:27 +0200 Subject: [PATCH 52/65] add entry for 4.3.28 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 8b91b53f4..9da6e485d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,7 @@ redirects to new page - apply all login restrictions like guest login, restrict to ip address, disabled account when authenticating by ldap +- place all authentication methods into its own class -------------------------------------------------------------------------------- Changes in version 4.3.27 From e1716da4852bde770f04e283ec31c6793f9d4f0d Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 11 Aug 2016 12:06:53 +0200 Subject: [PATCH 53/65] do not use showtree in documentListRow() anymore --- views/bootstrap/class.Bootstrap.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index b3e4efca7..e2a4d74a5 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1672,7 +1672,6 @@ $(document).ready( function() { function documentListRow($document, $previewer, $skipcont=false) { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; - $showtree = $this->params['showtree']; $workflowmode = $this->params['workflowmode']; $previewwidth = $this->params['previewWidthList']; $enableClipboard = $this->params['enableclipboard']; @@ -1717,7 +1716,7 @@ $(document).ready( function() { } else $content .= "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; - $content .= "" . htmlspecialchars($document->getName()) . ""; + $content .= "" . htmlspecialchars($document->getName()) . ""; $content .= "
    ".getMLText('owner').": ".htmlspecialchars($owner->getFullName()).", ".getMLText('creation_date').": ".date('Y-m-d', $document->getDate()).", ".getMLText('version')." ".$version." - ".date('Y-m-d', $latestContent->getDate())."".($document->expires() ? ", ".getMLText('expires').": ".getReadableDate($document->getExpires())."" : "").""; if($comment) { $content .= "
    ".htmlspecialchars($comment).""; From 434c97e25201db69b62566e0032d994de191cbd4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 11 Aug 2016 16:41:19 +0200 Subject: [PATCH 54/65] include Language.inc before Extension.inc --- out/out.AddDocument.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/out/out.AddDocument.php b/out/out.AddDocument.php index bf87db71f..d65cd360f 100644 --- a/out/out.AddDocument.php +++ b/out/out.AddDocument.php @@ -21,10 +21,10 @@ include("../inc/inc.Settings.php"); include("../inc/inc.Utils.php"); +include("../inc/inc.Language.php"); include("../inc/inc.Init.php"); include("../inc/inc.Extension.php"); include("../inc/inc.DBInit.php"); -include("../inc/inc.Language.php"); include("../inc/inc.ClassUI.php"); include("../inc/inc.Authentication.php"); From dd5394ea9e0b79adef8470f30e780ced157086fe Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 12 Aug 2016 18:19:44 +0200 Subject: [PATCH 55/65] new phrases --- languages/ar_EG/lang.inc | 2 ++ languages/bg_BG/lang.inc | 2 ++ languages/ca_ES/lang.inc | 2 ++ languages/cs_CZ/lang.inc | 2 ++ languages/de_DE/lang.inc | 14 ++++++++------ languages/en_GB/lang.inc | 8 +++++--- languages/es_ES/lang.inc | 2 ++ languages/fr_FR/lang.inc | 2 ++ languages/hr_HR/lang.inc | 2 ++ languages/hu_HU/lang.inc | 2 ++ languages/it_IT/lang.inc | 2 ++ languages/ko_KR/lang.inc | 2 ++ languages/nl_NL/lang.inc | 2 ++ languages/pl_PL/lang.inc | 2 ++ languages/pt_BR/lang.inc | 2 ++ languages/ro_RO/lang.inc | 2 ++ languages/ru_RU/lang.inc | 2 ++ languages/sk_SK/lang.inc | 2 ++ languages/sv_SE/lang.inc | 2 ++ languages/tr_TR/lang.inc | 2 ++ languages/uk_UA/lang.inc | 2 ++ languages/zh_CN/lang.inc | 2 ++ languages/zh_TW/lang.inc | 2 ++ 23 files changed, 55 insertions(+), 9 deletions(-) diff --git a/languages/ar_EG/lang.inc b/languages/ar_EG/lang.inc index c5899170b..fdf172854 100644 --- a/languages/ar_EG/lang.inc +++ b/languages/ar_EG/lang.inc @@ -644,6 +644,7 @@ URL: [url]', 'my_transmittals' => '', 'name' => 'اسم', 'needs_workflow_action' => 'هذا المستند يتطلب انتباهك . من فضلك تفقد زر مسار العمل', +'network_drive' => '', 'never' => '', 'new' => 'جديد', 'new_attrdef' => 'اضافة تعريف سمة', @@ -704,6 +705,7 @@ URL: [url]', 'no_default_keywords' => 'لايوجد كلمات بحثية متاحة', 'no_docs_checked_out' => '', 'no_docs_locked' => 'لايوجد مستندات حاليا مقفلة/محمية من التعديل', +'no_docs_rejected' => '', 'no_docs_to_approve' => 'لايوجد مستندات حالية في انتظار الموافقة', 'no_docs_to_look_at' => 'لايوجد مستندات حاليا تستدعي انتباهك', 'no_docs_to_receipt' => '', diff --git a/languages/bg_BG/lang.inc b/languages/bg_BG/lang.inc index 9a3e43c22..30f9d5e1e 100644 --- a/languages/bg_BG/lang.inc +++ b/languages/bg_BG/lang.inc @@ -575,6 +575,7 @@ $text = array( 'my_transmittals' => '', 'name' => 'Име', 'needs_workflow_action' => '', +'network_drive' => '', 'never' => '', 'new' => 'Нов', 'new_attrdef' => 'Добави дефиниция атрибути', @@ -611,6 +612,7 @@ $text = array( 'no_default_keywords' => 'Няма ключови думи', 'no_docs_checked_out' => '', 'no_docs_locked' => 'Няма блокирани документи', +'no_docs_rejected' => '', 'no_docs_to_approve' => 'Няма документи, нуждаещи се от утвърждаване', 'no_docs_to_look_at' => 'Няма документи, нуждаещи се от внимание', 'no_docs_to_receipt' => '', diff --git a/languages/ca_ES/lang.inc b/languages/ca_ES/lang.inc index 1656864dd..26553235a 100644 --- a/languages/ca_ES/lang.inc +++ b/languages/ca_ES/lang.inc @@ -580,6 +580,7 @@ URL: [url]', 'my_transmittals' => '', 'name' => 'Nom', 'needs_workflow_action' => '', +'network_drive' => '', 'never' => '', 'new' => 'Nou', 'new_attrdef' => '', @@ -616,6 +617,7 @@ URL: [url]', 'no_default_keywords' => 'No hi ha mots clau disponibles', 'no_docs_checked_out' => '', 'no_docs_locked' => 'No hi ha documents bloquejats.', +'no_docs_rejected' => '', 'no_docs_to_approve' => 'Actualmente no hi ha documents que necessitin aprovació.', 'no_docs_to_look_at' => 'No hi ha documents que necessitin atenció.', 'no_docs_to_receipt' => '', diff --git a/languages/cs_CZ/lang.inc b/languages/cs_CZ/lang.inc index 9c038ca48..d7ffc2f5d 100644 --- a/languages/cs_CZ/lang.inc +++ b/languages/cs_CZ/lang.inc @@ -651,6 +651,7 @@ URL: [url]', 'my_transmittals' => '', 'name' => 'Název', 'needs_workflow_action' => 'Tento dokument vyžaduje Vaši pozornost. Prosím zkontrolujte záložku pracovního postupu.', +'network_drive' => '', 'never' => 'nikdy', 'new' => 'Nový', 'new_attrdef' => 'Přidat definici atributu', @@ -711,6 +712,7 @@ URL: [url]', 'no_default_keywords' => 'Nejsou dostupná žádná klíčová slova.', 'no_docs_checked_out' => '', 'no_docs_locked' => 'Žádné uzamčené dokumenty', +'no_docs_rejected' => '', 'no_docs_to_approve' => 'Momentálně neexistují žádné dokumenty, které vyžadují schválení.', 'no_docs_to_look_at' => 'Žádné dokumenty, které vyžadují pozornost.', 'no_docs_to_receipt' => '', diff --git a/languages/de_DE/lang.inc b/languages/de_DE/lang.inc index 3fdb0ff09..b7b1240c4 100644 --- a/languages/de_DE/lang.inc +++ b/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 (2272), dgrutsch (21) +// Translators: Admin (2279), dgrutsch (21) $text = array( '2_factor_auth' => '2-Faktor Authentifizierung', @@ -82,7 +82,7 @@ URL: [url]', 'admin_tools' => 'Administration', 'all' => 'Alle', 'all_categories' => 'Alle Kategorien', -'all_documents' => 'alle Dokumente', +'all_documents' => 'Alle Dokumente', 'all_pages' => 'Alle', 'all_users' => 'Alle Benutzer', 'already_subscribed' => 'Bereits aboniert', @@ -307,7 +307,7 @@ URL: [url]', 'documents_only' => 'Nur Dokumente', 'documents_to_approve' => 'Freigabe erforderlich', 'documents_to_process' => 'Dokumente, die bearbeitet werden müssen', -'documents_to_receipt' => 'Dokumente deren Empfang bestätigt werden muss', +'documents_to_receipt' => 'Empfangsbestätigung erforderlich', 'documents_to_review' => 'Prüfung erforderlich', 'documents_to_revise' => 'Erneute Prüfung erforderlich', 'documents_user_rejected' => 'Abgelehnte Dokumente', @@ -512,13 +512,13 @@ URL: [url]', 'global_workflow_states' => 'Workflow-Status', 'group' => 'Gruppe', 'groups' => 'Gruppen', -'group_approval_summary' => 'Freigabe-Gruppen', +'group_approval_summary' => 'Übersicht Gruppenfreigabe', 'group_exists' => 'Gruppe existiert bereits', 'group_info' => 'Gruppeninformation', 'group_management' => 'Gruppenverwaltung', 'group_members' => 'Gruppenmitglieder', 'group_receipt_summary' => 'Übersicht Gruppenbestätigungen', -'group_review_summary' => 'Prüfergruppen', +'group_review_summary' => 'Übersicht Gruppenprüfungen', 'guest_login' => 'Als Gast anmelden', 'guest_login_disabled' => 'Anmeldung als Gast ist gesperrt.', 'help' => 'Hilfe', @@ -656,6 +656,7 @@ URL: [url]', 'my_transmittals' => 'Meine Dokumentenlisten', 'name' => 'Name', 'needs_workflow_action' => 'Dieses Dokument erfordert eine Aktion. Bitte schauen Sie auf den Workflow-Reiter.', +'network_drive' => 'Netzwerklaufwerk', 'never' => 'nie', 'new' => 'Neu', 'new_attrdef' => 'Neue Attributdefinition', @@ -715,6 +716,7 @@ URL: [url]', 'no_default_keywords' => 'Keine Vorlagen vorhanden', 'no_docs_checked_out' => 'Keine Dokumente ausgecheckt', 'no_docs_locked' => 'Keine Dokumente gesperrt.', +'no_docs_rejected' => 'Keine Dokumente abgelehnt.', 'no_docs_to_approve' => 'Es gibt zur Zeit keine Dokumente, die eine Freigabe erfordern.', 'no_docs_to_look_at' => 'Keine Dokumente, nach denen geschaut werden müsste.', 'no_docs_to_receipt' => 'Keine Dokumentenempfangsbestätigung erforderlich', @@ -1476,7 +1478,7 @@ URL: [url]', 'use_default_keywords' => 'Stichwortvorlagen', 'version' => 'Version', 'versioning_file_creation' => 'Datei-Versionierung', -'versioning_file_creation_warning' => 'Sie erzeugen eine Datei die sämtliche Versions-Informationen eines DMS-Verzeichnisses enthält. Nach Erstellung wird jede Datei im Dokumentenverzeichnis gespeichert.', +'versioning_file_creation_warning' => 'Mit dieser Operation erzeugen Sie pro Dokument eine Datei, die sämtliche Versions-Informationen des Dokuments enthält. Nach Erstellung wird jede Datei im Dokumentenverzeichnis gespeichert. Die erzeugten Dateien sind für den regulären Betrieb nicht erforderlich. Sie können aber von Nutzen sein, wenn der Dokumentenbestand auf ein anderes System übertragen werden soll.', 'versioning_info' => 'Versionsinformationen', 'versiontolow' => 'Version zu niedrig', 'version_deleted_email' => 'Version gelöscht', diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index ccbb39150..83fb9142f 100644 --- a/languages/en_GB/lang.inc +++ b/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 (1421), dgrutsch (7), netixw (14) +// Translators: Admin (1425), dgrutsch (7), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -309,7 +309,7 @@ URL: [url]', 'documents_to_process' => 'Documents that need processing', 'documents_to_receipt' => 'Documents awaiting to confirm the receipt', 'documents_to_review' => 'Documents awaiting your review', -'documents_to_revise' => 'Documents to revise', +'documents_to_revise' => 'Documents awaiting your revision', 'documents_user_rejected' => 'Rejected documents', 'documents_user_requiring_attention' => 'Documents owned by you that require attention', 'document_already_checkedout' => 'This document is already checked out', @@ -656,6 +656,7 @@ URL: [url]', 'my_transmittals' => 'My transmittals', 'name' => 'Name', 'needs_workflow_action' => 'This document requires your attention. Please check the workflow tab.', +'network_drive' => 'Network drive', 'never' => 'never', 'new' => 'New', 'new_attrdef' => 'Add attribute definition', @@ -716,6 +717,7 @@ URL: [url]', 'no_default_keywords' => 'No keywords available', 'no_docs_checked_out' => 'No documents checked out', 'no_docs_locked' => 'No documents locked.', +'no_docs_rejected' => 'No documents rejected.', 'no_docs_to_approve' => 'There are currently no documents that require approval.', 'no_docs_to_look_at' => 'No documents that need attention.', 'no_docs_to_receipt' => 'No document receipts required', @@ -1477,7 +1479,7 @@ URL: [url]', 'use_default_keywords' => 'Use predefined keywords', 'version' => 'Version', 'versioning_file_creation' => 'Versioning file creation', -'versioning_file_creation_warning' => 'With this operation you can create a file containing the versioning information of an entire DMS folder. After the creation every file will be saved inside the document folder.', +'versioning_file_creation_warning' => 'With this operation you can create a file for each document containing the versioning information of that document. After the creation every file will be saved inside the document folder. Those files are not needed for the regular operation of the dms, but could be of value if the complete repository shall be transferred to an other system.', 'versioning_info' => 'Versioning info', 'versiontolow' => 'Version to low', 'version_deleted_email' => 'Version deleted', diff --git a/languages/es_ES/lang.inc b/languages/es_ES/lang.inc index 8e8f94762..53a8c0732 100644 --- a/languages/es_ES/lang.inc +++ b/languages/es_ES/lang.inc @@ -651,6 +651,7 @@ URL: [url]', 'my_transmittals' => '', 'name' => 'Nombre', 'needs_workflow_action' => 'Este documento requiere su atención. Por favor chequee la pestaña de flujo de trabajo.', +'network_drive' => '', 'never' => 'nunca', 'new' => 'Nuevo', 'new_attrdef' => 'Nueva definición de atributo', @@ -711,6 +712,7 @@ URL: [url]', 'no_default_keywords' => 'No hay palabras clave disponibles', 'no_docs_checked_out' => '', 'no_docs_locked' => 'No hay documentos bloqueados.', +'no_docs_rejected' => '', 'no_docs_to_approve' => 'Actualmente no hay documentos que necesiten aprobación.', 'no_docs_to_look_at' => 'No hay documentos que necesiten atención.', 'no_docs_to_receipt' => '', diff --git a/languages/fr_FR/lang.inc b/languages/fr_FR/lang.inc index 97c833135..ce08250db 100644 --- a/languages/fr_FR/lang.inc +++ b/languages/fr_FR/lang.inc @@ -651,6 +651,7 @@ URL: [url]', 'my_transmittals' => '', 'name' => 'Nom', 'needs_workflow_action' => 'Ce document requiert votre attention. Consultez l\'onglet workflow.', +'network_drive' => '', 'never' => 'Jamais', 'new' => 'Nouveau', 'new_attrdef' => 'Ajouter une définition d\'attribut', @@ -710,6 +711,7 @@ URL: [url]', 'no_default_keywords' => 'Aucun mot-clé disponible', 'no_docs_checked_out' => '', 'no_docs_locked' => 'Aucun document verrouillé', +'no_docs_rejected' => '', 'no_docs_to_approve' => 'Aucun document ne nécessite actuellement une approbation', 'no_docs_to_look_at' => 'Aucun document à surveiller', 'no_docs_to_receipt' => '', diff --git a/languages/hr_HR/lang.inc b/languages/hr_HR/lang.inc index f866539c9..d9e25b8d0 100644 --- a/languages/hr_HR/lang.inc +++ b/languages/hr_HR/lang.inc @@ -656,6 +656,7 @@ Internet poveznica: [url]', 'my_transmittals' => 'Moja proslijeđivanja', 'name' => 'Naziv', 'needs_workflow_action' => 'Ovaj dokument zahtjeva vašu pažnju. Molimo provjerite karticu toka rada.', +'network_drive' => '', 'never' => 'nikada', 'new' => 'Novo', 'new_attrdef' => 'Dodaj definiciju atributa', @@ -715,6 +716,7 @@ Internet poveznica: [url]', 'no_default_keywords' => 'Nema dostupnih ključnih riječi', 'no_docs_checked_out' => 'Niti jedan dokument nije odjavljen', 'no_docs_locked' => 'Nema zaključanih dokumenata.', +'no_docs_rejected' => '', 'no_docs_to_approve' => 'Trenutno nema dokumenata koji zahtjevaju odobrenje.', 'no_docs_to_look_at' => 'Nema dokumenata na koje treba obratiti pozornost.', 'no_docs_to_receipt' => 'Nema potvrda o primitku dokumenta', diff --git a/languages/hu_HU/lang.inc b/languages/hu_HU/lang.inc index d78c2aa61..209875204 100644 --- a/languages/hu_HU/lang.inc +++ b/languages/hu_HU/lang.inc @@ -651,6 +651,7 @@ URL: [url]', 'my_transmittals' => '', 'name' => 'Név', 'needs_workflow_action' => 'Ez a dokumentum az Ön beavatkozására vár. Ellenőrizze a munkafolyamat fület.', +'network_drive' => '', 'never' => 'soha', 'new' => 'Új', 'new_attrdef' => 'Jellemző meghatározás hozzáadása', @@ -711,6 +712,7 @@ URL: [url]', 'no_default_keywords' => 'Nincsenek elérhető kulcsszavak', 'no_docs_checked_out' => '', 'no_docs_locked' => 'Nincsenek zárolt dokumentumok.', +'no_docs_rejected' => '', 'no_docs_to_approve' => 'Nincsenek jóváhagyandó dokumentumok.', 'no_docs_to_look_at' => 'Nincs karbantartást igénylő dokumentum.', 'no_docs_to_receipt' => '', diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index d5e98459a..c1b12b452 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -657,6 +657,7 @@ URL: [url]', 'my_transmittals' => 'Mie trasmissioni', 'name' => 'Nome', 'needs_workflow_action' => 'Il documento richiede attenzione. Prego controllare il flusso di lavoro.', +'network_drive' => '', 'never' => 'Mai', 'new' => 'Nuovo', 'new_attrdef' => 'Nuovo attributo', @@ -717,6 +718,7 @@ URL: [url]', 'no_default_keywords' => 'Nessuna parola-chiave disponibile', 'no_docs_checked_out' => 'Nessun documento approvato', 'no_docs_locked' => 'Nessun documento bloccato.', +'no_docs_rejected' => '', 'no_docs_to_approve' => 'Non ci sono documenti che richiedano approvazione.', 'no_docs_to_look_at' => 'Non ci sono documenti che richiedano attenzione.', 'no_docs_to_receipt' => 'Nessuna cartella richiesta.', diff --git a/languages/ko_KR/lang.inc b/languages/ko_KR/lang.inc index 7931de0df..8d81e9f80 100644 --- a/languages/ko_KR/lang.inc +++ b/languages/ko_KR/lang.inc @@ -656,6 +656,7 @@ URL: [url]', 'my_transmittals' => '내 송부', 'name' => '이름', 'needs_workflow_action' => '이 문서는 당신의주의가 필요합니다. 워크플로우 탭을 확인하시기 바랍니다.', +'network_drive' => '', 'never' => '불가', 'new' => '새', 'new_attrdef' => '속성 정의 추가', @@ -716,6 +717,7 @@ URL : [url]', 'no_default_keywords' => '사용 가능한 키워드가 존재하지 않습니다.', 'no_docs_checked_out' => '체크아웃 문서가 없습니다.', 'no_docs_locked' => '잠긴 문서가 없습니다.', +'no_docs_rejected' => '', 'no_docs_to_approve' => '승인이 필요한 문서가 현재 없습니다.', 'no_docs_to_look_at' => '.주의가 필요한 문서가 현재 없습니다', 'no_docs_to_receipt' => '문서 접수가 필요하지 않습니다', diff --git a/languages/nl_NL/lang.inc b/languages/nl_NL/lang.inc index ff4e2015b..d7f459e44 100644 --- a/languages/nl_NL/lang.inc +++ b/languages/nl_NL/lang.inc @@ -649,6 +649,7 @@ URL: [url]', 'my_transmittals' => 'Mijn zendingen', 'name' => 'Naam', 'needs_workflow_action' => 'Dit document vereist uw aandacht. Bekijk deze onder het tabblad workflows.', +'network_drive' => '', 'never' => 'Nooit', 'new' => 'Nieuw', 'new_attrdef' => 'Voeg kenmerk definitie toe', @@ -708,6 +709,7 @@ URL: [url]', 'no_default_keywords' => 'Geen Sleutelwoorden beschikbaar', 'no_docs_checked_out' => 'Geen documenten in gebruik genomen', 'no_docs_locked' => 'Geen documenten in gebruik.', +'no_docs_rejected' => '', 'no_docs_to_approve' => 'Er zijn momenteel geen documenten die goedkeuring behoeven.', 'no_docs_to_look_at' => 'Geen documenten die aandacht behoeven.', 'no_docs_to_receipt' => 'Geen documenten te ontvangen', diff --git a/languages/pl_PL/lang.inc b/languages/pl_PL/lang.inc index d2e07c909..c50ece867 100644 --- a/languages/pl_PL/lang.inc +++ b/languages/pl_PL/lang.inc @@ -644,6 +644,7 @@ URL: [url]', 'my_transmittals' => '', 'name' => 'Nazwa', 'needs_workflow_action' => 'Dokument wymaga uwagi. Proszę sprawdzić kartę workflow.', +'network_drive' => '', 'never' => '', 'new' => 'Nowy', 'new_attrdef' => 'Dodaj definicję atrybutu', @@ -704,6 +705,7 @@ URL: [url]', 'no_default_keywords' => 'Nie ma słów kluczowych', 'no_docs_checked_out' => '', 'no_docs_locked' => 'Brak zablokowanych dokumentów.', +'no_docs_rejected' => '', 'no_docs_to_approve' => 'Aktualnie nie ma dokumentów wymagających akceptacji.', 'no_docs_to_look_at' => 'Brak dokumentów wymagających uwagi.', 'no_docs_to_receipt' => '', diff --git a/languages/pt_BR/lang.inc b/languages/pt_BR/lang.inc index 98bd205db..7911d25ee 100644 --- a/languages/pt_BR/lang.inc +++ b/languages/pt_BR/lang.inc @@ -650,6 +650,7 @@ URL: [url]', 'my_transmittals' => '', 'name' => 'Nome', 'needs_workflow_action' => 'Este documento requer sua atenção. Por favor, verifique a guia de fluxo de trabalho.', +'network_drive' => '', 'never' => '', 'new' => 'Novo', 'new_attrdef' => 'Adicionar definição de atributo', @@ -709,6 +710,7 @@ URL: [url]', 'no_default_keywords' => 'não há palavras-chave disponíveis', 'no_docs_checked_out' => '', 'no_docs_locked' => 'Nenhum documento bloqueado.', +'no_docs_rejected' => '', 'no_docs_to_approve' => 'There are currently no documents that require approval.', 'no_docs_to_look_at' => 'Não há documentos que precisam de atenção.', 'no_docs_to_receipt' => '', diff --git a/languages/ro_RO/lang.inc b/languages/ro_RO/lang.inc index 380eb293f..4fa38d757 100644 --- a/languages/ro_RO/lang.inc +++ b/languages/ro_RO/lang.inc @@ -656,6 +656,7 @@ URL: [url]', 'my_transmittals' => 'Trimiterile mele', 'name' => 'Nume', 'needs_workflow_action' => 'Acest document necesită atenția dumneavoastră. Vă rugăm să verificați tab-ul workflow.', +'network_drive' => '', 'never' => 'niciodată', 'new' => 'Nou', 'new_attrdef' => 'Adaugă definitie atribut', @@ -716,6 +717,7 @@ URL: [url]', 'no_default_keywords' => 'Nu există cuvinte cheie disponibile', 'no_docs_checked_out' => 'Nu exista documente verificate', 'no_docs_locked' => 'Nici un document blocat.', +'no_docs_rejected' => '', 'no_docs_to_approve' => 'Momentan nu există documente care necesită aprobarea.', 'no_docs_to_look_at' => 'Nici un document care necesită atenție.', 'no_docs_to_receipt' => '', diff --git a/languages/ru_RU/lang.inc b/languages/ru_RU/lang.inc index 77f67ea13..38f3b23b5 100644 --- a/languages/ru_RU/lang.inc +++ b/languages/ru_RU/lang.inc @@ -656,6 +656,7 @@ URL: [url]', 'my_transmittals' => 'Мои пересылки', 'name' => 'Имя', 'needs_workflow_action' => 'Этот документ требует вашего внимания. См. вкладку «Процесс».', +'network_drive' => '', 'never' => 'никогда', 'new' => 'Новый', 'new_attrdef' => 'Добавить определение атрибута', @@ -715,6 +716,7 @@ URL: [url]', 'no_default_keywords' => 'Нет меток', 'no_docs_checked_out' => 'Нет документов на рассмотрении', 'no_docs_locked' => 'Нет заблокированных документов', +'no_docs_rejected' => '', 'no_docs_to_approve' => 'Нет документов, нуждающихся в утверждении', 'no_docs_to_look_at' => 'Нет документов, нуждающихся во внимании', 'no_docs_to_receipt' => 'Нет документов, нуждающихся в подтверждении', diff --git a/languages/sk_SK/lang.inc b/languages/sk_SK/lang.inc index 251a6d211..5da8bd168 100644 --- a/languages/sk_SK/lang.inc +++ b/languages/sk_SK/lang.inc @@ -579,6 +579,7 @@ URL: [url]', 'my_transmittals' => '', 'name' => 'Meno', 'needs_workflow_action' => '', +'network_drive' => '', 'never' => '', 'new' => 'Nove', 'new_attrdef' => '', @@ -615,6 +616,7 @@ URL: [url]', 'no_default_keywords' => 'Nie sú dostupné žiadne kľúčové slová.', 'no_docs_checked_out' => '', 'no_docs_locked' => '', +'no_docs_rejected' => '', 'no_docs_to_approve' => 'Momentálne neexistujú žiadne dokumenty, ktoré vyžadujú schválenie.', 'no_docs_to_look_at' => '', 'no_docs_to_receipt' => '', diff --git a/languages/sv_SE/lang.inc b/languages/sv_SE/lang.inc index 273f7423d..5413a4a9b 100644 --- a/languages/sv_SE/lang.inc +++ b/languages/sv_SE/lang.inc @@ -644,6 +644,7 @@ URL: [url]', 'my_transmittals' => '', 'name' => 'Namn', 'needs_workflow_action' => 'Detta dokument behöver din uppmärksamhet. Kolla arbetsflödet.', +'network_drive' => '', 'never' => '', 'new' => 'Ny', 'new_attrdef' => 'Lägg till attributdefinition', @@ -704,6 +705,7 @@ URL: [url]', 'no_default_keywords' => 'Inga nyckelord tillgängliga', 'no_docs_checked_out' => '', 'no_docs_locked' => 'Inga dokument är låsta.', +'no_docs_rejected' => '', 'no_docs_to_approve' => 'Det finns inga dokument som du behöver godkänna.', 'no_docs_to_look_at' => 'Det finns inga dokument som behöver godkännas eller granskas.', 'no_docs_to_receipt' => '', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 0327e7352..52c90ae60 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/lang.inc @@ -650,6 +650,7 @@ URL: [url]', 'my_transmittals' => '', 'name' => 'İsim', 'needs_workflow_action' => 'Bu doküman dikkatinizi gerektiriyor. Lütfen iş akış sekmesini kontrol ediniz.', +'network_drive' => '', 'never' => 'asla', 'new' => 'Yeni', 'new_attrdef' => 'Nitelik tanımı ekle', @@ -710,6 +711,7 @@ URL: [url]', 'no_default_keywords' => 'Anahtar kelime yok', 'no_docs_checked_out' => '', 'no_docs_locked' => 'Kilitli doküman yok.', +'no_docs_rejected' => '', 'no_docs_to_approve' => 'Şu anda onay bekleyen doküman yok.', 'no_docs_to_look_at' => 'Dikkat edilmesi gereken bir doküman yok.', 'no_docs_to_receipt' => '', diff --git a/languages/uk_UA/lang.inc b/languages/uk_UA/lang.inc index 26b25c61a..18f6d33d1 100644 --- a/languages/uk_UA/lang.inc +++ b/languages/uk_UA/lang.inc @@ -656,6 +656,7 @@ URL: [url]', 'my_transmittals' => 'Мої перенесення', 'name' => 'Назва', 'needs_workflow_action' => 'Цей документ потребує вашої уваги. Див. вкладку «Процес».', +'network_drive' => '', 'never' => 'ніколи', 'new' => 'Новий', 'new_attrdef' => 'Додати визначення атрибуту', @@ -715,6 +716,7 @@ URL: [url]', 'no_default_keywords' => 'Немає ключових слів', 'no_docs_checked_out' => 'Немає документів на опрацюванні', 'no_docs_locked' => 'Немає заблокованих документів', +'no_docs_rejected' => '', 'no_docs_to_approve' => 'Немає документів, які потребують затвердження', 'no_docs_to_look_at' => 'Немає документів, які потребують уваги', 'no_docs_to_receipt' => 'Немає документів, які потребують підтвердження', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index 65e4d8719..ffe4ed0e5 100644 --- a/languages/zh_CN/lang.inc +++ b/languages/zh_CN/lang.inc @@ -581,6 +581,7 @@ URL: [url]', 'my_transmittals' => '', 'name' => '名称', 'needs_workflow_action' => '', +'network_drive' => '', 'never' => '', 'new' => 'New', 'new_attrdef' => '添加属性', @@ -617,6 +618,7 @@ URL: [url]', 'no_default_keywords' => '无关键字', 'no_docs_checked_out' => '', 'no_docs_locked' => '无锁定的文档', +'no_docs_rejected' => '', 'no_docs_to_approve' => '当前没有需要审核的文档', 'no_docs_to_look_at' => '没有需要关注的文档', 'no_docs_to_receipt' => '', diff --git a/languages/zh_TW/lang.inc b/languages/zh_TW/lang.inc index a1b572912..431f2984d 100644 --- a/languages/zh_TW/lang.inc +++ b/languages/zh_TW/lang.inc @@ -579,6 +579,7 @@ URL: [url]', 'my_transmittals' => '', 'name' => '名稱', 'needs_workflow_action' => '', +'network_drive' => '', 'never' => '', 'new' => 'New', 'new_attrdef' => '添加屬性', @@ -615,6 +616,7 @@ URL: [url]', 'no_default_keywords' => '無關鍵字', 'no_docs_checked_out' => '', 'no_docs_locked' => '無鎖定的文檔', +'no_docs_rejected' => '', 'no_docs_to_approve' => '當前沒有需要審核的文檔', 'no_docs_to_look_at' => '沒有需要關注的文檔', 'no_docs_to_receipt' => '', From 9a17a5c0680d258a43b8efe69b3dabb8fd29210e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 22 Aug 2016 17:14:20 +0200 Subject: [PATCH 56/65] fix printFolderChooser() the last optional parameter $formname wasn't take into account --- views/bootstrap/class.Bootstrap.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index e53a739e0..fb51bde39 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1004,22 +1004,22 @@ function folderSelected(id, name) { -function folderSelected(id, name) { - $('#targetid').val(id); - $('#choosefoldersearch').val(name); - $('#folderChooser').modal('hide'); +function folderSelected(id, name) { + $('#targetid').val(id); + $('#choosefoldersearch').val(name); + $('#folderChooser').modal('hide'); } printFolderChooserHtml($formName, $accessMode, $exclude, $default); + function printFolderChooser($form, $accessMode, $exclude = -1, $default = false, $formname='') { /* {{{ */ + $this->printFolderChooserHtml($form, $accessMode, $exclude, $default, $formname); ?> Date: Mon, 22 Aug 2016 17:16:08 +0200 Subject: [PATCH 57/65] added entries for 5.0.5 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index f0031690a..782d49d25 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ Changes in version 5.0.5 -------------------------------------------------------------------------------- - merged changes from 4.3.28 +- fix choosing home folder of users +- fix clearing cache -------------------------------------------------------------------------------- Changes in version 5.0.4 From f47025542389c2bb75465cea1e63393b49290567 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 22 Aug 2016 18:13:57 +0200 Subject: [PATCH 58/65] add missing header von ContentType, set header for Cache-Control this fixes bug #280 --- op/op.Ajax.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/op/op.Ajax.php b/op/op.Ajax.php index c792469a0..bda2796f1 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -35,6 +35,7 @@ if (isset($_COOKIE["mydms_session"])) { $dms_session = $_COOKIE["mydms_session"]; $session = new SeedDMS_Session($db); if(!$resArr = $session->load($dms_session)) { + header('Content-Type: application/json'); echo json_encode(array('error'=>1)); exit; } @@ -45,6 +46,7 @@ if (isset($_COOKIE["mydms_session"])) { /* Load user data */ $user = $dms->getUser($resArr["userID"]); if (!is_object($user)) { + header('Content-Type: application/json'); echo json_encode(array('error'=>1)); exit; } @@ -63,6 +65,11 @@ if (isset($_COOKIE["mydms_session"])) { $user = null; } +/* make sure the browser doesn't cache the output of this page. + * Edge doesn't if not explicitly told to not do it, see bug #280 + */ +header("Cache-Control: no-cache,no-store"); + $command = $_REQUEST["command"]; switch($command) { case 'checkpwstrength': /* {{{ */ @@ -75,17 +82,21 @@ switch($command) { $score = $ps->get_score(); if($settings->_passwordStrength) { if($score >= $settings->_passwordStrength) { + header('Content-Type: application/json'); echo json_encode(array('error'=>0, 'strength'=>$score, 'score'=>$score/$settings->_passwordStrength, 'ok'=>1)); } else { + header('Content-Type: application/json'); echo json_encode(array('error'=>0, 'strength'=>$score, 'score'=>$score/$settings->_passwordStrength, 'ok'=>0)); } } else { + header('Content-Type: application/json'); echo json_encode(array('error'=>0, 'strength'=>$score)); } break; /* }}} */ case 'sessioninfo': /* {{{ */ if($user) { + header('Content-Type: application/json'); echo json_encode($resArr); } break; /* }}} */ @@ -159,6 +170,7 @@ switch($command) { } } + header('Content-Type: application/json'); echo json_encode($tree); // echo json_encode(array(array('label'=>'test1', 'id'=>1, 'load_on_demand'=> true), array('label'=>'test2', 'id'=>2, 'load_on_demand'=> true))); } @@ -506,6 +518,7 @@ switch($command) { } if ($folder->getAccessMode($user) < M_READWRITE) { + header('Content-Type: application/json'); echo json_encode(array('success'=>false, 'message'=>getMLText("access_denied"))); exit; } @@ -513,6 +526,7 @@ switch($command) { if($settings->_quota > 0) { $remain = checkQuota($user); if ($remain < 0) { + header('Content-Type: application/json'); echo json_encode(array('success'=>false, 'message'=>getMLText("quota_exceeded", array('bytes'=>SeedDMS_Core_File::format_filesize(abs($remain)))))); exit; } From 58d88443538814665d5a130d5b6eb61d391b3cc8 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 22 Aug 2016 18:15:37 +0200 Subject: [PATCH 59/65] add entry for 4.3.28 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 9da6e485d..e6f87e9e3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,6 +17,7 @@ - apply all login restrictions like guest login, restrict to ip address, disabled account when authenticating by ldap - place all authentication methods into its own class +- do not cache output of op/op.Ajax.php (Closes #280) -------------------------------------------------------------------------------- Changes in version 4.3.27 From 6193fada8f9bfc907e45c28c4726394f8ca8f698 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 24 Aug 2016 10:15:35 +0200 Subject: [PATCH 60/65] major overhoul by rickr --- languages/it_IT/lang.inc | 272 ++++++++++++++++++++------------------- 1 file changed, 141 insertions(+), 131 deletions(-) diff --git a/languages/it_IT/lang.inc b/languages/it_IT/lang.inc index c1b12b452..b11d46918 100644 --- a/languages/it_IT/lang.inc +++ b/languages/it_IT/lang.inc @@ -19,15 +19,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -// Translators: Admin (1530), s.pnt (26) +// Translators: Admin (1530), rickr (144), s.pnt (26) $text = array( -'2_factor_auth' => '', -'2_factor_auth_info' => '', -'2_fact_auth_secret' => '', +'2_factor_auth' => 'Autorizzazione a due fattori', +'2_factor_auth_info' => 'Questo sistema usa autenticazione a due fattori. Sarà necessario il “Google Authenticator” sul tuo telephono cellulare. Qui potete vedere due codici QR. Quello di destra è il tuo segreto. è sulla sinistra chè un nuovo segreto. Se si imposta un nuovo segreto per assicurarsi si deve scansione con “Google Authenticator” di nouvo.', +'2_fact_auth_secret' => 'Segreto', 'accept' => 'Accetta', -'access_control' => '', -'access_control_is_off' => '', +'access_control' => 'Il controllo degli accessi', +'access_control_is_off' => 'Controlo avanzate è spento', 'access_denied' => 'Accesso negato', 'access_inheritance' => 'Permessi ereditari', 'access_mode' => 'Permessi', @@ -54,7 +54,7 @@ URL: [url]', 'action_revise' => 'Revisiona', 'add' => 'Aggiungi', 'add_approval' => 'Invio approvazione', -'add_attrdefgroup' => '', +'add_attrdefgroup' => 'Aggiungi nuovo gruppo attributo', 'add_document' => 'Aggiungi documento', 'add_document_link' => 'Aggiungi collegamento', 'add_document_notify' => 'Notifica a', @@ -68,7 +68,7 @@ URL: [url]', 'add_receipt' => 'invio ricevuta', 'add_review' => 'Invio revisione', 'add_revision' => 'Aggiungi approvazione', -'add_role' => '', +'add_role' => 'Aggiungi nuova responsabilità', 'add_subfolder' => 'Aggiungi sottocartella', 'add_to_clipboard' => 'Aggiungi agli appunti', 'add_to_transmittal' => 'Aggiungi alla trasmissione', @@ -131,20 +131,20 @@ URL: [url]', 'assign_reviewers' => 'Assegna Revisori', 'assign_user_property_to' => 'Assegna le proprietà dell\'utente a', 'assumed_released' => 'Rilascio acquisito', -'attrdefgroup_management' => '', -'attrdefgrp_show_detail' => '', -'attrdefgrp_show_list' => '', -'attrdefgrp_show_search' => '', -'attrdefgrp_show_searchlist' => '', +'attrdefgroup_management' => 'Gestire gruppi di attributi', +'attrdefgrp_show_detail' => 'Dettagli', +'attrdefgrp_show_list' => 'Lista', +'attrdefgrp_show_search' => 'Trova', +'attrdefgrp_show_searchlist' => 'risultati trovati', 'attrdef_exists' => 'Definizione di Attributo già esistente', -'attrdef_info' => '', +'attrdef_info' => 'Informazione', 'attrdef_in_use' => 'Definizione di Attributo ancora in uso', 'attrdef_management' => 'Gestione Attributi', 'attrdef_maxvalues' => 'Numero di valori Max.', 'attrdef_minvalues' => 'Numero di valori Min.', 'attrdef_min_greater_max' => 'Il numero minimo di valori è maggiore del massimo', 'attrdef_multiple' => 'Permetti valori multipli', -'attrdef_multiple_needs_valueset' => '', +'attrdef_multiple_needs_valueset' => 'Attributo definizione con i molteplici valori esigenze un valore impostato.', 'attrdef_must_be_multiple' => 'Gli Attributi devono avere più di un valore, ma non sono permessi valori multipli', 'attrdef_name' => 'Nome', 'attrdef_noname' => 'Nella definizione dell\'Attributo manca il nome', @@ -172,7 +172,7 @@ URL: [url]', 'attribute_value' => 'Valore dell\'Attributo', 'attr_malformed_email' => 'Il valore di \'[value]\' dell, => attributo \'[attrname]\' non é un URL valido.', -'attr_malformed_url' => '', +'attr_malformed_url' => 'Il valore dell\'attributo \'[valore]\' di attributo \'[attrname]\' non è un URL valido.', 'attr_max_values' => 'Il numero massimo dei valori richiesti per l\'Attributo [attrname] è superato.', 'attr_min_values' => 'Il numero minimo di valori richiesti per l\'Attributo [attrname] non è raggiunto.', 'attr_no_regex_match' => 'Il valore dell\'Attributo non è conforme ad un\'espressione regolare.', @@ -201,11 +201,11 @@ URL: [url]', 'cannot_retrieve_review_snapshot' => 'Impossibile recuperare lo stato di revisione per questa versione del documento', 'cannot_rm_root' => 'Impossibile cancellare la cartella principale (root)', 'categories' => 'Categorie', -'categories_loading' => '', +'categories_loading' => 'Si prega di aspettare, fino a quando viene caricato elenco delle categorie ...', 'category' => 'Categoria', 'category_exists' => 'Categoria esistente.', 'category_filter' => 'Solo categorie', -'category_info' => '', +'category_info' => 'Informazione', 'category_in_use' => 'Questa categoria è attualmente in uso in alcuni documenti.', 'category_noname' => 'Non è stato attribuito un nome alla categoria.', 'ca_ES' => 'Catalano', @@ -231,10 +231,10 @@ URL: [url]', 'checkout_document' => 'Approvato', 'checkout_is_disabled' => 'Approvazione dei documenti disabilitata', 'choose_attrdef' => 'Seleziona l\'Attributo', -'choose_attrdefgroup' => '', +'choose_attrdefgroup' => 'Scegli gruppo di attributi', 'choose_category' => 'Seleziona', 'choose_group' => 'Seleziona il gruppo', -'choose_role' => '', +'choose_role' => '--Scegli ruolo--', 'choose_target_category' => 'Seleziona la categoria', 'choose_target_document' => 'Seleziona il documento', 'choose_target_file' => 'Scegli il file', @@ -243,19 +243,19 @@ URL: [url]', 'choose_workflow' => 'Seleziona il flusso di lavoro', 'choose_workflow_action' => 'Seleziona l\'azione del flusso di lavoro', 'choose_workflow_state' => 'Seleziona lo stato del flusso di lavoro', -'class_name' => '', +'class_name' => 'Nome della classe', 'clear_cache' => 'Pulisci cache', 'clear_clipboard' => 'Cancella appunti', -'clear_password' => '', +'clear_password' => 'Cancella la password', 'clipboard' => 'Appunti', 'close' => 'Chiudi', 'comment' => 'Commento', 'comment_changed_email' => '', 'comment_for_current_version' => 'Commento per la versione', -'confirm_clear_cache' => '', +'confirm_clear_cache' => 'Vuoi davvero cancellare la cache? Questo eliminerà tutte le immagini di anteprima precalcolate.', 'confirm_create_fulltext_index' => 'Sì, desidero ricreare l\'indice fulltext!', -'confirm_move_document' => '', -'confirm_move_folder' => '', +'confirm_move_document' => 'Conferma lo spostamento del documento.', +'confirm_move_folder' => 'Si prega di confermare lo spostamento della cartella.', 'confirm_pwd' => 'Conferma la password', 'confirm_rm_backup' => 'Vuoi davvero rimuovere il file "[arkname]"? Attenzione: questa operazione non può essere annullata.', 'confirm_rm_document' => 'Vuoi veramente eliminare il documento "[documentname]"? Attenzione: questa operazione non può essere annullata.', @@ -266,7 +266,7 @@ URL: [url]', 'confirm_rm_folder_files' => 'Vuoi davvero rimuovere tutti i file dalla cartella "[foldername]" e dalle sue sottocartelle? Attenzione: questa operazione non può essere annullata.', 'confirm_rm_group' => 'Vuoi davvero rimuovere il gruppo "[groupname]"? Attenzione: questa operazione non può essere annullata.', 'confirm_rm_log' => 'Vuoi davvero rimuovere il file di log "[logname]"?
    Attenzione: questa operazione non può essere annullata.', -'confirm_rm_transmittal' => '', +'confirm_rm_transmittal' => 'Si prega di confermare l\'eliminazione della trasmissione.', 'confirm_rm_transmittalitem' => 'Conferma rimozione', 'confirm_rm_user' => 'Vuoi davvero rimuovere l\'utente "[username]"? Attenzione: questa operazione non può essere annullata.', 'confirm_rm_version' => 'Vuoi veramente eliminare la versione [version] del documento "[documentname]"? Attenzione: questa operazione non può essere annullata.', @@ -288,7 +288,7 @@ URL: [url]', 'databasesearch' => 'Ricerca nel Database', 'date' => 'Data', 'days' => 'Giorni', -'debug' => '', +'debug' => 'Localizzare e rimuovere errori da (Debug)', 'december' => 'Dicembre', 'default_access' => 'Permesso di default', 'default_keywords' => 'Parole-chiave disponibili', @@ -303,15 +303,15 @@ URL: [url]', 'documents' => 'Documenti', 'documents_checked_out_by_you' => 'Documenti approvati da te', 'documents_in_process' => 'Documenti in lavorazione', -'documents_locked' => '', +'documents_locked' => 'Documenti bloccati', 'documents_locked_by_you' => 'Documenti bloccati da te', 'documents_only' => 'Solo documenti', 'documents_to_approve' => 'Documenti in attesa della tua approvazione', -'documents_to_process' => '', +'documents_to_process' => 'I documenti che necessitano di trattamento', 'documents_to_receipt' => 'Documenti in attesa di conferma ricezione', 'documents_to_review' => 'Documenti in attesa della tua revisione', 'documents_to_revise' => 'Documenti da revisionare.', -'documents_user_rejected' => '', +'documents_user_rejected' => 'Documenti rifiutati', 'documents_user_requiring_attention' => 'Tuoi documenti in attesa di revisione o approvazione', 'document_already_checkedout' => 'Questo documento è già approvato', 'document_already_locked' => 'Questo documento è già bloccato', @@ -324,7 +324,7 @@ Cartella: [folder_path] Utente: [username] URL: [url]', 'document_comment_changed_email_subject' => '[sitename]: [name] - Commento modificato', -'document_count' => '', +'document_count' => 'Numero di documenti', 'document_deleted' => 'Documento cancellato', 'document_deleted_email' => 'Documento cancellato', 'document_deleted_email_body' => 'Cancellazione documento @@ -385,9 +385,9 @@ URL: [url]', 'draft_pending_approval' => 'Bozza - in approvazione', 'draft_pending_review' => 'Bozza - in revisione', 'drag_icon_here' => 'Trascina qui l\'icona della cartella o del documento', -'dropfolderdir_missing' => '', +'dropfolderdir_missing' => 'La vostra cartella di personale non esiste sul server! Si prega di chiedere all\'amministratore di creare per te.', 'dropfolder_file' => 'Scegli file dal server', -'dropfolder_folder' => '', +'dropfolder_folder' => 'Cartella per il cartella di ricezione', 'dropupload' => 'Caricamento Rapido', 'drop_files_here' => 'Trascina qui il file', 'dump_creation' => 'Creazione del DB dump', @@ -404,38 +404,38 @@ URL: [url]', 'edit_document_props' => 'Modifica le proprietà del documento', 'edit_event' => 'Modifica l\'evento', 'edit_existing_access' => 'Modifica i permessi', -'edit_existing_attribute_groups' => '', +'edit_existing_attribute_groups' => 'Modifica gruppi degli attributi', 'edit_existing_notify' => 'Gestione lista di notifica', 'edit_folder_access' => 'Modifica permessi', -'edit_folder_attrdefgrp' => '', +'edit_folder_attrdefgrp' => 'Modifica i attributi degli gruppi', 'edit_folder_notify' => 'Modifica la lista di notifica per la cartella', 'edit_folder_props' => 'Modifica proprietà cartella', 'edit_group' => 'Modifica il gruppo', -'edit_online' => '', +'edit_online' => 'Modifica online', 'edit_transmittal_props' => 'Modifica proprietà trasmissione', 'edit_user' => 'Modifica l\'utente', 'edit_user_details' => 'Modifica i dettagli utente', -'edit_version' => '', +'edit_version' => 'Versione editato', 'email' => 'Email', 'email_error_title' => 'Nessuna email immessa', 'email_footer' => 'Puoi cambiare l\'impostazione della tua email utilizzando le funzioni del menu \'Account personale\'', 'email_header' => 'Questo è un messaggio automatico inviato dal server DMS', 'email_not_given' => 'Inserisci un indirizzo email valido.', -'empty_attribute_group_list' => '', +'empty_attribute_group_list' => 'Nessun gruppo di attributi', 'empty_folder_list' => 'Cartella vuota', 'empty_notify_list' => 'Nessun record', 'en_GB' => 'Inglese (GB)', 'equal_transition_states' => 'Lo stato iniziale e quello finale sono identici', 'error' => 'Errore', -'error_add_aro' => '', -'error_add_permission' => '', -'error_clearcache' => '', -'error_importfs' => '', +'error_add_aro' => 'Errore durante l\'accesso aggiungendo richiesta oggetto', +'error_add_permission' => 'Errore durante l\'aggiunta di permesso', +'error_clearcache' => 'Errore durante svuotare la cache', +'error_importfs' => 'Errore durante l\'importazione dal file system', 'error_no_document_selected' => 'Nessun documento selezionato', 'error_no_folder_selected' => 'Nessuna cartella selezionata', 'error_occured' => 'Ooops... Si è verificato un errore', -'error_remove_permission' => '', -'error_toogle_permission' => '', +'error_remove_permission' => 'Errore durante la rimozione delle autorizzazioni', +'error_toogle_permission' => 'Errore durante la modifica permessi', 'es_ES' => 'Spagnolo', 'event_details' => 'Dettagli evento', 'exclude_items' => 'Escludi Elementi', @@ -504,7 +504,7 @@ URL: [url]', 'fullsearch' => 'Ricerca Fulltext', 'fullsearch_hint' => 'Usa l\'indice fulltext', 'fulltext_info' => 'Info indice Fulltext', -'global_attributedefinitiongroups' => '', +'global_attributedefinitiongroups' => 'Attributo gruppi', 'global_attributedefinitions' => 'Definizione attributi', 'global_default_keywords' => 'Parole-chiave globali', 'global_document_categories' => 'Categorie', @@ -515,16 +515,16 @@ URL: [url]', 'groups' => 'Gruppi', 'group_approval_summary' => 'Dettaglio approvazioni di gruppo', 'group_exists' => 'Il gruppo è già esistente', -'group_info' => '', +'group_info' => 'Informazion del gruppo', 'group_management' => 'Amministrazione gruppi', 'group_members' => 'Membri del gruppo', -'group_receipt_summary' => '', +'group_receipt_summary' => 'Panoramica delle conferme ricevute gruppo.', 'group_review_summary' => 'Dettaglio revisioni di gruppo', 'guest_login' => 'Login come Ospite', 'guest_login_disabled' => 'Il login come Ospite è disabilitato.', 'help' => 'Aiuto', 'home_folder' => 'Cartella Utente', -'hook_name' => '', +'hook_name' => 'Nome del gangio', 'hourly' => 'Ogni ora', 'hours' => 'ore', 'hr_HR' => 'Croato', @@ -533,16 +533,16 @@ URL: [url]', 'id' => 'ID', 'identical_version' => 'La nuova versione è identica a quella attuale.', 'import' => 'Importa', -'importfs' => '', +'importfs' => 'Importa da File System / disco', 'import_fs' => 'Importa dalla cartella di sistema', -'import_fs_warning' => '', +'import_fs_warning' => 'Questo funziona solo per le cartelle nella cartella per lasciare. L\'operazione importa in modo ricorsivo tutte le cartelle e file. I file saranno rilasciati immediatamente.', 'include_content' => 'Includi contenuto', 'include_documents' => 'Includi documenti', 'include_subdirectories' => 'Includi sottocartelle', 'index_converters' => 'Indice di conversione documenti', 'index_folder' => 'Indicizza cartella', 'individuals' => 'Singoli', -'indivіduals_in_groups' => '', +'indivіduals_in_groups' => 'I membri de la gruppo', 'inherited' => 'ereditato', 'inherits_access_copy_msg' => 'Copia la lista degli accessi ereditati', 'inherits_access_empty_msg' => 'Reimposta una lista di permessi vuota', @@ -555,9 +555,9 @@ URL: [url]', 'invalid_create_date_end' => 'Fine data non valida per la creazione di un intervallo temporale', 'invalid_create_date_start' => 'Inizio data non valida per la creazione di un intervallo temporale', 'invalid_doc_id' => 'ID del documento non valido', -'invalid_dropfolder_folder' => '', -'invalid_expiration_date_end' => '', -'invalid_expiration_date_start' => '', +'invalid_dropfolder_folder' => 'cartella non valido nella cartella goccia', +'invalid_expiration_date_end' => 'Data di fine non è valida per l\'intervallo di data di scadenza.', +'invalid_expiration_date_start' => 'Data di inizio non valida per l\'intervallo di date di scadenza.', 'invalid_file_id' => 'ID del file non valido', 'invalid_folder_id' => 'ID della cartella non valido', 'invalid_group_id' => 'ID del gruppo non valido', @@ -608,7 +608,7 @@ URL: [url]', 'linked_documents' => 'Documenti collegati', 'linked_files' => 'Allegati', 'link_alt_updatedocument' => 'Se vuoi caricare file più grandi del limite massimo attuale, usa la pagina alternativa di upload.', -'list_hooks' => '', +'list_hooks' => 'Lista ganci', 'local_file' => 'File locale', 'locked_by' => 'Bloccato da', 'lock_document' => 'Blocca', @@ -640,9 +640,9 @@ URL: [url]', 'minutes' => 'minuti', 'misc' => 'Varie', 'missing_checksum' => 'Checksum mancante', -'missing_file' => '', +'missing_file' => 'File mancante', 'missing_filesize' => 'Dimensione mancante', -'missing_request_object' => '', +'missing_request_object' => 'Manca oggetto di richiesta', 'missing_transition_user_group' => 'Utente/Gruppo per la transizione mancanti', 'monday' => 'Lunedì', 'monday_abbr' => 'Lun', @@ -657,7 +657,7 @@ URL: [url]', 'my_transmittals' => 'Mie trasmissioni', 'name' => 'Nome', 'needs_workflow_action' => 'Il documento richiede attenzione. Prego controllare il flusso di lavoro.', -'network_drive' => '', +'network_drive' => 'Network drive', 'never' => 'Mai', 'new' => 'Nuovo', 'new_attrdef' => 'Nuovo attributo', @@ -718,7 +718,7 @@ URL: [url]', 'no_default_keywords' => 'Nessuna parola-chiave disponibile', 'no_docs_checked_out' => 'Nessun documento approvato', 'no_docs_locked' => 'Nessun documento bloccato.', -'no_docs_rejected' => '', +'no_docs_rejected' => 'Nessun documento rifiutato', 'no_docs_to_approve' => 'Non ci sono documenti che richiedano approvazione.', 'no_docs_to_look_at' => 'Non ci sono documenti che richiedano attenzione.', 'no_docs_to_receipt' => 'Nessuna cartella richiesta.', @@ -730,14 +730,14 @@ URL: [url]', 'no_group_members' => 'Questo gruppo non ha membri', 'no_linked_files' => 'Nessun file collegato', 'no_previous_versions' => 'Nessun\'altra versione trovata', -'no_receipt_needed' => '', +'no_receipt_needed' => 'Rete disco', 'no_review_needed' => 'Nessuna revisione in sospeso.', -'no_revision_needed' => '', +'no_revision_needed' => 'Nessuna revisione in corso.', 'no_revision_planed' => 'Nessuna revisione pianificata.', 'no_update_cause_locked' => 'Non è quindi possible aggiornare il documento. Prego contattare l\'utente che l\'ha bloccato.', 'no_user_image' => 'Nessuna immagine trovata', 'no_version_check' => 'Il controllo per una nuova versione di SeedDMS è fallito! Questo può essere causato da allow_url_fopen settato a 0 nella tua configurazione php.', -'no_version_modification' => '', +'no_version_modification' => 'Nessuna modifica versione', 'no_workflow_available' => 'Nessun flusso di lavoro disponibile', 'objectcheck' => 'Controllo cartelle o documenti', 'obsolete' => 'Obsoleto', @@ -782,16 +782,16 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di 'password_strength' => 'Sicurezza password', 'password_strength_insuffient' => 'Efficacia della password insufficiente', 'password_wrong' => 'Password errata', -'pending_approvals' => '', -'pending_reviews' => '', -'pending_workflows' => '', +'pending_approvals' => 'Approvazioni in sospeso', +'pending_reviews' => 'In attesa di recensioni', +'pending_workflows' => 'I flussi di lavoro in sospeso', 'personal_default_keywords' => 'Parole-chiave personali', 'pl_PL' => 'Polacco', 'possible_substitutes' => 'Sostituti', -'preview' => '', +'preview' => 'Anteprima', 'preview_converters' => 'Anteprima convesione documento', -'preview_markdown' => '', -'preview_plain' => '', +'preview_markdown' => 'Riduione ribasso', +'preview_plain' => 'Testo', 'previous_state' => 'Stato precedente', 'previous_versions' => 'Versioni precedenti', 'pt_BR' => 'Portoghese (BR)', @@ -800,9 +800,14 @@ Dovessero esserci ancora problemi al login, prego contatta l\'Amministratore di 'quota_is_disabled' => 'Il supporto per le quote è attualmente disattivato nelle impostazioni. L\'impostazione di una quota-utente non avrà alcun effetto finché tale funzionalità non verrà nuovamente attivata.', 'quota_warning' => 'Il vostro utilizzo massimo di spazio è stato superato di [bytes]. Si prega di rimuovere documenti o versioni obsolete.', 'receipt_log' => 'Ricezione Log', -'receipt_request_email_body' => '', -'receipt_request_email_subject' => '', -'receipt_status' => '', +'receipt_request_email_body' => 'Richiesta di ricezione +Document: [name] +Version: [version] +Parent folder: [folder_path] +User: [username] +URL: [url]', +'receipt_request_email_subject' => '[sitename]: [name] - Richiesta di ricezione', +'receipt_status' => 'Status', 'receipt_summary' => 'Sommario ricezione', 'recipients' => 'Cartelle', 'refresh' => 'Ricarica', @@ -839,7 +844,7 @@ Utente: [username] URL: [url]', 'request_workflow_action_email_subject' => 'Richiesta di azione in un flusso di lavoro', 'reset_checkout' => 'Check Out terminato', -'restrict_access' => '', +'restrict_access' => 'Nessun accesso al', 'results_page' => 'Pagina dei risultati', 'return_from_subworkflow' => 'Ritorno dal sotto-flusso di lavoro', 'return_from_subworkflow_email_body' => 'Ritorno dal sotto-flusso di lavoro @@ -891,9 +896,14 @@ URL: [url]', 'revise_document_on' => 'Prossima revisione del documento il [date]', 'revision_date' => 'data revisione', 'revision_log' => 'Log revisione', -'revision_request_email_body' => '', -'revision_request_email_subject' => '', -'revision_status' => '', +'revision_request_email_body' => 'Richiesta di ricezione +Document: [name] +Version: [version] +Parent folder: [folder_path] +User: [username] +URL: [url]', +'revision_request_email_subject' => '[sitename]: [name] - Richiesta di revisione', +'revision_status' => 'Status', 'revisors' => 'Revisori', 'revisor_already_assigned' => 'Utente già assegnato al ruolo di revisore', 'revisor_already_removed' => 'Revisore già rimosso dal processo di revisione o ha già revisionato documento.', @@ -908,7 +918,7 @@ URL: [url]', 'rewind_workflow_email_subject' => '[sitename]: [name] - Il flusso di lavoro è stato invertito', 'rewind_workflow_warning' => 'Se si inverte un flusso di lavoro al suo stato iniziale ogni traccia del flusso di lavoro originale per questo documento sarà cancellata permanentemente.', 'rm_attrdef' => 'Rimuovi attributo', -'rm_attrdefgroup' => '', +'rm_attrdefgroup' => 'Rimuovere questo gruppo di attributi', 'rm_default_keyword_category' => 'Rimuovi categoria', 'rm_document' => 'Rimuovi documento', 'rm_document_category' => 'Rimuovi categoria', @@ -916,7 +926,7 @@ URL: [url]', 'rm_folder' => 'Rimuovi cartella', 'rm_from_clipboard' => 'Rimuovi dalla clipboard', 'rm_group' => 'Rimuovi questo gruppo', -'rm_role' => '', +'rm_role' => 'Eliminare questo ruolo', 'rm_transmittal' => 'Rimuovi trasmissione', 'rm_transmittalitem' => 'Rimuovi oggetto', 'rm_user' => 'Rimuovi questo utente', @@ -928,10 +938,10 @@ URL: [url]', 'role' => 'Ruolo', 'role_admin' => 'Amministratore', 'role_guest' => 'Ospite', -'role_info' => '', -'role_management' => '', -'role_name' => '', -'role_type' => '', +'role_info' => 'Informazioni', +'role_management' => 'Gestione dei ruoli', +'role_name' => 'Nome', +'role_type' => 'Tipo di roulo', 'role_user' => 'Utente', 'ro_RO' => 'Rumeno', 'run_subworkflow' => 'Inizia un sotto-flusso di lavoro', @@ -966,14 +976,14 @@ URL: [url]', 'search_time' => 'Tempo trascorso: [time] secondi.', 'seconds' => 'secondi', 'selection' => 'Selezione', -'select_attrdefgrp_show' => '', +'select_attrdefgrp_show' => 'Scegli quando mostrare', 'select_category' => 'Clicca per selezionare la categoria', 'select_groups' => 'Clicca per selezionare i gruppi', 'select_grp_approvers' => 'Seleziona gruppo approvatore', -'select_grp_ind_approvers' => '', -'select_grp_ind_notification' => '', -'select_grp_ind_recipients' => '', -'select_grp_ind_reviewers' => '', +'select_grp_ind_approvers' => 'Fare clic per scegliere il gruppo', +'select_grp_ind_notification' => 'Fare clic per scegliere il gruppo', +'select_grp_ind_recipients' => 'Fare clic per scegliere il gruppo', +'select_grp_ind_reviewers' => 'Fare clic per scegliere il gruppo', 'select_grp_notification' => 'Seleziona Gruppo', 'select_grp_recipients' => 'Seleziona gruppo cartelle', 'select_grp_reviewers' => 'Seleziona gruppo revisore', @@ -986,7 +996,7 @@ URL: [url]', 'select_one' => 'Seleziona uno', 'select_users' => 'Clicca per selezionare gli utenti', 'select_workflow' => 'Seleziona il flusso di lavoro', -'send_test_mail' => '', +'send_test_mail' => 'Invia messagio di prova', 'september' => 'Settembre', 'sequence' => 'Posizione', 'seq_after' => 'Dopo "[prevname]"', @@ -999,14 +1009,14 @@ URL: [url]', 'settings_adminIP' => 'IP Amministratore', 'settings_adminIP_desc' => 'Se attivato l\'Amministratore si può collegare solo da un IP specifico; lasciare vuoto per evitare il controllo. NOTA: funziona solo con autenticazione locale (no LDAP)', 'settings_Advanced' => 'Avanzate', -'settings_advancedAcl' => '', -'settings_advancedAcl_desc' => '', +'settings_advancedAcl' => 'Avanzate controlo accesso', +'settings_advancedAcl_desc' => 'Avanzatoa controlo di accesso consente di attivare / diattivare alcuni moduli di software. Non può essere utilizzato per i diritti di accesso su documenti e cartelle.', 'settings_apache_mod_rewrite' => 'Apache - Mod Rewrite', 'settings_Authentication' => 'Impostazioni di Autenticazione', -'settings_autoLoginUser' => '', -'settings_autoLoginUser_desc' => '', -'settings_backupDir' => '', -'settings_backupDir_desc' => '', +'settings_autoLoginUser' => 'Login automatico', +'settings_autoLoginUser_desc' => 'Utilizzare questo ID utente per l\'accesso se l\'utente non è già connesso. Questo tipo di accesso non creerà una sessione.', +'settings_backupDir' => 'Directory di backup', +'settings_backupDir_desc' => 'Directory in cui lo strumento di backup salva i backup. Se questa directory non è impostato o non è possibile accedervi, quindi i backup vengono salvati nella directory dei contenuti.', 'settings_cacheDir' => 'Cartella di cache', 'settings_cacheDir_desc' => 'Cartella in cui vengono conservate le immagini di anteprima, si consiglia di scegliere una cartella sul web-server che non sia direttamente accessibile.', 'settings_Calendar' => 'Impostazioni calendario', @@ -1043,9 +1053,9 @@ URL: [url]', 'settings_dbUser_desc' => 'Utente per accedere al database da utilizzarsi durante il processo di installazione. Non modificare questo campo se non assolutamente necessario, per esempio nel caso di trasferimento del database su un nuovo Host.', 'settings_dbVersion' => 'Schema del database obsoleto', 'settings_defaultSearchMethod' => 'Metodo di ricerca predefinito', -'settings_defaultSearchMethod_desc' => '', +'settings_defaultSearchMethod_desc' => 'Metodo di ricerca predefinito, quando la ricerca viene avviata dal modulo di ricerca nel menu principale.', 'settings_defaultSearchMethod_valdatabase' => 'database', -'settings_defaultSearchMethod_valfulltext' => '', +'settings_defaultSearchMethod_valfulltext' => 'Testo intero', 'settings_delete_install_folder' => 'Per poter usare SeedDMS, devi cancellare il file ENABLE_INSTALL_TOOL nella cartella di configurazione.', 'settings_disableSelfEdit' => 'Disabilita Auto-Modifica', 'settings_disableSelfEdit_desc' => 'Se selezionato l\'utente non può modificare il proprio profilo', @@ -1055,9 +1065,9 @@ URL: [url]', 'settings_dropFolderDir_desc' => 'Questa cartella viene utilizzata per rilasciare (drop) files sul server per importarli direttamente anziché caricarli attraverso il browser. La cartella deve contenere una sottocartella per ciascun utente autorizzato ad importare files in questo modo.', 'settings_Edition' => 'Impostazioni di edizione', 'settings_editOnlineFileTypes' => 'Tipi di files modificabili Online', -'settings_editOnlineFileTypes_desc' => '', -'settings_enable2FactorAuthentication' => '', -'settings_enable2FactorAuthentication_desc' => '', +'settings_editOnlineFileTypes_desc' => 'I file con uno dei seguenti terminali possono essere modificati on-line (usare solo caratteri minuscoli)', +'settings_enable2FactorAuthentication' => 'Permettere autenticazione a due fattori', +'settings_enable2FactorAuthentication_desc' => 'Abilitare / disabilitare autenticazione a due fattori. Gli utenti avranno bisogno di "Google Authenticator" sul tuo telefono cellulare.', 'settings_enableAcknowledgeWorkflow' => 'Abilitare per notifiche', 'settings_enableAcknowledgeWorkflow_desc' => 'Abilitare per attivare sul workflow le ricevute di notifica.', 'settings_enableAdminRevApp' => 'Permetti la revisione/approvazione da parte degli amministratori', @@ -1079,7 +1089,7 @@ URL: [url]', 'settings_enableFullSearch' => 'Abilita ricerca fulltext', 'settings_enableFullSearch_desc' => 'Abilita/disabilita la ricerca fulltext', 'settings_enableGuestAutoLogin' => 'Activer la connexion automatique pour le compte invité', -'settings_enableGuestAutoLogin_desc' => '', +'settings_enableGuestAutoLogin_desc' => 'Se il login ospite e il login automatico è abilitato, il login ospite sarà usato automaticamente.', 'settings_enableGuestLogin' => 'Permetti login come ospite', 'settings_enableGuestLogin_desc' => 'Per impedire il login come ospite, selezionare questa opzione. Nota bene: il login come ospite dovrebbe essere permesso soltanto in un ambiente fidato.', 'settings_enableHelp' => 'Abilita Aiuto', @@ -1088,8 +1098,8 @@ URL: [url]', 'settings_enableLanguageSelector_desc' => 'Mostra/nasconde il selettore di lingua successivamente al login.', 'settings_enableLargeFileUpload' => 'Abilita caricamento grandi files', 'settings_enableLargeFileUpload_desc' => 'Se selezionato, il caricamento (upload) dei files può essere effettuato anche attraverso un\'applet Java chiamata Jumploader evitando il limite di dimensioni file imposto dal browser; Jumploader permette anche il caricamento di diversi files contemporaneamente.', -'settings_enableMenuTasks' => '', -'settings_enableMenuTasks_desc' => '', +'settings_enableMenuTasks' => 'Abilita compito delle attività nel menù', +'settings_enableMenuTasks_desc' => 'Abilita / Disabilita la voce di menu che contiene tutte le attività degli utenti. Questo conterrà i documenti che devono essere rivisti, approvati, etc.', 'settings_enableNotificationAppRev' => 'Abilita/disabilita notifica a revisore/approvatore', 'settings_enableNotificationAppRev_desc' => 'Spuntare per inviare una notifica al revisore/approvatore nel momento in cui viene aggiunta una nuova versione del documento.', 'settings_enableNotificationWorkflow' => 'Invia notifiche ai partecipanti al flusso di lavoro', @@ -1171,8 +1181,8 @@ URL: [url]', 'settings_maxExecutionTime_desc' => 'Imposta il tempo limite per l\'esecuzione di uno script prima che il parser lo termini.', 'settings_maxRecursiveCount' => 'Conteggio ricursivo Max di files e cartelle', 'settings_maxRecursiveCount_desc' => 'Numero massimo di documenti e cartelle considerati dal conteggio ricursivo per il controllo dei diritti d\'accesso. Se tale valore dovesse essere superato, il risultato del conteggio sarà stimato.', -'settings_maxSizeForFullText' => '', -'settings_maxSizeForFullText_desc' => '', +'settings_maxSizeForFullText' => 'La lungeza massima del file per l\'indicizzazione istantanea', +'settings_maxSizeForFullText_desc' => 'Tutte le nuove versioni dei documenti più in basso della dimensione configurata saranno completamente indicizzati dopo il caricamento. In tutti gli altri casi sarà indicizzato solo i metadati.', 'settings_more_settings' => 'Ulteriori configurazioni. Login di default: admin/admin', 'settings_notfound' => 'Non trovato', 'settings_Notification' => 'Impostazioni di notifica', @@ -1209,8 +1219,8 @@ URL: [url]', 'settings_printDisclaimer_desc' => 'Se abilitato il messaggio circa i termini e le condizioni d\'uso verrà mostrato nel pié di pagina.', 'settings_quota' => 'Quota utente', 'settings_quota_desc' => 'La quantità Max di spazio su disco che può essere occupata da ciascun utente. Impostare il valore 0 offre spazio illimitato.', -'settings_removeFromDropFolder' => '', -'settings_removeFromDropFolder_desc' => '', +'settings_removeFromDropFolder' => 'Rimuovere file dalla cartella di ricezione dopo il successo di posto', +'settings_removeFromDropFolder_desc' => 'Attivare questa, se un file è preso dalla cartella di ricezione, si è cancellata dopo il caricamento di successo.', 'settings_restricted' => 'Accesso limitato', 'settings_restricted_desc' => 'Permette agli utenti di entrare nel sistema soltanto se hanno un record nel database locale (ignora l\'autenticazione positiva attraverso LDAP)', 'settings_rootDir' => 'Cartella principale', @@ -1291,10 +1301,10 @@ URL: [url]', 'splash_add_attribute' => 'Attributo aggiunto', 'splash_add_group' => 'Gruppo aggiunto', 'splash_add_group_member' => 'Membro aggiunto al gruppo', -'splash_add_role' => '', -'splash_add_to_transmittal' => '', +'splash_add_role' => 'Aggiunto nuovo ruolo', +'splash_add_to_transmittal' => 'Aggiungere alla trasmissione', 'splash_add_user' => 'Utente aggiunto', -'splash_clearcache' => '', +'splash_clearcache' => 'Cache cancellata', 'splash_cleared_clipboard' => 'Appunti cancellati', 'splash_document_added' => 'Documento aggiunto', 'splash_document_checkedout' => 'Documento approvato', @@ -1303,24 +1313,24 @@ URL: [url]', 'splash_document_unlocked' => 'Documento sbloccato', 'splash_edit_attribute' => 'Attributo modificato', 'splash_edit_group' => 'Gruppo modificato', -'splash_edit_role' => '', +'splash_edit_role' => 'Ruolo memorizzata', 'splash_edit_user' => 'Utente modificato', -'splash_error_add_to_transmittal' => '', +'splash_error_add_to_transmittal' => 'Errore durante l\'aggiunta di documento per la trasmissione', 'splash_folder_edited' => 'Cartella modificata', -'splash_importfs' => '', +'splash_importfs' => 'Importati [Documenti] documenti e cartelle [cartelle]', 'splash_invalid_folder_id' => 'ID cartella non valido', 'splash_invalid_searchterm' => 'Termine di ricerca non valido', 'splash_moved_clipboard' => 'Appunti trasferiti nella cartella corrente', -'splash_move_document' => '', -'splash_move_folder' => '', +'splash_move_document' => 'Documento spostato', +'splash_move_folder' => 'Cartella spostato', 'splash_removed_from_clipboard' => 'Rimosso dagli appunti', 'splash_rm_attribute' => 'Attributo rimosso', 'splash_rm_document' => 'Documento rimosso', 'splash_rm_folder' => 'Cartella eliminata', 'splash_rm_group' => 'Gruppo eliminato', 'splash_rm_group_member' => 'Membro del gruppo eliminato', -'splash_rm_role' => '', -'splash_rm_transmittal' => '', +'splash_rm_role' => 'Ruolo cancellato', +'splash_rm_transmittal' => 'Trasmissione cancellato', 'splash_rm_user' => 'Utente eliminato', 'splash_settings_saved' => 'Impostazioni salvate', 'splash_substituted_user' => 'Utente sostituito', @@ -1348,21 +1358,21 @@ URL: [url]', 'status_revisor_removed' => 'Revisore rimosso dalla lista', 'status_unknown' => 'Sconosciuto', 'storage_size' => 'Spazio di archiviazione', -'submit_2_fact_auth' => '', +'submit_2_fact_auth' => 'Salva segreto', 'submit_approval' => 'Invio approvazione', 'submit_login' => 'Accedi', 'submit_password' => 'Impostazione nuova password', 'submit_password_forgotten' => 'Inizio processo di recupero', 'submit_receipt' => 'Invio ricevuta', 'submit_review' => 'Invio revisione', -'submit_revision' => '', +'submit_revision' => 'Aggiungere Revisione', 'submit_userinfo' => 'Invio info utente', 'substitute_to_user' => 'Cambia in \'[username]\'', 'substitute_user' => 'Impersona utente', -'success_add_aro' => '', -'success_add_permission' => '', -'success_remove_permission' => '', -'success_toogle_permission' => '', +'success_add_aro' => 'Aggiunto richiesta di accesso oggetto', +'success_add_permission' => 'Il permesso aggiungato', +'success_remove_permission' => 'Il permesso rimosso', +'success_toogle_permission' => 'Il permesso è cambiato', 'sunday' => 'Domenica', 'sunday_abbr' => 'Dom', 'sv_SE' => 'Svedese', @@ -1371,7 +1381,7 @@ URL: [url]', 'takeOverGrpReviewer' => 'Riprendi il gruppo dei revisori dall\'ultima versione.', 'takeOverIndApprover' => 'Riprendi l\'approvatore dall\'ultima versione.', 'takeOverIndReviewer' => 'Riprendi il revisore dall\'ultima versione.', -'tasks' => '', +'tasks' => 'Compiti', 'testmail_body' => 'Questo messaggio di posta elettronica è solo un test per verificare la configurazione del repository', 'testmail_subject' => 'Messaggio di test', 'theme' => 'Tema', @@ -1379,11 +1389,11 @@ URL: [url]', 'thursday_abbr' => 'Gio', 'timeline' => 'Linea del Tempo', 'timeline_add_file' => 'Nuovo allegato', -'timeline_add_version' => '', -'timeline_full_add_file' => '', -'timeline_full_add_version' => '', -'timeline_full_status_change' => '', -'timeline_selected_item' => '', +'timeline_add_version' => 'Nuova versione [version]', +'timeline_full_add_file' => '[document]
    Nuovo attacco', +'timeline_full_add_version' => '[document]
    Nuovo versione [version]', +'timeline_full_status_change' => '[document]
    Versione [version]: [status]', +'timeline_selected_item' => 'Documento selezionato', 'timeline_skip_add_file' => 'allegato aggiunto', 'timeline_skip_status_change_-1' => 'respinto', 'timeline_skip_status_change_-3' => 'scaduto', @@ -1391,10 +1401,10 @@ URL: [url]', 'timeline_skip_status_change_1' => 'in attesa di approvazione', 'timeline_skip_status_change_2' => 'rilasciato', 'timeline_skip_status_change_3' => 'nel workflow', -'timeline_status_change' => 'Versione - Stato', +'timeline_status_change' => 'Versione [version]: Stato', 'to' => 'A', 'toggle_manager' => 'Gestore', -'toggle_qrcode' => '', +'toggle_qrcode' => 'Mostri / nascondi codice QR', 'to_before_from' => 'La data di fine non può essere antecedente a quella di inizio', 'transition_triggered_email' => 'Inizio transizione del flusso di lavoro', 'transition_triggered_email_body' => 'Transizione del flusso di lavoro iniziata @@ -1419,7 +1429,7 @@ URL: [url]', 'tr_TR' => 'Turco', 'tuesday' => 'Martedì', 'tuesday_abbr' => 'Mar', -'type_of_hook' => '', +'type_of_hook' => 'Tipo', 'type_to_search' => 'Digitare per cercare', 'uk_UA' => 'Ucraino', 'under_folder' => 'Nella cartella', @@ -1500,7 +1510,7 @@ URL: [url]', 'workflow_management' => 'Gestione flusso di lavoro', 'workflow_name' => 'Nome', 'workflow_no_states' => 'Prima di aggiungere un flusso di lavoro occorre definirne prima gli stati.', -'workflow_state' => '', +'workflow_state' => 'Stato del flusso di lavoro', 'workflow_states_management' => 'Gestione stati del flusso di lavoro', 'workflow_state_docstatus' => 'Stato del documento', 'workflow_state_in_use' => 'Questo stato è attualmente usato da alcuni flussi di lavoro', From be9ec1adfeb296c0346a98b35d45d66fb96a431b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 24 Aug 2016 10:16:05 +0200 Subject: [PATCH 61/65] various small corrections --- languages/en_GB/lang.inc | 4 ++-- languages/tr_TR/lang.inc | 4 ++-- languages/zh_CN/lang.inc | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 83fb9142f..ce0cc0f60 100644 --- a/languages/en_GB/lang.inc +++ b/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 (1425), dgrutsch (7), netixw (14) +// Translators: Admin (1426), dgrutsch (7), netixw (14) $text = array( '2_factor_auth' => '2-factor authentication', @@ -653,7 +653,7 @@ URL: [url]', 'move_folder' => 'Move Folder', 'my_account' => 'My Account', 'my_documents' => 'My Documents', -'my_transmittals' => 'My transmittals', +'my_transmittals' => 'My Transmittals', 'name' => 'Name', 'needs_workflow_action' => 'This document requires your attention. Please check the workflow tab.', 'network_drive' => 'Network drive', diff --git a/languages/tr_TR/lang.inc b/languages/tr_TR/lang.inc index 52c90ae60..cc9b186a7 100644 --- a/languages/tr_TR/lang.inc +++ b/languages/tr_TR/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 (1039), aydin (83) +// Translators: Admin (1040), aydin (83) $text = array( '2_factor_auth' => '', @@ -150,7 +150,7 @@ URL: [url]', 'attrdef_type_email' => '', 'attrdef_type_float' => '', 'attrdef_type_int' => 'TamSayı', -'attrdef_type_string' => '', +'attrdef_type_string' => 'Dizi', 'attrdef_type_url' => '', 'attrdef_valueset' => 'Değer', 'attributes' => 'Nitelik', diff --git a/languages/zh_CN/lang.inc b/languages/zh_CN/lang.inc index ffe4ed0e5..4be546f1a 100644 --- a/languages/zh_CN/lang.inc +++ b/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 (642), fengjohn (5) +// Translators: Admin (644), fengjohn (5) $text = array( '2_factor_auth' => '', @@ -527,7 +527,7 @@ URL: [url]', 'language' => '语言', 'lastaccess' => '最后登录', 'last_update' => '上次更新', -'legend' => '', +'legend' => '图例', 'librarydoc' => '', 'linked_documents' => '相关文档', 'linked_files' => '附件', @@ -1160,7 +1160,7 @@ URL: [url]', 'splash_switched_back_user' => '', 'splash_toogle_group_manager' => '', 'state_and_next_state' => '', -'statistic' => '', +'statistic' => '统计', 'status' => '状态', 'status_approval_rejected' => '拟拒绝', 'status_approved' => '批准', From 5215d0a23078da4fb948d36fa9c4e955bdcbe774 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 24 Aug 2016 10:17:21 +0200 Subject: [PATCH 62/65] search() searches in comment of document versions --- SeedDMS_Core/Core/inc.ClassDMS.php | 1 + 1 file changed, 1 insertion(+) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 2999fa977..1e73c3422 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -778,6 +778,7 @@ class SeedDMS_Core_DMS { } if (in_array(3, $searchin)) { $searchFields[] = "`tblDocuments`.`comment`"; + $searchFields[] = "`tblDocumentContent`.`comment`"; } if (in_array(4, $searchin)) { $searchFields[] = "`tblDocumentAttributes`.`value`"; From 606b04bc55136d62bb8f7730fd7aa748ee944a3c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 24 Aug 2016 10:19:41 +0200 Subject: [PATCH 63/65] new version 4.3.28 --- SeedDMS_Core/package.xml | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index e7d8817a7..83ebe9ced 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,11 +12,11 @@ uwe@steinmann.cx yes - 2016-04-26 - + 2016-08-24 + - 4.3.27 - 4.3.27 + 4.3.28 + 4.3.28 stable @@ -24,8 +24,7 @@ GPL License -- callbacks can have more then one user function -- fix some sql statements, because they didn't work with mysql 5.7.5 anymore +- SeedDMЅ_Core_DMS::search() searches also comment of document version @@ -1001,5 +1000,22 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated - add more callbacks + + 2016-04-26 + + + 4.3.27 + 4.3.27 + + + stable + stable + + GPL License + +- callbacks can have more then one user function +- fix some sql statements, because they didn't work with mysql 5.7.5 anymore + + From 8da3f9160cbf43b1e02e9ae68134a14172407e4b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 24 Aug 2016 10:19:53 +0200 Subject: [PATCH 64/65] add entries for 4.3.28 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index e6f87e9e3..175c0180c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -18,6 +18,8 @@ disabled account when authenticating by ldap - place all authentication methods into its own class - do not cache output of op/op.Ajax.php (Closes #280) +- major update of italian translations +- search also in comment of document versions -------------------------------------------------------------------------------- Changes in version 4.3.27 From 6ab08983bb8dd5bbe070b3b16f1f9e06c81f46bb Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 24 Aug 2016 10:20:53 +0200 Subject: [PATCH 65/65] new version 4.3.28 --- Makefile | 2 +- SeedDMS_Core/Core/inc.ClassDMS.php | 2 +- inc/inc.Version.php | 2 +- install/install.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 74b9eba92..7090cab53 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=4.3.27 +VERSION=4.3.28 SRC=CHANGELOG inc conf utils index.php languages views op out doc drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi # webapp diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 1e73c3422..dec7f6b63 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -274,7 +274,7 @@ class SeedDMS_Core_DMS { $this->callbacks = array(); $this->version = '@package_version@'; if($this->version[0] == '@') - $this->version = '4.3.27'; + $this->version = '4.3.28'; } /* }}} */ /** diff --git a/inc/inc.Version.php b/inc/inc.Version.php index e48181fe5..86c407bd2 100644 --- a/inc/inc.Version.php +++ b/inc/inc.Version.php @@ -20,7 +20,7 @@ class SeedDMS_Version { - public $_number = "4.3.27"; + public $_number = "4.3.28"; private $_string = "SeedDMS"; function __construct() { diff --git a/install/install.php b/install/install.php index 2d1e2d51d..453468194 100644 --- a/install/install.php +++ b/install/install.php @@ -118,7 +118,7 @@ function fileExistsInIncludePath($file) { /* {{{ */ * Load default settings + set */ define("SEEDDMS_INSTALL", "on"); -define("SEEDDMS_VERSION", "4.3.27"); +define("SEEDDMS_VERSION", "4.3.28"); require_once('../inc/inc.ClassSettings.php');