Merge branch 'seeddms-5.0.x' into develop

inc/inc.ClassSettings.php

@@ -102,7 +102,7 @@ class Settings { /* {{{ */
 	// Maximum number of sub-directories per parent directory
 	var $_maxDirID = 32700;
 	// default language (name of a subfolder in folder "languages")
-	var $_language = "English";
+	var $_language = "en_GB";
 	// users are notified about document-changes that took place within the last $_updateNotifyTime seconds
 	var $_updateNotifyTime = 86400;
 	// files with one of the following endings can be viewed online

install/index.php

@@ -7,9 +7,7 @@ $settings->_rootDir = $rootDir.'/';
 
 $theme = "blue";
 include("../inc/inc.Language.php");
-include "../languages/en_GB/lang.inc";
 include("../inc/inc.ClassUI.php");
-$LANG['en_GB'] = $text;
 
 UI::htmlStartPage("INSTALL");
 UI::contentHeading("SeedDMS Installation...");

install/install.php

@@ -206,7 +206,7 @@ if (isset($_GET['disableinstall'])) { /* {{{ */
 		if(unlink($configDir."/ENABLE_INSTALL_TOOL")) {
 			echo getMLText("settings_install_disabled");
 			echo "<br/><br/>";
-			echo '<a href="' . $httpRoot . '/out/out.Settings.php">' . getMLText("settings_more_settings") .'</a>';
+			echo '<a href="../out/out.Settings.php">' . getMLText("settings_more_settings") .'</a>';
 		} else {
 			echo getMLText("settings_cannot_disable");
 			echo "<br/><br/>";
@@ -368,7 +368,7 @@ if ($action=="setSettings") {
 						echo '<a href="install.php?disableinstall=1">' . getMLText("settings_disable_install") . '</a>';
 						echo "<br/><br/>";
 
-						echo '<a href="' . $httpRoot . '/out/out.Settings.php">' . getMLText("settings_more_settings") .'</a>';
+						echo '<a href="../out/out.Settings.php">' . getMLText("settings_more_settings") .'</a>';
 						$showform = false;
 					}
 				} else {

languages/ar_EG/lang.inc

@@ -466,6 +466,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'بالساعة',
 'hours' => 'ساعات',
+'hr_HR' => '',
 'human_readable' => 'ارشيف مقروء',
 'hu_HU' => 'مجرية',
 'id' => 'معرف',

languages/bg_BG/lang.inc

@@ -397,6 +397,7 @@ $text = array(
 'home_folder' => '',
 'hourly' => 'Ежечасно',
 'hours' => 'часа',
+'hr_HR' => '',
 'human_readable' => 'Човекопонятен архив',
 'hu_HU' => '',
 'id' => 'ID',

languages/ca_ES/lang.inc

@@ -402,6 +402,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'Hourly',
 'hours' => '',
+'hr_HR' => '',
 'human_readable' => 'Arxiu llegible per humans',
 'hu_HU' => '',
 'id' => 'ID',

languages/cs_CZ/lang.inc

@@ -473,6 +473,7 @@ URL: [url]',
 'home_folder' => 'Domácí složka',
 'hourly' => 'Hodinově',
 'hours' => 'hodiny',
+'hr_HR' => '',
 'human_readable' => 'Bežně čitelný archív',
 'hu_HU' => 'Maďarština',
 'id' => 'ID',

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 (2101), dgrutsch (18)
+//    Translators: Admin (2102), dgrutsch (18)
 
 $text = array(
 'accept' => 'Übernehmen',
@@ -478,6 +478,7 @@ URL: [url]',
 'home_folder' => 'Heimatordner',
 'hourly' => 'stündlich',
 'hours' => 'Stunden',
+'hr_HR' => 'Kroatisch',
 'human_readable' => 'Menschenlesbares Archiv',
 'hu_HU' => 'Ungarisch',
 'id' => 'ID',

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 (1232), dgrutsch (3), netixw (14)
+//    Translators: Admin (1234), dgrutsch (3), netixw (14)
 
 $text = array(
 'accept' => 'Accept',
@@ -478,6 +478,7 @@ URL: [url]',
 'home_folder' => 'Home folder',
 'hourly' => 'Hourly',
 'hours' => 'hours',
+'hr_HR' => 'Croatian',
 'human_readable' => 'Human readable archive',
 'hu_HU' => 'Hungarian',
 'id' => 'ID',
@@ -540,7 +541,7 @@ URL: [url]',
 'keep_doc_status' => 'Keep document status',
 'keywords' => 'Keywords',
 'keyword_exists' => 'Keyword already exists',
-'ko_KR' => '',
+'ko_KR' => 'Korean',
 'language' => 'Language',
 'lastaccess' => 'Last access',
 'last_update' => 'Last Update',

languages/es_ES/lang.inc

@@ -473,6 +473,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'Horaria',
 'hours' => 'horas',
+'hr_HR' => '',
 'human_readable' => 'Archivo legible por humanos',
 'hu_HU' => 'Hungaro',
 'id' => 'ID',

languages/fr_FR/lang.inc

@@ -473,6 +473,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'Une fois par heure',
 'hours' => 'heures',
+'hr_HR' => '',
 'human_readable' => 'Archive au format lisible',
 'hu_HU' => 'Hongrois',
 'id' => 'ID',

languages/hu_HU/lang.inc

@@ -473,6 +473,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'Óra',
 'hours' => 'óra',
+'hr_HR' => '',
 'human_readable' => 'Felhasználó által olvasható archívum',
 'hu_HU' => 'Magyar',
 'id' => 'ID',

languages/it_IT/lang.inc

@@ -479,6 +479,7 @@ URL: [url]',
 'home_folder' => 'Cartella Utente',
 'hourly' => 'Ogni ora',
 'hours' => 'ore',
+'hr_HR' => '',
 'human_readable' => 'Archivio per uso esterno',
 'hu_HU' => 'Ungherese',
 'id' => 'ID',

languages/ko_KR/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 (933), daivoc (353)
+//    Translators: Admin (933), daivoc (356)
 
 $text = array(
 'accept' => '동의',
@@ -478,6 +478,7 @@ URL: [url]',
 'home_folder' => '홈 폴더',
 'hourly' => '시간별',
 'hours' => '시간',
+'hr_HR' => '',
 'human_readable' => '가독력',
 'hu_HU' => '헝가리어',
 'id' => 'ID',
@@ -915,8 +916,8 @@ URL : [url]',
 'settings_cannot_disable' => '파일 ENABLE_INSTALL_TOOL 삭제할 수 없습니다',
 'settings_checkOutDir' => '체크아웃 문서 디렉토리',
 'settings_checkOutDir_desc' => '이것은 문서가 체크아웃된 문서의 최신 내용이 복사되는 디렉토리입니다. 사용자를 위해 이 디렉토리에 액세스 할 수 있도록 하면 파일을 편집하고 종료시 그것을 다시 확인할 수 있습니다.',
-'settings_cmdTimeout' => '',
-'settings_cmdTimeout_desc' => '',
+'settings_cmdTimeout' => '작업 시간 초과',
+'settings_cmdTimeout_desc' => '외부로부터 요청된 명령의 종료시점 까지의 소요시간(예: 전체 텍스트 인덱스 생성시간)',
 'settings_contentDir' => '내용 디렉토리',
 'settings_contentDir_desc' => '업로드 된 파일의 저장 위치(웹 서버를 통해 액세스 할 수없는 디렉토리를 선택하는 것이 가장 좋습니다)',
 'settings_contentOffsetDir' => '내용 오프셋 디렉토리',

languages/nl_NL/lang.inc

@@ -466,6 +466,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'Elk uur',
 'hours' => 'uren',
+'hr_HR' => '',
 'human_readable' => 'Leesbaar Archief',
 'hu_HU' => 'Hongaars',
 'id' => 'ID',

languages/pl_PL/lang.inc

@@ -466,6 +466,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'Co godzinę',
 'hours' => 'godzin',
+'hr_HR' => '',
 'human_readable' => 'Archiwum czytelne dla człowieka',
 'hu_HU' => 'Węgierski',
 'id' => 'ID',

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 (880), flaviove (627), lfcristofoli (352)
+//    Translators: Admin (885), flaviove (627), lfcristofoli (352)
 
 $text = array(
 'accept' => 'Aceitar',
@@ -345,7 +345,7 @@ URL: [url]',
 'do_object_setfilesize' => 'Defina o tamanho do arquivo',
 'do_object_unlink' => 'Excluir versão do documento',
 'draft' => '',
-'draft_pending_approval' => '',
+'draft_pending_approval' => 'Rascunho - Aprovação pendente',
 'draft_pending_review' => 'Draft - pending review',
 'drag_icon_here' => 'Arraste ícone de pasta ou documento para aqui!',
 'dropfolder_file' => 'Arquivo de pasta suspensa',
@@ -472,6 +472,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'De hora em hora',
 'hours' => 'horas',
+'hr_HR' => '',
 'human_readable' => 'Human readable archive',
 'hu_HU' => 'Húngaro',
 'id' => 'ID',
@@ -843,15 +844,15 @@ URL: [url]',
 'search_fulltext' => 'Pesquisa em texto completo',
 'search_in' => 'Busca em',
 'search_mode_and' => 'todas as palavras',
-'search_mode_documents' => '',
-'search_mode_folders' => '',
+'search_mode_documents' => 'Só Documentos',
+'search_mode_folders' => 'Só Pastas',
 'search_mode_or' => 'at least one word',
 'search_no_results' => 'não há documento que satisfaçam sua busca',
 'search_query' => 'Busca por',
 'search_report' => 'Encontrados [count] documentos',
 'search_report_fulltext' => 'Encontrados [doccount] documentos',
-'search_resultmode' => '',
-'search_resultmode_both' => '',
+'search_resultmode' => 'Resultados da Busca',
+'search_resultmode_both' => 'Documentos e Pastas',
 'search_results' => 'Resultados da busca',
 'search_results_access_filtered' => 'Search results may contain content to which access has been denied.',
 'search_time' => 'Tempo decorrido: [time] sec.',

languages/ro_RO/lang.inc

@@ -478,6 +478,7 @@ URL: [url]',
 'home_folder' => 'Folder Home',
 'hourly' => 'Orare',
 'hours' => 'ore',
+'hr_HR' => '',
 'human_readable' => 'Arhivă lizibilă omului',
 'hu_HU' => 'Ungureste',
 'id' => 'ID',

languages/ru_RU/lang.inc

@@ -466,6 +466,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'Ежечасно',
 'hours' => 'часы',
+'hr_HR' => '',
 'human_readable' => 'Понятный человеку архив',
 'hu_HU' => 'Hungarian',
 'id' => 'Идентификатор',

languages/sk_SK/lang.inc

@@ -397,6 +397,7 @@ $text = array(
 'home_folder' => '',
 'hourly' => '',
 'hours' => '',
+'hr_HR' => '',
 'human_readable' => 'Použivateľský archív',
 'hu_HU' => 'Maďarčina',
 'id' => 'ID',

languages/sv_SE/lang.inc

@@ -466,6 +466,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => 'timvis',
 'hours' => 'timmar',
+'hr_HR' => '',
 'human_readable' => 'Arkiv som är läsbart av användare',
 'hu_HU' => 'ungerska',
 'id' => 'ID',

languages/tr_TR/lang.inc

@@ -472,6 +472,7 @@ URL: [url]',
 'home_folder' => 'Temel klasör',
 'hourly' => 'Saatlik',
 'hours' => 'saat',
+'hr_HR' => '',
 'human_readable' => 'Okunabilir arşiv',
 'hu_HU' => 'Macarca',
 'id' => 'ID',

languages/uk_UA/lang.inc

@@ -478,6 +478,7 @@ URL: [url]',
 'home_folder' => 'Домашній каталог',
 'hourly' => 'Щогодини',
 'hours' => 'години',
+'hr_HR' => '',
 'human_readable' => 'Зрозумілий людині архів',
 'hu_HU' => 'Hungarian',
 'id' => 'Ідентифікатор',

languages/zh_CN/lang.inc

@@ -403,6 +403,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => '',
 'hours' => '',
+'hr_HR' => '',
 'human_readable' => '可读存档',
 'hu_HU' => '匈牙利语',
 'id' => '序号',

languages/zh_TW/lang.inc

@@ -401,6 +401,7 @@ URL: [url]',
 'home_folder' => '',
 'hourly' => '',
 'hours' => '',
+'hr_HR' => '',
 'human_readable' => '可讀存檔',
 'hu_HU' => '匈牙利語',
 'id' => '序號',