Merge pull request #2045 from openNAMU/dev

전체적인 번역 추가

lang/en-US.json

@@ -247,6 +247,8 @@
         "document_set" : "Document settings",
         "user_added_menu" : "User added menu",
         "move_redirect_make" : "Redirect document generation (Only if possible)",
+        "redirect" : "Redirect",
+        "new_doc" : "New document(s)",
         "user_fix" : "Fix user",
         "main_user_name" : "Main user name",
         "change_user_name" : "Change main user name",
@@ -255,6 +257,15 @@
         "challenge_and_level_manage" : "Challenges and level management",
         "bbs_record" : "BBS post(s) record",
         "bbs_comment_record" : "BBS comment(s) record",
+        "load_temp_save" : "Temporary save",
+        "load_temp_save_load" : "Load temporary save",
+        "bbs_comment_delete" : "Delete BBS comment",
+        "bbs_post_pinned" : "Pin BBS post",
+        "bbs_post_delete" : "Delete BBS post",
+        "outer_link_filter_list" : "External link auto image list",
+        "html_or_link" : "HTML or link",
+        "template_document_list" : "Template document(s) list",
+        "no_link_document_list" : "List of document(s) without link",
         "_comment_" : "BBS",
             "bbs" : "BBS",
             "bbs_main" : "BBS main",
@@ -406,7 +417,7 @@
                 "slow_thread" : "Continuous thread upload limit",
                 "edit_timeout" : "render timeout",
                 "display_level_in_user_name" : "Displaying levels in username",
-                "ua_expiration_date" : "UA Expiration deadline",
+                "ua_expiration_date" : "UA expiration deadline",
                 "document_content_max_length" : "Maximum document length",
             "_comment_" : "Text",
                 "register_text" : "Terms of sign-up",
@@ -459,12 +470,17 @@
             "admin_list" : "Administrator(s) list",
             "member_list" : "Member(s) list",
             "authority_use_list" : "Authority use list",
+            "authority_use_list_off" : "Authority use list off",
+            "authority_use_list_expiration_date" : "Authority use list expiration deadline",
             "admin_group_list" : "Administrator group(s) list",
             "all_document_list" : "All document(s) list",
             "watchlist" : "Watchlist",
             "image_file_list" : "Image file(s) list",
             "short_page" : "Short page(s) list",
             "long_page" : "Long page(s) list",
+            "bbs_help" : "BBS editor help",
+            "bbs_comment_help" : "BBS comment editor help",
+            "outdated_doc_warning" : "Out of date document warning",
             "_comment_2.3.1_" : "ACL document list",
                 "acl_document_list" : "ACL document(s) list",
                 "acl_required" : "Required ACL",

lang/ko-KR.json

@@ -533,7 +533,7 @@
     "image_paste": "이미지 붙여넣기 (컨트롤 C + V로)",
     "monaco_editor": "모나코 에디터",
     "document_set": "문서 설정",
-    "move_redirect_make": "리다이렉트 문서 생성 (가능한 경우에만)",
+    "move_redirect_make": "넘겨주기 문서 생성 (가능한 경우에만)",
     "slow_edit_acl": "편집 속도 제한 시간 제외 대상 ACL",
     "edit_bottom_compulsion_acl": "편집 사유 필수 제외 대상 ACL",
     "main_skin_set_default": "기본 스킨 설정 기본값",
@@ -570,13 +570,13 @@
     "main_user_name": "메인 사용자명",
     "change_user_name": "메인 사용자명 변경",
     "last_comment_time": "마지막 댓글 시간",
-    "bbs_comment_tool": "BBS 댓글 도구",
-    "bbs_comment_edit": "BBS 댓글 수정",
-    "move_with_redirect": "문서 이동시 리다이렉트 문서 생성",
+    "bbs_comment_tool": "게시판 댓글 도구",
+    "bbs_comment_edit": "게시판 댓글 수정",
+    "move_with_redirect": "문서 이동시 넘겨주기 문서 생성",
     "slow_thread": "토론 올리기 제한 시간",
     "edit_timeout": "렌더링 제한 시간",
     "linux_only": "리눅스 OS 전용",
-    "bbs_post_tool": "BBS 게시글 도구",
+    "bbs_post_tool": "게시판 게시글 도구",
     "position": "위치",
     "category_change_title": "분류 내 문서명 변경 금지",
     "table_scroll": "표에 스크롤 사용",
@@ -599,5 +599,21 @@
     "backup" : "백업",
     "document_content_max_length" : "문서 최대 길이",
     "bbs_record" : "게시판 작성글 목록",
-    "bbs_comment_record" : "게시판 작성댓글 목록"
+    "bbs_comment_record" : "게시판 작성댓글 목록",
+    "load_temp_save" : "임시 저장",
+    "load_temp_save_load" : "임시 저장 불러오기",
+    "bbs_comment_delete" : "게시판 댓글 삭제",
+    "bbs_post_pinned" : "게시판 게시글 고정",
+    "bbs_post_delete" : "게시판 게시글 삭제",
+    "outer_link_filter_list" : "외부 링크 자동 이미지 목록",
+    "html_or_link" : "HTML 혹은 링크",
+    "template_document_list" : "템플릿 문서 목록",
+    "no_link_document_list" : "링크가 없는 문서 목록",
+    "authority_use_list_off" : "권한 사용 목록 끄기",
+    "authority_use_list_expiration_date" : "권한 사용 목록 만료 기한",
+    "bbs_help" : "게시판 편집기 도움말",
+    "bbs_comment_help" : "게시판 댓글 편집기 도움말",
+    "outdated_doc_warning" : "오래된 문서 경고",
+    "redirect" : "넘겨주기",
+    "new_doc" : "새 문서"
 }

