Merge remote-tracking branch 'upstream/master' into vichan-merge

1 files changed, 171 insertions, 43 deletions

diff --git a/inc/locale/en/LC_MESSAGES/javascript.po b/inc/locale/en/LC_MESSAGES/javascript.po
index a9a57d2c..e857e1d2 100644
--- a/inc/locale/en/LC_MESSAGES/javascript.po
+++ b/inc/locale/en/LC_MESSAGES/javascript.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-21 04:38+0200\n"
+"POT-Creation-Date: 2014-10-18 13:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -118,7 +118,7 @@ msgid "Delete"
 msgstr ""
 
 #: ../../../../js/quick-post-controls.js:35
-#: ../../../../js/quick-post-controls.js:37
+#: ../../../../js/quick-post-controls.js:37 ../../../../js/mod/ban-list.js:40
 msgid "Reason"
 msgstr ""
 
@@ -213,43 +213,45 @@ msgid "disabled"
 msgstr ""
 
 #: ../../../../js/local-time.js:40 ../../../../js/local-time.js:41
-#: ../../../../js/local-time.js:30
+#: ../../../../js/local-time.js:30 ../../../../templates/main.js:63
 msgid "Sun"
 msgstr ""
 
 #: ../../../../js/local-time.js:40 ../../../../js/local-time.js:41
-#: ../../../../js/local-time.js:30
+#: ../../../../js/local-time.js:30 ../../../../templates/main.js:63
 msgid "Mon"
 msgstr ""
 
 #: ../../../../js/local-time.js:40 ../../../../js/local-time.js:41
-#: ../../../../js/local-time.js:30
+#: ../../../../js/local-time.js:30 ../../../../templates/main.js:63
 msgid "Tue"
 msgstr ""
 
 #: ../../../../js/local-time.js:40 ../../../../js/local-time.js:41
-#: ../../../../js/local-time.js:30
+#: ../../../../js/local-time.js:30 ../../../../templates/main.js:63
 msgid "Wed"
 msgstr ""
 
 #: ../../../../js/local-time.js:40 ../../../../js/local-time.js:41
-#: ../../../../js/local-time.js:30
+#: ../../../../js/local-time.js:30 ../../../../templates/main.js:63
 msgid "Thu"
 msgstr ""
 
 #: ../../../../js/local-time.js:40 ../../../../js/local-time.js:41
-#: ../../../../js/local-time.js:30
+#: ../../../../js/local-time.js:30 ../../../../templates/main.js:63
 msgid "Fri"
 msgstr ""
 
 #: ../../../../js/local-time.js:40 ../../../../js/local-time.js:41
-#: ../../../../js/local-time.js:30
+#: ../../../../js/local-time.js:30 ../../../../templates/main.js:63
 msgid "Sat"
 msgstr ""
 
 #: ../../../../js/catalog-link.js:21 ../../../../js/catalog-link.js:32
 #: ../../../../js/catalog-link.js:40 ../../../../js/catalog-link.js:33
 #: ../../../../js/catalog-link.js:44 ../../../../js/catalog-link.js:52
+#: ../../../../js/catalog-link.js:28 ../../../../js/catalog-link.js:39
+#: ../../../../js/catalog-link.js:47
 msgid "Catalog"
 msgstr ""
 
@@ -317,6 +319,7 @@ msgstr ""
 #: ../../../../templates/themes/ukko/ukko.js:79
 #: ../../../../templates/themes/ukko/ukko.js:80
 #: ../../../../templates/themes/ukko/ukko.js:103
+#: ../../../../js/infinite-scroll.js:48
 msgid "Loading..."
 msgstr ""
 
@@ -433,139 +436,140 @@ msgstr ""
 msgid "Click on any image on this site to load it into oekaki applet"
 msgstr ""
 
-#: ../../../../js/local-time.js:29
+#: ../../../../js/local-time.js:29 ../../../../templates/main.js:62
 msgid "Sunday"
 msgstr ""
 
-#: ../../../../js/local-time.js:29
+#: ../../../../js/local-time.js:29 ../../../../templates/main.js:62
 msgid "Monday"
 msgstr ""
 
-#: ../../../../js/local-time.js:29
+#: ../../../../js/local-time.js:29 ../../../../templates/main.js:62
 msgid "Tuesday"
 msgstr ""
 
-#: ../../../../js/local-time.js:29
+#: ../../../../js/local-time.js:29 ../../../../templates/main.js:62
 msgid "Wednesday"
 msgstr ""
 
-#: ../../../../js/local-time.js:29
+#: ../../../../js/local-time.js:29 ../../../../templates/main.js:62
 msgid "Thursday"
 msgstr ""
 
-#: ../../../../js/local-time.js:29
+#: ../../../../js/local-time.js:29 ../../../../templates/main.js:62
 msgid "Friday"
 msgstr ""
 
