rebase translations

2 files changed, 342 insertions, 295 deletions

diff --git a/locale/ko_KR/LC_MESSAGES/messages.mo b/locale/ko_KR/LC_MESSAGES/messages.mo
index 18fa98d1d..c808e5b86 100644
--- a/locale/ko_KR/LC_MESSAGES/messages.mo
+++ b/locale/ko_KR/LC_MESSAGES/messages.mo
diff --git a/locale/ko_KR/LC_MESSAGES/messages.po b/locale/ko_KR/LC_MESSAGES/messages.po
index ecc3fedfe..33298b43b 100644
--- a/locale/ko_KR/LC_MESSAGES/messages.po
+++ b/locale/ko_KR/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss unstable\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-21 14:06+0300\n"
+"POT-Creation-Date: 2019-02-22 06:38+0300\n"
 "PO-Revision-Date: 2014-11-04 12:05+0900\n"
 "Last-Translator: YoungMin Park <[email protected]>\n"
 "Language-Team: YoungMin Park <[email protected]>\n"
@@ -355,7 +355,7 @@ msgstr "로그아웃"
 #: prefs.php:33
 #: prefs.php:130
 #: include/functions.php:1201
-#: classes/pref/prefs.php:428
+#: classes/pref/prefs.php:471
 msgid "Preferences"
 msgstr "설정"
 
@@ -371,6 +371,7 @@ msgstr "설정 완료"
 #: classes/pref/feeds.php:127
 #: classes/pref/feeds.php:1226
 #: classes/pref/feeds.php:1280
+#: classes/pref/prefs.php:28
 msgid "Feeds"
 msgstr "피드"
 
@@ -381,7 +382,7 @@ msgstr "필터"
 
 #: prefs.php:141
 #: classes/pref/labels.php:91
-#: classes/feeds.php:1424
+#: classes/feeds.php:1423
 msgid "Labels"
 msgstr "라벨"
 
@@ -482,7 +483,7 @@ msgstr "모든 피드"
 #: classes/opml.php:508
 #: classes/digest.php:124
 #: classes/pref/feeds.php:246
-#: classes/feeds.php:1436
+#: classes/feeds.php:1435
 msgid "Uncategorized"
 msgstr "카테고리 없음"
 
@@ -550,17 +551,17 @@ msgid "Article"
 msgstr "글"
 
 #: include/functions.php:1159
-#: js/Headlines.js:1246
+#: js/Headlines.js:1232
 msgid "Toggle starred"
 msgstr "중요 표시"
 
 #: include/functions.php:1160
-#: js/Headlines.js:1258
+#: js/Headlines.js:1244
 msgid "Toggle published"
 msgstr "공개 설정"
 
 #: include/functions.php:1161
-#: js/Headlines.js:1233
+#: js/Headlines.js:1219
 msgid "Toggle unread"
 msgstr "읽지 않음 표시"
 
@@ -573,12 +574,12 @@ msgid "Open in new window"
 msgstr "새창에서 열기"
 
 #: include/functions.php:1164
-#: js/Headlines.js:1279
+#: js/Headlines.js:1265
 msgid "Mark below as read"
 msgstr "아래 글 읽음 표시"
 
 #: include/functions.php:1165
-#: js/Headlines.js:1272
+#: js/Headlines.js:1258
 msgid "Mark above as read"
 msgstr "위 글 읽음 표시"
 
@@ -658,7 +659,7 @@ msgid "Subscribe to feed"
 msgstr "피드 구독"
 
 #: include/functions.php:1185
-#: js/Headlines.js:1396
+#: js/Headlines.js:1382
 #: js/PrefFeedTree.js:56
 #: js/FeedTree.js:62
 msgid "Edit feed"
@@ -703,7 +704,7 @@ msgid "Go to"
 msgstr "이동"
 
 #: include/functions.php:1196
-#: classes/feeds.php:1297
+#: classes/feeds.php:1296
 msgid "All articles"
 msgstr "전체 글"
 
@@ -793,7 +794,7 @@ msgstr "프로필:"
 
 #: include/login_form.php:103
 #: classes/handler/public.php:280
-#: classes/pref/prefs.php:1030
+#: classes/pref/prefs.php:1096
 #: classes/rpc.php:69
 msgid "Default profile"
 msgstr "기본 프로필"
@@ -849,7 +850,7 @@ msgstr "이 글의 태그 (쉼표로 구분)"
 #: classes/pref/feeds.php:832
 #: classes/pref/feeds.php:1001
 #: classes/pref/filters.php:511
-#: classes/pref/prefs.php:981
+#: classes/pref/prefs.php:1047
 #: plugins/nsfw/init.php:86
 #: plugins/note/init.php:56
 #: plugins/af_readability/init.php:81
@@ -866,15 +867,15 @@ msgstr "저장"
 #: classes/pref/users.php:110
 #: classes/pref/feeds.php:833
 #: classes/pref/feeds.php:1004
-#: classes/pref/feeds.php:1755
+#: classes/pref/feeds.php:1748
 #: classes/pref/filters.php:514
 #: classes/pref/filters.php:950
-#: classes/pref/filters.php:1028
-#: classes/pref/filters.php:1121
-#: classes/pref/prefs.php:983
+#: classes/pref/filters.php:1029
+#: classes/pref/filters.php:1122
+#: classes/pref/prefs.php:1049
 #: classes/feeds.php:720
 #: classes/feeds.php:772
-#: classes/feeds.php:815
+#: classes/feeds.php:814
 #: plugins/note/init.php:58
 #: plugins/mail/init.php:179
 msgid "Cancel"
@@ -963,37 +964,41 @@ msgstr "오류: 이동된 OPML 파일을 찾을 수 없습니다."
 msgid "Error while parsing document."
 msgstr "문서 분석중에 오류가 발생했습니다."
 
-#: classes/backend.php:31
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
-msgstr ""
-
-#: classes/backend.php:36
+#: classes/backend.php:32
 msgid "Keyboard Shortcuts"
 msgstr "키보드 단축키"
 