route/bbs_w_delete.py

@@ -49,9 +49,9 @@ def bbs_w_delete(bbs_num = '', post_num = '', comment_num = ''):
             sub = '(' + bbs_name + ')'
             sub += ' (' + post_num_str + ')'
             
-            name = load_lang('bbs_post_delete')
+            name = load_lang('bbs_comment_delete')
             if comment_num == '':
-                name = load_lang('bbs_comment_delete')
+                name = load_lang('bbs_post_delete')
             else:
                 sub += ' (' + comment_num + ')'
 

route/bbs_w_set.py

@@ -37,7 +37,7 @@ def bbs_w_set(bbs_num = ''):
                 disable = 'disabled'
             else:
                 disable = ''
-                other_menu += [['bbs/hide/' + bbs_num_str, load_lang('hide')], ['bbs/delete/' + bbs_num_str, load_lang('delete')]]
+                other_menu += [['bbs/delete/' + bbs_num_str, load_lang('delete')]]
 
             for for_a in range(len(i_list)):
                 curs.execute(db_change('select set_data from bbs_set where set_name = ? and set_id = ?'), [i_list[for_a], bbs_num])

route/bbs_w_tool.py

@@ -23,7 +23,7 @@ def bbs_w_tool(bbs_num = '', post_num = ''):
             data += '''
                 <h3>''' + load_lang('admin') + '''</h3>
                 <ul class="opennamu_ul">
-                    <li><a href="/bbs/blind/''' + url_pas(bbs_num_str) + '/' + url_pas(post_num_str) + '">' + load_lang('hide') + '''</a></li>
+                    <!-- <li><a href="/bbs/blind/''' + url_pas(bbs_num_str) + '/' + url_pas(post_num_str) + '">' + load_lang('hide') + '''</a></li> -->
                     <li><a href="/bbs/pinned/''' + url_pas(bbs_num_str) + '/' + url_pas(post_num_str) + '">' + pinned + '''</a></li>
                 </ul>
             '''

route/filter_all_add.py

@@ -139,7 +139,7 @@ def filter_all_add(tool, name = None):
                     <hr class="main_hr">
                     <input value="''' + html.escape(value[1]) + '''" type="text" name="link">
                     <hr class="main_hr">
-                    ''' + load_lang('icon') + ''' (''' + ('HTML' if tool == 'inter_wiki' else load_lang('html_or_link')) + ''') (''' + load_lang('link') + ' EX' + ''' : /image/Test.svg)
+                    ''' + load_lang('icon') + ''' (''' + ('HTML' if tool == 'inter_wiki' else load_lang('html_or_link')) + ''') (''' + load_lang('link') + ' - EX' + ''' : /image/Test.svg)
                     <hr class="main_hr">
                     <input value="''' + html.escape(value[2]) + '''" type="text" name="icon">
                     ''' + select + '''

route/main_setting_main.py

@@ -167,12 +167,12 @@ def main_setting_main(db_set):
                         <hr class="main_hr">
                         <input type="password" name="wiki_access_password" value="''' + html.escape(d_list[32]) + '''">
                         
-                        <h3>''' + load_lang('auth_history') + '''</h3>
+                        <h3>''' + load_lang('authority_use_list') + '''</h3>
                         
-                        <input type="checkbox" name="auth_history_off" ''' + check_box_div[14] + '''> ''' + load_lang('auth_history_off') + '''
+                        <input type="checkbox" name="auth_history_off" ''' + check_box_div[14] + '''> ''' + load_lang('authority_use_list_off') + '''
                         <hr class="main_hr">
                         
-                        <span>''' + load_lang('auth_history_expiration_date') + '''</span> (''' + load_lang('day') + ''') (''' + load_lang('off') + ''' : ''' + load_lang('empty') + ''')
+                        <span>''' + load_lang('authority_use_list_expiration_date') + '''</span> (''' + load_lang('day') + ''') (''' + load_lang('off') + ''' : ''' + load_lang('empty') + ''')
                         <hr class="main_hr">
                         <input name="auth_history_expiration_date" value="''' + html.escape(d_list[43]) + '''">
                         <hr class="main_hr">

route/main_setting_phrase.py

@@ -132,7 +132,7 @@ def main_setting_phrase():
                         <textarea class="opennamu_textarea_100" name="''' + i_list[22] + '''">''' + html.escape(d_list[22]) + '''</textarea>
 
                         <h2>''' + load_lang('outdated_doc_warning') + '''  (HTML)</h2>
-                        <span>''' + load_lang('period') + '''</span> (''' + load_lang('off') + ''' : ''' + load_lang('empty') + ''')
+                        <span>''' + load_lang('period') + '''</span> (''' + load_lang('day') + ''') (''' + load_lang('off') + ''' : ''' + load_lang('empty') + ''')
                         <hr class="main_hr">
                         <input name="''' + i_list[24] + '''" value="''' + html.escape(d_list[24]) + '''">
                         <hr class="main_hr">