diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-05-04 17:09:51 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-05-04 17:09:51 +0200 |
| commit | 0fbc92e0c4c07d61da55d0bbb3cadd55f51dc4d7 (patch) | |
| tree | 4be569ab0f86370fe9044a9b13d69c858c980de0 /addons/web | |
| parent | 858188f1a2a2207cf93cc0f2d0d2deb08bb7dbf6 (diff) | |
| parent | 1e86774207d09c901c61b148c5c0c23a511aa282 (diff) | |
[MERGE] forward port of branch saas-10 up to 1e86774
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/web/i18n/ko.po | 1282 | ||||
| -rw-r--r-- | addons/web/i18n/mk.po | 6 | ||||
| -rw-r--r-- | addons/web/i18n/web.pot | 6 | ||||
| -rw-r--r-- | addons/web/i18n/zh_CN.po | 18 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/list_view_editable.js | 4 |
6 files changed, 573 insertions, 745 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 74d0d140874..c147f84f094 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -486,7 +486,7 @@ class Home(http.Controller): redirect = '/web' return http.redirect_with_hash(redirect) request.uid = old_uid - values['error'] = "Wrong login/password" + values['error'] = _("Wrong login/password") return request.render('web.login', values) class WebClient(http.Controller): diff --git a/addons/web/i18n/ko.po b/addons/web/i18n/ko.po index 62727a4457f..01d0f84af2d 100644 --- a/addons/web/i18n/ko.po +++ b/addons/web/i18n/ko.po @@ -1,55 +1,40 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * web -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-12 10:10+0000\n" -"PO-Revision-Date: 2016-01-21 10:35+0000\n" +"POT-Creation-Date: 2016-01-18 04:43+0000\n" +"PO-Revision-Date: 2016-04-26 05:50+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Korean (http://www.transifex.com/odoo/odoo-9/language/ko/)\n" -"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" +"Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_common.js:874 +#: code:addons/web/static/src/js/views/form_common.js:870 #, python-format msgid " & Close" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_inputs.js:544 -#: code:addons/web/static/src/js/views/search_view.js:205 -#, python-format -msgid " or " -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:428 +#: code:addons/web/static/src/js/views/form_widgets.js:442 #, python-format msgid " selected records" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/view_manager.js:222 -#, python-format -msgid " view couldn't be loaded" -msgstr "" - -#. module: web -#. openerp-web #: code:addons/web/static/src/js/views/search_filters.js:115 -#: code:addons/web/static/src/js/views/search_filters.js:297 +#: code:addons/web/static/src/js/views/search_filters.js:290 #, python-format msgid "%(field)s %(operator)s" msgstr "%(field)s %(operator)s" @@ -63,13 +48,27 @@ msgstr "%(field)s %(operator)s \"%(value)s\"" #. module: web #. openerp-web -#: code:addons/web/static/src/js/view_manager.js:65 +#: code:addons/web/static/src/js/views/list_view.js:1579 +#, python-format +msgid "%(page)d/%(page_count)d" +msgstr "%(page)d/%(page_count)d" + +#. module: web +#. openerp-web +#: code:addons/web/static/src/js/view_manager.js:66 #, python-format msgid "%(view_type)s view" msgstr "%(view_type)s 화면" #. module: web #. openerp-web +#: code:addons/web/static/src/js/views/form_view.js:443 +#, python-format +msgid "%d / %d" +msgstr "%d / %d" + +#. module: web +#. openerp-web #: code:addons/web/static/src/js/framework/core.js:134 #, python-format msgid "%d days ago" @@ -98,41 +97,42 @@ msgstr "%d달 전" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/debug_manager.js:140 +#: code:addons/web/static/src/js/framework/core.js:138 #, python-format -msgid "%d requests (%d ms) %d queries (%d ms)" -msgstr "" +msgid "%d years ago" +msgstr "%d년 전" #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/core.js:138 +#: code:addons/web/static/src/js/views/list_view.js:441 #, python-format -msgid "%d years ago" -msgstr "%d년 전" +msgid "%d-%d of %d" +msgstr "%d의 %d-%d" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:1393 +#: code:addons/web/static/src/js/views/list_view.js:1488 #, python-format msgid "%s (%d)" msgstr "%s (%d)" #. module: web #: model:ir.ui.view,arch_db:web.webclient_bootstrap -msgid "" -"<!--[if lt IE 10]>\n" -" <body class=\"ie9\">\n" -" <![endif]-->" +msgid "<!--[if lte IE 9]>" msgstr "" #. module: web #: model:ir.ui.view,arch_db:web.layout #: model:ir.ui.view,arch_db:web.qunit_suite -#: model:ir.ui.view,arch_db:web.webclient_bootstrap msgid "<!DOCTYPE html>" msgstr "" #. module: web +#: model:ir.ui.view,arch_db:web.webclient_bootstrap +msgid "<![endif]-->" +msgstr "" + +#. module: web #. openerp-web #: code:addons/web/static/src/js/framework/formats.js:171 #, python-format @@ -190,9 +190,9 @@ msgstr "(%d개의 기록)" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1363 +#: code:addons/web/static/src/xml/base.xml:106 #, python-format -msgid "(Enterprise Edition)" +msgid "(Community Edition)" msgstr "" #. module: web @@ -211,17 +211,17 @@ msgstr "(nolabel)" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:981 +#: code:addons/web/static/src/js/framework/utils.js:300 #, python-format -msgid "...Upload in progress..." -msgstr "...업로드가 진행 중입니다..." +msgid ",k,M" +msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:72 +#: code:addons/web/static/src/xml/base.xml:1012 #, python-format -msgid "1 month" -msgstr "" +msgid "...Upload in progress..." +msgstr "...업로드가 진행 중입니다..." #. module: web #: model:ir.ui.view,arch_db:web.menu_secondary @@ -235,11 +235,11 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/user_menu.js:71 -#: code:addons/web/static/src/xml/base.xml:1344 +#: code:addons/web/static/src/js/widgets/user_menu.js:81 +#: code:addons/web/static/src/xml/base.xml:84 #, python-format msgid "About" -msgstr "정보" +msgstr "" #. module: web #. openerp-web @@ -257,21 +257,21 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1402 +#: code:addons/web/static/src/xml/base.xml:1503 #, python-format msgid "Access to all Enterprise Apps" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/sidebar.js:23 +#: code:addons/web/static/src/js/widgets/sidebar.js:24 #, python-format msgid "Action" msgstr "동작" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1113 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1106 #, python-format msgid "Action Button" msgstr "액션 버튼" @@ -285,178 +285,165 @@ msgstr "동작 ID :" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:632 +#: code:addons/web/static/src/js/views/form_widgets.js:660 #, python-format msgid "Activate" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:179 -#, python-format -msgid "Activate Assets Debugging" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:1391 +#: code:addons/web/static/src/xml/base.xml:96 #, python-format msgid "Activate the developer mode" -msgstr "개발자 모드 활성화" +msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:629 +#: code:addons/web/static/src/js/views/form_widgets.js:657 #, python-format msgid "Active" msgstr "활성" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1347 -#: code:addons/web/static/src/xml/base.xml:1197 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1367 +#: code:addons/web/static/src/xml/base.xml:1110 +#: code:addons/web/static/src/xml/base.xml:1343 #, python-format msgid "Add" msgstr "추가" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1022 +#: code:addons/web/static/src/xml/base.xml:1216 #, python-format msgid "Add Custom Filter" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1026 +#: code:addons/web/static/src/xml/base.xml:1217 #, python-format msgid "Add a condition" msgstr "조건 추가" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1011 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1016 #, python-format msgid "Add an item" msgstr "항목 추가" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1132 +#: code:addons/web/static/src/xml/base.xml:1227 #, python-format msgid "Add custom group" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:98 -#, python-format -msgid "Add more users" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:338 +#: code:addons/web/static/src/xml/base.xml:323 #, python-format msgid "Add..." msgstr "추가..." #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1288 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1308 #, python-format msgid "Add: " msgstr "추가 : " #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:998 +#: code:addons/web/static/src/xml/base.xml:1123 #, python-format msgid "Advanced Search..." msgstr "고급 검색..." #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/dialog.js:169 +#: code:addons/web/static/src/js/framework/dialog.js:162 #, python-format msgid "Alert" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:568 +#: code:addons/web/static/src/xml/base.xml:564 #, python-format msgid "All users" msgstr "모든 사용자" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1407 +#: code:addons/web/static/src/xml/base.xml:1508 #, python-format msgid "And more" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1025 -#: code:addons/web/static/src/xml/base.xml:1143 +#: code:addons/web/static/src/xml/base.xml:1217 +#: code:addons/web/static/src/xml/base.xml:1237 #, python-format msgid "Apply" msgstr "적용" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:636 -#: code:addons/web/static/src/js/views/list_view.js:283 +#: code:addons/web/static/src/js/views/form_widgets.js:664 +#: code:addons/web/static/src/js/views/list_view.js:308 #, python-format msgid "Archive" msgstr "보존" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:637 +#: code:addons/web/static/src/js/views/form_widgets.js:671 #, python-format msgid "Archived" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_menus.js:245 +#: code:addons/web/static/src/js/views/search_menus.js:243 #, python-format msgid "Are you sure that you want to remove this filter?" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:312 +#: code:addons/web/static/src/xml/base.xml:295 #, python-format msgid "Attachment :" msgstr "첨부 파일 :" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1193 +#: code:addons/web/static/src/xml/base.xml:1327 #, python-format msgid "Available fields" msgstr "사용 가능한 필드" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:635 +#: code:addons/web/static/src/xml/base.xml:616 #, python-format msgid "Bar Chart" msgstr "막대 차트" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:1830 +#: code:addons/web/static/src/js/views/list_view.js:1955 #, python-format msgid "Binary file" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1406 +#: code:addons/web/static/src/xml/base.xml:1507 #, python-format msgid "Bugfixes guarantee" msgstr "" @@ -491,24 +478,31 @@ msgstr "문맥의 %s 값을 변환할 수 없습니다" #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/crash_manager.js:177 -#: code:addons/web/static/src/js/framework/dialog.js:183 -#: code:addons/web/static/src/js/views/form_common.js:1046 -#: code:addons/web/static/src/js/views/form_relational_widgets.js:42 -#: code:addons/web/static/src/js/views/form_upgrade_widgets.js:42 -#: code:addons/web/static/src/xml/base.xml:56 +#: code:addons/web/static/src/js/views/form_widgets.js:352 +#, python-format +msgid "Can't send email to invalid e-mail address" +msgstr "이메일 주소가 잘못되어 이메일을 전송할 수 없습니다" + +#. module: web +#. openerp-web +#: code:addons/web/static/src/js/framework/crash_manager.js:182 +#: code:addons/web/static/src/js/framework/dialog.js:176 +#: code:addons/web/static/src/js/views/form_common.js:1029 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:44 +#: code:addons/web/static/src/js/views/form_widgets.js:1667 +#: code:addons/web/static/src/xml/base.xml:60 #, python-format msgid "Cancel" msgstr "취소" #. module: web #. openerp-web -#: code:addons/web/controllers/main.py:743 -#: code:addons/web/controllers/main.py:745 -#: code:addons/web/controllers/main.py:751 -#: code:addons/web/controllers/main.py:752 -#: code:addons/web/static/src/js/widgets/change_password.js:15 -#: code:addons/web/static/src/xml/base.xml:55 +#: code:addons/web/controllers/main.py:829 +#: code:addons/web/controllers/main.py:831 +#: code:addons/web/controllers/main.py:837 +#: code:addons/web/controllers/main.py:838 +#: code:addons/web/static/src/js/widgets/change_password.js:14 +#: code:addons/web/static/src/xml/base.xml:59 #, python-format msgid "Change Password" msgstr "비밀번호 변경" @@ -522,80 +516,60 @@ msgstr "기본 값 변경 :" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:433 +#: code:addons/web/static/src/js/views/form_widgets.js:447 #, python-format msgid "Change selection " msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:902 -#: code:addons/web/static/src/xml/base.xml:932 +#: code:addons/web/static/src/xml/base.xml:967 +#: code:addons/web/static/src/xml/base.xml:1021 +#: code:addons/web/static/src/xml/base.xml:1023 #, python-format msgid "Clear" msgstr "제거" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:187 -#, python-format -msgid "Clear Events" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/framework/crash_manager.js:130 -#: code:addons/web/static/src/js/web_client.js:117 +#: code:addons/web/static/src/js/framework/crash_manager.js:135 +#: code:addons/web/static/src/js/web_client.js:132 #, python-format msgid "Client Error" msgstr "클라이언트 오류" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_common.js:868 -#: code:addons/web/static/src/js/views/form_view.js:1106 -#: code:addons/web/static/src/js/widgets/data_export.js:202 +#: code:addons/web/static/src/js/views/form_common.js:864 +#: code:addons/web/static/src/js/views/form_view.js:1128 +#: code:addons/web/static/src/js/widgets/data_export.js:40 #, python-format msgid "Close" msgstr "마감" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:542 +#: code:addons/web/static/src/xml/base.xml:487 #, python-format msgid "Condition:" msgstr "조건 :" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:50 +#: code:addons/web/static/src/xml/base.xml:53 #, python-format -msgid "Confirm New Password" +msgid "Confirm New Password:" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/dialog.js:194 +#: code:addons/web/static/src/js/framework/dialog.js:187 #, python-format msgid "Confirmation" msgstr "확인" #. module: web #. openerp-web -#: code:addons/web/static/src/js/web_client.js:212 -#, python-format -msgid "Connection lost" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/web_client.js:221 -#, python-format -msgid "Connection restored" -msgstr "" - -#. module: web -#. openerp-web #: code:addons/web/static/src/xml/base_common.xml:59 #, python-format msgid "Context:" @@ -603,21 +577,21 @@ msgstr "문맥 :" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1373 +#: code:addons/web/static/src/xml/base.xml:116 #, python-format msgid "Copyright © 2004-2015 Odoo S.A." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1255 +#: code:addons/web/static/src/js/views/form_widgets.js:1347 #, python-format msgid "Could not display the selected image." msgstr "선택한 이미지를 표시할 수 없습니다." #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:1013 +#: code:addons/web/static/src/js/views/list_view.js:1110 #, python-format msgid "Could not find id in dataset" msgstr "데이터 세트에서 id를 찾을 수 없습니다" @@ -631,76 +605,76 @@ msgstr "XML을 직렬화할 수 없습니다" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_common.js:1049 -#: code:addons/web/static/src/js/views/form_relational_widgets.js:28 -#: code:addons/web/static/src/js/views/list_view.js:47 -#: code:addons/web/static/src/js/views/list_view.js:1913 -#: code:addons/web/static/src/xml/base.xml:504 +#: code:addons/web/static/src/js/views/form_common.js:1032 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:30 +#: code:addons/web/static/src/js/views/list_view.js:48 +#: code:addons/web/static/src/js/views/list_view.js:2024 +#: code:addons/web/static/src/xml/base.xml:451 #, python-format msgid "Create" msgstr "작성" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_common.js:226 +#: code:addons/web/static/src/js/views/form_common.js:223 #, python-format msgid "Create \"<strong>%s</strong>\"" msgstr "\"<strong>%s</strong>\" 작성" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:25 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:27 #, python-format msgid "Create a %s" msgstr "%s 작성" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_common.js:237 +#: code:addons/web/static/src/js/views/form_common.js:234 #, python-format msgid "Create and Edit..." msgstr "작성 및 편집..." #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:38 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:40 #, python-format msgid "Create and edit" msgstr "직상 및 편집" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_common.js:282 -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1071 +#: code:addons/web/static/src/js/views/form_common.js:279 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1064 #, python-format msgid "Create: " msgstr "작성 : " #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:317 +#: code:addons/web/static/src/xml/base.xml:249 #, python-format msgid "Created by :" msgstr "작성자 :" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:271 +#: code:addons/web/static/src/xml/base.xml:200 #, python-format msgid "Creation Date:" msgstr "작성일 :" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:267 +#: code:addons/web/static/src/xml/base.xml:196 #, python-format msgid "Creation User:" msgstr "작성자 :" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_common.js:1096 -#: code:addons/web/static/src/js/views/search_menus.js:177 +#: code:addons/web/static/src/js/views/form_common.js:1065 +#: code:addons/web/static/src/js/views/search_menus.js:175 #, python-format msgid "Custom Filter" msgstr "사용자 지정 필터" @@ -712,98 +686,91 @@ msgstr "데이터베이스" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1367 +#: code:addons/web/static/src/xml/base.xml:110 #, python-format msgid "Database expiration:" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:679 +#: code:addons/web/static/src/xml/base.xml:675 #, python-format msgid "Day" msgstr "일" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:630 +#: code:addons/web/static/src/js/views/form_widgets.js:658 #, python-format msgid "Deactivate" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:525 +#: code:addons/web/static/src/xml/base.xml:521 #, python-format msgid "Default:" msgstr "기본 값:" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:171 -#: code:addons/web/static/src/js/views/list_view.js:285 -#: code:addons/web/static/src/xml/base.xml:1238 +#: code:addons/web/static/src/js/views/form_view.js:210 +#: code:addons/web/static/src/js/views/list_view.js:310 +#: code:addons/web/static/src/xml/base.xml:1368 #, python-format msgid "Delete" msgstr "삭제" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:328 +#: code:addons/web/static/src/xml/base.xml:260 #, python-format msgid "Delete this attachment" msgstr "해당 첨부파일 삭제" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:986 +#: code:addons/web/static/src/xml/base.xml:1019 #, python-format msgid "Delete this file" msgstr "해당 파일 삭제" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:172 -#, python-format -msgid "Disable Technical Features" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/views/form_common.js:868 -#: code:addons/web/static/src/xml/base.xml:435 -#: code:addons/web/static/src/xml/base.xml:514 +#: code:addons/web/static/src/js/views/form_common.js:864 +#: code:addons/web/static/src/xml/base.xml:408 +#: code:addons/web/static/src/xml/base.xml:457 #, python-format msgid "Discard" msgstr "폐기" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/sidebar.js:214 +#: code:addons/web/static/src/js/widgets/sidebar.js:205 #, python-format msgid "Do you really want to delete this attachment ?" msgstr "해당 첨부 파일을 정말로 삭제하시겠습니까?" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:715 +#: code:addons/web/static/src/js/views/form_view.js:780 #, python-format msgid "Do you really want to delete this record?" msgstr "정말로 해당 기록을 삭제하시겠습니까?" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:537 +#: code:addons/web/static/src/js/views/list_view.js:630 #, python-format msgid "Do you really want to remove these records?" msgstr "정말로 해당 기록을 제거하시겠습니까?" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1342 +#: code:addons/web/static/src/xml/base.xml:82 #, python-format msgid "Documentation" -msgstr "문서화" +msgstr "" #. module: web #. openerp-web @@ -814,66 +781,74 @@ msgstr "도메인 :" #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/misc.js:16 +#: code:addons/web/static/src/js/framework/misc.js:17 #, python-format msgid "Don't leave yet,<br />it's still loading..." msgstr "잠시만 기다리세요. <br />아직 불러오는 중입니다..." #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:1830 +#: code:addons/web/static/src/js/views/form_widgets.js:1278 +#: code:addons/web/static/src/js/views/list_view.js:1946 #, python-format msgid "Download" msgstr "다운로드" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:1846 +#: code:addons/web/static/src/js/views/list_view.js:1962 #, python-format msgid "Download \"%s\"" msgstr "\"%s\" 다운로드" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:666 +#: code:addons/web/static/src/js/views/pivot_view.js:123 #, python-format msgid "Download xls" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:172 +#: code:addons/web/static/src/js/views/form_view.js:211 #, python-format msgid "Duplicate" msgstr "사본 생성" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:247 -#: code:addons/web/static/src/xml/base.xml:500 -#: code:addons/web/static/src/xml/base.xml:901 +#: code:addons/web/static/src/js/views/form_widgets.js:352 +#, python-format +msgid "E-mail Error" +msgstr "이메일 에러" + +#. module: web +#. openerp-web +#: code:addons/web/static/src/xml/base.xml:171 +#: code:addons/web/static/src/xml/base.xml:446 +#: code:addons/web/static/src/xml/base.xml:915 #, python-format msgid "Edit" msgstr "편집" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:215 +#: code:addons/web/static/src/xml/base.xml:173 #, python-format msgid "Edit Action" msgstr "동작 편집" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:248 +#: code:addons/web/static/src/xml/base.xml:172 #, python-format msgid "Edit SearchView" msgstr "검색 화면 편집" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/debug_manager.js:281 -#: code:addons/web/static/src/xml/base.xml:219 +#: code:addons/web/static/src/js/widgets/debug_manager.js:180 +#: code:addons/web/static/src/xml/base.xml:174 #, python-format msgid "Edit Workflow" msgstr "업무 흐름 편집" @@ -885,13 +860,6 @@ msgstr "이메일" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:175 -#, python-format -msgid "Enable Technical Features" -msgstr "" - -#. module: web -#. openerp-web #: code:addons/web/static/src/xml/website.tour.xml:25 #, python-format msgid "End This Tutorial" @@ -899,92 +867,92 @@ msgstr "안내서 끝내기" #. module: web #. openerp-web -#: code:addons/web/static/src/js/view_manager.js:222 -#: code:addons/web/static/src/js/views/search_menus.js:85 -#: code:addons/web/static/src/js/views/search_menus.js:92 +#: code:addons/web/static/src/js/views/search_menus.js:83 +#: code:addons/web/static/src/js/views/search_menus.js:90 #, python-format msgid "Error" msgstr "오류" #. module: web -#: code:addons/web/controllers/main.py:752 +#: code:addons/web/controllers/main.py:838 #, python-format msgid "Error, password not changed !" msgstr "오류, 암호가 변경되지 않았습니다!" #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/pyeval.js:993 +#: code:addons/web/static/src/js/framework/pyeval.js:981 #, python-format msgid "Evaluation Error" msgstr "평가 오류" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:665 +#: code:addons/web/static/src/xml/base.xml:599 #, python-format msgid "Expand all" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:282 +#: code:addons/web/static/src/js/views/list_view.js:307 +#: code:addons/web/static/src/xml/base.xml:1259 #, python-format msgid "Export" msgstr "내보내기" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/data_export.js:199 +#: code:addons/web/static/src/js/widgets/data_export.js:50 #, python-format msgid "Export Data" msgstr "데이터 내보내기" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1186 +#: code:addons/web/static/src/xml/base.xml:1277 #, python-format -msgid "Export Formats :" -msgstr "" +msgid "Export Formats" +msgstr "내보내기 형식" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/data_export.js:201 +#: code:addons/web/static/src/js/widgets/data_export.js:41 #, python-format msgid "Export To File" msgstr "파일로 내보내기" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1179 +#: code:addons/web/static/src/xml/base.xml:1271 #, python-format -msgid "Export Type :" -msgstr "" +msgid "Export Type:" +msgstr "내보내기 유형 :" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1182 +#: code:addons/web/static/src/xml/base.xml:1274 #, python-format msgid "Export all Data" msgstr "모든 데이터 내보내기" #. module: web #. openerp-web -#: code:addons/web/static/src/js/view_manager.js:435 +#: code:addons/web/static/src/js/view_manager.js:370 #, python-format msgid "Failed to evaluate search criterions" msgstr "검색 조건을 평가할 수 없습니다." #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1149 +#: code:addons/web/static/src/xml/base.xml:1197 #, python-format msgid "Favorites" msgstr "즐겨찾기" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:1279 +#: code:addons/web/static/src/js/views/form_view.js:1292 #, python-format msgid "Field '%s' specified in view could not be found." msgstr "화면에서 지정된 '%s' 필드를 찾을 수 없습니다." @@ -998,117 +966,100 @@ msgstr "필드 :" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/debug_manager.js:358 -#: code:addons/web/static/src/xml/base.xml:245 +#: code:addons/web/static/src/js/widgets/debug_manager.js:135 +#: code:addons/web/static/src/xml/base.xml:167 #, python-format msgid "Fields View Get" msgstr "필드 화면 얻기" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/debug_manager.js:259 -#, python-format -msgid "Fields of %s" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:1205 +#: code:addons/web/static/src/xml/base.xml:1285 #, python-format msgid "Fields to export" msgstr "내보낼 필드" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1115 +#: code:addons/web/static/src/js/views/form_widgets.js:1193 #, python-format msgid "File Upload" msgstr "파일 업로드" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1095 +#: code:addons/web/static/src/js/views/form_widgets.js:1173 #, python-format msgid "File upload" msgstr "파일 업로드" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_inputs.js:542 +#: code:addons/web/static/src/js/views/search_inputs.js:540 #, python-format msgid "Filter" msgstr "필터" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_menus.js:85 +#: code:addons/web/static/src/js/views/search_menus.js:83 #, python-format msgid "Filter name is required." msgstr "필터 이름이 필요합니다." #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_inputs.js:486 +#: code:addons/web/static/src/js/views/search_inputs.js:484 #, python-format msgid "Filter on: %s" msgstr "다음에 필터 적용 : %s" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_menus.js:92 +#: code:addons/web/static/src/js/views/search_menus.js:90 #, python-format msgid "Filter with same name already exists." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1018 +#: code:addons/web/static/src/xml/base.xml:1213 #, python-format msgid "Filters" msgstr "필터" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:664 +#: code:addons/web/static/src/xml/base.xml:649 #, python-format msgid "Flip axis" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/pivot_view.js:820 -#, python-format -msgid "" -"For Excel compatibility, data cannot be exported if there is more than 256 columns.\n" -"\n" -"Tip: try to flip axis, filter further or reduce the number of measures." -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:1376 +#: code:addons/web/static/src/xml/base.xml:119 #, python-format msgid "For more information visit" -msgstr "더 많은 정보를 원하시면 다음을 방문하세요 :" +msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:33 -#: code:addons/web/static/src/js/views/form_view.js:308 +#: code:addons/web/static/src/js/views/form_view.js:34 +#: code:addons/web/static/src/js/views/form_view.js:357 #, python-format msgid "Form" msgstr "양식" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1375 +#: code:addons/web/static/src/xml/base.xml:118 #, python-format msgid "GNU Lesser General Public License" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1399 +#: code:addons/web/static/src/xml/base.xml:1500 #, python-format msgid "Get this feature and much more with Odoo Enterprise!" msgstr "" @@ -1129,15 +1080,22 @@ msgstr "그래프" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_inputs.js:689 -#: code:addons/web/static/src/xml/base.xml:1127 +#: code:addons/web/static/src/js/views/list_view.js:465 +#, python-format +msgid "Group" +msgstr "그룹" + +#. module: web +#. openerp-web +#: code:addons/web/static/src/js/views/search_inputs.js:685 +#: code:addons/web/static/src/xml/base.xml:1179 #, python-format msgid "Group By" msgstr "그룹화" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_inputs.js:664 +#: code:addons/web/static/src/js/views/search_inputs.js:660 #, python-format msgid "Group by: %s" msgstr "그룹화 : %s" @@ -1151,137 +1109,129 @@ msgstr "높음" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:197 -#, python-format -msgid "ID" -msgstr "ID" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:255 +#: code:addons/web/static/src/xml/base.xml:184 #, python-format msgid "ID:" msgstr "ID :" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1255 +#: code:addons/web/static/src/js/views/form_widgets.js:1351 #, python-format msgid "Image" msgstr "이미지" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1181 +#: code:addons/web/static/src/xml/base.xml:1273 #, python-format msgid "Import-Compatible Export" msgstr "가져오기-호환 파일 내보내기" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:631 +#: code:addons/web/static/src/js/views/form_widgets.js:665 #, python-format msgid "Inactive" msgstr "비활성" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/graph_widget.js:195 -#: code:addons/web/static/src/js/views/graph_widget.js:202 +#: code:addons/web/static/src/js/views/graph_widget.js:190 +#: code:addons/web/static/src/js/views/graph_widget.js:197 #, python-format msgid "Invalid data" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/debug_manager.js:201 +#: code:addons/web/static/src/js/widgets/debug_manager.js:106 +#: code:addons/web/static/src/xml/base.xml:211 #, python-format msgid "JS Tests" msgstr "JS 시험" #. module: web -#: code:addons/web/controllers/main.py:759 +#: code:addons/web/controllers/main.py:769 #, python-format msgid "Languages" msgstr "언어" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:279 +#: code:addons/web/static/src/xml/base.xml:254 #, python-format msgid "Latest Modification Date:" msgstr "최종 수정일 :" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:275 +#: code:addons/web/static/src/xml/base.xml:250 #, python-format msgid "Latest Modification by:" msgstr "최근 수정자 :" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:190 +#: code:addons/web/static/src/xml/base.xml:223 #, python-format -msgid "Leave the Developer Tools" +msgid "Leave Debug Mode" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1375 +#: code:addons/web/static/src/xml/base.xml:118 #, python-format msgid "Licenced under the terms of" -msgstr "다음 조건에 따라 허가됨 :" +msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:636 +#: code:addons/web/static/src/xml/base.xml:617 #, python-format msgid "Line Chart" msgstr "선 차트" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:57 +#: code:addons/web/static/src/js/views/list_view.js:39 #, python-format msgid "List" msgstr "목록" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/loading.js:47 +#: code:addons/web/static/src/js/widgets/loading.js:12 +#: code:addons/web/static/src/js/widgets/loading.js:46 #, python-format msgid "Loading" msgstr "불러오는 중" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/loading.js:45 +#: code:addons/web/static/src/js/widgets/loading.js:44 #, python-format msgid "Loading (%d)" msgstr "(%d)을(를) 불러오는 중" #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/misc.js:13 +#: code:addons/web/static/src/js/framework/misc.js:14 +#: code:addons/web/static/src/xml/base.xml:5 #, python-format msgid "Loading..." msgstr "불러오는 중..." #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/pyeval.js:997 +#: code:addons/web/static/src/js/framework/pyeval.js:985 #, python-format msgid "" "Local evaluation failure\n" "%s\n" "\n" "%s" -msgstr "" -"로컬 평가 실패\n" -"%s\n" -"\n" -"%s" +msgstr "로컬 평가 실패\n%s\n\n%s" #. module: web #: model:ir.ui.view,arch_db:web.login @@ -1290,14 +1240,7 @@ msgstr "로그인" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:101 -#, python-format -msgid "Log in as an administrator to correct the issue." -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:1348 +#: code:addons/web/static/src/xml/base.xml:84 #, python-format msgid "Log out" msgstr "로그아웃" @@ -1311,7 +1254,7 @@ msgstr "낮음" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_inputs.js:442 +#: code:addons/web/static/src/js/views/search_inputs.js:440 #, python-format msgid "M2O search fields do not currently handle multiple default values" msgstr "M2O 검색 필드는 현재 다중 기본값을 처리하지 않습니다" @@ -1323,30 +1266,36 @@ msgstr "데이터베이스 관리" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/debug_manager.js:269 -#: code:addons/web/static/src/xml/base.xml:218 +#: code:addons/web/static/src/js/widgets/debug_manager.js:141 +#: code:addons/web/static/src/xml/base.xml:168 #, python-format msgid "Manage Filters" msgstr "필터 관리" #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/misc.js:19 +#: code:addons/web/static/src/js/framework/misc.js:20 #, python-format msgid "Maybe you should consider reloading the application by pressing F5..." msgstr "F5를 눌러 응용 프로그램을 다시 불러오는 것을 고려해보십시오..." #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:623 -#: code:addons/web/static/src/xml/base.xml:652 +#: code:addons/web/static/src/xml/base.xml:570 +#, python-format +msgid "Measure" +msgstr "" + +#. module: web +#. openerp-web +#: code:addons/web/static/src/xml/base.xml:602 #, python-format msgid "Measures" msgstr "단위" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/debug_manager.js:345 +#: code:addons/web/static/src/js/widgets/debug_manager.js:89 #, python-format msgid "Metadata (%s)" msgstr "메타데이타 (%s)" @@ -1367,14 +1316,21 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1404 +#: code:addons/web/static/src/xml/base.xml:1505 #, python-format msgid "Mobile support" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:322 +#: code:addons/web/static/src/js/widgets/debug_manager.js:129 +#, python-format +msgid "Model %s fields" +msgstr "%s 필드 모델" + +#. module: web +#. openerp-web +#: code:addons/web/static/src/xml/base.xml:254 #, python-format msgid "Modified by :" msgstr "수정자 :" @@ -1388,14 +1344,14 @@ msgstr "수정자 :" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:681 +#: code:addons/web/static/src/xml/base.xml:626 #, python-format msgid "Month" msgstr "월" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:881 +#: code:addons/web/static/src/xml/base.xml:900 #, python-format msgid "More" msgstr "더 보기" @@ -1407,121 +1363,144 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1201 +#: code:addons/web/static/src/xml/base.xml:1303 #, python-format msgid "Move Down" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1200 +#: code:addons/web/static/src/xml/base.xml:1302 #, python-format msgid "Move Up" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1347 +#: code:addons/web/static/src/js/tour.js:180 +#, python-format +msgid "Move your mouse" +msgstr "" + +#. module: web +#. openerp-web +#: code:addons/web/static/src/js/tour.js:181 +#, python-format +msgid "Move your mouse here to open the insert block" +msgstr "" + +#. module: web +#. openerp-web +#: code:addons/web/static/src/xml/base.xml:83 #, python-format msgid "My Odoo.com account" msgstr "내 Odoo.com 계정" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:198 +#: code:addons/web/static/src/xml/base.xml:1322 #, python-format msgid "Name" msgstr "이름" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1252 +#: code:addons/web/static/src/xml/base.xml:1381 #, python-format msgid "Name:" msgstr "명칭 :" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:313 +#: code:addons/web/static/src/js/views/form_view.js:362 #, python-format msgid "New" msgstr "신규" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:46 +#: code:addons/web/static/src/xml/base.xml:48 #, python-format -msgid "New Password" -msgstr "새 비밀번호" +msgid "New Password:" +msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1403 +#: code:addons/web/static/src/xml/base.xml:1504 #, python-format msgid "New design" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_inputs.js:332 +#: code:addons/web/static/src/js/views/search_inputs.js:330 #, python-format msgid "No" msgstr "아니오" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:263 +#: code:addons/web/static/src/xml/base.xml:192 #, python-format msgid "No Update:" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/graph_widget.js:94 +#: code:addons/web/static/src/js/views/graph_widget.js:89 #, python-format -msgid "No data available for this chart. Try to add some records, or make sure that there is no active filter in the search bar." +msgid "" +"No data available for this chart. Try to add some records, or make sure that" +" there is no active filter in the search bar." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:696 +#: code:addons/web/static/src/xml/base.xml:642 #, python-format msgid "" "No data available for this pivot table. Try to add some records, or make sure\n" -" that there is at least one measure and no active filter in the search bar." +" that there is at least one measure and no active filter in the search bar." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/graph_widget.js:93 +#: code:addons/web/static/src/js/views/form_view.js:123 +#, python-format +msgid "No data provided." +msgstr "데이터가 제공되지 않습니다." + +#. module: web +#. openerp-web +#: code:addons/web/static/src/js/views/graph_widget.js:88 #, python-format msgid "No data to display" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:695 +#: code:addons/web/static/src/xml/base.xml:641 #, python-format msgid "No data to display." msgstr "표시할 데이타가 없습니다." #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_common.js:246 +#: code:addons/web/static/src/js/views/form_common.js:243 #, python-format msgid "No results to show..." msgstr "표시할 결과가 없습니다..." #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:442 +#: code:addons/web/static/src/js/views/form_widgets.js:456 #, python-format msgid "No selected record" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:323 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:328 #, python-format msgid "No value found for the field for value " msgstr "이 필드용 값을 찾을 수 없습니다. " @@ -1542,21 +1521,21 @@ msgstr "보통" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:635 +#: code:addons/web/static/src/js/views/form_widgets.js:669 #, python-format msgid "Not Archived" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/graph_widget.js:235 +#: code:addons/web/static/src/js/views/graph_widget.js:226 #, python-format msgid "Not enough data points" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:833 +#: code:addons/web/static/src/xml/base.xml:838 #, python-format msgid "Not shown in kanban" msgstr "" @@ -1570,37 +1549,36 @@ msgstr "객체 :" #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/dialog.js:37 +#: code:addons/web/static/src/js/framework/dialog.js:36 #: model:ir.ui.view,arch_db:web.layout -#: model:ir.ui.view,arch_db:web.webclient_bootstrap #, python-format msgid "Odoo" msgstr "Odoo" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1358 +#: code:addons/web/static/src/xml/base.xml:101 #, python-format msgid "Odoo (Formerly OpenERP)" -msgstr "Odoo (구 OpenERP)" +msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/apps.js:192 +#: code:addons/web/static/src/js/apps.js:189 #, python-format msgid "Odoo Apps will be available soon" msgstr "Odoo 앱이 곧 사용가능해 질 것입니다" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_upgrade_widgets.js:53 +#: code:addons/web/static/src/js/views/form_widgets.js:1675 #, python-format msgid "Odoo Enterprise" -msgstr "" +msgstr "Odoo Enterprise" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1374 +#: code:addons/web/static/src/xml/base.xml:117 #, python-format msgid "Odoo S.A." msgstr "" @@ -1612,45 +1590,45 @@ msgstr "Odoo 웹 시험" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1374 +#: code:addons/web/static/src/xml/base.xml:117 #, python-format msgid "Odoo is a trademark of" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1376 +#: code:addons/web/static/src/xml/base.xml:119 #, python-format msgid "Odoo.com" -msgstr "Odoo.com" +msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:649 +#: code:addons/web/static/src/js/views/form_widgets.js:671 #, python-format msgid "Off" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/dialog.js:41 -#: code:addons/web/static/src/js/framework/dialog.js:159 -#: code:addons/web/static/src/js/framework/dialog.js:177 -#: code:addons/web/static/src/xml/base.xml:1228 +#: code:addons/web/static/src/js/framework/dialog.js:40 +#: code:addons/web/static/src/js/framework/dialog.js:152 +#: code:addons/web/static/src/js/framework/dialog.js:170 +#: code:addons/web/static/src/xml/base.xml:1356 #, python-format msgid "Ok" msgstr "OK" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:42 +#: code:addons/web/static/src/xml/base.xml:43 #, python-format -msgid "Old Password" +msgid "Old Password:" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:647 +#: code:addons/web/static/src/js/views/form_widgets.js:675 #, python-format msgid "On" msgstr "" @@ -1671,31 +1649,24 @@ msgstr "오직 정수 값만이 유효합니다." #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:561 +#: code:addons/web/static/src/xml/base.xml:557 #, python-format msgid "Only you" msgstr "개인용" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:162 -#, python-format -msgid "Open Developer Tools" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:182 +#: code:addons/web/static/src/xml/base.xml:198 #, python-format -msgid "Open View" +msgid "Open Debug Menu" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:150 -#: code:addons/web/static/src/js/views/form_relational_widgets.js:915 -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1095 -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1304 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:153 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:928 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1098 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1324 #, python-format msgid "Open: " msgstr "열기 : " @@ -1707,77 +1678,69 @@ msgstr "비밀번호" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:119 -#, python-format -msgid "Paste code here" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:199 -#, python-format -msgid "Path" -msgstr "경로" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:637 +#: code:addons/web/static/src/xml/base.xml:567 #, python-format msgid "Pie Chart" msgstr "원그래프" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/graph_widget.js:203 +#: code:addons/web/static/src/js/views/graph_widget.js:198 #, python-format -msgid "Pie chart cannot display all zero numbers.. Try to change your domain to display positive results" +msgid "" +"Pie chart cannot display all zero numbers.. Try to change your domain to " +"display positive results" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/graph_widget.js:196 +#: code:addons/web/static/src/js/views/graph_widget.js:191 #, python-format -msgid "Pie chart cannot mix positive and negative numbers. Try to change your domain to only display positive results" +msgid "" +"Pie chart cannot mix positive and negative numbers. Try to change your " +"domain to only display positive results" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/pivot_view.js:30 +#: code:addons/web/static/src/js/views/pivot_view.js:25 #, python-format msgid "Pivot" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/data_export.js:167 +#: code:addons/web/static/src/js/widgets/data_export.js:165 #, python-format msgid "Please enter save field list name" msgstr "저장 필드 목록명을 입력하십시오" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1216 +#: code:addons/web/static/src/xml/base.xml:1316 #, python-format msgid "Please note that only the selected ids will be exported." msgstr "선택한 ID만 내보내기함에 유의하십시오." #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1215 +#: code:addons/web/static/src/xml/base.xml:1313 #, python-format -msgid "Please pay attention that all records matching your search filter will be exported. Not only the selected ids." +msgid "" +"Please pay attention that all records matching your search filter will be " +"exported. Not only the selected ids." msgstr "선택한 ID뿐만이 아니라 검색 필터와 일치하는 모든 결과를 내보내는 것에 주의하십시오." #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/data_export.js:419 +#: code:addons/web/static/src/js/widgets/data_export.js:414 #, python-format msgid "Please select fields to export..." msgstr "내보낼 필드를 선택하십시오..." #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/data_export.js:405 +#: code:addons/web/static/src/js/widgets/data_export.js:401 #, python-format msgid "Please select fields to save export list..." msgstr "내보내기 목록을 저장할 필드를 선택하십시오..." @@ -1794,66 +1757,44 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1346 +#: code:addons/web/static/src/xml/base.xml:82 #, python-format msgid "Preferences" msgstr "기본 설정" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/sidebar.js:22 +#: code:addons/web/static/src/js/widgets/sidebar.js:23 #, python-format msgid "Print" msgstr "인쇄" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:242 +#: code:addons/web/static/src/xml/base.xml:175 #, python-format msgid "Print Workflow" msgstr "업무 흐름 인쇄" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:641 -#, python-format -msgid "Production Environment" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/views/graph_view.js:87 -#: code:addons/web/static/src/js/views/graph_widget.js:21 -#: code:addons/web/static/src/js/views/pivot_view.js:182 -#: code:addons/web/static/src/xml/base.xml:631 -#: code:addons/web/static/src/xml/base.xml:660 +#: code:addons/web/static/src/js/views/graph_view.js:90 +#: code:addons/web/static/src/js/views/graph_widget.js:16 +#: code:addons/web/static/src/xml/base.xml:578 +#: code:addons/web/static/src/xml/base.xml:610 #, python-format msgid "Quantity" msgstr "수량" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:682 +#: code:addons/web/static/src/xml/base.xml:627 #, python-format msgid "Quarter" msgstr "분기" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:121 -#, python-format -msgid "Register" -msgstr "등록" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:91 -#, python-format -msgid "Register your subscription" -msgstr "" - -#. module: web -#. openerp-web #: code:addons/web/static/src/xml/base_common.xml:79 #, python-format msgid "Relation:" @@ -1861,148 +1802,147 @@ msgstr "관계 :" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1198 +#: code:addons/web/static/src/xml/base.xml:1300 #, python-format msgid "Remove" msgstr "제거" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1199 +#: code:addons/web/static/src/xml/base.xml:1301 #, python-format msgid "Remove All" msgstr "모두 삭제" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:323 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:328 #, python-format msgid "Render" msgstr "화면 생성" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:94 +#: code:addons/web/static/src/js/views/form_widgets.js:382 #, python-format -msgid "Renew your subscription" -msgstr "" +msgid "Resource Error" +msgstr "리소스 에러" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:181 -#, python-format -msgid "Run JS Tests" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/views/form_common.js:874 -#: code:addons/web/static/src/xml/base.xml:432 -#: code:addons/web/static/src/xml/base.xml:510 -#: code:addons/web/static/src/xml/base.xml:1166 +#: code:addons/web/static/src/js/views/form_common.js:870 +#: code:addons/web/static/src/xml/base.xml:456 +#: code:addons/web/static/src/xml/base.xml:507 +#: code:addons/web/static/src/xml/base.xml:1253 #, python-format msgid "Save" msgstr "저장" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_common.js:889 +#: code:addons/web/static/src/js/views/form_common.js:885 #, python-format msgid "Save & New" msgstr "저장 및 신규 작성" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1133 -#: code:addons/web/static/src/xml/base.xml:931 +#: code:addons/web/static/src/xml/base.xml:1014 +#: code:addons/web/static/src/xml/base.xml:1016 +#, python-format +msgid "Save As" +msgstr "다른 이름으로 저장" + +#. module: web +#. openerp-web +#: code:addons/web/static/src/js/views/form_widgets.js:1204 #, python-format msgid "Save As..." msgstr "다른 이름으로 저장..." #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1228 +#: code:addons/web/static/src/xml/base.xml:1398 #, python-format msgid "Save as:" msgstr "다른 이름으로 저장 :" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1154 +#: code:addons/web/static/src/xml/base.xml:1245 #, python-format msgid "Save current search" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:1107 +#: code:addons/web/static/src/js/views/form_view.js:1134 #, python-format msgid "Save default" msgstr "기본 값 저장" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1205 +#: code:addons/web/static/src/xml/base.xml:1331 #, python-format msgid "Save fields list" msgstr "필드 목록 저장" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1231 +#: code:addons/web/static/src/xml/base.xml:1404 #, python-format msgid "Saved exports:" msgstr "저장된 내보내기 파일 :" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_inputs.js:351 +#: code:addons/web/static/src/js/views/search_inputs.js:349 #, python-format msgid "Search %(field)s at: %(value)s" msgstr "다음 위치에서 %(field)s 검색: %(value)s" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_inputs.js:193 -#: code:addons/web/static/src/js/views/search_inputs.js:212 -#: code:addons/web/static/src/js/views/search_inputs.js:393 +#: code:addons/web/static/src/js/views/search_inputs.js:191 +#: code:addons/web/static/src/js/views/search_inputs.js:210 +#: code:addons/web/static/src/js/views/search_inputs.js:391 #, python-format msgid "Search %(field)s for: %(value)s" msgstr "%(field)s에서 다음 검색: %(value)s" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_common.js:212 +#: code:addons/web/static/src/xml/base.xml:1077 #, python-format -msgid "Search More..." -msgstr "추가 검색..." +msgid "Search Again" +msgstr "다시 검색" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1000 +#: code:addons/web/static/src/js/views/form_common.js:209 #, python-format -msgid "Search..." -msgstr "검색..." +msgid "Search More..." +msgstr "추가 검색..." #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_common.js:282 +#: code:addons/web/static/src/js/views/form_common.js:279 #, python-format msgid "Search: " msgstr "검색 : " #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:430 +#: code:addons/web/static/src/js/views/form_widgets.js:444 #, python-format msgid "See selection " msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_common.js:1054 -#: code:addons/web/static/src/xml/base.xml:929 -#: code:addons/web/static/src/xml/base.xml:930 +#: code:addons/web/static/src/js/views/form_common.js:1043 +#: code:addons/web/static/src/xml/base.xml:1008 #, python-format msgid "Select" msgstr "선택하기" @@ -2014,35 +1954,21 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/debug_manager.js:181 -#, python-format -msgid "Select a view" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:444 -#, python-format -msgid "Select records " -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:454 +#: code:addons/web/static/src/js/views/form_widgets.js:468 #, python-format msgid "Select records..." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_common.js:1103 +#: code:addons/web/static/src/js/views/form_common.js:1078 #, python-format msgid "Selected domain" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:454 +#: code:addons/web/static/src/js/views/form_widgets.js:468 #, python-format msgid "Selected records" msgstr "" @@ -2056,35 +1982,35 @@ msgstr "선택 :" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:1104 +#: code:addons/web/static/src/js/views/form_view.js:1126 #, python-format msgid "Set Default" msgstr "기본 값 설정" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:239 +#: code:addons/web/static/src/xml/base.xml:163 #, python-format msgid "Set Defaults" msgstr "기본 값 설정" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:922 +#: code:addons/web/static/src/js/views/list_view.js:1013 #, python-format msgid "Setting 'id' attribute on existing record %s" msgstr "기존 %s 기록에 'id' 속성 설정" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1163 +#: code:addons/web/static/src/xml/base.xml:1207 #, python-format msgid "Share with all users" msgstr "모든 사용자들과 공유" #. module: web #. openerp-web -#: code:addons/web/static/src/js/apps.js:192 +#: code:addons/web/static/src/js/apps.js:189 #, python-format msgid "Showing locally available modules" msgstr "로컬로 사용 가능한 모듈 보기" @@ -2097,20 +2023,13 @@ msgid "Size:" msgstr "크기 :" #. module: web -#: code:addons/web/controllers/main.py:1057 +#: code:addons/web/controllers/main.py:1067 #, python-format msgid "Something horrible happened" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:110 -#, python-format -msgid "Something went wrong while registering your database. You can try again or contact our support at" -msgstr "" - -#. module: web -#. openerp-web #: code:addons/web/static/src/xml/base_common.xml:107 #, python-format msgid "Special:" @@ -2118,232 +2037,185 @@ msgstr "특별 :" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:183 -#, python-format -msgid "Start tour" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/framework/misc.js:14 +#: code:addons/web/static/src/js/framework/misc.js:15 #, python-format msgid "Still loading..." msgstr "아직 불러오는 중..." #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/misc.js:15 +#: code:addons/web/static/src/js/framework/misc.js:16 #, python-format msgid "Still loading...<br />Please be patient." msgstr "로딩 중입니다...<br />기다려 주세요." #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:116 -#, python-format -msgid "Subscription Code:" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:1343 +#: code:addons/web/static/src/xml/base.xml:83 #, python-format msgid "Support" -msgstr "지원" +msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:648 +#: code:addons/web/static/src/js/views/form_widgets.js:670 #, python-format msgid "Switch Off" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:650 +#: code:addons/web/static/src/js/views/form_widgets.js:672 #, python-format msgid "Switch On" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:644 -#, python-format -msgid "Switch to production environment" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:642 -#, python-format -msgid "Switch to test environment" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/framework/misc.js:18 +#: code:addons/web/static/src/js/framework/misc.js:19 #, python-format msgid "Take a minute to get a coffee,<br />because it's loading..." msgstr "불러오는 중이오니<br />커피 한 잔 하시면서 기다려 주십시오." #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:220 +#: code:addons/web/static/src/xml/base.xml:216 #, python-format msgid "Technical Translation" msgstr "기술 번역" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:643 -#, python-format -msgid "Test Environment" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:107 -#, python-format -msgid "Thank you, your registration was successful! Your database is valid until" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1133 +#: code:addons/web/static/src/js/views/form_widgets.js:1208 #, python-format msgid "The field is empty, there's nothing to save !" msgstr "필드가 비어 있어 저장할 것이 없습니다 !" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:866 +#: code:addons/web/static/src/js/views/form_view.js:939 #, python-format msgid "The following fields are invalid:" msgstr "다음 필드는 유효하지 않습니다 :" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view_editable.js:120 +#: code:addons/web/static/src/js/views/list_view_editable.js:121 #, python-format -msgid "The line has been modified, your changes will be discarded. Are you sure you want to discard the changes ?" +msgid "" +"The line has been modified, your changes will be discarded. Are you sure you" +" want to discard the changes ?" msgstr "" #. module: web -#: code:addons/web/controllers/main.py:745 +#: code:addons/web/controllers/main.py:831 #, python-format msgid "The new password and its confirmation must be identical." msgstr "새 비밀번호와 확인 비밀번호가 동일해야 합니다." #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1114 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1107 #, python-format msgid "The o2m record must be saved before an action can be used" msgstr "o2m 기록은 동작을 사용하기 전에 저장되어야 합니다." #. module: web -#: code:addons/web/controllers/main.py:751 +#: code:addons/web/controllers/main.py:837 #, python-format -msgid "The old password you provided is incorrect, your password was not changed." +msgid "" +"The old password you provided is incorrect, your password was not changed." msgstr "이전 암호를 틀렸습니다. 암호가 변경되지 않습니다." #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:308 +#: code:addons/web/static/src/js/views/form_view.js:357 #, python-format msgid "The record could not be found in the database." msgstr "데이터베이스에서 레코드를 찾을 수 없습니다." #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:738 +#: code:addons/web/static/src/js/views/form_view.js:802 #, python-format -msgid "The record has been modified, your changes will be discarded. Are you sure you want to leave this page ?" +msgid "" +"The record has been modified, your changes will be discarded. Are you sure " +"you want to leave this page ?" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1094 +#: code:addons/web/static/src/js/views/form_widgets.js:1172 #, python-format msgid "The selected file exceed the maximum file size of %s." msgstr "선택된 파일은 %s인 최대 파일 크기를 초과했습니다." #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1568 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1520 #, python-format -msgid "The type of the field '%s' must be a many2many field with a relation to 'ir.attachment' model." +msgid "" +"The type of the field '%s' must be a many2many field with a relation to " +"'ir.attachment' model." msgstr "'%s' 필드의 유형은 'ir.attachment' 모델과 관련된 many2many 필드여야 합니다." #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:1115 +#: code:addons/web/static/src/js/views/form_widgets.js:1193 #, python-format msgid "There was a problem while uploading your file" msgstr "파일 업로드 중 문제가 발생했습니다" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:85 -#, python-format -msgid "This database has expired." -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:81 -#, python-format -msgid "This database will expire in" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:78 +#: code:addons/web/static/src/js/views/search_menus.js:242 #, python-format -msgid "This demo database will expire in" -msgstr "" +msgid "" +"This filter is global and will be removed for everybody if you continue." +msgstr "이 필터는 글로벌이며 만약 계속한다면 모두에게 제거됩니다." #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_menus.js:244 +#: code:addons/web/static/src/js/views/form_widgets.js:382 #, python-format -msgid "This filter is global and will be removed for everybody if you continue." -msgstr "이 필터는 글로벌이며 만약 계속한다면 모두에게 제거됩니다." +msgid "This resource is empty" +msgstr "해당 리소스는 비어있습니다" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1172 +#: code:addons/web/static/src/xml/base.xml:1264 #, python-format msgid "" "This wizard will export all data that matches the current search criteria to a CSV file.\n" -" You can export all data or only the fields that can be reimported after modification." -msgstr "" +" You can export all data or only the fields that can be reimported after modification." +msgstr "해당 마법사는 현재 검색 조건과 일치하는 모든 데이터를 CSV 파일로 내보냅니다.\n 전체 데이터 또는 수정 후 다시 가져올 수 있는 필드만 내보낼 수 있습니다." #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:862 +#: code:addons/web/static/src/js/views/form_widgets.js:944 #, python-format -msgid "Timezone Mismatch : The timezone of your browser doesn't match the selected one. The time in Odoo is displayed according to your field timezone." +msgid "" +"Timezone Mismatch : The timezone of your browser doesn't match the selected " +"one. The time in Odoo is displayed according to your field timezone." msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:186 +#: code:addons/web/static/src/xml/base.xml:162 #, python-format -msgid "Toggle Timelines" -msgstr "" +msgid "Toggle Form Layout Outline" +msgstr "양식 배치 표식 전환" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/pivot_view.js:515 -#: code:addons/web/static/src/js/views/pivot_view.js:544 +#: code:addons/web/static/src/js/views/pivot_view.js:20 #, python-format msgid "Total" msgstr "총계" #. module: web #. openerp-web -#: code:addons/web/static/src/js/web_client.js:119 +#: code:addons/web/static/src/js/web_client.js:134 #, python-format msgid "Traceback:" msgstr "" @@ -2357,9 +2229,9 @@ msgstr "트리" #. module: web #. openerp-web -#: code:addons/web/static/src/js/web_client.js:213 +#: code:addons/web/static/src/js/framework/crash_manager.js:48 #, python-format -msgid "Trying to reconnect..." +msgid "Trying to reconnect... " msgstr "" #. module: web @@ -2371,110 +2243,111 @@ msgstr "유형 :" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:638 -#: code:addons/web/static/src/js/views/list_view.js:284 +#: code:addons/web/static/src/js/views/form_widgets.js:672 +#: code:addons/web/static/src/js/views/list_view.js:309 #, python-format msgid "Unarchive" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/graph_widget.js:78 -#: code:addons/web/static/src/js/views/list_view.js:1368 -#: code:addons/web/static/src/js/views/list_view.js:1374 -#: code:addons/web/static/src/js/views/list_view.js:1386 -#: code:addons/web/static/src/js/views/pivot_view.js:497 +#: code:addons/web/static/src/js/views/graph_widget.js:73 +#: code:addons/web/static/src/js/views/list_view.js:1463 +#: code:addons/web/static/src/js/views/list_view.js:1469 +#: code:addons/web/static/src/js/views/list_view.js:1481 +#: code:addons/web/static/src/js/views/pivot_view.js:494 #, python-format msgid "Undefined" msgstr "정의되지 않음" #. module: web -#: code:addons/web/controllers/main.py:872 +#: code:addons/web/controllers/main.py:958 #, python-format msgid "Underscore prefixed methods cannot be remotely called" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:703 +#: code:addons/web/static/src/xml/base.xml:650 #, python-format msgid "Unhandled widget" msgstr "처리되지 않은 위젯" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_widgets.js:801 +#: code:addons/web/static/src/js/views/form_widgets.js:884 #, python-format msgid "Unknown" msgstr "알 수 없음" #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/data.js:1076 +#: code:addons/web/static/src/js/framework/data.js:1075 #, python-format msgid "Unknown field %s in domain %s" msgstr "알 수 없는 %s 필드가 %s 도메인에 존재합니다" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:1075 +#: code:addons/web/static/src/js/views/list_view.js:1163 #, python-format msgid "Unknown m2m command %s" msgstr "알 수 없는 %s m2m 명령" #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/pyeval.js:961 +#: code:addons/web/static/src/js/framework/pyeval.js:949 #, python-format msgid "Unknown nonliteral type " msgstr "알 수 없는 비문자 유형 " #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/data.js:1068 +#: code:addons/web/static/src/js/framework/data.js:1067 #, python-format msgid "Unknown operator %s in domain %s" msgstr "알 수 없는 %s 작업자가 %s 도메인에 존재합니다" #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/data.js:1114 +#: code:addons/web/static/src/js/views/list_view.js:368 #, python-format -msgid "Unsupported operator %s in domain %s" -msgstr "지원되지 않는 %s 작업자가 %s 도메인에 있습니다" +msgid "Unlimited" +msgstr "무한" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1330 +#: code:addons/web/static/src/js/framework/data.js:1120 #, python-format -msgid "Update translations" -msgstr "" +msgid "Unsupported operator %s in domain %s" +msgstr "지원되지 않는 %s 작업자가 %s 도메인에 있습니다" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_upgrade_widgets.js:36 +#: code:addons/web/static/src/js/views/form_widgets.js:1658 #, python-format msgid "Upgrade now" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1405 +#: code:addons/web/static/src/xml/base.xml:1506 #, python-format msgid "Upgrade to future versions" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:929 +#: code:addons/web/static/src/xml/base.xml:970 +#: code:addons/web/static/src/xml/base.xml:1031 #, python-format -msgid "Upload your file" -msgstr "" +msgid "Uploading ..." +msgstr "업로드 중 ..." #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:1627 -#: code:addons/web/static/src/js/widgets/sidebar.js:170 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:1633 +#: code:addons/web/static/src/js/widgets/sidebar.js:168 #, python-format msgid "Uploading Error" msgstr "업로드 에러" @@ -2482,15 +2355,13 @@ msgstr "업로드 에러" #. module: web #. openerp-web #: code:addons/web/static/src/js/widgets/sidebar.js:196 -#: code:addons/web/static/src/xml/base.xml:904 -#: code:addons/web/static/src/xml/base.xml:934 #, python-format msgid "Uploading..." msgstr "업로드 중…" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1160 +#: code:addons/web/static/src/xml/base.xml:1204 #, python-format msgid "Use by default" msgstr "기본으로 사용" @@ -2504,10 +2375,10 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:1362 +#: code:addons/web/static/src/xml/base.xml:105 #, python-format msgid "Version" -msgstr "버전" +msgstr "" #. module: web #. openerp-web @@ -2518,29 +2389,29 @@ msgstr "매우 높음" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:1913 -#: code:addons/web/static/src/xml/base.xml:247 +#: code:addons/web/static/src/js/views/list_view.js:2024 +#: code:addons/web/static/src/xml/base.xml:171 #, python-format msgid "View" msgstr "화면" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:217 +#: code:addons/web/static/src/xml/base.xml:166 #, python-format msgid "View Fields" msgstr "필드 화면" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:241 +#: code:addons/web/static/src/xml/base.xml:161 #, python-format msgid "View Metadata" msgstr "메타데이타 보기" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:735 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:746 #, python-format msgid "View type '%s' is not supported in X2Many." msgstr "" @@ -2549,24 +2420,24 @@ msgstr "" #. openerp-web #: code:addons/web/static/src/js/framework/crash_manager.js:19 #: code:addons/web/static/src/js/framework/crash_manager.js:20 -#: code:addons/web/static/src/js/framework/crash_manager.js:114 -#: code:addons/web/static/src/js/views/form_view.js:743 -#: code:addons/web/static/src/js/views/list_view.js:667 -#: code:addons/web/static/src/js/widgets/sidebar.js:128 +#: code:addons/web/static/src/js/framework/crash_manager.js:119 +#: code:addons/web/static/src/js/views/form_view.js:807 +#: code:addons/web/static/src/js/views/list_view.js:756 +#: code:addons/web/static/src/js/widgets/sidebar.js:126 #, python-format msgid "Warning" msgstr "경고" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:680 +#: code:addons/web/static/src/xml/base.xml:625 #, python-format msgid "Week" msgstr "주" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_view.js:1283 +#: code:addons/web/static/src/js/views/form_view.js:1296 #, python-format msgid "Widget type '%s' is not implemented" msgstr "'%s' 위젯 유형은 구현되지 않습니다." @@ -2580,28 +2451,28 @@ msgstr "위젯 :" #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/progress_bar.js:79 +#: code:addons/web/static/src/js/widgets/progress_bar.js:76 #, python-format msgid "Wrong value entered!" msgstr "잘못된 값을 입력!" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:259 +#: code:addons/web/static/src/xml/base.xml:188 #, python-format msgid "XML ID:" msgstr "XML ID :" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:683 +#: code:addons/web/static/src/xml/base.xml:628 #, python-format msgid "Year" msgstr "년" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_inputs.js:331 +#: code:addons/web/static/src/js/views/search_inputs.js:329 #: code:addons/web/static/src/xml/base_common.xml:71 #, python-format msgid "Yes" @@ -2609,82 +2480,55 @@ msgstr "네" #. module: web #. openerp-web -#: code:addons/web/static/src/js/web_client.js:222 +#: code:addons/web/static/src/js/framework/crash_manager.js:53 #, python-format msgid "You are back online" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/form_relational_widgets.js:47 +#: code:addons/web/static/src/js/views/form_relational_widgets.js:49 #, python-format msgid "You are creating a new %s, are you sure it does not exist yet?" msgstr "새 %s를 생성하려고 합니다. 아직 없는 것이 확실한가요?" #. module: web -#: code:addons/web/controllers/main.py:743 +#: code:addons/web/controllers/main.py:829 #, python-format msgid "You cannot leave any password empty." msgstr "비밀번호는 비워둘 수 없습니다." #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:96 -#, python-format -msgid "You have more users than your subscription allows." -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/xml/base.xml:1328 -#, python-format -msgid "You have updated" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/framework/misc.js:17 +#: code:addons/web/static/src/js/framework/misc.js:18 #, python-format -msgid "You may not believe it,<br />but the application is actually loading..." +msgid "" +"You may not believe it,<br />but the application is actually loading..." msgstr "믿기시지 않겠지만<br />응용 프로그램을 실제로 불러오는 중입니다..." #. module: web #. openerp-web -#: code:addons/web/static/src/js/widgets/sidebar.js:128 +#: code:addons/web/static/src/js/widgets/sidebar.js:126 #, python-format msgid "You must choose at least one record." msgstr "최소 한 개의 기록을 선택해야 합니다." #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/list_view.js:667 +#: code:addons/web/static/src/js/views/list_view.js:756 #, python-format msgid "You must select at least one record." msgstr "최소한 하나의 기록을 선택해야 합니다." #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:67 -#, python-format -msgid "You will be able to register your database once you have installed your first app." -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/framework/crash_manager.js:64 +#: code:addons/web/static/src/js/framework/crash_manager.js:69 #, python-format msgid "Your Odoo session expired. Please refresh the current web page." msgstr "사용자의 Odoo 세션이 만료되었습니다. 현재 웹 페이지를 새로 고침하십시오." #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:119 -#, python-format -msgid "Your subscription code" -msgstr "" - -#. module: web -#. openerp-web #: code:addons/web/static/src/js/framework/core.js:133 #, python-format msgid "a day ago" @@ -2720,133 +2564,112 @@ msgstr "약 1시간 전" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:91 -#, python-format -msgid "buy a subscription" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/views/search_filters.js:163 +#: code:addons/web/static/src/js/views/search_filters.js:160 #, python-format msgid "contains" msgstr "포함" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:75 -#, python-format -msgid "days" -msgstr "일" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/views/search_filters.js:164 +#: code:addons/web/static/src/js/views/search_filters.js:161 #, python-format msgid "doesn't contain" msgstr "포함안함" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_filters.js:180 -#: code:addons/web/static/src/js/views/search_filters.js:218 -#: code:addons/web/static/src/js/views/search_filters.js:247 +#: code:addons/web/static/src/js/views/search_filters.js:177 +#: code:addons/web/static/src/js/views/search_filters.js:211 +#: code:addons/web/static/src/js/views/search_filters.js:240 #, python-format msgid "greater than" msgstr "보다 큼" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_filters.js:182 -#: code:addons/web/static/src/js/views/search_filters.js:220 -#: code:addons/web/static/src/js/views/search_filters.js:249 +#: code:addons/web/static/src/js/views/search_filters.js:179 +#: code:addons/web/static/src/js/views/search_filters.js:213 +#: code:addons/web/static/src/js/views/search_filters.js:242 #, python-format msgid "greater than or equal to" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_filters.js:239 -#: code:addons/web/static/src/js/views/search_filters.js:274 +#: code:addons/web/static/src/js/views/search_filters.js:232 +#: code:addons/web/static/src/js/views/search_filters.js:267 #, python-format msgid "is" msgstr "같음" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_filters.js:165 -#: code:addons/web/static/src/js/views/search_filters.js:178 -#: code:addons/web/static/src/js/views/search_filters.js:216 -#: code:addons/web/static/src/js/views/search_filters.js:245 +#: code:addons/web/static/src/js/views/search_filters.js:162 +#: code:addons/web/static/src/js/views/search_filters.js:175 +#: code:addons/web/static/src/js/views/search_filters.js:209 +#: code:addons/web/static/src/js/views/search_filters.js:238 #, python-format msgid "is equal to" msgstr "같음" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_filters.js:293 +#: code:addons/web/static/src/js/views/search_filters.js:286 #, python-format msgid "is false" msgstr "거짓" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_filters.js:275 +#: code:addons/web/static/src/js/views/search_filters.js:268 #, python-format msgid "is not" msgstr "일치하지 않음" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_filters.js:166 -#: code:addons/web/static/src/js/views/search_filters.js:179 -#: code:addons/web/static/src/js/views/search_filters.js:217 -#: code:addons/web/static/src/js/views/search_filters.js:246 +#: code:addons/web/static/src/js/views/search_filters.js:163 +#: code:addons/web/static/src/js/views/search_filters.js:176 +#: code:addons/web/static/src/js/views/search_filters.js:210 +#: code:addons/web/static/src/js/views/search_filters.js:239 #, python-format msgid "is not equal to" msgstr "같지 않음" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_filters.js:168 -#: code:addons/web/static/src/js/views/search_filters.js:185 -#: code:addons/web/static/src/js/views/search_filters.js:223 -#: code:addons/web/static/src/js/views/search_filters.js:252 -#: code:addons/web/static/src/js/views/search_filters.js:277 +#: code:addons/web/static/src/js/views/search_filters.js:165 +#: code:addons/web/static/src/js/views/search_filters.js:182 +#: code:addons/web/static/src/js/views/search_filters.js:216 +#: code:addons/web/static/src/js/views/search_filters.js:245 +#: code:addons/web/static/src/js/views/search_filters.js:270 #, python-format msgid "is not set" msgstr "설정되지 않음" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_filters.js:167 -#: code:addons/web/static/src/js/views/search_filters.js:184 -#: code:addons/web/static/src/js/views/search_filters.js:222 -#: code:addons/web/static/src/js/views/search_filters.js:251 -#: code:addons/web/static/src/js/views/search_filters.js:276 +#: code:addons/web/static/src/js/views/search_filters.js:164 +#: code:addons/web/static/src/js/views/search_filters.js:181 +#: code:addons/web/static/src/js/views/search_filters.js:215 +#: code:addons/web/static/src/js/views/search_filters.js:244 +#: code:addons/web/static/src/js/views/search_filters.js:269 #, python-format msgid "is set" msgstr "설정됨" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_filters.js:292 +#: code:addons/web/static/src/js/views/search_filters.js:285 #, python-format msgid "is true" msgstr "참" #. module: web #. openerp-web -#: code:addons/web/static/src/js/framework/utils.js:303 -#, python-format -msgid "kMGTPE" -msgstr "" - -#. module: web -#. openerp-web -#: code:addons/web/static/src/js/views/search_filters.js:181 -#: code:addons/web/static/src/js/views/search_filters.js:219 -#: code:addons/web/static/src/js/views/search_filters.js:248 +#: code:addons/web/static/src/js/views/search_filters.js:178 +#: code:addons/web/static/src/js/views/search_filters.js:212 +#: code:addons/web/static/src/js/views/search_filters.js:241 #, python-format msgid "less than" msgstr "보다 작음" @@ -2860,31 +2683,30 @@ msgstr "1분 전" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_filters.js:183 -#: code:addons/web/static/src/js/views/search_filters.js:221 -#: code:addons/web/static/src/js/views/search_filters.js:250 +#: code:addons/web/static/src/js/views/search_filters.js:180 +#: code:addons/web/static/src/js/views/search_filters.js:214 +#: code:addons/web/static/src/js/views/search_filters.js:243 #, python-format msgid "less than or equal to" msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_inputs.js:231 +#: code:addons/web/static/src/js/views/search_inputs.js:229 #, python-format msgid "not a valid integer" msgstr "유효하지 않은 정수" #. module: web #. openerp-web -#: code:addons/web/static/src/js/views/search_inputs.js:246 +#: code:addons/web/static/src/js/views/search_inputs.js:244 #, python-format msgid "not a valid number" msgstr "유효한 숫자가 아님" #. module: web #. openerp-web -#: code:addons/web/static/src/xml/base.xml:91 -#: code:addons/web/static/src/xml/base.xml:1095 +#: code:addons/web/static/src/xml/base.xml:1214 #: code:addons/web/static/src/xml/website.tour.xml:14 #, python-format msgid "or" diff --git a/addons/web/i18n/mk.po b/addons/web/i18n/mk.po index fbeb0917e80..43af44cc85a 100644 --- a/addons/web/i18n/mk.po +++ b/addons/web/i18n/mk.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-18 04:43+0000\n" -"PO-Revision-Date: 2016-04-22 13:33+0000\n" +"PO-Revision-Date: 2016-04-27 13:30+0000\n" "Last-Translator: Aleksandar Vangelovski <aleksandarv@hbee.eu>\n" "Language-Team: Macedonian (http://www.transifex.com/odoo/odoo-9/language/mk/)\n" "MIME-Version: 1.0\n" @@ -412,7 +412,7 @@ msgstr "Архивирано" #: code:addons/web/static/src/js/views/search_menus.js:243 #, python-format msgid "Are you sure that you want to remove this filter?" -msgstr "" +msgstr "Дали сте сигурни дека сакате да го отстраните овој филтер?" #. module: web #. openerp-web @@ -704,7 +704,7 @@ msgstr "Ден" #: code:addons/web/static/src/js/views/form_widgets.js:658 #, python-format msgid "Deactivate" -msgstr "" +msgstr "Деактивирај" #. module: web #. openerp-web diff --git a/addons/web/i18n/web.pot b/addons/web/i18n/web.pot index ef907f9e42e..b9733001727 100644 --- a/addons/web/i18n/web.pot +++ b/addons/web/i18n/web.pot @@ -2582,6 +2582,12 @@ msgid "XML ID:" msgstr "" #. module: web +#: code:addons/web/controllers/main.py:513 +#, python-format +msgid "Wrong login/password" +msgstr "" + +#. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:683 #, python-format diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po index 692ed80d2b5..7274c8a65a0 100644 --- a/addons/web/i18n/zh_CN.po +++ b/addons/web/i18n/zh_CN.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-18 04:43+0000\n" -"PO-Revision-Date: 2016-04-15 11:50+0000\n" +"PO-Revision-Date: 2016-05-02 09:44+0000\n" "Last-Translator: Jeffery Chenn <jeffery9@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -193,7 +193,7 @@ msgstr "'%s' 无法转换为日期，日期时间 和 时间" #: code:addons/web/static/src/js/framework/formats.js:77 #, python-format msgid "(%d records)" -msgstr "（%d 条记录）" +msgstr "(%d 条记录)" #. module: web #. openerp-web @@ -281,14 +281,14 @@ msgstr "动作" #: code:addons/web/static/src/js/views/form_relational_widgets.js:1106 #, python-format msgid "Action Button" -msgstr "动作 按钮" +msgstr "动作按钮" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base_common.xml:120 #, python-format msgid "Action ID:" -msgstr "动作ID" +msgstr "动作ID:" #. module: web #. openerp-web @@ -332,14 +332,14 @@ msgstr "增加自定义筛选" #: code:addons/web/static/src/xml/base.xml:1217 #, python-format msgid "Add a condition" -msgstr "添加一个条件" +msgstr "添加条件" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/form_relational_widgets.js:1016 #, python-format msgid "Add an item" -msgstr "添加一个项目" +msgstr "添加项目" #. module: web #. openerp-web @@ -488,7 +488,7 @@ msgstr "不能转换值 %s 到 context" #: code:addons/web/static/src/js/views/form_widgets.js:352 #, python-format msgid "Can't send email to invalid e-mail address" -msgstr "不能发送email到非法的email地址" +msgstr "不能发送电子邮件到非法email地址" #. module: web #. openerp-web @@ -601,7 +601,7 @@ msgstr "不能显示选择的图片。" #: code:addons/web/static/src/js/views/list_view.js:1110 #, python-format msgid "Could not find id in dataset" -msgstr "不能在数据集中找到此 ID" +msgstr "数据集中找不到此 ID" #. module: web #. openerp-web @@ -1401,7 +1401,7 @@ msgstr "将鼠标在这里打开插入块" #: code:addons/web/static/src/xml/base.xml:83 #, python-format msgid "My Odoo.com account" -msgstr "我的 Odoo.com 帐号" +msgstr "我的Odoo.com帐号" #. module: web #. openerp-web diff --git a/addons/web/static/src/js/views/list_view_editable.js b/addons/web/static/src/js/views/list_view_editable.js index f4a4c695334..02f810e5c66 100644 --- a/addons/web/static/src/js/views/list_view_editable.js +++ b/addons/web/static/src/js/views/list_view_editable.js @@ -725,13 +725,13 @@ ListView.include(/** @lends instance.web.ListView# */{ keyup_UP: function (e) { var self = this; return this._key_move_record(e, 'pred', function (el, cursor) { - return self._at_start(cursor, el); + return self._at_start(cursor, el) && !$(el).is('select,.ui-autocomplete-input'); }); }, keyup_DOWN: function (e) { var self = this; return this._key_move_record(e, 'succ', function (el, cursor) { - return self._at_end(cursor, el); + return self._at_end(cursor, el) && !$(el).is('select,.ui-autocomplete-input'); }); }, |