-#: classes/backend.php:60
+#: classes/backend.php:56
+#: classes/backend.php:125
 msgid "Shift"
 msgstr ""
 
-#: classes/backend.php:63
+#: classes/backend.php:59
+#: classes/backend.php:128
 msgid "Ctrl"
 msgstr ""
 
-#: classes/backend.php:98
-msgid "Help topic not found."
-msgstr "도움말 주제가 없습니다."
+#: classes/backend.php:154
+#: classes/dlg.php:183
+#: classes/pref/filters.php:1023
+#: classes/pref/prefs.php:673
+#: classes/pref/prefs.php:896
+#: plugins/bookmarklets/init.php:43
+#, fuzzy
+msgid "More info..."
+msgstr "기타 동작..."
 
-#: classes/backend.php:104
+#: classes/backend.php:157
 #: classes/dlg.php:30
 #: classes/dlg.php:57
 #: classes/dlg.php:90
 #: classes/dlg.php:155
-#: classes/dlg.php:186
-#: classes/dlg.php:202
-#: classes/pref/feeds.php:1561
-#: classes/pref/feeds.php:1624
+#: classes/dlg.php:189
+#: classes/dlg.php:205
+#: classes/pref/feeds.php:1554
+#: classes/pref/feeds.php:1617
 #: classes/pref/filters.php:175
-#: classes/pref/prefs.php:1083
+#: classes/pref/prefs.php:1149
 #: plugins/af_psql_trgm/init.php:111
 #: plugins/import_export/init.php:447
 #: plugins/import_export/init.php:491
@@ -1010,7 +1015,7 @@ msgid "Your Public OPML URL is:"
 msgstr "공개 OPML URL: "
 
 #: classes/dlg.php:54
-#: classes/dlg.php:183
+#: classes/dlg.php:186
 #: plugins/share/init.php:130
 msgid "Generate new URL"
 msgstr "새 URL 생성"
@@ -1033,11 +1038,11 @@ msgstr ""
 msgid "%s can be accessed via the following secret URL:"
 msgstr ""
 
-#: classes/dlg.php:195
+#: classes/dlg.php:198
 msgid "You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."
 msgstr ""
 
-#: classes/dlg.php:199
+#: classes/dlg.php:202
 #, fuzzy
 msgid "Open Preferences"
 msgstr "설정"
@@ -1216,28 +1221,28 @@ msgstr "<b>%s</b> 라벨이 생성되었습니다."
 #: classes/pref/labels.php:263
 #: classes/pref/users.php:360
 #: classes/pref/feeds.php:1271
-#: classes/pref/feeds.php:1513
-#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1506
+#: classes/pref/feeds.php:1567
 #: classes/pref/filters.php:362
 #: classes/pref/filters.php:422
 #: classes/pref/filters.php:778
 #: classes/pref/filters.php:865
 #: classes/pref/filters.php:895
-#: classes/pref/prefs.php:992
+#: classes/pref/prefs.php:1058
 msgid "Select"
 msgstr "선택"
 
 #: classes/pref/labels.php:266
 #: classes/pref/users.php:363
 #: classes/pref/feeds.php:1274
-#: classes/pref/feeds.php:1516
-#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1570
 #: classes/pref/filters.php:365
 #: classes/pref/filters.php:425
 #: classes/pref/filters.php:781
 #: classes/pref/filters.php:868
 #: classes/pref/filters.php:898
-#: classes/pref/prefs.php:995
+#: classes/pref/prefs.php:1061
 #: classes/feeds.php:62
 msgid "All"
 msgstr "전체"
@@ -1245,14 +1250,14 @@ msgstr "전체"
 #: classes/pref/labels.php:268
 #: classes/pref/users.php:365
 #: classes/pref/feeds.php:1276
-#: classes/pref/feeds.php:1518
-#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1511
+#: classes/pref/feeds.php:1572
 #: classes/pref/filters.php:367
 #: classes/pref/filters.php:427
 #: classes/pref/filters.php:783
 #: classes/pref/filters.php:870
 #: classes/pref/filters.php:900
-#: classes/pref/prefs.php:997
+#: classes/pref/prefs.php:1063
 #: classes/feeds.php:65
 msgid "None"
 msgstr "선택 안 함"
@@ -1283,7 +1288,7 @@ msgstr "규칙 편집"
 #: classes/pref/users.php:61
 #: classes/pref/feeds.php:653
 #: classes/pref/feeds.php:920
-#: classes/pref/feeds.php:1737
+#: classes/pref/feeds.php:1730
 #: classes/feeds.php:690
 #: plugins/auth_internal/init.php:58
 msgid "Authentication"
@@ -1365,7 +1370,7 @@ msgstr "[tt-rss] 암호 변경 안내"
 #: classes/pref/feeds.php:1267
 #: classes/pref/filters.php:774
 #: classes/feeds.php:742
-#: classes/feeds.php:814
+#: classes/feeds.php:813
 #: js/Feeds.js:540
 msgid "Search"
 msgstr "검색"
@@ -1382,7 +1387,7 @@ msgstr "편집"
 #: classes/pref/users.php:408
 #: classes/pref/feeds.php:659
 #: classes/pref/feeds.php:926
-#: classes/pref/feeds.php:1740
+#: classes/pref/feeds.php:1733
 #: classes/feeds.php:694
 msgid "Login"
 msgstr "로그인"
@@ -1416,7 +1421,7 @@ msgid "Refresh"
 msgstr "새로고침"
 
 #: classes/pref/system.php:44
-#: classes/pref/prefs.php:612
+#: classes/pref/prefs.php:669
 msgid "Clear"
 msgstr ""
 
@@ -1456,7 +1461,7 @@ msgid_plural "(%d feeds)"
 msgstr[0] "(%d개의 피드)"
 
 #: classes/pref/feeds.php:526
-#: classes/pref/prefs.php:18
+#: classes/pref/prefs.php:20
 msgid "General"
 msgstr "일반"
 