-#: ../../../../js/local-time.js:29
+#: ../../../../js/local-time.js:29 ../../../../templates/main.js:62
 msgid "Saturday"
 msgstr ""
 
-#: ../../../../js/local-time.js:31
+#: ../../../../js/local-time.js:31 ../../../../templates/main.js:64
 msgid "January"
 msgstr ""
 
-#: ../../../../js/local-time.js:31
+#: ../../../../js/local-time.js:31 ../../../../templates/main.js:64
 msgid "February"
 msgstr ""
 
-#: ../../../../js/local-time.js:31
+#: ../../../../js/local-time.js:31 ../../../../templates/main.js:64
 msgid "March"
 msgstr ""
 
-#: ../../../../js/local-time.js:31
+#: ../../../../js/local-time.js:31 ../../../../templates/main.js:64
 msgid "April"
 msgstr ""
 
 #: ../../../../js/local-time.js:31 ../../../../js/local-time.js:32
+#: ../../../../templates/main.js:64 ../../../../templates/main.js:65
 msgid "May"
 msgstr ""
 
-#: ../../../../js/local-time.js:31
+#: ../../../../js/local-time.js:31 ../../../../templates/main.js:64
 msgid "June"
 msgstr ""
 
-#: ../../../../js/local-time.js:31
+#: ../../../../js/local-time.js:31 ../../../../templates/main.js:64
 msgid "July"
 msgstr ""
 
-#: ../../../../js/local-time.js:31
+#: ../../../../js/local-time.js:31 ../../../../templates/main.js:64
 msgid "August"
 msgstr ""
 
-#: ../../../../js/local-time.js:31
+#: ../../../../js/local-time.js:31 ../../../../templates/main.js:64
 msgid "September"
 msgstr ""
 
-#: ../../../../js/local-time.js:31
+#: ../../../../js/local-time.js:31 ../../../../templates/main.js:64
 msgid "October"
 msgstr ""
 
-#: ../../../../js/local-time.js:31
+#: ../../../../js/local-time.js:31 ../../../../templates/main.js:64
 msgid "November"
 msgstr ""
 
-#: ../../../../js/local-time.js:31
+#: ../../../../js/local-time.js:31 ../../../../templates/main.js:64
 msgid "December"
 msgstr ""
 
-#: ../../../../js/local-time.js:32
+#: ../../../../js/local-time.js:32 ../../../../templates/main.js:65
 msgid "Jan"
 msgstr ""
 
-#: ../../../../js/local-time.js:32
+#: ../../../../js/local-time.js:32 ../../../../templates/main.js:65
 msgid "Feb"
 msgstr ""
 
-#: ../../../../js/local-time.js:32
+#: ../../../../js/local-time.js:32 ../../../../templates/main.js:65
 msgid "Mar"
 msgstr ""
 
-#: ../../../../js/local-time.js:32
+#: ../../../../js/local-time.js:32 ../../../../templates/main.js:65
 msgid "Apr"
 msgstr ""
 
-#: ../../../../js/local-time.js:32
+#: ../../../../js/local-time.js:32 ../../../../templates/main.js:65
 msgid "Jun"
 msgstr ""
 
-#: ../../../../js/local-time.js:32
+#: ../../../../js/local-time.js:32 ../../../../templates/main.js:65
 msgid "Jul"
 msgstr ""
 
-#: ../../../../js/local-time.js:32
+#: ../../../../js/local-time.js:32 ../../../../templates/main.js:65
 msgid "Aug"
 msgstr ""
 
-#: ../../../../js/local-time.js:32
+#: ../../../../js/local-time.js:32 ../../../../templates/main.js:65
 msgid "Sep"
 msgstr ""
 
-#: ../../../../js/local-time.js:32
+#: ../../../../js/local-time.js:32 ../../../../templates/main.js:65
 msgid "Oct"
 msgstr ""
 
-#: ../../../../js/local-time.js:32
+#: ../../../../js/local-time.js:32 ../../../../templates/main.js:65
 msgid "Nov"
 msgstr ""
 
-#: ../../../../js/local-time.js:32
+#: ../../../../js/local-time.js:32 ../../../../templates/main.js:65
 msgid "Dec"
 msgstr ""
 
-#: ../../../../js/local-time.js:33
+#: ../../../../js/local-time.js:33 ../../../../templates/main.js:66
 msgid "AM"
 msgstr ""
 
-#: ../../../../js/local-time.js:34
+#: ../../../../js/local-time.js:34 ../../../../templates/main.js:67
 msgid "PM"
 msgstr ""
 
-#: ../../../../js/local-time.js:35
+#: ../../../../js/local-time.js:35 ../../../../templates/main.js:68
 msgid "am"
 msgstr ""
 
