diff --git a/config/alfresco/messages/webclient_de.properties b/config/alfresco/messages/webclient_de.properties index 370467a5a5..52db9441e5 100644 --- a/config/alfresco/messages/webclient_de.properties +++ b/config/alfresco/messages/webclient_de.properties @@ -1368,7 +1368,7 @@ deployment_previous_report_title=Deployment-Bericht f\u00fcr {0} deployment_previous_report_desc=Deployment-Details f\u00fcr jeden der im Deployment ausgew\u00e4hlten Server anzeigen. monitor_deployment_title=Deployment \u00fcberwachen monitor_deployment_desc=\u00dcberwacht Stand eines Deployments auf einen oder mehrere Server. -deploy_status_in_progress=L\u00c4UFT +deploy_status_in_progress=IN BEARBEITUNG deploy_status_live=LIVE deploy_status_failed=FEHLGESCHLAGEN deploy_status_partial=TEILWEISE FEHLGESCHLAGEN diff --git a/config/alfresco/messages/webclient_ja.properties b/config/alfresco/messages/webclient_ja.properties index f5408b70d8..526c6ed8b4 100755 --- a/config/alfresco/messages/webclient_ja.properties +++ b/config/alfresco/messages/webclient_ja.properties @@ -1017,7 +1017,7 @@ condition_is_subtype_not=\u30a2\u30a4\u30c6\u30e0\u306f ''{0}'' \u306e\u30b5\u30 condition_compare_mime_type=\u30a2\u30a4\u30c6\u30e0\u306f ''{0}'' \u306eMIME\u30bf\u30a4\u30d7\u3092\u542b\u307f\u307e\u3059\u3002 condition_compare_mime_type_not=\u30a2\u30a4\u30c6\u30e0\u306f ''{0}'' \u306eMIME\u30bf\u30a4\u30d7\u3092\u542b\u307f\u307e\u305b\u3093\u3002 condition_in_category=\u30a2\u30a4\u30c6\u30e0\u306f\u30ab\u30c6\u30b4\u30ea ''{0}'' \u306b\u5165\u3063\u3066\u3044\u307e\u3059\u3002 -condition_in_category_not=\u30a2\u30a4\u30c6\u30e0\u306f\u30ab\u30c6\u30b4\u30ea ''{0}'\u306b\u5165\u3063\u3066\u3044\u307e\u305b\u3093\u3002 +condition_in_category_not=\u30a2\u30a4\u30c6\u30e0\u306f\u30ab\u30c6\u30b4\u30ea ''{0}''\u306b\u5165\u3063\u3066\u3044\u307e\u305b\u3093\u3002 condition_compare_property_value=''{0}'' \u3068\u30de\u30c3\u30c1\u3059\u308b\u30cd\u30fc\u30e0\u30d7\u30ed\u30d1\u30c6\u30a3 condition_compare_property_value_not=''{0}'' \u3068\u30de\u30c3\u30c1\u3057\u306a\u3044\u30cd\u30fc\u30e0\u30d7\u30ed\u30d1\u30c6\u30a3 action_add_features=\u30a2\u30b9\u30da\u30af\u30c8 ''{0}''\u306e\u8ffd\u52a0 diff --git a/config/alfresco/messages/webclient_ru.properties b/config/alfresco/messages/webclient_ru.properties index ecaf827038..10e2986f41 100755 --- a/config/alfresco/messages/webclient_ru.properties +++ b/config/alfresco/messages/webclient_ru.properties @@ -207,9 +207,9 @@ has_following_categories_space=\u041A \u044D\u0442\u043E\u043C\u0443 \u043F\u044 moved=\u043F\u0435\u0440\u0435\u043C\u0435\u0449\u0435\u043D\u043E copied=\u0441\u043A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u043D\u043E clipboard=\u0411\u0443\u0444\u0435\u0440 \u043E\u0431\u043C\u0435\u043D\u0430 -node_added_clipboard=\u042D\u043B\u0435\u043C\u0435\u043D\u0442 \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0432 \u0431\u0443\u0444\u0435\u0440 \u043E\u0431\u043C\u0435\u043D\u0430. \u0411\u0443\u0444\u0435\u0440 \u043E\u0431\u043C\u0435\u043D\u0430 \u0441\u0435\u0439\u0447\u0430\u0441 \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u0442 {0} \u044D\u043B\u0435\u043C. \u0414\u043B\u044F \u0432\u0441\u0442\u0430\u0432\u043A\u0438 \u0432\u0441\u0435\u0445 \u0441\u043E\u0431\u0440\u0430\u043D\u043D\u044B\u0445 \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u043E\u0432 \u043F\u0435\u0440\u0435\u0439\u0434\u0438\u0442\u0435 \u043A \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u043E\u043C\u0443 \u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u0441\u0442\u0432\u0443 \u0438 \u0432\u044B\u0431\u0435\u0440\u0438\u0442\u0435 '\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u0432\u0441\u0435' \u0432 \u043C\u0435\u043D\u044E '\u0414\u0440\u0443\u0433\u0438\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u044F'. -node_added_clipboard_avm=\u042D\u043B\u0435\u043C\u0435\u043D\u0442 \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0432 \u0431\u0443\u0444\u0435\u0440 \u043E\u0431\u043C\u0435\u043D\u0430. \u0411\u0443\u0444\u0435\u0440 \u043E\u0431\u043C\u0435\u043D\u0430 \u0441\u0435\u0439\u0447\u0430\u0441 \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u0442 {0} \u044D\u043B\u0435\u043C. \u0414\u043E\u0441\u0442\u0443\u043F \u043A \u043D\u0438\u043C \u043C\u043E\u0436\u043D\u043E \u043F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u0441 \u0431\u043E\u043A\u043E\u0432\u043E\u0439 \u043F\u0430\u043D\u0435\u043B\u0438, \u0432\u044B\u0431\u0440\u0430\u0432 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0430\u0435\u043C\u044B\u0439 \u043C\u043E\u0434\u0443\u043B\u044C '\u041F\u043E\u043B\u043A\u0430' \u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E \u043C\u0435\u043D\u044E \u0432 \u043B\u0435\u0432\u043E\u0439 \u0432\u0435\u0440\u0445\u043D\u0435\u0439 \u0447\u0430\u0441\u0442\u0438 \u044D\u043A\u0440\u0430\u043D\u0430. -not_suitable_view_for_paste_warn=\u041D\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044F \u0432\u0441\u0442\u0430\u0432\u0438\u0442\u044C \"{0}\" \u0432 \u0442\u0435\u043A\u0443\u0449\u0438\u0439 \u0432\u0438\u0434. \u041F\u0435\u0440\u0435\u0439\u0434\u0438\u0442\u0435 \u043A \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u043C\u0443 \u043C\u0435\u0441\u0442\u0443 \u043D\u0430\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F. +node_added_clipboard=\u042D\u043B\u0435\u043C\u0435\u043D\u0442 \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0432 \u0431\u0443\u0444\u0435\u0440 \u043E\u0431\u043C\u0435\u043D\u0430. \u0411\u0443\u0444\u0435\u0440 \u043E\u0431\u043C\u0435\u043D\u0430 \u0441\u0435\u0439\u0447\u0430\u0441 \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u0442 {0} \u044D\u043B\u0435\u043C. \u0414\u043B\u044F \u0432\u0441\u0442\u0430\u0432\u043A\u0438 \u0432\u0441\u0435\u0445 \u0441\u043E\u0431\u0440\u0430\u043D\u043D\u044B\u0445 \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u043E\u0432 \u043F\u0435\u0440\u0435\u0439\u0434\u0438\u0442\u0435 \u043A \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u043E\u043C\u0443 \u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u0441\u0442\u0432\u0443 \u0438 \u0432\u044B\u0431\u0435\u0440\u0438\u0442\u0435 ''\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u0432\u0441\u0435'' \u0432 \u043C\u0435\u043D\u044E ''\u0414\u0440\u0443\u0433\u0438\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u044F''. +node_added_clipboard_avm=\u042D\u043B\u0435\u043C\u0435\u043D\u0442 \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0432 \u0431\u0443\u0444\u0435\u0440 \u043E\u0431\u043C\u0435\u043D\u0430. \u0411\u0443\u0444\u0435\u0440 \u043E\u0431\u043C\u0435\u043D\u0430 \u0441\u0435\u0439\u0447\u0430\u0441 \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u0442 {0} \u044D\u043B\u0435\u043C. \u0414\u043E\u0441\u0442\u0443\u043F \u043A \u043D\u0438\u043C \u043C\u043E\u0436\u043D\u043E \u043F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u0441 \u0431\u043E\u043A\u043E\u0432\u043E\u0439 \u043F\u0430\u043D\u0435\u043B\u0438, \u0432\u044B\u0431\u0440\u0430\u0432 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0430\u0435\u043C\u044B\u0439 \u043C\u043E\u0434\u0443\u043B\u044C ''\u041F\u043E\u043B\u043A\u0430'' \u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E \u043C\u0435\u043D\u044E \u0432 \u043B\u0435\u0432\u043E\u0439 \u0432\u0435\u0440\u0445\u043D\u0435\u0439 \u0447\u0430\u0441\u0442\u0438 \u044D\u043A\u0440\u0430\u043D\u0430. +not_suitable_view_for_paste_warn=\u041D\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044F \u0432\u0441\u0442\u0430\u0432\u0438\u0442\u044C \''{0}\'' \u0432 \u0442\u0435\u043A\u0443\u0449\u0438\u0439 \u0432\u0438\u0434. \u041F\u0435\u0440\u0435\u0439\u0434\u0438\u0442\u0435 \u043A \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u043C\u0443 \u043C\u0435\u0441\u0442\u0443 \u043D\u0430\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F. recent_spaces=\u041D\u0435\u0434\u0430\u0432\u043D\u0438\u0435 \u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u0441\u0442\u0432\u0430 shortcuts=\u042F\u0440\u043B\u044B\u043A\u0438 company_home=\u0414\u043E\u043C\u0430\u0448\u043D\u044F\u044F \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430 \u043A\u043E\u043C\u043F\u0430\u043D\u0438\u0438 @@ -217,7 +217,7 @@ my_home=\u041C\u043E\u044F \u0434\u043E\u043C\u0430\u0448\u043D\u044F\u044F \u04 guest_home=\u0414\u043E\u043C\u0430\u0448\u043D\u044F\u044F \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430 \u0433\u043E\u0441\u0442\u044F new_search=\u041D\u043E\u0432\u044B\u0439 \u043F\u043E\u0438\u0441\u043A search_results=\u0420\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u044B \u043F\u043E\u0438\u0441\u043A\u0430 -search_detail=\u0420\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u044B \u043F\u043E\u0438\u0441\u043A\u0430 \"{0}\" \u043F\u0440\u0438\u0432\u0435\u0434\u0435\u043D\u044B \u043D\u0438\u0436\u0435 +search_detail=\u0420\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u044B \u043F\u043E\u0438\u0441\u043A\u0430 \''{0}\'' \u043F\u0440\u0438\u0432\u0435\u0434\u0435\u043D\u044B \u043D\u0438\u0436\u0435 close_search=\u0417\u0430\u043A\u0440\u044B\u0442\u044C \u043F\u043E\u0438\u0441\u043A browse_spaces=\u041E\u0431\u0437\u043E\u0440 \u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u0441\u0442\u0432 browse_content=\u042D\u043B\u0435\u043C\u0435\u043D\u0442\u044B \u043A\u043E\u043D\u0442\u0435\u043D\u0442\u0430 @@ -806,8 +806,8 @@ import_error_info=\u041F\u0440\u0438 \u0432\u044B\u0431\u043E\u0440\u0435 \u044D # Edit Content messages edit_file_title=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0444\u0430\u0439\u043B -edit_file_prompt=\u0427\u0442\u043E\u0431\u044B \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0444\u0430\u0439\u043B ''{0}'', \u043D\u0430\u0436\u043C\u0438\u0442\u0435 \u0441\u0441\u044B\u043B\u043A\u0443 \u043D\u0438\u0436\u0435 \u0438 \u043F\u0440\u0438 \u0437\u0430\u043F\u0440\u043E\u0441\u0435 \u0432\u044B\u0431\u0435\u0440\u0438\u0442\u0435 '\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C'. -edit_download_complete=\u041F\u043E\u0441\u043B\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u0438\u044F \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438 \u043D\u0430\u0436\u043C\u0438\u0442\u0435 '\u0417\u0430\u043A\u0440\u044B\u0442\u044C'. +edit_file_prompt=\u0427\u0442\u043E\u0431\u044B \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0444\u0430\u0439\u043B ''{0}'', \u043D\u0430\u0436\u043C\u0438\u0442\u0435 \u0441\u0441\u044B\u043B\u043A\u0443 \u043D\u0438\u0436\u0435 \u0438 \u043F\u0440\u0438 \u0437\u0430\u043F\u0440\u043E\u0441\u0435 \u0432\u044B\u0431\u0435\u0440\u0438\u0442\u0435 ''\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C''. +edit_download_complete=\u041F\u043E\u0441\u043B\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u0438\u044F \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438 \u043D\u0430\u0436\u043C\u0438\u0442\u0435 ''\u0417\u0430\u043A\u0440\u044B\u0442\u044C''. edit_using_web_form=\u0427\u0442\u043E\u0431\u044B \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u044D\u0442\u043E\u0442 \u0444\u0430\u0439\u043B \u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E \u0432\u0435\u0431-\u0444\u043E\u0440\u043C\u044B, \u043D\u0430\u0436\u043C\u0438\u0442\u0435 \u0437\u0434\u0435\u0441\u044C. checkout_file_title=\u0412\u044B\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0444\u0430\u0439\u043B checkout_you_may_want=\u0412\u043E\u0437\u043C\u043E\u0436\u043D\u043E, \u043F\u043E\u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044F \u0432\u044B\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0444\u0430\u0439\u043B \u0434\u043B\u044F \u0435\u0433\u043E \u0431\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u043A\u0438 \u0438 \u043F\u0440\u0435\u0434\u043E\u0442\u0432\u0440\u0430\u0449\u0435\u043D\u0438\u044F \u0432\u043D\u0435\u0441\u0435\u043D\u0438\u044F \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0439 \u0434\u0440\u0443\u0433\u0438\u043C\u0438 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F\u043C\u0438. @@ -1355,7 +1355,7 @@ deploy_successful=\u0420\u0430\u0437\u0432\u0435\u0440\u0442\u044B\u0432\u0430\u deploy_failed=\u0421\u0431\u043E\u0439 \u043F\u0440\u0438 \u0440\u0430\u0437\u0432\u0435\u0440\u0442\u044B\u0432\u0430\u043D\u0438\u0438 deploy_server_not_selected=\u042D\u0442\u043E\u0442 \u0441\u0435\u0440\u0432\u0435\u0440 \u043D\u0435 \u0431\u044B\u043B \u0432\u044B\u0431\u0440\u0430\u043D, \u043F\u043E\u0441\u043A\u043E\u043B\u044C\u043A\u0443 \u0440\u0430\u043D\u0435\u0435 \u0431\u044B\u043B \u0443\u0441\u043F\u0435\u0448\u043D\u043E \u0440\u0430\u0437\u0432\u0435\u0440\u043D\u0443\u0442 \u0441\u043D\u0438\u043C\u043E\u043A. deploy_test_server_not_available=\u041E\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u044E\u0442 \u0432\u044B\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0435 \u0442\u0435\u0441\u0442\u043E\u0432\u044B\u0435 \u0441\u0435\u0440\u0432\u0435\u0440\u044B. -deploy_test_server_allocated=\u0414\u043B\u044F \u0434\u0430\u043D\u043D\u043E\u0439 \u043F\u0435\u0441\u043E\u0447\u043D\u0438\u0446\u044B \u0432\u044B\u0434\u0435\u043B\u0435\u043D \u0442\u0435\u0441\u0442\u043E\u0432\u044B\u0439 \u0441\u0435\u0440\u0432\u0435\u0440 ''{0}''. \u0429\u0435\u043B\u043A\u043D\u0438\u0442\u0435 \u0440\u0430\u0441\u043F\u043E\u043B\u043E\u0436\u0435\u043D\u043D\u0443\u044E \u043D\u0438\u0436\u0435 \u0441\u0441\u044B\u043B\u043A\u0443 \u043F\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0433\u043E \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 (\u0435\u0441\u043B\u0438 \u0443\u043A\u0430\u0437\u0430\u043D URL-\u0430\u0434\u0440\u0435\u0441) \u0434\u043B\u044F \u043F\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0433\u043E \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 \u0442\u0435\u043A\u0443\u0449\u0435\u0433\u043E \u0440\u0430\u0437\u0432\u0435\u0440\u0442\u044B\u0432\u0430\u043D\u0438\u044F \u0438\u043B\u0438 \u043D\u0430\u0436\u043C\u0438\u0442\u0435 \u043A\u043D\u043E\u043F\u043A\u0443 '\u041E\u041A' \u0434\u043B\u044F \u0440\u0430\u0437\u0432\u0435\u0440\u0442\u044B\u0432\u0430\u043D\u0438\u044F \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0445 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0439. +deploy_test_server_allocated=\u0414\u043B\u044F \u0434\u0430\u043D\u043D\u043E\u0439 \u043F\u0435\u0441\u043E\u0447\u043D\u0438\u0446\u044B \u0432\u044B\u0434\u0435\u043B\u0435\u043D \u0442\u0435\u0441\u0442\u043E\u0432\u044B\u0439 \u0441\u0435\u0440\u0432\u0435\u0440 ''{0}''. \u0429\u0435\u043B\u043A\u043D\u0438\u0442\u0435 \u0440\u0430\u0441\u043F\u043E\u043B\u043E\u0436\u0435\u043D\u043D\u0443\u044E \u043D\u0438\u0436\u0435 \u0441\u0441\u044B\u043B\u043A\u0443 \u043F\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0433\u043E \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 (\u0435\u0441\u043B\u0438 \u0443\u043A\u0430\u0437\u0430\u043D URL-\u0430\u0434\u0440\u0435\u0441) \u0434\u043B\u044F \u043F\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0433\u043E \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 \u0442\u0435\u043A\u0443\u0449\u0435\u0433\u043E \u0440\u0430\u0437\u0432\u0435\u0440\u0442\u044B\u0432\u0430\u043D\u0438\u044F \u0438\u043B\u0438 \u043D\u0430\u0436\u043C\u0438\u0442\u0435 \u043A\u043D\u043E\u043F\u043A\u0443 ''\u041E\u041A'' \u0434\u043B\u044F \u0440\u0430\u0437\u0432\u0435\u0440\u0442\u044B\u0432\u0430\u043D\u0438\u044F \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0445 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0439. deploy_started=\u0417\u0430\u043F\u0443\u0449\u0435\u043D\u043E deploy_finished=\u0417\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u043E deployed_by=\u041F\u043E @@ -1449,7 +1449,7 @@ prompt_for_web_form_info=\u0412\u044B\u0431\u043E\u0440 \u0432\u0435\u0431-\u044 prompt_for_web_form_form_not_found_error_in_web_project=\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043D\u0430\u0439\u0442\u0438 \u0432\u0435\u0431-\u0444\u043E\u0440\u043C\u0443 {0}, \u0441\u0432\u044F\u0437\u0430\u043D\u043D\u0443\u044E \u0441 {1} \u0432 \u0432\u0435\u0431-\u043F\u0440\u043E\u0435\u043A\u0442\u0435 {2}. prompt_for_web_form_form_not_found_error=\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043D\u0430\u0439\u0442\u0438 \u0432\u0435\u0431-\u0444\u043E\u0440\u043C\u0443 {0}, \u0441\u0432\u044F\u0437\u0430\u043D\u043D\u0443\u044E \u0441 {1}. prompt_for_web_form_explanation=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0432\u0435\u0431-\u0444\u043E\u0440\u043C\u0443, \u043A\u043E\u0442\u043E\u0440\u0430\u044F \u0431\u0443\u0434\u0435\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C\u0441\u044F \u0434\u043B\u044F {0}. -prompt_for_web_form_continue_msg=\u041D\u0430\u0436\u043C\u0438\u0442\u0435 '\u041E\u041A' \u0434\u043B\u044F \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F {0} \u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u043E\u0439 \u0432\u0435\u0431-\u0444\u043E\u0440\u043C\u044B. \u041D\u0430\u0436\u043C\u0438\u0442\u0435 '\u041E\u0442\u043C\u0435\u043D\u0430', \u0435\u0441\u043B\u0438 {0} \u043D\u0435 \u044F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u0430\u043A\u0442\u0438\u0432\u043E\u043C, \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u043C \u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E \u0432\u0435\u0431-\u0444\u043E\u0440\u043C\u044B, \u043A\u043E\u0442\u043E\u0440\u044B\u0439 \u0434\u043E\u043B\u0436\u0435\u043D \u043E\u0431\u0440\u0430\u0431\u0430\u0442\u044B\u0432\u0430\u0442\u044C\u0441\u044F \u043A\u0430\u043A \u043E\u0431\u044B\u0447\u043D\u044B\u0439 \u043A\u043E\u043D\u0442\u0435\u043D\u0442. +prompt_for_web_form_continue_msg=\u041D\u0430\u0436\u043C\u0438\u0442\u0435 ''\u041E\u041A'' \u0434\u043B\u044F \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F {0} \u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u043E\u0439 \u0432\u0435\u0431-\u0444\u043E\u0440\u043C\u044B. \u041D\u0430\u0436\u043C\u0438\u0442\u0435 ''\u041E\u0442\u043C\u0435\u043D\u0430'', \u0435\u0441\u043B\u0438 {0} \u043D\u0435 \u044F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u0430\u043A\u0442\u0438\u0432\u043E\u043C, \u0441\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u043C \u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E \u0432\u0435\u0431-\u0444\u043E\u0440\u043C\u044B, \u043A\u043E\u0442\u043E\u0440\u044B\u0439 \u0434\u043E\u043B\u0436\u0435\u043D \u043E\u0431\u0440\u0430\u0431\u0430\u0442\u044B\u0432\u0430\u0442\u044C\u0441\u044F \u043A\u0430\u043A \u043E\u0431\u044B\u0447\u043D\u044B\u0439 \u043A\u043E\u043D\u0442\u0435\u043D\u0442. # New User Wizard messages new_user_title=\u041C\u0430\u0441\u0442\u0435\u0440 \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F @@ -1744,7 +1744,7 @@ assignee=\u0418\u0441\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C comment=\u041A\u043E\u043C\u043C\u0435\u043D\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C invalid_task=\u041F\u0440\u043E\u0441\u043C\u0430\u0442\u0440\u0438\u0432\u0430\u0435\u043C\u0430\u044F \u0437\u0430\u0434\u0430\u0447\u0430 \u0441\u0442\u0430\u043B\u0430 \u043D\u0435\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0439, \u0432\u0435\u0440\u043E\u044F\u0442\u043D\u043E, \u043E\u043D\u0430 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043D\u0430 \u0434\u0440\u0443\u0433\u0438\u043C \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u043C. error_webprj_does_not_exist=\u0412\u0435\u0431-\u043F\u0440\u043E\u0435\u043A\u0442 {0} \u043D\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 (\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E, \u043E\u043D \u0443\u0434\u0430\u043B\u0435\u043D) -inviteOutcome=\u041f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u044c \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 +inviteOutcome=\u041f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u044c \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442=\u041f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u044c \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 # Workflow Definitions wf_review_options=\u041F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u044C \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B diff --git a/config/alfresco/messages/webclient_zh_CN.properties b/config/alfresco/messages/webclient_zh_CN.properties index 7bf6b13569..6c9088f524 100755 --- a/config/alfresco/messages/webclient_zh_CN.properties +++ b/config/alfresco/messages/webclient_zh_CN.properties @@ -208,7 +208,7 @@ moved=\u5df2\u542f\u52a8 copied=\u5df2\u590d\u5236 clipboard=\u526a\u8d34\u677f node_added_clipboard=\u5df2\u5411\u526a\u8d34\u677f\u6dfb\u52a0\u4e86\u4e00\u9879\u3002 \u526a\u8d34\u677f\u4e2d\u73b0\u5728\u6709 {0} \u9879\u3002 \u8981\u7c98\u8d34\u6536\u96c6\u7684\u6240\u6709\u9879\uff0c\u8bf7\u6d4f\u89c8\u5230\u6240\u9700\u7a7a\u95f4\uff0c\u7136\u540e\u4ece''\u66f4\u591a\u64cd\u4f5c''\u4e0b\u7684\u83dc\u5355\u9009\u62e9''\u5168\u90e8\u7c98\u8d34''\u3002 -node_added_clipboard_avm=\u5df2\u5411\u526a\u8d34\u677f\u6dfb\u52a0\u4e86\u4e00\u9879\u3002 \u526a\u8d34\u677f\u4e2d\u73b0\u5728\u6709 {0} \u9879\u3002 \u53ef\u901a\u8fc7\u4f7f\u7528\u5de6\u4e0a\u83dc\u5355\u9009\u62e9''\u67b6''\u63d2\u4ef6\u6765\u8bbf\u95ee\u4fa7\u8fb9\u680f\u4e0a\u7684\u9879\u3002 +node_added_clipboard_avm=\u5df2\u5411\u526a\u8d34\u677f\u6dfb\u52a0\u4e86\u4e00\u9879\u3002 \u526a\u8d34\u677f\u4e2d\u73b0\u5728\u6709 {0} \u9879\u3002 \u53ef\u901a\u8fc7\u4f7f\u7528\u5de6\u4e0a\u83dc\u5355\u9009\u62e9''\u7cfb\u7edf\u6258\u67b6''\u63d2\u4ef6\u6765\u8bbf\u95ee\u4fa7\u8fb9\u680f\u4e0a\u7684\u9879\u3002 not_suitable_view_for_paste_warn=\u65e0\u6cd5\u5c06 \"{0}\" \u7c98\u8d34\u5230\u5f53\u524d\u89c6\u56fe\u3002 \u8bf7\u6d4f\u89c8\u5230\u6709\u6548\u76ee\u6807\u3002 recent_spaces=\u6700\u8fd1\u7684\u7a7a\u95f4 shortcuts=\u5feb\u6377\u65b9\u5f0f @@ -525,7 +525,7 @@ discussion_for={0} \u8ba8\u8bba # Sidebar messages navigator=\u5bfc\u822a\u5668 navigator_desc=\u7528\u4e8e\u5bf9\u5b58\u50a8\u5e93\u6267\u884c\u57fa\u4e8e\u6811\u7684\u5bfc\u822a -shelf=\u67b6 +shelf=\u7cfb\u7edf\u6258\u67b6 shelf_desc=\u5305\u542b\u526a\u8d34\u677f\u3001\u6700\u8fd1\u7684\u7a7a\u95f4\u548c\u5feb\u6377\u65b9\u5f0f\u7684\u533a\u57df reset_navigator=\u5237\u65b0 reset_categories=\u5237\u65b0 @@ -1055,7 +1055,7 @@ discard_template=\u653e\u5f03\u6a21\u677f # Create Space Wizard messages create_space_title=\u521b\u5efa\u7a7a\u95f4\u5411\u5bfc create_space_desc=\u6b64\u5411\u5bfc\u5e2e\u52a9\u60a8\u521b\u5efa\u65b0\u7a7a\u95f4\u3002 -create_space_step1_title=\u6b65\u9aa4 1 - \u8d77\u52a8\u7a7a\u95f4 +create_space_step1_title=\u6b65\u9aa4 1 - \u8d77\u59cb\u7a7a\u95f4 create_space_step1_desc=\u9009\u62e9\u521b\u5efa\u7a7a\u95f4\u7684\u65b9\u6cd5\u3002 create_space_step2_title=\u6b65\u9aa4 2 - \u7a7a\u95f4\u9009\u9879 create_space_step2_desc=\u9009\u62e9\u7a7a\u95f4\u9009\u9879\u3002 @@ -1519,15 +1519,15 @@ recover_listed_items_confirm=\u662f\u5426\u786e\u5b9a\u8981\u4ece\u5df2\u5220\u9 recovered_item_success=\u5df2\u6210\u529f\u6062\u590d\u9879 \"{0}\"\u3002 recovered_item_parent=\u6062\u590d\u9879 \"{0}\" \u5931\u8d25\uff0c\u56e0\u4e3a\u7f3a\u5c11\u7236\u6587\u4ef6\u5939\uff1b\u8bf7\u9009\u62e9\u65b0\u7684\u6587\u4ef6\u5939\u76ee\u6807\u3002 recovered_item_parent_short=\u7f3a\u5c11\u7236\u6587\u4ef6\u5939 -recovered_item_permission=\u6062\u590d\u9879 \"{0}\" \u5931\u8d25\uff0c\u56e0\u4e3a\u60a8\u6ca1\u6709\u5c06\u8be5\u9879\u6062\u590d\u5230\u7236\u6587\u4ef6\u5939\u7684\u76f8\u5e94\u6743\u9650\uff1b\u8bf7\u9009\u62e9\u65b0\u7684\u6587\u4ef6\u5939\u76ee\u6807\u3002 +recovered_item_permission=\u6062\u590d\u9879 \''{0}\'' \u5931\u8d25\uff0c\u56e0\u4e3a\u60a8\u6ca1\u6709\u5c06\u8be5\u9879\u6062\u590d\u5230\u7236\u6587\u4ef6\u5939\u7684\u76f8\u5e94\u6743\u9650\uff1b\u8bf7\u9009\u62e9\u65b0\u7684\u6587\u4ef6\u5939\u76ee\u6807\u3002 recovered_item_permission_short=\u65e0\u5199\u6743\u9650 -recovered_item_integrity=\u6062\u590d\u9879 \"{0}\" \u5931\u8d25\uff0c\u56e0\u4e3a\u7236\u6587\u4ef6\u5939\u4e2d\u5df2\u5b58\u5728\u540c\u540d\u9879\uff1b\u8bf7\u9009\u62e9\u65b0\u7684\u6587\u4ef6\u5939\u76ee\u6807\u3002 +recovered_item_integrity=\u6062\u590d\u9879 \''{0}\'' \u5931\u8d25\uff0c\u56e0\u4e3a\u7236\u6587\u4ef6\u5939\u4e2d\u5df2\u5b58\u5728\u540c\u540d\u9879\uff1b\u8bf7\u9009\u62e9\u65b0\u7684\u6587\u4ef6\u5939\u76ee\u6807\u3002 recovered_item_integrity_short=\u5b58\u5728\u540c\u540d\u9879 -recovered_item_failure=\u6062\u590d\u9879 \"{0}\" \u5931\u8d25\uff0c\u539f\u56e0\u662f\u9519\u8bef\uff1a{1} +recovered_item_failure=\u6062\u590d\u9879 \''{0}\'' \u5931\u8d25\uff0c\u539f\u56e0\u662f\u9519\u8bef\uff1a{1} recovered_item_failure_short=\u5931\u8d25 -recovered_item_duplicate=\u6062\u590d\u9879\"{0}\"'\u5931\u8d25\uff0c\u4e0d\u5141\u8bb8\u5b58\u5728\u91cd\u590d\u540d\u79f0\u3002 +recovered_item_duplicate=\u6062\u590d\u9879\''{0}\''\u5931\u8d25\uff0c\u4e0d\u5141\u8bb8\u5b58\u5728\u91cd\u590d\u540d\u79f0\u3002 recovered_item_duplicate_short=\u4e0d\u5141\u8bb8\u5b58\u5728\u91cd\u590d\u540d\u79f0 -delete_item_success=\u5df2\u6c38\u4e45\u6027\u5220\u9664\u9879 \"{0}\"\u3002 +delete_item_success=\u5df2\u6c38\u4e45\u6027\u5220\u9664\u9879 \''{0}\''\u3002 title_deleted_item_details=\u5df2\u5220\u9664\u9879\u7684\u8be6\u7ec6\u4fe1\u606f deleteditem_details_description=\u5df2\u5220\u9664\u9879\u7684\u8be6\u7ec6\u4fe1\u606f alternative_destination=\u53ef\u9009\u62e9\u5e0c\u671b\u7528\u4e8e\u653e\u7f6e\u5df2\u6062\u590d\u9879\u7684\u76ee\u6807\u3002 \u5982\u679c\u4e0d\u9009\u62e9\u76ee\u6807\uff0c\u5c06\u4f7f\u7528\u8be5\u9879\u7684\u539f\u59cb\u4f4d\u7f6e\u3002 \u5982\u679c\u76ee\u6807\u4e0d\u5b58\u5728\u6216\u60a8\u65e0\u6743\u5728\u6b64\u5904\u6dfb\u52a0\u9879\uff0c\u6062\u590d\u9879\u53ef\u80fd\u5931\u8d25\u3002 diff --git a/pom.xml b/pom.xml index dbed209e69..2e0d90c842 100644 --- a/pom.xml +++ b/pom.xml @@ -237,14 +237,6 @@ 1.3.167 test - - axis2 - addressing - 1.0 - mar - - - diff --git a/source/java/org/alfresco/web/app/servlet/SecurityContextCleanupPhaseListener.java b/source/java/org/alfresco/web/app/servlet/SecurityContextCleanupPhaseListener.java new file mode 100644 index 0000000000..3fb1dc7e36 --- /dev/null +++ b/source/java/org/alfresco/web/app/servlet/SecurityContextCleanupPhaseListener.java @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2005-2013 Alfresco Software Limited. + * + * This file is part of Alfresco + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + */ +package org.alfresco.web.app.servlet; + +import javax.faces.event.PhaseEvent; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; + +import net.sf.acegisecurity.context.ContextHolder; + +/** + * This JSF phase listener clears security context after finishing rendering of each request to back-end bean. This action is required due to conflict in HTTP request processing + * threads in application server thread pool. Not cleaned up security context becomes shared between Alfresco Explorer and CMIS.
+ *
+ * See "cmisatom URL (opencmis backed by Apache Chemistry OpenCMIS) does not support External authentication" and + * "Security context for Alfresco Explorer is not being cleaned up after processing a request" for more details + * + * @since 4.1.4 + * @author Dmitry Velichkevich + */ +public class SecurityContextCleanupPhaseListener implements PhaseListener +{ + private static final long serialVersionUID = 1L; + + public SecurityContextCleanupPhaseListener() + { + } + + @Override + public void afterPhase(PhaseEvent phaseevent) + { + ContextHolder.setContext(null); + } + + @Override + public void beforePhase(PhaseEvent phaseevent) + { + } + + @Override + public PhaseId getPhaseId() + { + return PhaseId.RENDER_RESPONSE; + } +} diff --git a/source/java/org/alfresco/web/app/servlet/ajax/AjaxServlet.java b/source/java/org/alfresco/web/app/servlet/ajax/AjaxServlet.java index 5755174a6c..18394a117f 100644 --- a/source/java/org/alfresco/web/app/servlet/ajax/AjaxServlet.java +++ b/source/java/org/alfresco/web/app/servlet/ajax/AjaxServlet.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Alfresco Software Limited. + * Copyright (C) 2005-2013 Alfresco Software Limited. * * This file is part of Alfresco * @@ -26,6 +26,8 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import net.sf.acegisecurity.context.ContextHolder; + import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.web.app.servlet.AuthenticationStatus; import org.alfresco.web.app.servlet.BaseServlet; @@ -152,6 +154,8 @@ public class AjaxServlet extends BaseServlet { perfLogger.debug("Time to execute command: " + (System.currentTimeMillis() - startTime) + "ms"); } + + ContextHolder.setContext(null); } } diff --git a/source/java/org/alfresco/web/bean/LoginBean.java b/source/java/org/alfresco/web/bean/LoginBean.java index a516e52b3a..61a9a79c51 100644 --- a/source/java/org/alfresco/web/bean/LoginBean.java +++ b/source/java/org/alfresco/web/bean/LoginBean.java @@ -351,7 +351,7 @@ public class LoginBean implements Serializable { // Perform a full session invalidation to ensure no cached data is left around // - important if the login page has been accessed directly rather than via the Login/out action links - Application.logOut(fc); + logout(); // Authenticate via the authentication service, then save the details of user in an object // in the session - this is used by the servlet filter etc. on each page to check for login diff --git a/source/web/WEB-INF/faces-config-app.xml b/source/web/WEB-INF/faces-config-app.xml index ea4a942c45..f0b7949704 100644 --- a/source/web/WEB-INF/faces-config-app.xml +++ b/source/web/WEB-INF/faces-config-app.xml @@ -13,10 +13,12 @@ - + + org.alfresco.web.app.servlet.SecurityContextCleanupPhaseListener - -->