@@ -1470,7 +1475,7 @@ msgstr "피드 주소"
 
 #: classes/pref/feeds.php:576
 #: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1730
+#: classes/pref/feeds.php:1723
 #: classes/feeds.php:666
 msgid "Place in category:"
 msgstr "카테고리 위치:"
@@ -1510,8 +1515,8 @@ msgstr "글을 유지:"
 
 #: classes/pref/feeds.php:668
 #: classes/pref/feeds.php:937
-#: classes/pref/feeds.php:1741
-#: classes/pref/prefs.php:244
+#: classes/pref/feeds.php:1734
+#: classes/pref/prefs.php:287
 #: classes/feeds.php:699
 msgid "Password"
 msgstr "암호"
@@ -1542,6 +1547,7 @@ msgstr ""
 
 #: classes/pref/feeds.php:750
 #: classes/pref/feeds.php:974
+#: classes/pref/prefs.php:95
 #, fuzzy
 msgid "Do not embed media"
 msgstr "글에 이미지 삽입하지 않음"
@@ -1561,7 +1567,7 @@ msgid "Icon"
 msgstr "아이콘"
 
 #: classes/pref/feeds.php:802
-#: classes/pref/feeds.php:1375
+#: classes/pref/feeds.php:1374
 #: plugins/import_export/init.php:72
 #, fuzzy
 msgid "Choose file..."
@@ -1572,7 +1578,7 @@ msgid "Replace"
 msgstr ""
 
 #: classes/pref/feeds.php:816
-#: classes/pref/prefs.php:673
+#: classes/pref/prefs.php:735
 msgid "Plugins"
 msgstr "플러그인"
 
@@ -1619,54 +1625,50 @@ msgstr "OPML"
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "OPML을 사용하면 피드/필터/라벨/설정을 내보내고 불러올 수 있습니다."
 
-#: classes/pref/feeds.php:1364
-msgid "Only main settings profile can be migrated using OPML."
-msgstr ""
-
-#: classes/pref/feeds.php:1381
+#: classes/pref/feeds.php:1380
 #, fuzzy
 msgid "Import OPML"
 msgstr "내 OPML 불러오기"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1388
 msgid "Export OPML"
 msgstr "OPML 내보내기"
 
-#: classes/pref/feeds.php:1395
+#: classes/pref/feeds.php:1392
 msgid "Include settings"
 msgstr "설정 포함"
 
-#: classes/pref/feeds.php:1402
+#: classes/pref/feeds.php:1399
 #, fuzzy
 msgid "Published OPML"
 msgstr "공개됨"
 
-#: classes/pref/feeds.php:1404
+#: classes/pref/feeds.php:1401
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "사용중인 OPML을 공개하면, 누구든 아래 URL만으로 구독할 수 있습니다."
 
-#: classes/pref/feeds.php:1406
+#: classes/pref/feeds.php:1403
 msgid "Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1408
+#: classes/pref/feeds.php:1405
 msgid "Public OPML URL"
 msgstr ""
 
-#: classes/pref/feeds.php:1409
+#: classes/pref/feeds.php:1406
 msgid "Display published OPML URL"
 msgstr "공개 OPML URL 표시"
 
-#: classes/pref/feeds.php:1417
+#: classes/pref/feeds.php:1414
 msgid "Published & shared articles / Generated feeds"
 msgstr "공개, 공유된 글 / 생성된 피드"
 
-#: classes/pref/feeds.php:1419
+#: classes/pref/feeds.php:1416
 #, fuzzy
 msgid "Published articles can be subscribed by anyone who knows the following URL:"
 msgstr "사용중인 OPML을 공개하면, 누구든 아래 URL만으로 구독할 수 있습니다."
 
-#: classes/pref/feeds.php:1426
+#: classes/pref/feeds.php:1421
 #: classes/feeds.php:34
 #: classes/feeds.php:35
 #: classes/feeds.php:99
@@ -1675,37 +1677,37 @@ msgstr "사용중인 OPML을 공개하면, 누구든 아래 URL만으로 구독�
 msgid "Show as feed"
 msgstr "이 피드"
 
-#: classes/pref/feeds.php:1427
+#: classes/pref/feeds.php:1422
 msgid "Display URL"
 msgstr "URL 표시"
 
-#: classes/pref/feeds.php:1430
+#: classes/pref/feeds.php:1425
 msgid "Clear all generated URLs"
 msgstr "이미 만들어진 URL 제거"
 
-#: classes/pref/feeds.php:1509
+#: classes/pref/feeds.php:1502
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "3개월 이상 업데이트 되지 않은 피드(오래된 순서):"
 
-#: classes/pref/feeds.php:1539
-#: classes/pref/feeds.php:1600
+#: classes/pref/feeds.php:1532
+#: classes/pref/feeds.php:1593
 msgid "Click to edit feed"
 msgstr "클릭하여 피드 편집"
 
-#: classes/pref/feeds.php:1557
-#: classes/pref/feeds.php:1620
+#: classes/pref/feeds.php:1550
+#: classes/pref/feeds.php:1613
 msgid "Unsubscribe from selected feeds"
 msgstr "선택된 피드 구독 해제 중..."
 
-#: classes/pref/feeds.php:1720
+#: classes/pref/feeds.php:1713
 msgid "One valid feed per line (no detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1750
+#: classes/pref/feeds.php:1743
 msgid "Feeds require authentication."
 msgstr "인증이 필요한 피드"
 
-#: classes/pref/feeds.php:1754
+#: classes/pref/feeds.php:1747
 #: classes/feeds.php:714
 #: classes/feeds.php:770
 msgid "Subscribe"
@@ -1793,452 +1795,472 @@ msgstr "필드"
 msgid "in"
 msgstr ""
 
-#: classes/pref/filters.php:1022
-#, fuzzy
-msgid "Wiki: Filters"
-msgstr "필터"
-
-#: classes/pref/filters.php:1025
+#: classes/pref/filters.php:1026
 msgid "Save rule"
 msgstr "규칙 저장"
 
