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

languages/ar_EG/lang.inc

@@ -624,6 +624,7 @@ URL: [url]',
 'filetype' => '',
 'file_size' => 'حجم الملف',
 'filter_for_documents' => 'فلتر للمستندات',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'فلتر للملفات',
 'folder' => 'مجلد',
 'folders' => 'مجلدات',

languages/bg_BG/lang.inc

@@ -573,6 +573,7 @@ $text = array(
 'filetype' => '',
 'file_size' => 'Размер',
 'filter_for_documents' => '',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => '',
 'folder' => 'Папка',
 'folders' => 'Папки',

languages/ca_ES/lang.inc

@@ -578,6 +578,7 @@ URL: [url]',
 'filetype' => '',
 'file_size' => 'Mida',
 'filter_for_documents' => '',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'Filtre adicional per les carpetes',
 'folder' => 'Carpeta',
 'folders' => 'Carpetes',

languages/cs_CZ/lang.inc

@@ -648,6 +648,7 @@ URL: [url]',
 'filetype' => '',
 'file_size' => 'Velikost souboru',
 'filter_for_documents' => 'Další filtr pro dokumenty',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'Další filtr pro složky',
 'folder' => 'Složka',
 'folders' => 'Složky',

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 (3118), dgrutsch (22)
+//    Translators: Admin (3119), dgrutsch (22)
 
 $text = array(
 '2_factor_auth' => '2-Faktor Authentifizierung',
@@ -755,6 +755,7 @@ URL: [url]</p>',
 'filetype' => 'Dateityp',
 'file_size' => 'Dateigröße',
 'filter_for_documents' => 'Zusätzliche Filter für Dokumente',
+'filter_for_documents_and_folders' => 'Zusätzliche Filter für Ordner und Dokumente',
 'filter_for_folders' => 'Zusätzliche Filter für Ordner',
 'folder' => 'Ordner',
 'folders' => 'Verzeichnisse',

languages/el_GR/lang.inc

@@ -573,6 +573,7 @@ $text = array(
 'filetype' => '',
 'file_size' => 'Μέγεθος αρχείου',
 'filter_for_documents' => '',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => '',
 'folder' => 'Φάκελος',
 'folders' => 'Φάκελοι',

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 (2212), archonwang (3), dgrutsch (9), netixw (14)
+//    Translators: Admin (2213), archonwang (3), dgrutsch (9), netixw (14)
 
 $text = array(
 '2_factor_auth' => '2-factor authentication',
@@ -755,6 +755,7 @@ URL: [url]</p>',
 'filetype' => 'File type',
 'file_size' => 'Filesize',
 'filter_for_documents' => 'Additional filter for documents',
+'filter_for_documents_and_folders' => 'Additional filter for folder and documents',
 'filter_for_folders' => 'Additional filter for folders',
 'folder' => 'Folder',
 'folders' => 'Folders',

languages/es_ES/lang.inc

@@ -637,6 +637,7 @@ URL: [url]',
 'filetype' => '',
 'file_size' => 'Tamaño',
 'filter_for_documents' => 'Filtro adicional para documentos',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'Filtro adicional para carpetas',
 'folder' => 'Carpeta',
 'folders' => 'Carpetas',

languages/fr_FR/lang.inc

@@ -741,6 +741,7 @@ URL : [url]</p>',
 'filetype' => 'Type de fichier',
 'file_size' => 'Taille',
 'filter_for_documents' => 'Filtre additionnel pour les documents',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'Filtre additionnel pour les dossiers',
 'folder' => 'Dossier',
 'folders' => 'Dossiers',

languages/hr_HR/lang.inc

@@ -636,6 +636,7 @@ Internet poveznica: [url]',
 'filetype' => '',
 'file_size' => 'Veličina datoteke',
 'filter_for_documents' => 'Dodatni filter za dokumente',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'Dodatni filter za dokumente',
 'folder' => 'Mapa',
 'folders' => 'Mape',

languages/hu_HU/lang.inc

@@ -631,6 +631,7 @@ URL: [url]',
 'filetype' => '',
 'file_size' => 'Állomány méret',
 'filter_for_documents' => 'További dokumentum szűrők',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'További mappa szűrők',
 'folder' => 'Mappa',
 'folders' => 'Mappák',

languages/id_ID/lang.inc

@@ -676,6 +676,7 @@ URL: [url]',
 'filetype' => '',
 'file_size' => 'Ukuran berkas',
 'filter_for_documents' => '',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'Filter tambahan untuk folder',
 'folder' => '',
 'folders' => 'Folder',

languages/it_IT/lang.inc

@@ -641,6 +641,7 @@ URL: [url]',
 'filetype' => '',
 'file_size' => 'Grandezza del file',
 'filter_for_documents' => 'Filtro aggiuntivo per i documenti',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'Filtro aggiuntivo per le cartelle',
 'folder' => 'Cartella',
 'folders' => 'Cartelle',

languages/ko_KR/lang.inc

@@ -637,6 +637,7 @@ URL: [url]',
 'filetype' => '',
 'file_size' => '파일 크기',
 'filter_for_documents' => '문서에 대한 추가 필터',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => '폴더에 대한 추가 필터',
 'folder' => '폴더',
 'folders' => '폴더',

languages/lo_LA/lang.inc

@@ -634,6 +634,7 @@ URL: [url]',
 'filetype' => '',
 'file_size' => 'ຂະໜາດ',
 'filter_for_documents' => 'ຕົວກອງເພີ່ມເຕົມສຳລັບເອກະສານ',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'ຕົວກອງເພີ່ມເຕີມສຳລັບໂຟລເດີ',
 'folder' => 'ໂຟລເດີ',
 'folders' => 'ໂຟລເດີ',

languages/nb_NO/lang.inc

@@ -648,6 +648,7 @@ URL: [url]',
 'filetype' => 'Filtype',
 'file_size' => 'Filstørrelse',
 'filter_for_documents' => 'Tilleggsfilter for dokumentet',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'Tilleggsfilter for mapper',
 'folder' => 'Mappe',
 'folders' => 'Mapper',

languages/nl_NL/lang.inc

@@ -641,6 +641,7 @@ URL: [url]',
 'filetype' => 'Type file',
 'file_size' => 'Bestandsomvang',
 'filter_for_documents' => 'Extra filter voor documenten',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'Extra filter voor mappen',
 'folder' => 'Map',
 'folders' => 'Mappen',

languages/pl_PL/lang.inc

@@ -624,6 +624,7 @@ URL: [url]',
 'filetype' => 'Typ pliku',
 'file_size' => 'Rozmiar pliku',
 'filter_for_documents' => 'Dodatkowe filtrowanie dla dokumentów',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'Dodatkowe filtrowanie dla folderów',
 'folder' => 'Folder',
 'folders' => 'Foldery',

languages/pt_BR/lang.inc

@@ -648,6 +648,7 @@ URL: [url]',
 'filetype' => '',
 'file_size' => 'Tamanho',
 'filter_for_documents' => 'Filtro adicional para documentos',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'Filtro adicional para pasta',
 'folder' => 'Pasta',
 'folders' => 'Pastas',

languages/ro_RO/lang.inc

@@ -636,6 +636,7 @@ URL: [url]',
 'filetype' => '',
 'file_size' => 'Mărimea fișierului',
 'filter_for_documents' => 'Filtru suplimentar pentru documente',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'Filtru suplimentar pentru foldere',
 'folder' => 'Folder',
 'folders' => 'Foldere',

languages/ru_RU/lang.inc

@@ -636,6 +636,7 @@ URL: [url]',
 'filetype' => '',
 'file_size' => 'Размер',
 'filter_for_documents' => 'Дополнительный фильтр по документам',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'Дополнительный фильтр по папкам',
 'folder' => 'Каталог',
 'folders' => 'кат.',

languages/sk_SK/lang.inc

@@ -648,6 +648,7 @@ URL: [url]',
 'filetype' => '',
 'file_size' => 'Veľkosť súboru',
 'filter_for_documents' => 'Ďalší filter pre dokumenty',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'Ďalší filter pre zložky',
 'folder' => 'Zložka',
 'folders' => 'Zložky',

languages/sv_SE/lang.inc

@@ -642,6 +642,7 @@ URL: [url]',
 'filetype' => '',
 'file_size' => 'Filstorlek',
 'filter_for_documents' => 'Tilläggsfilter för dokument',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'Tilläggsfilter för kataloger',
 'folder' => 'Katalog',
 'folders' => 'Kataloger',

languages/tr_TR/lang.inc

@@ -630,6 +630,7 @@ URL: [url]',
 'filetype' => '',
 'file_size' => 'Dosya boyutu',
 'filter_for_documents' => 'Dokümanlar için ek filtreler',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'Klasörler için ek filtreler',
 'folder' => 'Klasör',
 'folders' => 'Klasör',

languages/uk_UA/lang.inc

@@ -636,6 +636,7 @@ URL: [url]',
 'filetype' => '',
 'file_size' => 'Розмір',
 'filter_for_documents' => 'Додатковий фільтр по документах',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => 'Додатковий фільтр по каталогах',
 'folder' => 'Каталог',
 'folders' => 'кат.',

languages/zh_CN/lang.inc

@@ -638,6 +638,7 @@ URL: [url]',
 'filetype' => '',
 'file_size' => '文件大小',
 'filter_for_documents' => '文档新增过滤',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => '文件夹新增过滤',
 'folder' => '文件夹',
 'folders' => '文件夹',

languages/zh_TW/lang.inc

@@ -648,6 +648,7 @@ URL: [url]',
 'filetype' => '檔案類型',
 'file_size' => '文件大小',
 'filter_for_documents' => '附加文件過濾器',
+'filter_for_documents_and_folders' => '',
 'filter_for_folders' => '文件夾的附加過濾器',
 'folder' => '資料夾',
 'folders' => '資料夾',