-#: ../../../../js/local-time.js:36
+#: ../../../../js/local-time.js:36 ../../../../templates/main.js:69
 msgid "pm"
 msgstr ""
 
@@ -604,16 +608,19 @@ msgid "Tree view"
 msgstr ""
 
 #: ../../../../js/expand-all-images.js:32
+#: ../../../../js/expand-all-images.js:35
 msgid "Shrink all images"
 msgstr ""
 
 #: ../../../../js/no-animated-gif.js:33 ../../../../js/no-animated-gif.js:37
+#: ../../../../js/no-animated-gif.js:40
 msgid "Animate GIFs"
 msgstr ""
 
 #: ../../../../js/no-animated-gif.js:42 ../../../../js/no-animated-gif.js:48
 #: ../../../../js/no-animated-gif.js:47 ../../../../js/no-animated-gif.js:57
-#: ../../../../js/no-animated-gif.js:62
+#: ../../../../js/no-animated-gif.js:62 ../../../../js/no-animated-gif.js:50
+#: ../../../../js/no-animated-gif.js:60 ../../../../js/no-animated-gif.js:65
 msgid "Unanimate GIFs"
 msgstr ""
 
@@ -716,3 +723,124 @@ msgstr ""
 #: ../../../../js/options/user-js.js:56
 msgid "You can include JS files from remote servers, for example:"
 msgstr ""
+
+#: ../../../../js/id_colors.js:6 ../../../../js/id_colors.js:12
+msgid "Color IDs"
+msgstr ""
+
+#: ../../../../js/auto-reload.js:33
+msgid "Update"
+msgstr ""
+
+#: ../../../../js/mod/ban-list.js:29
+msgid "IP address"
+msgstr ""
+
+#: ../../../../js/mod/ban-list.js:42
+msgid "Seen"
+msgstr ""
+
+#: ../../../../js/mod/ban-list.js:44
+msgid "Message for which user was banned is included"
+msgstr ""
+
+#: ../../../../js/mod/ban-list.js:45
+msgid "Message:"
+msgstr ""
+
+#: ../../../../js/mod/ban-list.js:53
+msgid "Board"
+msgstr ""
+
+#: ../../../../js/mod/ban-list.js:55
+msgid "all"
+msgstr ""
+
+#: ../../../../js/mod/ban-list.js:57
+msgid "Set"
+msgstr ""
+
+#: ../../../../js/mod/ban-list.js:58
+msgid " ago"
+msgstr ""
+
+#: ../../../../js/mod/ban-list.js:61
+msgid "Expires"
+msgstr ""
+
+#: ../../../../js/mod/ban-list.js:62
+msgid "never"
+msgstr ""
+
+#: ../../../../js/mod/ban-list.js:64
+msgid "in "
+msgstr ""
+
+#: ../../../../js/mod/ban-list.js:66
+msgid "Staff"
+msgstr ""
+
+#: ../../../../js/mod/ban-list.js:73
+msgid "system"
+msgstr ""
+
+#: ../../../../js/auto-reload.js:33
+msgid "Auto"
+msgstr ""
+
+#: ../../../../js/auto-reload.js:141
+msgid "Updating..."
+msgstr ""
+
+#: ../../../../js/auto-reload.js:183
+#, python-brace-format
+msgid "Thread updated with {0} new post(s)"
+msgstr ""
+
+#: ../../../../js/auto-reload.js:185
+msgid "No new posts found"
+msgstr ""
+
+#: ../../../../js/auto-reload.js:191
+msgid "Thread deleted or pruned"
+msgstr ""
+
+#: ../../../../js/auto-reload.js:199
+msgid "Error: "
+msgstr ""
+
+#: ../../../../js/auto-reload.js:201
+msgid "Unknown error"
+msgstr ""
+
+#: ../../../../js/infinite-scroll.js:47
+msgid "Page"
+msgstr ""
+
+#: ../../../../js/infinite-scroll.js:82
+msgid "All"
+msgstr ""
+
+#: ../../../../templates/main.js:29 ../../../../templates/main.js:47
+msgid "second(s)"
+msgstr ""
+
+#: ../../../../templates/main.js:31 ../../../../templates/main.js:49
+msgid "minute(s)"
+msgstr ""
+
+#: ../../../../templates/main.js:33 ../../../../templates/main.js:51
+msgid "hour(s)"
+msgstr ""
+
+#: ../../../../templates/main.js:35 ../../../../templates/main.js:53
+msgid "day(s)"
+msgstr ""
+
+#: ../../../../templates/main.js:37 ../../../../templates/main.js:55
+msgid "week(s)"
+msgstr ""
+
+#: ../../../../templates/main.js:39 ../../../../templates/main.js:57
+msgid "year(s)"
+msgstr ""