-#: classes/pref/filters.php:1025
+#: classes/pref/filters.php:1026
 #: js/CommonFilters.js:133
 msgid "Add rule"
 msgstr "규칙 추가"
 
-#: classes/pref/filters.php:1048
+#: classes/pref/filters.php:1049
 msgid "Perform Action"
 msgstr "동작 실행"
 
-#: classes/pref/filters.php:1099
+#: classes/pref/filters.php:1100
 #, fuzzy
 msgid "No actions available"
 msgstr "새 버전 나왔어요!"
 
-#: classes/pref/filters.php:1118
+#: classes/pref/filters.php:1119
 msgid "Save action"
 msgstr "저장 동작"
 
-#: classes/pref/filters.php:1118
+#: classes/pref/filters.php:1119
 #: js/CommonFilters.js:155
 msgid "Add action"
 msgstr "동작 추가"
 
-#: classes/pref/filters.php:1145
+#: classes/pref/filters.php:1146
 msgid "[No caption]"
 msgstr "[자막 없음]"
 
-#: classes/pref/filters.php:1147
+#: classes/pref/filters.php:1148
 #, fuzzy, php-format
 msgid "%s (%d rule)"
 msgid_plural "%s (%d rules)"
 msgstr[0] "규칙 추가"
 
-#: classes/pref/filters.php:1161
+#: classes/pref/filters.php:1162
 #, fuzzy
 msgid "matches any rule"
 msgstr "아무 규칙이나 적용"
 
-#: classes/pref/filters.php:1164
+#: classes/pref/filters.php:1165
 #, fuzzy, php-format
 msgid "%s (+%d action)"
 msgid_plural "%s (+%d actions)"
 msgstr[0] "동작 추가"
 
-#: classes/pref/prefs.php:19
-msgid "Interface"
-msgstr "인터페이스"
-
-#: classes/pref/prefs.php:20
-msgid "Advanced"
-msgstr "고급"
+#: classes/pref/prefs.php:40
+#, fuzzy
+msgid "Articles"
+msgstr "글"
 
-#: classes/pref/prefs.php:21
+#: classes/pref/prefs.php:53
 msgid "Digest"
 msgstr ""
 
-#: classes/pref/prefs.php:25
+#: classes/pref/prefs.php:58
+msgid "Advanced"
+msgstr "고급"
+
+#: classes/pref/prefs.php:69
 msgid "Allow duplicate articles"
 msgstr "글 중복 허용"
 
-#: classes/pref/prefs.php:26
+#: classes/pref/prefs.php:70
 msgid "Blacklisted tags"
 msgstr "블랙리스트된 태그"
 
-#: classes/pref/prefs.php:26
-msgid "When auto-detecting tags in articles these tags will not be applied (comma-separated list)."
+#: classes/pref/prefs.php:70
+msgid "Never apply these tags automatically (comma-separated list)."
 msgstr ""
 
-#: classes/pref/prefs.php:27
-msgid "Automatically mark articles as read"
-msgstr "자동으로 읽음 표시"
+#: classes/pref/prefs.php:71
+#, fuzzy
+msgid "Mark read on scroll"
+msgstr "모든 글을 읽음 표시 할까요?"
 
-#: classes/pref/prefs.php:27
+#: classes/pref/prefs.php:71
 #, fuzzy
-msgid "Mark articles as read while you scroll"
+msgid "Mark articles as read as you scroll past them"
 msgstr "모든 글을 읽음 표시 할까요?"
 
-#: classes/pref/prefs.php:28
-msgid "Automatically expand articles in combined mode"
-msgstr "통합 모드에서 자동으로 글 펼침"
+#: classes/pref/prefs.php:72
+#, fuzzy
+msgid "Always expand articles"
+msgstr "글을 펼쳐보려면 클릭하세요"
 
-#: classes/pref/prefs.php:29
-msgid "Combined feed display"
-msgstr "피드 통합 표시"
+#: classes/pref/prefs.php:73
+#, fuzzy
+msgid "Combined mode"
+msgstr "통합 모드 켜기/끄기"
 
-#: classes/pref/prefs.php:29
+#: classes/pref/prefs.php:73
 #, fuzzy
-msgid "Show combined list of articles, instead of separate panels"
+msgid "Show flat list of articles instead of separate panels"
 msgstr "제목하고 내용을 분리해서 표시하지 않고, 피드 내용의 펼쳐진 목록을 보여줍니다."
 
-#: classes/pref/prefs.php:30
+#: classes/pref/prefs.php:74
 msgid "Confirm marking feed as read"
 msgstr "피드를 읽음표시 할 때 물어봄"
 
-#: classes/pref/prefs.php:31
+#: classes/pref/prefs.php:75
 msgid "Amount of articles to display at once"
 msgstr "한 번에 표시할 글의 수"
 
-#: classes/pref/prefs.php:32
-msgid "Default feed update interval"
+#: classes/pref/prefs.php:76
+#, fuzzy
+msgid "Default update interval"
 msgstr "피드 업데이트 주기"
 
-#: classes/pref/prefs.php:33
-msgid "Mark articles in e-mail digest as read"
-msgstr "이메일 요약에 있는 글 읽음 표시"
+#: classes/pref/prefs.php:77
+#, fuzzy
+msgid "Mark sent articles as read"
+msgstr "모든 글을 읽음 표시 할까요?"
 
-#: classes/pref/prefs.php:34
-msgid "Enable e-mail digest"
+#: classes/pref/prefs.php:78
+#, fuzzy
+msgid "Enable digest"
 msgstr "이메일 요약본 활성화"
 
-#: classes/pref/prefs.php:34
+#: classes/pref/prefs.php:78
 msgid "Send daily digest of new (and unread) headlines to your e-mail address"
 msgstr ""
 
-#: classes/pref/prefs.php:35
-msgid "Try to send digests around specified time"
+#: classes/pref/prefs.php:79
+#, fuzzy
+msgid "Try to send around this time"
 msgstr "특정 시간에 이메일 요약본 전송"
 
