Merge branch 'master-1.2.x' of git@github.com:mantisbt/mantisbt.git i…

…nto master-1.2.x
mantisbt · Sep 24, 2012 · e843371 · e843371
2 parents cc60613 + 9db6eb1
commit e843371
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/lang/strings_chinese_simplified.txt b/lang/strings_chinese_simplified.txt
@@ -243,6 +243,7 @@ $MANTIS_ERROR[ERROR_CATEGORY_DUPLICATE] = '已存在同名类别。';
 $MANTIS_ERROR[ERROR_CATEGORY_NO_ACTION] = '没有指定的复制操作。';
 $MANTIS_ERROR[ERROR_CATEGORY_NOT_FOUND] = '没有找到类别。';
 $MANTIS_ERROR[ERROR_CATEGORY_NOT_FOUND_FOR_PROJECT] = '未在项目 "%2$s"中找到"%1$s"类别';
+$MANTIS_ERROR[ERROR_CATEGORY_CANNOT_DELETE_DEFAULT] = '这个分类不可以被删除，因为它被定为“为移动默认的分类“';
 $MANTIS_ERROR[ERROR_VERSION_DUPLICATE] = '已存在同名版本。';
 $MANTIS_ERROR[ERROR_VERSION_NOT_FOUND] = '没有找到版本“%1$s” 。';
 $MANTIS_ERROR[ERROR_USER_NAME_INVALID] = '用户名无效。用户名只能包含字母、数字、空格、连字符、点、加号和下划线。';

diff --git a/lang/strings_dutch.txt b/lang/strings_dutch.txt
@@ -932,6 +932,9 @@ $s_issue_id = 'Meldingsnr.';
 $s_recently_visited = 'Recent bekeken';
 $s_priority_abbreviation = 'P';
 $s_note_user_id = 'Opmerking van';
+$s_filter_match_type = 'Zoektype';
+$s_filter_match_all = 'Alle voorwaarden';
+$s_filter_match_any = 'Elke voorwaarde';
 $s_none = 'geen';
 $s_current = 'huidig';
 $s_search = 'Zoeken';

diff --git a/lang/strings_korean.txt b/lang/strings_korean.txt
@@ -740,7 +740,7 @@ $s_add_and_edit_version_button = '버전 추가 및 수정';
 $s_edit_link = '편집';
 $s_actions = '실행';
 $s_version = '버전/빌드번호';
-$s_timestamp = '시간';
+$s_timestamp = '시간 기록';
 $s_update = '갱신';
 $s_subprojects = '서브프로젝트';
 $s_add_subproject = '서브프로젝트로 추가';

diff --git a/plugins/XmlImportExport/lang/strings_dutch.txt b/plugins/XmlImportExport/lang/strings_dutch.txt
@@ -45,3 +45,4 @@ $s_plugin_XmlImportExport_disable_desc = 'Verwijzging uitschakelen';
 $s_plugin_XmlImportExport_fallback = 'Terugvalstrategie (als "Hernummeren" niet werkt):';
 $s_plugin_XmlImportExport_fallback_category = 'Terugvalcategorie:';
 $s_plugin_XmlImportExport_keep_same_category = 'Proberen dezelfde categorie te houden';
+$s_plugin_XmlImportExport_error_no_xml = 'de extensies xmlreader en xmlwriter zijn niet aangetroffen';