Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

CHANGELOG

@@ -73,6 +73,7 @@
 - major update of russian language (Thanks to r3code)
 - when updating or adding a document do not send request for approval
   if review needs to be done before
+- uncheck checkbox for expiration date if date is selected.
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.30
@@ -80,7 +81,7 @@
 - fix adding new workflows
 - fix moving documents/folders via drag&drop in Edge (Closes #286)
 - update folder tree after moving a document/folder with drag&drop (Closes #288)
-- trim each value of a value sets of attribute definitions bevor saving
+- trim each value of a value sets of attribute definitions before saving
 - assign role 'user' instead of 'admin' to accounts automatically created during
   ldap authentication
 

languages/ar_EG/lang.inc

@@ -429,6 +429,8 @@ URL: [url]',
 'error_no_document_selected' => 'لم يتم اختيار مستند',
 'error_no_folder_selected' => 'لم يتم اختيار مجلد',
 'error_occured' => 'حدث خطأ',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'الإسبانية',

languages/bg_BG/lang.inc

@@ -384,6 +384,8 @@ $text = array(
 'error_no_document_selected' => 'Няма избрани документи',
 'error_no_folder_selected' => 'Няма избрани папки',
 'error_occured' => 'Стана грешка',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => '',

languages/ca_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: Admin (702)
+//    Translators: Admin (710)
 
 $text = array(
 '2_factor_auth' => '',
@@ -199,7 +199,7 @@ URL: [url]',
 'change_recipients' => '',
 'change_revisors' => '',
 'change_status' => 'Canviar estat',
-'charts' => '',
+'charts' => 'Gràfiques',
 'chart_docsaccumulated_title' => '',
 'chart_docspercategory_title' => '',
 'chart_docspermimetype_title' => '',
@@ -260,7 +260,7 @@ URL: [url]',
 'converter_new_cmd' => '',
 'converter_new_mimetype' => '',
 'copied_to_checkout_as' => '',
-'create_fulltext_index' => '',
+'create_fulltext_index' => 'Crea un índex full-text',
 'create_fulltext_index_warning' => '',
 'creation_date' => 'Creació',
 'cs_CZ' => 'Txec',
@@ -276,7 +276,7 @@ URL: [url]',
 'december' => 'Desembre',
 'default_access' => 'Mode d\'accés predeterminat',
 'default_keywords' => '',
-'definitions' => '',
+'definitions' => 'Definicions',
 'delete' => 'Eliminar',
 'details' => 'Detalls',
 'details_version' => 'Detalls de la versió: [version]',
@@ -370,7 +370,7 @@ URL: [url]',
 'edit_user' => 'Editar usuari...',
 'edit_user_details' => 'Editar detalls d\'usuari',
 'edit_version' => '',
-'el_GR' => '',
+'el_GR' => 'Grec',
 'email' => 'Email',
 'email_error_title' => '',
 'email_footer' => 'Sempre es pot canviar la configuració de correu electrònic utilitzant les funcions de «El meu compte»',
@@ -389,6 +389,8 @@ URL: [url]',
 'error_no_document_selected' => '',
 'error_no_folder_selected' => '',
 'error_occured' => 'Ha succeït un error',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'Castellà',
@@ -432,11 +434,11 @@ URL: [url]',
 'friday_abbr' => '',
 'from' => 'Des de',
 'fr_FR' => 'Francès',
-'fullsearch' => '',
+'fullsearch' => 'Cerca full-text',
 'fullsearch_hint' => '',
-'fulltext_info' => '',
+'fulltext_info' => 'Informació de full-text',
 'global_attributedefinitiongroups' => '',
-'global_attributedefinitions' => '',
+'global_attributedefinitions' => 'Atributs',
 'global_default_keywords' => 'Mots clau globals',
 'global_document_categories' => 'Categories',
 'global_workflows' => '',
@@ -465,7 +467,7 @@ URL: [url]',
 'identical_version' => '',
 'import' => '',
 'importfs' => '',
-'import_fs' => '',
+'import_fs' => 'Importa del sistema d\'arxius',
 'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => 'Incloure documents',

languages/cs_CZ/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 (710), kreml (455)
+//    Translators: Admin (715), kreml (455)
 
 $text = array(
 '2_factor_auth' => '',
@@ -436,6 +436,8 @@ URL: [url]',
 'error_no_document_selected' => 'Není vybrán žádný dokument.',
 'error_no_folder_selected' => 'Není vybrána žádná složka',
 'error_occured' => 'Vyskytla se chyba',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'Španělština',
@@ -1053,7 +1055,7 @@ URL: [url]',
 'settings_Display' => 'Nastavení zobrazení',
 'settings_dropFolderDir' => 'Adresář pro přetažení složky',
 'settings_dropFolderDir_desc' => 'Tento adresář může být použit k ukládání souborů do souborového systému serveru a jejich importování odtud, místo natahování přes prohlížeč. Adresář musí obsahovat podadresář pro každého uživatele, kterému je povoleno importovat soubory touto cestou.',
-'settings_Edition' => '',
+'settings_Edition' => 'Nastavení vydání (edice)',
 'settings_editOnlineFileTypes' => '',
 'settings_editOnlineFileTypes_desc' => '',
 'settings_enable2FactorAuthentication' => '',
@@ -1068,7 +1070,7 @@ URL: [url]',
 'settings_enableCalendar_desc' => '',
 'settings_enableClipboard' => 'Povolit schránku',
 'settings_enableClipboard_desc' => 'Povolit/zakázat schránku',
-'settings_enableConverting' => '',
+'settings_enableConverting' => 'Povolit konverzi',
 'settings_enableConverting_desc' => '',
 'settings_enableDropUpload' => 'Povolit rychlý upload',
 'settings_enableDropUpload_desc' => 'Povolit/zakázat pokládácí prostor na stránce \'Zobrazení složek\' pro upload souborů pomocí Drag&Drop.',
@@ -1115,7 +1117,7 @@ URL: [url]',
 'settings_enableUserImage' => '',
 'settings_enableUserImage_desc' => '',
 'settings_enableUsersView' => '',
-'settings_enableUsersView_desc' => '',
+'settings_enableUsersView_desc' => 'Povolit/zakázat zobrazení skupiny a uživatele pro všechny',
 'settings_enableVersionDeletion' => 'Povolit odstranění předchozích verzí',
 'settings_enableVersionDeletion_desc' => 'Povolit/zakázat odstranění předchozích verzí dokumentů běžným uživatelům. Administrátor může odstranit staré verze kdykoliv.',
 'settings_enableVersionModification' => 'Povolit změnu verze',
@@ -1223,8 +1225,8 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID of root-folder (mostly no need to change)',
 'settings_SaveError' => 'Configuration file save error',
 'settings_Server' => '',
-'settings_showFullPreview' => '',
+'settings_showFullPreview' => 'Zobrazit celý dokument',
-'settings_showFullPreview_desc' => '',
+'settings_showFullPreview_desc' => 'Povolit/zakázat zobrazení skupiny a uživatele pro všechny',
 'settings_showMissingTranslations' => 'Zobrazit chybějící překlady',
 'settings_showMissingTranslations_desc' => 'Vypsat všechny chybějící překlady na stránce v dolní části. Přihlášený uživatel bude moci předložit návrh na chybějící překlad, který bude uložen v souboru CSV. Nezapínejte tuto funkci v produkčním prostředí!',
 'settings_showSingleSearchHit' => '',

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 (2340), dgrutsch (21)
+//    Translators: Admin (2346), dgrutsch (21)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -441,6 +441,8 @@ URL: [url]',
 'error_no_document_selected' => 'Kein Dokument ausgewählt',
 'error_no_folder_selected' => 'Kein Ordner ausgewählt',
 'error_occured' => 'Ein Fehler ist aufgetreten. Bitte Administrator benachrichtigen.',
+'error_remove_document' => 'Fehler beim Löschen des Dokuments',
+'error_remove_folder' => 'Fehler beim Löschen des Ordners',
 'error_remove_permission' => 'Fehler beim Entfernen der Berechtigung',
 'error_toogle_permission' => 'Fehler beim Ändern der Berechtigung',
 'es_ES' => 'Spanisch',

languages/el_GR/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 (206)
+//    Translators: Admin (212)
 
 $text = array(
 '2_factor_auth' => '',
@@ -384,6 +384,8 @@ $text = array(
 'error_no_document_selected' => 'Δεν έχει επιλεγεί έγγραφο',
 'error_no_folder_selected' => '',
 'error_occured' => 'Έγινε λάθος',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'Spanish/Ισπανικά',
@@ -527,7 +529,7 @@ $text = array(
 'keep' => '',
 'keep_doc_status' => '',
 'keywords' => 'Κλειδιά',
-'keywords_loading' => '',
+'keywords_loading' => 'Παρακαλούμε αναμείνατε. Φόρτωση λίστας λέξεων κλειδιών',
 'keyword_exists' => 'Το κλειδί υπάρχει',
 'ko_KR' => '',
 'language' => 'Γλώσσα',
@@ -810,7 +812,7 @@ URL: [url]',
 'ru_RU' => 'Russian/Ρωσσικά',
 'saturday' => 'Σαββάτο',
 'saturday_abbr' => 'Σα',
-'save' => '',
+'save' => 'Αποθήκευση',
 'search' => 'Αναζήτηση',
 'search_fulltext' => '',
 'search_in' => '',
@@ -830,7 +832,7 @@ URL: [url]',
 'seconds' => 'δεύτερα',
 'selection' => 'Επιλογή',
 'select_attrdefgrp_show' => '',
-'select_category' => '',
+'select_category' => 'Επιλογή κατηγορίας',
 'select_groups' => '',
 'select_grp_approvers' => '',
 'select_grp_ind_approvers' => '',
@@ -854,8 +856,8 @@ URL: [url]',
 'sequence' => 'Σειρά',
 'seq_after' => 'Μετά "[prevname]"',
 'seq_end' => 'Στο τέλος',
-'seq_keep' => '',
+'seq_keep' => 'Διατήρηση θέσης',
-'seq_start' => '',
+'seq_start' => 'Τοποθέτηση στην αρχή',
 'settings' => 'Ρυθμίσεις',
 'settings_activate_module' => '',
 'settings_activate_php_extension' => '',
@@ -1295,7 +1297,7 @@ URL: [url]',
 'under_folder' => '',
 'unknown_attrdef' => '',
 'unknown_command' => '',
-'unknown_document_category' => '',
+'unknown_document_category' => 'Άγνωστη κατηγορία',
 'unknown_group' => '',
 'unknown_id' => '',
 'unknown_keyword_category' => '',

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 (1473), dgrutsch (7), netixw (14)
+//    Translators: Admin (1475), dgrutsch (7), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -441,6 +441,8 @@ URL: [url]',
 'error_no_document_selected' => 'No document selected',
 'error_no_folder_selected' => 'No folder selected',
 'error_occured' => 'An error has occurred',
+'error_remove_document' => 'Error while deleting document',
+'error_remove_folder' => 'Error while deleting folder',
 'error_remove_permission' => 'Error while remove permission',
 'error_toogle_permission' => 'Error while changing permission',
 'es_ES' => 'Spanish',

languages/es_ES/lang.inc

@@ -436,6 +436,8 @@ URL: [url]',
 'error_no_document_selected' => 'Ningún documento seleccionado',
 'error_no_folder_selected' => 'Ninguna carpeta seleccionada',
 'error_occured' => 'Ha ocurrido un error',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'Castellano',

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 (1055), jeromerobert (50), lonnnew (9), Oudiceval (130)
+//    Translators: Admin (1055), jeromerobert (50), lonnnew (9), Oudiceval (132)
 
 $text = array(
 '2_factor_auth' => 'Authentification forte',
@@ -437,10 +437,12 @@ URL: [url]',
 'error_add_aro' => '',
 'error_add_permission' => 'Erreur lors de l’ajout de permission',
 'error_clearcache' => 'Erreur lors du vidage du cache',
-'error_importfs' => '',
+'error_importfs' => 'Erreur lors de l’import depuis le système de fichiers',
 'error_no_document_selected' => 'Aucun document sélectionné',
 'error_no_folder_selected' => 'Aucun dossier sélectionné',
 'error_occured' => 'Une erreur s\'est produite',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => 'Erreur lors de la suppression de permission',
 'error_toogle_permission' => 'Erreur lors de la modification de permission',
 'es_ES' => 'Espagnol',
@@ -1274,7 +1276,7 @@ URL: [url]',
 'settings_zendframework' => 'Zend Framework',
 'set_expiry' => 'Modifier la date d\'expiration',
 'set_owner' => 'Sélection du propriétaire',
-'set_owner_error' => 'Error setting owner',
+'set_owner_error' => 'Erreur lors de la définition du propriétaire',
 'set_password' => 'Définir mot de passe',
 'set_workflow' => 'Définir le Workflow',
 'signed_in_as' => 'Connecté en tant que',

languages/hr_HR/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 (1190), marbanas (16)
+//    Translators: Admin (1191), marbanas (16)
 
 $text = array(
 '2_factor_auth' => '',
@@ -441,6 +441,8 @@ Internet poveznica: [url]',
 'error_no_document_selected' => 'Nije odabran dokument',
 'error_no_folder_selected' => 'Nije odabrana mapa',
 'error_occured' => 'Dogodila se greška',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'Španjolski',
@@ -541,7 +543,7 @@ Internet poveznica: [url]',
 'identical_version' => 'Nova verzija je identična trenutnoj verziji.',
 'import' => '',
 'importfs' => '',
-'import_fs' => '',
+'import_fs' => 'Importaj iz FS-a',
 'import_fs_warning' => '',
 'include_content' => 'Uključi sadržaj',
 'include_documents' => 'Sadrži dokumente',

languages/hu_HU/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 (598), ribaz (1023)
+//    Translators: Admin (601), ribaz (1023)
 
 $text = array(
 '2_factor_auth' => '',
@@ -436,6 +436,8 @@ URL: [url]',
 'error_no_document_selected' => 'Nincs kijelölt dokumentum',
 'error_no_folder_selected' => 'Nincs kijelölt mappa',
 'error_occured' => 'Hiba történt',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'Spanyol',
@@ -799,7 +801,7 @@ Amennyiben problémákba ütközik a bejelentkezés során, kérjük vegye fel a
 'personal_default_keywords' => 'Személyes kulcsszó lista',
 'pl_PL' => 'Lengyel',
 'possible_substitutes' => '',
-'preview' => '',
+'preview' => 'Előnézet',
 'preview_converters' => '',
 'preview_markdown' => '',
 'preview_plain' => '',
@@ -1395,7 +1397,7 @@ URL: [url]',
 'thursday' => 'Csütörtök',
 'thursday_abbr' => 'Cs',
 'timeline' => 'Vremenska crta',
-'timeline_add_file' => '',
+'timeline_add_file' => 'Új csatolmány',
 'timeline_add_version' => '',
 'timeline_full_add_file' => '',
 'timeline_full_add_version' => '',

languages/it_IT/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 (1532), rickr (144), s.pnt (26)
+//    Translators: Admin (1537), rickr (144), s.pnt (26)
 
 $text = array(
 '2_factor_auth' => 'Autorizzazione a due fattori',
@@ -442,6 +442,8 @@ URL: [url]',
 'error_no_document_selected' => 'Nessun documento selezionato',
 'error_no_folder_selected' => 'Nessuna cartella selezionata',
 'error_occured' => 'Ooops... Si è verificato un errore',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => 'Errore durante la rimozione delle autorizzazioni',
 'error_toogle_permission' => 'Errore durante la modifica permessi',
 'es_ES' => 'Spagnolo',
@@ -1059,7 +1061,7 @@ URL: [url]',
 'settings_contentOffsetDir' => 'Cartella Offset',
 'settings_contentOffsetDir_desc' => 'Per supplire a limitazioni all\'utilizzo del filesystem è stata concepita una nuova struttura di cartelle all\'interno della cartella contenitore (Content Directory). Questa necessita di una cartella di partenza: di solito è sufficiente lasciare il nome di default, 1048576, ma può essere usato un qualsiasi numero o stringa che non esistano già all\'interno della cartella contenitore (Content Directory)',
 'settings_convertToPdf' => '',
-'settings_convertToPdf_desc' => '',
+'settings_convertToPdf_desc' => 'Se il documento non può essere nativamente mostrato nel browser, verrà mostrata una versione in PDF.',
 'settings_cookieLifetime' => 'Tempo di vita del cookie',
 'settings_cookieLifetime_desc' => 'Tempo di vita del cookie in secondi: se impostato su 0 il cookie verrà rimosso alla chiusura del browser',
 'settings_coreDir' => 'Cartella principale dell\'applicazione',
@@ -1262,12 +1264,12 @@ URL: [url]',
 'settings_rootFolderID_desc' => 'ID della cartella principale (non dovrebbe essere necessario modificarlo)',
 'settings_SaveError' => 'Errore di salvataggio del file di configurazione',
 'settings_Server' => 'Impostazioni Server',
-'settings_showFullPreview' => '',
+'settings_showFullPreview' => 'Mostra il documento completo',
-'settings_showFullPreview_desc' => '',
+'settings_showFullPreview_desc' => 'Abilita/disabilita una preview completa del documento sulla pagina dei dettagli, se il browser è in grado di eseguirlo.',
 'settings_showMissingTranslations' => 'Mostra traduzioni mancanti',
 'settings_showMissingTranslations_desc' => 'Elenca tutte le traduzioni mancanti alla fine della pagina. L\'utente collegato potrà sottoporre una proposta per le traduzioni mancanti che verrà salvata in un file .csv. Da non usarsi in un ambiente di produzione.',
-'settings_showSingleSearchHit' => '',
+'settings_showSingleSearchHit' => 'Salta direttamente ad un singolo elemento di ricerca',
-'settings_showSingleSearchHit_desc' => '',
+'settings_showSingleSearchHit_desc' => 'Se i risultati di ricerca daranno origine ad un solo elemento, allora sarà visualizzato al posto della lista dei risultati.',
 'settings_Site' => 'Sito',
 'settings_siteDefaultPage' => 'Pagina iniziale',
 'settings_siteDefaultPage_desc' => 'Pagina iniziale di default del sito. Se lasciato vuoto punta su: out/out.ViewFolder.php',

languages/ko_KR/lang.inc

@@ -441,6 +441,8 @@ URL: [url]',
 'error_no_document_selected' => '선택되지 문서는',
 'error_no_folder_selected' => '어떤 폴더를 선택하지',
 'error_occured' => '오류가 발생했습니다',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => '스페인어',

languages/nl_NL/lang.inc

@@ -434,6 +434,8 @@ URL: [url]',
 'error_no_document_selected' => 'Geen document geselecteerd',
 'error_no_folder_selected' => 'Geen map geselecteerd',
 'error_occured' => 'Er is een fout opgetreden',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => 'Verwijder permissie',
 'error_toogle_permission' => 'Wijzig permissie',
 'es_ES' => 'Spaans',

languages/pl_PL/lang.inc

@@ -429,6 +429,8 @@ URL: [url]',
 'error_no_document_selected' => 'Brak wybranych dokumentów',
 'error_no_folder_selected' => 'Brak wybranych katalogów',
 'error_occured' => 'Wystąpił błąd',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'Hiszpański',

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 (931), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (932), flaviove (627), lfcristofoli (352)
 
 $text = array(
 '2_factor_auth' => '',
@@ -435,6 +435,8 @@ URL: [url]',
 'error_no_document_selected' => 'Nenhum documento selecionado',
 'error_no_folder_selected' => 'Nenhuma pasta selecionada',
 'error_occured' => 'Ocorreu um erro',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'Espanhol',
@@ -797,7 +799,7 @@ Se você ainda tiver problemas para fazer o login, por favor, contate o administ
 'personal_default_keywords' => 'palavras-chave pessoais',
 'pl_PL' => 'Polonês',
 'possible_substitutes' => '',
-'preview' => '',
+'preview' => 'visualizar',
 'preview_converters' => '',
 'preview_markdown' => '',
 'preview_plain' => '',

languages/ro_RO/lang.inc

@@ -441,6 +441,8 @@ URL: [url]',
 'error_no_document_selected' => 'Nici un document selectat',
 'error_no_folder_selected' => 'Nici un folder selectat',
 'error_occured' => 'An error has occured',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'Spaniola',

languages/ru_RU/lang.inc

@@ -441,6 +441,8 @@ URL: [url]',
 'error_no_document_selected' => 'Нет выбранных документов',
 'error_no_folder_selected' => 'Нет выбранных каталогов',
 'error_occured' => 'Произошла ошибка',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => 'Ошибка снятия разрешения',
 'error_toogle_permission' => 'Ошибка смены разрешения',
 'es_ES' => 'Spanish',

languages/sk_SK/lang.inc

@@ -388,6 +388,8 @@ URL: [url]',
 'error_no_document_selected' => '',
 'error_no_folder_selected' => '',
 'error_occured' => 'Vyskytla sa chyba',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'Španielčina',

languages/sv_SE/lang.inc

@@ -429,6 +429,8 @@ URL: [url]',
 'error_no_document_selected' => 'Inget dokument har valts',
 'error_no_folder_selected' => 'Ingen katalog har valts',
 'error_occured' => 'Ett fel har inträffat.',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'spanska',

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 (1044), aydin (83)
+//    Translators: Admin (1045), aydin (83)
 
 $text = array(
 '2_factor_auth' => '',
@@ -435,6 +435,8 @@ URL: [url]',
 'error_no_document_selected' => 'Hiçbir doküman seçilmedi',
 'error_no_folder_selected' => 'Hiçbir klasör seçilmedi',
 'error_occured' => 'Bir hata oluştu',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'İspanyolca',
@@ -800,7 +802,7 @@ Giriş yaparken halen sorun yaşıyorsanız lütfen sistem yöneticinizle görü
 'personal_default_keywords' => 'Kişisel anahtar kelimeler',
 'pl_PL' => 'Polonyaca',
 'possible_substitutes' => '',
-'preview' => '',
+'preview' => 'Önizle',
 'preview_converters' => '',
 'preview_markdown' => '',
 'preview_plain' => '',

languages/uk_UA/lang.inc

@@ -441,6 +441,8 @@ URL: [url]',
 'error_no_document_selected' => 'Немає вибраних документів',
 'error_no_folder_selected' => 'Немає вибраних каталогів',
 'error_occured' => 'Виникла помилка',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => 'Spanish',

languages/zh_CN/lang.inc

@@ -390,6 +390,8 @@ URL: [url]',
 'error_no_document_selected' => '请选择文档',
 'error_no_folder_selected' => '请选择文件夹',
 'error_occured' => '出错',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => '西班牙语',

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 (2371)
+//    Translators: Admin (2374)
 
 $text = array(
 '2_factor_auth' => '',
@@ -227,7 +227,7 @@ URL: [url]',
 'choose_workflow_action' => '選擇流程行為',
 'choose_workflow_state' => '選擇流程狀態',
 'class_name' => '',
-'clear_cache' => '',
+'clear_cache' => '清除緩存',
 'clear_clipboard' => '清除剪貼簿',
 'clear_password' => '',
 'clipboard' => '剪貼簿',
@@ -369,7 +369,7 @@ URL: [url]',
 'edit_user' => '編輯用戶',
 'edit_user_details' => '編輯用戶詳情',
 'edit_version' => '',
-'el_GR' => '',
+'el_GR' => '希臘語',
 'email' => 'Email',
 'email_error_title' => '',
 'email_footer' => '您可以用‘我的帳戶’選項來改變您的e-mail設置',
@@ -388,6 +388,8 @@ URL: [url]',
 'error_no_document_selected' => '請選擇文檔',
 'error_no_folder_selected' => '請選擇資料夾',
 'error_occured' => '出錯',
+'error_remove_document' => '',
+'error_remove_folder' => '',
 'error_remove_permission' => '',
 'error_toogle_permission' => '',
 'es_ES' => '西班牙語',
@@ -464,7 +466,7 @@ URL: [url]',
 'identical_version' => '新版本的內容與舊版本完全相同',
 'import' => '',
 'importfs' => '',
-'import_fs' => '',
+'import_fs' => '由檔案系統匯入',
 'import_fs_warning' => '',
 'include_content' => '',
 'include_documents' => '包含文檔',

op/op.Ajax.php

@@ -354,7 +354,7 @@ switch($command) {
 							add_log_line();
 						} else {
 							header('Content-Type: application/json');
-							echo json_encode(array('success'=>false, 'message'=>'Error removing folder', 'data'=>''));
+							echo json_encode(array('success'=>false, 'message'=>getMLText('error_remove_folder'), 'data'=>''));
 						}
 					} else {
 						header('Content-Type: application/json');
@@ -419,7 +419,7 @@ switch($command) {
 							add_log_line();
 						} else {
 							header('Content-Type: application/json');
-							echo json_encode(array('success'=>false, 'message'=>'Error removing document', 'data'=>''));
+							echo json_encode(array('success'=>false, 'message'=>getMLText('error_remove_document'), 'data'=>''));
 						}
 					} else {
 						header('Content-Type: application/json');
@@ -669,15 +669,10 @@ switch($command) {
 						}
 					}
 					if($settings->_enableFullSearch) {
-						if(!empty($settings->_luceneClassDir))
+						$index = $indexconf['Indexer']::open($settings->_luceneDir);
-							require_once($settings->_luceneClassDir.'/Lucene.php');
-						else
-							require_once('SeedDMS/Lucene.php');
-
-						$index = SeedDMS_Lucene_Indexer::open($settings->_luceneDir);
 						if($index) {
-							SeedDMS_Lucene_Indexer::init($settings->_stopWordsFile);
+							$indexconf['Indexer']::init($settings->_stopWordsFile);
-							$index->addDocument(new SeedDMS_Lucene_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)));
 						}
 					}
 

op/op.RemoveDocument.php

@@ -83,7 +83,7 @@ $controller->setParam('document', $document);
 $controller->setParam('index', $index);
 $controller->setParam('indexconf', $indexconf);
 if(!$controller->run()) {
-	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("error_occured"));
+	UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($docname)))),getMLText("error_remove_document"));
 }
 
 if ($notifier){

op/op.RemoveFolder.php

@@ -79,7 +79,7 @@ $controller->setParam('folder', $folder);
 $controller->setParam('index', $index);
 $controller->setParam('indexconf', $indexconf);
 if(!$controller->run()) {
-	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
+	UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($foldername))),getMLText("error_remove_folder"));
 }
 
 if ($notifier) {

out/out.KeywordChooser.php

@@ -36,7 +36,7 @@ foreach($allusers as $u) {
 $categories = $dms->getAllKeywordCategories($userids);
 
 if($_GET['target']) {
-	$target = sanitizeString($_GET['target']);
+	$target = preg_replace('/[^A-Za-z0-9_]+/', '', $_GET['target']);
 } else {
 	$target = 'form1';
 }

styles/bootstrap/application.js

@@ -17,6 +17,8 @@ $(document).ready( function() {
 	$('.datepicker, #expirationdate, #fromdate, #todate, #createstartdate, #createenddate, #expirationstartdate, #expirationenddate')
 		.datepicker()
 		.on('changeDate', function(ev){
+			if(ev.date && $(ev.target).data('checkbox'))
+				$($(ev.target).data('checkbox')).prop('checked', false);
 			$(ev.currentTarget).datepicker('hide');
 		});
 
@@ -340,7 +342,7 @@ $(document).ready( function() {
 		input.trigger('fileselect', [numFiles, label]);
 	});
 
-	$('#upload-files').on('fileselect', '.btn-file :file', function(event, numFiles, label) {
+	$(document).on('fileselect', '#upload-file .btn-file :file', function(event, numFiles, label) {
 		var input = $(this).parents('.input-append').find(':text'),
 		log = numFiles > 1 ? numFiles + ' files selected' : label;
 

views/bootstrap/class.AddDocument.php

@@ -226,12 +226,12 @@ console.log(element);
 		<tr>
 			<td><?php printMLText("expires");?>:</td>
 			<td>
-        <span class="input-append date span12" id="expirationdate" data-date="<?php echo date('Y-m-d', $expts); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+        <span class="input-append date span12" id="expirationdate" data-date="<?php echo date('Y-m-d', $expts); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>" data-checkbox="#expires">
           <input class="span3" size="16" name="expdate" type="text" value="<?php echo date('Y-m-d', $expts); ?>">
           <span class="add-on"><i class="icon-calendar"></i></span>
         </span>&nbsp;
         <label class="checkbox inline">
-					<input type="checkbox" name="expires" value="false" <?php echo  ($presetexpiration ? "" : "checked");?>><?php printMLText("does_not_expire");?>
+					<input type="checkbox" id="expires" name="expires" value="false" <?php echo  ($presetexpiration ? "" : "checked");?>><?php printMLText("does_not_expire");?>
         </label>
 			</td>
 		</tr>

views/bootstrap/class.EditDocument.php

@@ -154,12 +154,12 @@ $(document).ready( function() {
 		<tr>
 			<td><?php printMLText("expires");?>:</td>
 			<td>
-        <span class="input-append date span12" id="expirationdate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
+        <span class="input-append date span12" id="expirationdate" data-date="<?php echo $expdate; ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>" data-checkbox="#expires">
           <input class="span3" size="16" name="expdate" type="text" value="<?php echo $expdate; ?>">
           <span class="add-on"><i class="icon-calendar"></i></span>
         </span><br />
         <label class="checkbox inline">
-				  <input type="checkbox" name="expires" value="false"<?php if (!$document->expires()) print " checked";?>><?php printMLText("does_not_expire");?><br>
+				  <input type="checkbox" id="expires" name="expires" value="false"<?php if (!$document->expires()) print " checked";?>><?php printMLText("does_not_expire");?><br>
         </label>
 			</td>
 		</tr>

views/bootstrap/class.KeywordChooser.php

@@ -108,7 +108,6 @@ myTA.focus();
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$categories = $this->params['categories'];
-		$form = $this->params['form'];
 
 //		$this->htmlStartPage(getMLText("use_default_keywords"));
 ?>