-#: classes/pref/prefs.php:35
+#: classes/pref/prefs.php:79
 #, fuzzy
 msgid "Time in UTC"
 msgstr "시간대"
 
-#: classes/pref/prefs.php:36
-msgid "Enable API access"
-msgstr "API 접근 켜기"
+#: classes/pref/prefs.php:80
+#, fuzzy
+msgid "Enable API"
+msgstr "OTP 활성화"
 
-#: classes/pref/prefs.php:36
-msgid "Allows external clients to access this account through the API"
+#: classes/pref/prefs.php:80
+msgid "Allows accessing this account through the API"
 msgstr ""
 
-#: classes/pref/prefs.php:37
-msgid "Enable feed categories"
-msgstr "피드 카테고리 활성화"
+#: classes/pref/prefs.php:81
+#, fuzzy
+msgid "Enable categories"
+msgstr "フィードカテゴリーを有効にする"
 
-#: classes/pref/prefs.php:38
+#: classes/pref/prefs.php:82
 msgid "Sort feeds by unread articles count"
 msgstr "읽지 않은 글 수에 따라 피드 정렬"
 
-#: classes/pref/prefs.php:39
-msgid "Maximum age of fresh articles (in hours)"
+#: classes/pref/prefs.php:83
+#, fuzzy
+msgid "Maximum age of fresh articles"
 msgstr "새 글로 표시할 기준(시간)"
 
-#: classes/pref/prefs.php:40
-msgid "Hide feeds with no unread articles"
-msgstr "모든 글을 읽은 피드 숨기기"
+#: classes/pref/prefs.php:83
+#, fuzzy
+msgid "hours"
+msgstr "4시간마다"
+
+#: classes/pref/prefs.php:84
+#, fuzzy
+msgid "Hide read feeds"
+msgstr "읽은 피드 숨기기/보이기"
 
-#: classes/pref/prefs.php:41
-msgid "Show special feeds when hiding read feeds"
+#: classes/pref/prefs.php:85
+msgid "Always show special feeds"
+msgstr ""
+
+#: classes/pref/prefs.php:85
+#, fuzzy
+msgid "While hiding read feeds"
 msgstr "자동분류에서는 다 읽은 피드를 숨기지 않음"
 
-#: classes/pref/prefs.php:42
+#: classes/pref/prefs.php:86
 msgid "Long date format"
 msgstr "긴 날짜 형식"
 
-#: classes/pref/prefs.php:42
+#: classes/pref/prefs.php:86
 msgid "Syntax is identical to PHP <a href='http://php.net/manual/function.date.php'>date()</a> function."
 msgstr ""
 
-#: classes/pref/prefs.php:43
+#: classes/pref/prefs.php:87
 msgid "On catchup show next feed"
 msgstr "다시 볼 때 다음 피드를 표시"
 
-#: classes/pref/prefs.php:43
+#: classes/pref/prefs.php:87
 msgid "Automatically opens next unread feed after marking one as read"
 msgstr ""
 
-#: classes/pref/prefs.php:44
+#: classes/pref/prefs.php:88
 #, fuzzy
 msgid "Purge articles older than"
 msgstr "읽지 않은 글 남겨둠"
 
-#: classes/pref/prefs.php:45
+#: classes/pref/prefs.php:88
+msgid "<strong>days</strong> (0 disables)"
+msgstr ""
+
+#: classes/pref/prefs.php:89
 msgid "Purge unread articles"
 msgstr "읽지 않은 글 남겨둠"
 
-#: classes/pref/prefs.php:46
+#: classes/pref/prefs.php:90
 msgid "Reverse headline order (oldest first)"
 msgstr "헤드라인 순서 반전 (오래된것부터)"
 
-#: classes/pref/prefs.php:47
+#: classes/pref/prefs.php:91
 msgid "Short date format"
 msgstr "짧은 날짜 형식"
 
-#: classes/pref/prefs.php:48
-msgid "Show content preview in headlines list"
+#: classes/pref/prefs.php:92
+#, fuzzy
+msgid "Show content preview in headlines"
 msgstr "헤드라인 목록에 내용 미리보기 표시"
 
-#: classes/pref/prefs.php:49
+#: classes/pref/prefs.php:93
 msgid "Sort headlines by feed date"
 msgstr "피드 날짜별 헤드라인 정렬"
 
-#: classes/pref/prefs.php:49
+#: classes/pref/prefs.php:93
 msgid "Use feed-specified date to sort headlines instead of local import date."
 msgstr ""
 
-#: classes/pref/prefs.php:50
-msgid "Login with an SSL certificate"
-msgstr "SSL 인증을 사용하여 로그인"
-
-#: classes/pref/prefs.php:50
-msgid "Click to register your SSL client certificate with tt-rss"
-msgstr ""
-
-#: classes/pref/prefs.php:51
+#: classes/pref/prefs.php:94
 #, fuzzy
-msgid "Do not embed media in articles"
-msgstr "글에 이미지 삽입하지 않음"
+msgid "SSL client certificate"
+msgstr "SSL 인증을 사용하여 로그인"
 
-#: classes/pref/prefs.php:52
+#: classes/pref/prefs.php:96
 msgid "Strip unsafe tags from articles"
 msgstr "안전하지 않은 태그 제거"
 
-#: classes/pref/prefs.php:52
+#: classes/pref/prefs.php:96
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
 
-#: classes/pref/prefs.php:53
+#: classes/pref/prefs.php:97
 #: js/PrefHelpers.js:113
 msgid "Customize stylesheet"
 msgstr "스타일시트 변경"
 
-#: classes/pref/prefs.php:54
+#: classes/pref/prefs.php:98
 msgid "Time zone"
 msgstr "시간대"
 
-#: classes/pref/prefs.php:55
-msgid "Group headlines in virtual feeds"
-msgstr "가상 피드의 헤드라인을 묶음"
+#: classes/pref/prefs.php:99
+#, fuzzy
+msgid "Group by feed"
+msgstr "トップ 25 フィード"
 
-#: classes/pref/prefs.php:55
-msgid "Special feeds, labels, and categories are grouped by originating feeds"
+#: classes/pref/prefs.php:99
+msgid "Group multiple-feed output by originating feed"
 msgstr ""
 
-#: classes/pref/prefs.php:56
+#: classes/pref/prefs.php:100
 msgid "Language"
 msgstr "언어"
 
-#: classes/pref/prefs.php:57
+#: classes/pref/prefs.php:101
 msgid "Theme"
 msgstr "테마"
 
-#: classes/pref/prefs.php:129
+#: classes/pref/prefs.php:185
 msgid "The configuration was saved."
 msgstr "설정이 저장되었습니다."
 
-#: classes/pref/prefs.php:143
+#: classes/pref/prefs.php:199
 msgid "Your personal data has been saved."
 msgstr "개인 정보가 저장되었습니다."
 
-#: classes/pref/prefs.php:159
+#: classes/pref/prefs.php:215
 msgid "Your preferences are now set to default values."
 msgstr ""
 
-#: classes/pref/prefs.php:183
+#: classes/pref/prefs.php:226
 msgid "Personal data / Authentication"
 msgstr "개인 정보 / 인증"
 
-#: classes/pref/prefs.php:186
+#: classes/pref/prefs.php:229
 msgid "Personal data"
 msgstr "개인 정보"
 
-#: classes/pref/prefs.php:215
+#: classes/pref/prefs.php:258
 msgid "Full name:"
 msgstr ""
 
-#: classes/pref/prefs.php:220
+#: classes/pref/prefs.php:263
 #, fuzzy
 msgid "E-mail:"
 msgstr "이메일:"
 
-#: classes/pref/prefs.php:228
+#: classes/pref/prefs.php:271
 #, fuzzy
 msgid "Access level:"
 msgstr "계정 권한:"
 
-#: classes/pref/prefs.php:239
+#: classes/pref/prefs.php:282
 msgid "Save data"
 msgstr "데이터 저장"
 
-#: classes/pref/prefs.php:288
+#: classes/pref/prefs.php:331
 msgid "Changing your current password will disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:292
+#: classes/pref/prefs.php:335
 #, fuzzy
 msgid "Old password:"
 msgstr "원래 암호"
 
-#: classes/pref/prefs.php:297
+#: classes/pref/prefs.php:340
 #, fuzzy
 msgid "New password:"
 msgstr "새 암호"
 
-#: classes/pref/prefs.php:302
+#: classes/pref/prefs.php:345
 #, fuzzy
 msgid "Confirm password:"
 msgstr "암호 확인"
 
-#: classes/pref/prefs.php:312
+#: classes/pref/prefs.php:355
 msgid "Change password"
 msgstr "암호 변경"
 
-#: classes/pref/prefs.php:317
+#: classes/pref/prefs.php:360
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:347
-#: classes/pref/prefs.php:395
+#: classes/pref/prefs.php:390
+#: classes/pref/prefs.php:438
 #, fuzzy
 msgid "Your password:"
 msgstr "암호 확인"
 
-#: classes/pref/prefs.php:357
+#: classes/pref/prefs.php:400
 msgid "Disable OTP"
 msgstr "OTP 비활성화"
 
-#: classes/pref/prefs.php:401
+#: classes/pref/prefs.php:444
 #, fuzzy
 msgid "One time password:"
 msgstr "잘못된 OTP 입니다"
 
-#: classes/pref/prefs.php:408
+#: classes/pref/prefs.php:451
 msgid "Enable OTP"
 msgstr "OTP 활성화"
 
-#: classes/pref/prefs.php:461
+#: classes/pref/prefs.php:504
 msgid "Some preferences are only available in default profile."
 msgstr ""
 
-#: classes/pref/prefs.php:530
-msgid "Customize"
-msgstr "사용자 설정"
-
-#: classes/pref/prefs.php:544
+#: classes/pref/prefs.php:595
 #, fuzzy
 msgid "default"
 msgstr "기본 정렬"
 
+#: classes/pref/prefs.php:605
+msgid "Customize"
+msgstr "사용자 설정"
+
 #: classes/pref/prefs.php:608
+#, fuzzy
+msgid "More themes..."
+msgstr "更なるフィード..."
+
+#: classes/pref/prefs.php:665
 msgid "Register"
 msgstr "등록"
 
-#: classes/pref/prefs.php:619
+#: classes/pref/prefs.php:680
 #, php-format
 msgid "Current server time: %s"
 msgstr ""
 
-#: classes/pref/prefs.php:647
+#: classes/pref/prefs.php:709
 msgid "Save configuration"
 msgstr "설정 저장"
 
-#: classes/pref/prefs.php:651
+#: classes/pref/prefs.php:713
 msgid "Save and exit preferences"
 msgstr "저장하고 설정 종료"
 
-#: classes/pref/prefs.php:656
+#: classes/pref/prefs.php:718
 msgid "Manage profiles"
 msgstr "프로필 관리"
 
-#: classes/pref/prefs.php:659
+#: classes/pref/prefs.php:721
 msgid "Reset to defaults"
 msgstr "초기화"
 
-#: classes/pref/prefs.php:706
+#: classes/pref/prefs.php:768
 msgid "System plugins"
 msgstr "시스템 플러그인"
 
-#: classes/pref/prefs.php:707
+#: classes/pref/prefs.php:769
 msgid "System plugins are enabled in <strong>config.php</strong> for all users."
 msgstr ""
 
-#: classes/pref/prefs.php:712
-#: classes/pref/prefs.php:768
+#: classes/pref/prefs.php:774
+#: classes/pref/prefs.php:830
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:713
-#: classes/pref/prefs.php:769
+#: classes/pref/prefs.php:775
+#: classes/pref/prefs.php:831
 msgid "Description"
 msgstr "설명"
 
-#: classes/pref/prefs.php:714
-#: classes/pref/prefs.php:770
+#: classes/pref/prefs.php:776
+#: classes/pref/prefs.php:832
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:715
-#: classes/pref/prefs.php:771
+#: classes/pref/prefs.php:777
+#: classes/pref/prefs.php:833
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:746
-#: classes/pref/prefs.php:805
+#: classes/pref/prefs.php:808
+#: classes/pref/prefs.php:867
 msgid "more info"
 msgstr ""
 
-#: classes/pref/prefs.php:755
-#: classes/pref/prefs.php:814
+#: classes/pref/prefs.php:817
+#: classes/pref/prefs.php:876
 msgid "Clear data"
 msgstr "데이터 제거"
 
-#: classes/pref/prefs.php:764
+#: classes/pref/prefs.php:826
 msgid "User plugins"
 msgstr "사용자 플러그인"
 
-#: classes/pref/prefs.php:833
+#: classes/pref/prefs.php:899
 msgid "Enable selected plugins"
 msgstr "선택한 플러그인 켜기"
 
-#: classes/pref/prefs.php:909
+#: classes/pref/prefs.php:975
 msgid "Incorrect one time password"
 msgstr "잘못된 OTP 입니다"
 
-#: classes/pref/prefs.php:914
-#: classes/pref/prefs.php:945
+#: classes/pref/prefs.php:980
+#: classes/pref/prefs.php:1011
 msgid "Incorrect password"
 msgstr "잘못된 암호입니다"
 
-#: classes/pref/prefs.php:969
+#: classes/pref/prefs.php:1035
 msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here."
 msgstr ""
 
-#: classes/pref/prefs.php:1006
+#: classes/pref/prefs.php:1072
 msgid "Create profile"
 msgstr "프로필 생성"
 
-#: classes/pref/prefs.php:1025
-#: classes/pref/prefs.php:1045
+#: classes/pref/prefs.php:1091
+#: classes/pref/prefs.php:1111
 msgid "(active)"
 msgstr "(활성화)"
 
-#: classes/pref/prefs.php:1077
+#: classes/pref/prefs.php:1143
 msgid "Remove selected profiles"
 msgstr "선택된 프로필 삭제"
 
-#: classes/pref/prefs.php:1079
+#: classes/pref/prefs.php:1145
 msgid "Activate profile"
 msgstr "프로필 활성화"
 
@@ -2297,7 +2319,7 @@ msgid "Never"
 msgstr "영원히"
 
 #: classes/feeds.php:258
-#: classes/feeds.php:1299
+#: classes/feeds.php:1298
 msgid "Archived articles"
 msgstr "보관 처리된 글"
 
@@ -2382,27 +2404,27 @@ msgstr ""
 msgid "Search syntax"
 msgstr "문법 "
 
-#: classes/feeds.php:1291
+#: classes/feeds.php:1290
 msgid "Starred articles"
 msgstr "중요 표시된 글"
 
-#: classes/feeds.php:1293
+#: classes/feeds.php:1292
 msgid "Published articles"
 msgstr "공개 글"
 
-#: classes/feeds.php:1295
+#: classes/feeds.php:1294
 msgid "Fresh articles"
 msgstr "새 글"
 
-#: classes/feeds.php:1301
+#: classes/feeds.php:1300
 msgid "Recently read"
 msgstr "최근에 읽은 글"
 
-#: classes/feeds.php:1422
+#: classes/feeds.php:1421
 msgid "Special"
 msgstr "자동 분류"
 
-#: classes/feeds.php:1680
+#: classes/feeds.php:1679
 #, php-format
 msgid "Search results: %s"
 msgstr "검색 결과: %s"
@@ -2715,19 +2737,19 @@ msgstr ""
 msgid "Close this dialog"
 msgstr "이 창 닫기"
 
-#: plugins/share/init.php:47
+#: plugins/share/init.php:45
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "아래의 개별 URL로 공유된 모든 글들이 공유 중단됩니다."
 
-#: plugins/share/init.php:50
+#: plugins/share/init.php:48
 msgid "Unshare all articles"
 msgstr "모든 글 공유중단"
 
-#: plugins/share/init.php:83
+#: plugins/share/init.php:81
 msgid "Share by URL"
 msgstr "URL로 공유"
 
-#: plugins/share/init.php:105
+#: plugins/share/init.php:103
 msgid "You can share this article by the following unique URL:"
 msgstr ""
 
@@ -2754,16 +2776,16 @@ msgid "Please enter new score for selected articles:"
 msgstr "선택된 글의 점수를 새로 매기세요:"
 
 #: js/Article.js:59
-#: js/Headlines.js:909
-#: js/Headlines.js:927
-#: js/Headlines.js:945
-#: js/Headlines.js:1059
-#: js/Headlines.js:1095
+#: js/Headlines.js:895
+#: js/Headlines.js:913
+#: js/Headlines.js:931
+#: js/Headlines.js:1045
+#: js/Headlines.js:1081
 #: plugins/mail/mail.js:7
 #: plugins/mailto/init.js:7
-#: js/Headlines.js:732
-#: js/Headlines.js:758
-#: js/Headlines.js:770
+#: js/Headlines.js:718
+#: js/Headlines.js:744
+#: js/Headlines.js:756
 #, fuzzy
 msgid "No articles selected."
 msgstr "선택된 글이 없습니다."
@@ -2892,101 +2914,101 @@ msgstr ""
 msgid "Your password is at default value"
 msgstr "사용중인 암호가 기본 값입니다. 암호를 변경하세요."
 
-#: js/Headlines.js:623
-#: js/Headlines.js:671
-#: js/Headlines.js:688
+#: js/Headlines.js:609
+#: js/Headlines.js:657
+#: js/Headlines.js:674
 #, fuzzy
 msgid "Click to open next unread feed."
 msgstr "클릭하여 피드 편집"
 
-#: js/Headlines.js:627
+#: js/Headlines.js:613
 msgid "Cancel search"
 msgstr "검색 취소"
 
-#: js/Headlines.js:685
+#: js/Headlines.js:671
 #, fuzzy
 msgid "New articles found, reload feed to continue."
 msgstr "표시할 글이 없습니다."
 
-#: js/Headlines.js:696
+#: js/Headlines.js:682
 msgid "Could not update headlines (invalid object received - see error console for details)"
 msgstr ""
 
-#: js/Headlines.js:953
+#: js/Headlines.js:939
 #, fuzzy, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "%s에서 선택된 %d개 글을 삭제 할까요?"
 
-#: js/Headlines.js:955
+#: js/Headlines.js:941
 #, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "선택된 %d개 글을 삭제할까요?"
 
-#: js/Headlines.js:1068
+#: js/Headlines.js:1054
 #, fuzzy, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "%s에서 선택된 %d개 글을 보관 처리 할까요?"
 
-#: js/Headlines.js:1071
+#: js/Headlines.js:1057
 #, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "보관 처리된 %d개의 글을 다시 옮길까요?"
 
-#: js/Headlines.js:1072
+#: js/Headlines.js:1058
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/Headlines.js:1101
+#: js/Headlines.js:1087
 #, fuzzy, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "%s에서 선택된 %d개 글을 읽음 표시 할까요?"
 
-#: js/Headlines.js:1117
+#: js/Headlines.js:1103
 msgid "No article is selected."
 msgstr "선택된 글이 없습니다."
 
-#: js/Headlines.js:1152
+#: js/Headlines.js:1138
 msgid "No articles found to mark"
 msgstr "표시할 글이 없습니다."
 
-#: js/Headlines.js:1154
+#: js/Headlines.js:1140
 #, perl-format
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "%d 글을 읽음 표시 할까요?"
 
-#: js/Headlines.js:1217
+#: js/Headlines.js:1203
 msgid "Open original article"
 msgstr "원본 글 열기"
 
-#: js/Headlines.js:1224
+#: js/Headlines.js:1210
 msgid "Display article URL"
 msgstr "글 URL 표시"
 
-#: js/Headlines.js:1331
+#: js/Headlines.js:1317
 msgid "Assign label"
 msgstr "라벨 적용"
 
-#: js/Headlines.js:1336
+#: js/Headlines.js:1322
 msgid "Remove label"
 msgstr "라벨 제거"
 
-#: js/Headlines.js:1367
+#: js/Headlines.js:1353
 #, fuzzy
 msgid "Select articles in group"
 msgstr "커서위치의 글 선택"
 
-#: js/Headlines.js:1377
+#: js/Headlines.js:1363
 #, fuzzy
 msgid "Mark group as read"
 msgstr "읽음 표시"
 
-#: js/Headlines.js:1389
+#: js/Headlines.js:1375
 msgid "Mark feed as read"
 msgstr "피드 읽음 표시"
 
@@ -3324,7 +3346,7 @@ msgstr "전체 글"
 msgid "Mark all articles in %s as read?"
 msgstr "%s의 모든 글을 읽음 표시 할까요?"
 
-#: js/Headlines.js:878
+#: js/Headlines.js:864
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "%d개의 글이 선택되었습니다."
@@ -3486,6 +3508,44 @@ msgstr "フィードの URL を変更できません。"
 msgid "Shared URLs cleared."
 msgstr ""
 
+#~ msgid "Help topic not found."
+#~ msgstr "도움말 주제가 없습니다."
+
+#, fuzzy
+#~ msgid "Wiki: Filters"
+#~ msgstr "필터"
+
+#~ msgid "Interface"
+#~ msgstr "인터페이스"
+
+#~ msgid "Automatically mark articles as read"
+#~ msgstr "자동으로 읽음 표시"
+
+#~ msgid "Automatically expand articles in combined mode"
+#~ msgstr "통합 모드에서 자동으로 글 펼침"
+
+#~ msgid "Combined feed display"
+#~ msgstr "피드 통합 표시"
+
+#~ msgid "Mark articles in e-mail digest as read"
+#~ msgstr "이메일 요약에 있는 글 읽음 표시"
+
+#~ msgid "Enable API access"
+#~ msgstr "API 접근 켜기"
+
+#~ msgid "Enable feed categories"
+#~ msgstr "피드 카테고리 활성화"
+
+#~ msgid "Hide feeds with no unread articles"
+#~ msgstr "모든 글을 읽은 피드 숨기기"
+
+#, fuzzy
+#~ msgid "Do not embed media in articles"
+#~ msgstr "글에 이미지 삽입하지 않음"
+
+#~ msgid "Group headlines in virtual feeds"
+#~ msgstr "가상 피드의 헤드라인을 묶음"
+
 #~ msgid "This option enables marking articles as read automatically while you scroll article list."
 #~ msgstr "이 옵션을 선택하면, 글 목록에서 아래로 스크롤할때 자동으로 읽음 표시가 됩니다."
 
@@ -3597,9 +3657,6 @@ msgstr ""
 #~ msgid "All done."
 #~ msgstr "완료되었습니다."
 
-#~ msgid "More actions..."
-#~ msgstr "기타 동작..."
-
 #~ msgid "Manual purge"
 #~ msgstr "수동 남김"
 
@@ -3836,10 +3893,6 @@ msgstr ""
 #~ msgstr "ようこそ、"
 
 #, fuzzy
-#~ msgid "Enable categories"
-#~ msgstr "フィードカテゴリーを有効にする"
-
-#, fuzzy
 #~ msgid "Browse categories like folders"
 #~ msgstr "カテゴリーの順序をリセットする"
 
@@ -4092,9 +4145,6 @@ msgstr ""
 #~ msgid "Panel actions"
 #~ msgstr "パネル操作"
 
-#~ msgid "Top 25 feeds"
-#~ msgstr "トップ 25 フィード"
-
 #~ msgid "Edit feed categories"
 #~ msgstr "フィードカテゴリーを編集する"
 
@@ -4621,9 +4671,6 @@ msgstr ""
 #~ msgid "Remove selected feeds from archive?"
 #~ msgstr "ラベルから選択した記事を削除しますか?"
 
-#~ msgid "More feeds..."
-#~ msgstr "更なるフィード..."
-
 #~ msgid "Search:"
 #~ msgstr "検索:"