From 34b2e18587c374c8beba95ce2e22215ab50f409e Mon Sep 17 00:00:00 2001
From: ZiRo <z_i_r_o@ymail.com>
Date: Sun, 28 Feb 2016 08:54:05 +0100
Subject: [PATCH 1/7] Add dummy translation files

---
 .gitignore                     | 3 ++-
 contrib/translations/en-US.ini | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 contrib/translations/en-US.ini

diff --git a/.gitignore b/.gitignore
index a482ca1..ecee1b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,8 @@
 .\#*
 
 # srnd config files
-*.ini
+srnd.ini
+feeds.ini
 
 # default article store directory
 articles
diff --git a/contrib/translations/en-US.ini b/contrib/translations/en-US.ini
new file mode 100644
index 0000000..04eabf0
--- /dev/null
+++ b/contrib/translations/en-US.ini
@@ -0,0 +1,5 @@
+[formats]
+long_date_format=Mon Jan _2 15:04:05 2006
+
+[strings]
+foo=bar

From 2ea928417daae749a3c8568df77e6dfa772dd2b7 Mon Sep 17 00:00:00 2001
From: ZiRo <z_i_r_o@ymail.com>
Date: Sun, 28 Feb 2016 09:48:07 +0100
Subject: [PATCH 2/7] Localize time formats

---
 contrib/translations/en-US.ini | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/translations/en-US.ini b/contrib/translations/en-US.ini
index 04eabf0..11b038d 100644
--- a/contrib/translations/en-US.ini
+++ b/contrib/translations/en-US.ini
@@ -1,5 +1,7 @@
 [formats]
-long_date_format=Mon Jan _2 15:04:05 2006
+full_date_format=Mon Jan _2 15:04:05 2006
+month_date_format=2006-02
+day_date_format=01-02
 
 [strings]
 foo=bar

From 9974628f62d1906e2f9f0a6cc95e799b39130c6e Mon Sep 17 00:00:00 2001
From: ZiRo <z_i_r_o@ymail.com>
Date: Sun, 28 Feb 2016 10:19:55 +0100
Subject: [PATCH 3/7] Make it possible to add more parameters to post template

---
 contrib/templates/default/post.mustache | 38 ++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/contrib/templates/default/post.mustache b/contrib/templates/default/post.mustache
index 1799255..e1ad1bd 100644
--- a/contrib/templates/default/post.mustache
+++ b/contrib/templates/default/post.mustache
@@ -1,31 +1,31 @@
-<div id="{{PostHash}}" class="{{CSSClass}}">
+<div id="{{post.PostHash}}" class="{{post.CSSClass}}">
   <legend class="postheader">
     <span class="origin">
-  {{#IsI2P}}
-    <img src="{{Prefix}}static/i2p.png" title="post from i2p" />
-  {{/IsI2P}}
-  {{#IsTor}}
-    <img src="{{Prefix}}static/tor.png" title="post from tor" />
-  {{/IsTor}}
-  {{#IsClearnet}}
-    <img src="{{Prefix}}static/clearnet.png" title="post from clearnet" />
-  {{/IsClearnet}}
+  {{#post.IsI2P}}
+    <img src="{{post.Prefix}}static/i2p.png" title="post from i2p" />
+  {{/post.IsI2P}}
+  {{#post.IsTor}}
+    <img src="{{post.Prefix}}static/tor.png" title="post from tor" />
+  {{/post.IsTor}}
+  {{#post.IsClearnet}}
+    <img src="{{post.Prefix}}static/clearnet.png" title="post from clearnet" />
+  {{/post.IsClearnet}}
     </span>  
-    <span class="subject">{{Subject}}</span>
-    <span class="name">{{Name}}</span>
-    <time datetime="{{DateRFC}}">{{Date}}</time>
-    <a href="#" class="postnol">No.</a><a class="postno" onclick="nntpchan_backlink('{{ShortHash}}');" title="{{MessageID}}">{{ShortHash}}</a>
-    <a href="{{PostURL}}">[Reply]</a>
-    <span class="tripcode">{{{Pubkey}}}</span>  
+    <span class="subject">{{post.Subject}}</span>
+    <span class="name">{{post.Name}}</span>
+    <time datetime="{{post.DateRFC}}">{{post.Date}}</time>
+    <a href="#" class="postnol">No.</a><a class="postno" onclick="nntpchan_backlink('{{post.ShortHash}}');" title="{{post.MessageID}}">{{post.ShortHash}}</a>
+    <a href="{{post.PostURL}}">[Reply]</a>
+    <span class="tripcode">{{{post.Pubkey}}}</span>  
   </legend>
-  {{#Attachments}}
+  {{#post.Attachments}}
     <figure>
     <figcaption>
     <a href="{{Source}}" title="{{Filename}}" target="_blank"><img src="{{Thumbnail}}" alt="{{Filename}}" class="thumbnail"/></a>
     </figcaption>
     </figure>
-  {{/Attachments}}
+  {{/post.Attachments}}
   <div class="post_body">
-    {{{RenderBody}}}
+    {{{post.RenderBody}}}
   </div> 
 </div>

From 1c4f4630c25f2c90ad7bbe87f3ce9dc8778b4aef Mon Sep 17 00:00:00 2001
From: ZiRo <z_i_r_o@ymail.com>
Date: Sun, 28 Feb 2016 13:40:16 +0100
Subject: [PATCH 4/7] localize templates

---
 contrib/templates/default/board.mustache      |   6 +-
 contrib/templates/default/boardlist.mustache  |  10 +-
 contrib/templates/default/catalog.mustache    |   6 +-
 contrib/templates/default/frontpage.mustache  |   8 +-
 .../templates/default/graph_history.mustache  |   6 +-
 contrib/templates/default/keygen.mustache     |   6 +-
 contrib/templates/default/modlogin.mustache   |   6 +-
 .../default/modlogin_result.mustache          |   4 +-
 contrib/templates/default/modpage.mustache    |  56 ++++-----
 contrib/templates/default/navbar.mustache     |   8 +-
 contrib/templates/default/newboard.mustache   |  12 +-
 contrib/templates/default/overview.mustache   |   6 +-
 contrib/templates/default/post.mustache       |   8 +-
 contrib/templates/default/post_fail.mustache  |   4 +-
 contrib/templates/default/post_retry.mustache |   6 +-
 .../templates/default/post_success.mustache   |   4 +-
 contrib/templates/default/postform.mustache   |  14 +--
 .../templates/default/posts_graph.mustache    |   4 +-
 contrib/templates/default/thread.mustache     |   2 +-
 contrib/templates/default/ukko.mustache       |   6 +-
 contrib/translations/en-US.ini                | 112 +++++++++++++++++-
 21 files changed, 202 insertions(+), 92 deletions(-)

diff --git a/contrib/templates/default/board.mustache b/contrib/templates/default/board.mustache
index 01dd049..99ced97 100644
--- a/contrib/templates/default/board.mustache
+++ b/contrib/templates/default/board.mustache
@@ -29,7 +29,7 @@
       </div>
     </center>
     <div class="board_header">{{board.Board}}</div>
-    <div class="board_header_catalog"><a href="{{board.Prefix}}catalog-{{board.Name}}.html"> Catalog </a></div>
+    <div class="board_header_catalog"><a href="{{board.Prefix}}catalog-{{board.Name}}.html"> {{#i18n.Translations}}{{catalog_label}}{{/i18n.Translations}} </a></div>
     <!-- postform -->
     <div id="postform_container">
       {{{form}}}
@@ -38,7 +38,7 @@
     <div id="threads_container">
       {{#board.Threads}}
         <div class="thread" id="thread_{{OP.PostHash}}">
-          <div clsss="thread_header">
+          <div class="thread_header">
           </div>
           {{{OP.Truncate.RenderPost}}}
           {{#Truncate.Replies}}
@@ -52,7 +52,7 @@
     <span class="navbar-sep">
      |
     </span>
-    <a href="{{board.Prefix}}catalog-{{board.Name}}.html"> Catalog </a>
+    <a href="{{board.Prefix}}catalog-{{board.Name}}.html"> {{#i18n.Translations}}{{catalog_label}}{{/i18n.Translations}} </a>
     </div>
     <script type="text/javascript">
 
diff --git a/contrib/templates/default/boardlist.mustache b/contrib/templates/default/boardlist.mustache
index 7bfa54f..c8f02c6 100644
--- a/contrib/templates/default/boardlist.mustache
+++ b/contrib/templates/default/boardlist.mustache
@@ -10,7 +10,7 @@
   <head>
     <link rel="stylesheet" href="{{prefix}}static/site.css"></link>
     <link rel="stylesheet" href="{{prefix}}static/user.css"></link>
-    <title> {{frontend}} board list </title>
+    <title> {{frontend}} {{#i18n.Translations}}{{board_list_title}}{{/i18n.Translations}} </title>
   </head>
   <body>
     <center>
@@ -19,10 +19,10 @@
         <table id="board_graph">
           <thead>
             <tr>
-              <th> Board </th>
-              <th> Post per Hour </th>
-              <th> Post per Day </th>
-              <th> Total </th>
+              <th> {{#i18n.Translations}}{{board_label}}{{/i18n.Translations}} </th>
+              <th> {{#i18n.Translations}}{{pph_label}}{{/i18n.Translations}} </th>
+              <th> {{#i18n.Translations}}{{ppd_label}}{{/i18n.Translations}} </th>
+              <th> {{#i18n.Translations}}{{total}}{{/i18n.Translations}} </th>
             </tr>
            </thead>
            <tbody>
diff --git a/contrib/templates/default/catalog.mustache b/contrib/templates/default/catalog.mustache
index eaad4b0..2e57d20 100644
--- a/contrib/templates/default/catalog.mustache
+++ b/contrib/templates/default/catalog.mustache
@@ -5,7 +5,7 @@
     <link rel="stylesheet" href="{{board.Prefix}}static/site.css" />
     <link rel="stylesheet" href="{{board.Prefix}}static/user.css" />
     <script type="text/javascript" src="{{board.Prefix}}static/nntpchan.js"></script>
-    <title>Catalog for {{board.Name}}</title>
+    <title>{{#i18n.Translations}}{{catalog_title}}{{/i18n.Translations}} {{board.Name}}</title>
   </head>
   <body>
     <!-- begin navbar -->
@@ -15,14 +15,14 @@
       <div id="nntpchan_banner">
       </div>
     </center>
-    <div class="board_header">Catalog for {{board.Name}}</div>
+    <div class="board_header">{{#i18n.Translations}}{{catalog_title}}{{/i18n.Translations}} {{board.Name}}</div>
     <!-- postform -->
     <hr />
     <div id="catalog_container">
       {{#board.Threads}}
         <div class="catalog_thread">
           <a class="linkThumb" href="{{OP.PostURL}}"><img src="{{OP.RepresentativeThumb}}"></a>
-          <div class="catalog_header">R: {{ReplyCount}} / P: {{Page}}</div>
+          <div class="catalog_header">{{#i18n.Translations}}{{replies_short_label}}{{/i18n.Translations}}: {{ReplyCount}} / {{#i18n.Translations}}{{pictures_short_label}}{{/i18n.Translations}}: {{Page}}</div>
           <div class="catalog_subject">{{OP.Subject}}</div>
           <div class="catalog_body">
             {{{OP.RenderBody}}}
diff --git a/contrib/templates/default/frontpage.mustache b/contrib/templates/default/frontpage.mustache
index b7c4f85..1dc29a3 100644
--- a/contrib/templates/default/frontpage.mustache
+++ b/contrib/templates/default/frontpage.mustache
@@ -43,10 +43,10 @@
                 <table id="board_graph">
                   <thead>
                     <tr>
-                      <th> Board </th>
-                      <th> Posts this Hour </th>
-                      <th> Posts Today </th>
-                      <th> Total </th>
+                      <th> {{#i18n.Translations}}{{board_label}}{{/i18n.Translations}} </th>
+                      <th> {{#i18n.Translations}}{{posts_hour}}{{/i18n.Translations}} </th>
+                      <th> {{#i18n.Translations}}{{posts_today}}{{/i18n.Translations}} </th>
+                      <th> {{#i18n.Translations}}{{total}}{{/i18n.Translations}} </th>
                     </tr>
                    </thead>
                    <tbody>
diff --git a/contrib/templates/default/graph_history.mustache b/contrib/templates/default/graph_history.mustache
index 1860f9b..7ab8396 100644
--- a/contrib/templates/default/graph_history.mustache
+++ b/contrib/templates/default/graph_history.mustache
@@ -9,15 +9,15 @@ template parameters:
     <meta charset="utf-8"></meta>
     <link rel="stylesheet" href="{{prefix}}static/site.css" />
     <link rel="stylesheet" href="{{prefix}}static/user.css" />
-    <title> Post History</title>
+    <title>{{#i18n.Translations}}{{post_history_title}}{{/i18n.Translations}}</title>
   </head>
   <body>
     <td>
       <table id="history_graph">
         <thead>
           <tr>
-            <th>Month</th>
-            <th>Posts</th>
+            <th>{{#i18n.Translations}}{{month}}{{/i18n.Translations}}</th>
+            <th>{{#i18n.Translations}}{{posts}}{{/i18n.Translations}}</th>
             <th></th>
           </tr>
         </thead>
diff --git a/contrib/templates/default/keygen.mustache b/contrib/templates/default/keygen.mustache
index b176b96..d7fb725 100644
--- a/contrib/templates/default/keygen.mustache
+++ b/contrib/templates/default/keygen.mustache
@@ -11,11 +11,11 @@
     <meta charset="utf-8"></meta>
     <link rel="stylesheet" href="{{prefix}}static/site.css" />
     <link rel="stylesheet" href="{{prefix}}static/user.css" />
-    <title> here is a new tripcode </title>
+    <title>{{#i18n.Translations}}{{new_tripcode_title}}{{/i18n.Translations}}</title>
   </head>
   <body>
-    <pre>New Tripcode:
-      <div id="secret_key">secret: {{secret}}</div><div id="public_key">public: {{public}}</div><div>tripcode: <span class="tripcode" id="capcode_key">{{{tripcode}}}</span></div>
+    <pre>{{#i18n.Translations}}{{new_tripcode_label}}{{/i18n.Translations}}:
+      <div id="secret_key">{{#i18n.Translations}}{{secret_key}}{{/i18n.Translations}}: {{secret}}</div><div id="public_key">{{#i18n.Translations}}{{public_key}}{{/i18n.Translations}}: {{public}}</div><div>{{#i18n.Translations}}{{tripcode}}{{/i18n.Translations}}: <span class="tripcode" id="capcode_key">{{{tripcode}}}</span></div>
     </pre>
   </body>
 </html>
diff --git a/contrib/templates/default/modlogin.mustache b/contrib/templates/default/modlogin.mustache
index 5f9643c..8f4cb2f 100644
--- a/contrib/templates/default/modlogin.mustache
+++ b/contrib/templates/default/modlogin.mustache
@@ -2,13 +2,13 @@
   <head>
     <link rel="stylesheet" href="{{prefix}}static/site.css" />
     <link rel="stylesheet" href="{{prefix}}static/user.css" />
-    <title>login</title>
+    <title>{{#i18n.Translations}}{{login}}{{/i18n.Translations}}</title>
   </head>
   <body>
     <form action="login" method="POST" name="modlogin">
-      <label for="mod_key">secret</label>
+      <label for="mod_key">{{#i18n.Translations}}{{secret_key}}{{/i18n.Translations}}</label>
       <input type="password" id="mod_key" name="privkey" />
-      <input type="submit" value="login" />
+      <input type="submit" value="{{#i18n.Translations}}{{login}}{{/i18n.Translations}}" />
       {{{csrfField}}}
     </form>
   </body>
diff --git a/contrib/templates/default/modlogin_result.mustache b/contrib/templates/default/modlogin_result.mustache
index 55cbaa2..80d6851 100644
--- a/contrib/templates/default/modlogin_result.mustache
+++ b/contrib/templates/default/modlogin_result.mustache
@@ -11,9 +11,9 @@
     <link rel="stylesheet" href="{{prefix}}static/site.css" />
     <link rel="stylesheet" href="{{prefix}}static/user.css" />
     <meta http-equiv="refresh" content="1; {{mod_prefix}}"></meta>
-    <title>login</title>
+    <title>{{#i18n.Translations}}{{login}}{{/i18n.Translations}}</title>
   </head>
   <body>
     <p>{{message}}</p>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/contrib/templates/default/modpage.mustache b/contrib/templates/default/modpage.mustache
index b727431..d762c47 100644
--- a/contrib/templates/default/modpage.mustache
+++ b/contrib/templates/default/modpage.mustache
@@ -10,93 +10,93 @@
     <link rel="stylesheet" href="{{prefix}}static/user.css" />
     <!-- yes it uses js -->
     <script type="text/javascript" src="{{prefix}}static/mod.js"></script>
-    <title> nntpchan mod page </title>
+    <title> {{#i18n.Translations}}{{modpage_title}}{{/i18n.Translations}} </title>
   </head>
   <body>
     <div>
-      <div> post actions </div>
+      <div> {{#i18n.Translations}}{{post_actions_label}}{{/i18n.Translations}} </div>
       <hr />
       <div>
-        <label for="nntpchan_mod_target">target</label>
+        <label for="nntpchan_mod_target">{{#i18n.Translations}}{{target_label}}{{/i18n.Translations}}</label>
         <input id="nntpchan_mod_target" type="text" />
       </div>
       <div>
-        <button onclick="nntpchan_ban()">ban (url)</button>
-        <button onclick="nntpchan_delete()">delete (url)</button>
-        <button onclick="nntpchan_unban()">unban (ip)</button>
+        <button onclick="nntpchan_ban()">{{#i18n.Translations}}{{ban_url_prompt}}{{/i18n.Translations}}</button>
+        <button onclick="nntpchan_delete()">{{#i18n.Translations}}{{delete_url_prompt}}{{/i18n.Translations}}</button>
+        <button onclick="nntpchan_unban()">{{#i18n.Translations}}{{unban_ip_prompt}}{{/i18n.Translations}}</button>
       </div>
     </div>
     <hr />
     <div>
-      <div> key actions </div>
+      <div> {{#i18n.Translations}}{{key_actions_label}}{{/i18n.Translations}} </div>
       <div>
-        <label for="nntpchan_board_target">pubkey:</label>
+        <label for="nntpchan_board_target">{{#i18n.Translations}}{{pubkey_label}}{{/i18n.Translations}}:</label>
         <input type="text" id="nntpchan_key_target" />
       </div>
       <div>
-        <button onclick="nntpchan_key_add()">add key</button>
-        <button onclick="nntpchan_key_del()">remove key</button>
+        <button onclick="nntpchan_key_add()">{{#i18n.Translations}}{{add_key_prompt}}{{/i18n.Translations}}</button>
+        <button onclick="nntpchan_key_del()">{{#i18n.Translations}}{{remove_key_prompt}}{{/i18n.Translations}}</button>
       </div>
     </div>
     <hr />
     <div>
-      <div> nntp login </div>
+      <div> {{#i18n.Translations}}{{nntp_login_label}}{{/i18n.Translations}} </div>
       <div>
-        <label for="nntpchan_nntp_username">username:</label>
+        <label for="nntpchan_nntp_username">{{#i18n.Translations}}{{username}}{{/i18n.Translations}}:</label>
         <input id="nntpchan_nntp_username" />
       </div>
       <div>
-        <label for="nntpchan_nntp_passwd">password:</label>
+        <label for="nntpchan_nntp_passwd">{{#i18n.Translations}}{{password}}{{/i18n.Translations}}:</label>
         <input type="password" id="nntpchan_nntp_passwd" />
       </div>
       <div>
-        <button onclick="nntpchan_admin_nntp('nntp.login.add')">add user</button>
+        <button onclick="nntpchan_admin_nntp('nntp.login.add')">{{#i18n.Translations}}{{add_user_prompt}}{{/i18n.Translations}}</button>
       </div>
       <div>  
-        <button onclick="nntpchan_admin_nntp('nntp.login.del')">remove user</button>        
+        <button onclick="nntpchan_admin_nntp('nntp.login.del')">{{#i18n.Translations}}{{remove_user_prompt}}{{/i18n.Translations}}</button>        
       </div>
     </div>
     <hr />
     <div>
-      <div> board actions </div>
+      <div> {{#i18n.Translations}}{{board_actions_label}}{{/i18n.Translations}} </div>
       <div>
-        <label for="nntpchan_board_target">board name:</label>
+        <label for="nntpchan_board_target">{{#i18n.Translations}}{{board_name_title}}{{/i18n.Translations}}:</label>
         <input id="nntpchan_board_target" />
       </div>
       <div>
-        <button onclick="nntpchan_admin_board('frontend.add')">add board</button>
+        <button onclick="nntpchan_admin_board('frontend.add')">{{#i18n.Translations}}{{add_board_prompt}}{{/i18n.Translations}}</button>
       </div>
       <div>
-        <button onclick="nntpchan_admin_board('frontend.regen')">regenerate</button>
+        <button onclick="nntpchan_admin_board('frontend.regen')">{{#i18n.Translations}}{{regenerate_prompt}}{{/i18n.Translations}}</button>
       </div>
       <div>    
-        <button onclick="nntpchan_admin_board('frontend.ban')">ban</button>
-        <button onclick="nntpchan_admin_board('frontend.unban')">unban</button>
+        <button onclick="nntpchan_admin_board('frontend.ban')">{{#i18n.Translations}}{{ban_prompt}}{{/i18n.Translations}}</button>
+        <button onclick="nntpchan_admin_board('frontend.unban')">{{#i18n.Translations}}{{unban_prompt}}{{/i18n.Translations}}</button>
       </div>
       <div>
-        <button onclick="nntpchan_admin_board('frontend.nuke')">nuke</button>
+        <button onclick="nntpchan_admin_board('frontend.nuke')">{{#i18n.Translations}}{{nuke_prompt}}{{/i18n.Translations}}</button>
       </div>
     </div>
     <hr />
     <div>
       <div>
-        lightweight actions
+        {{#i18n.Translations}}{{light_actions_label}}{{/i18n.Translations}}
       </div>
       <div>
-        <button onclick="nntpchan_admin('template.reload')">reload all templates</button>
+        <button onclick="nntpchan_admin('template.reload')">{{#i18n.Translations}}{{reload_templates_prompt}}{{/i18n.Translations}}</button>
       </div>
     </div>
     <hr />
     <div>
-      <label>very load heavy actions, use with care</label>
+      <label>{{#i18n.Translations}}{{heavy_actions_label}}{{/i18n.Translations}}</label>
       <div>
-        <button onclick="nntpchan_admin('frontend.regen')">rengenerate all markup</button>
-        <button onclick="nntpchan_admin('thumbnail.regen')">regenerate all thumbnails</button>
+        <button onclick="nntpchan_admin('frontend.regen')">{{#i18n.Translations}}{{regenerate_markup_prompt}}{{/i18n.Translations}}</button>
+        <button onclick="nntpchan_admin('thumbnail.regen')">{{#i18n.Translations}}{{regenerate_thumbs_prompt}}{{/i18n.Translations}}</button>
       </div>
     </div>  
     <div id="nntpchan_mod_result"></div>
     <noscript>
-      <b>enable js to use the mod panel kthx</b>
+      <b>{{#i18n.Translations}}{{nojs_info}}{{/i18n.Translations}}</b>
     </noscript>
   </body>
 </html>
diff --git a/contrib/templates/default/navbar.mustache b/contrib/templates/default/navbar.mustache
index f3c7e39..d07876b 100644
--- a/contrib/templates/default/navbar.mustache
+++ b/contrib/templates/default/navbar.mustache
@@ -12,7 +12,7 @@
  <div class="navbar">
    <span class="navbar-name">
      <span class="board_title">{{name}}</span>
-     on
+     {{#i18n.Translations}}{{navbar_on}}{{/i18n.Translations}}
      <span class="frontend_title">{{frontend}}</span>
    </span>
    <span class="navbar-sep">
@@ -31,16 +31,16 @@
      |
    </span>
    <span class="navbar-links"> 
-     <span class="navbar-link"><a href="{{prefix}}">front page</a></span>
+     <span class="navbar-link"><a href="{{prefix}}">{{#i18n.Translations}}{{front_page_title}}{{/i18n.Translations}}</a></span>
    </span>
    <span class="navbar-sep">
      |
    </span>
    <span class="navbar-links"> 
-     <span class="navbar-link"><a href="{{prefix}}ukko.html">overboard</a></span>
+     <span class="navbar-link"><a href="{{prefix}}ukko.html">{{#i18n.Translations}}{{overboard_title}}{{/i18n.Translations}}</a></span>
    </span>
    <span class="navbar-sep">
      |
    </span>
  </div>
- <hr />
\ No newline at end of file
+ <hr />
diff --git a/contrib/templates/default/newboard.mustache b/contrib/templates/default/newboard.mustache
index c6315db..1889605 100644
--- a/contrib/templates/default/newboard.mustache
+++ b/contrib/templates/default/newboard.mustache
@@ -1,13 +1,13 @@
 <html>
   <head>
-    <title>create new board</title>
+    <title>{{#i18n.Translations}}{{new_board_title}}{{/i18n.Translations}}</title>
     <link rel="stylesheet" href="{{prefix}}static/site.css" />
     <link rel="stylesheet" href="{{prefix}}static/user.css" />
     <script type="text/javascript" src="{{prefix}}static/newboard.js">
     </script>
   </head>
   <body>
-    <p>make your first post</p>
+    <p>{{#i18n.Translations}}{{first_post_label}}{{/i18n.Translations}}</p>
     <hr />
     <form action="{{prefix}}post/" enctype="multipart/form-data" name="post" method="post" id="postform" >
     <div id="postform-outer">
@@ -16,7 +16,7 @@
           <tbody>
             <tr>
               <th>
-                Board Name
+                {{#i18n.Translations}}{{board_name_title}}{{/i18n.Translations}}
               </th>
               <td>
                 <input type="text" name="name" value="" id="boardname" />
@@ -25,7 +25,7 @@
             </tr>
             <tr>
               <th>
-                Comment
+                {{#i18n.Translations}}{{comment}}{{/i18n.Translations}}
               </th>
               <td>
              <textarea id="postform_message" name="message" cols=40 rows=5></textarea>
@@ -33,7 +33,7 @@
             </tr>
             <tr>
               <th>
-                Captcha
+                {{#i18n.Translations}}{{captcha}}{{/i18n.Translations}}
               </th>
               <td>
                 <img id="captcha_img" src="{{prefix}}captcha/img" alt="captcha" />
@@ -41,7 +41,7 @@
             </tr>
             <tr>
               <th>
-                Solution
+                {{#i18n.Translations}}{{solution}}{{/i18n.Translations}}
               </th>
               <td>
                 <input type="text" name="captcha" />
diff --git a/contrib/templates/default/overview.mustache b/contrib/templates/default/overview.mustache
index 01a2f97..ee434ed 100644
--- a/contrib/templates/default/overview.mustache
+++ b/contrib/templates/default/overview.mustache
@@ -8,9 +8,9 @@ paramters:
 <table id="overview_graph">
   <thead>
     <tr>
-      <th>Newsgroup</th>
-      <th>Posted</th>
-      <th>Subject</th>
+      <th>{{#i18n.Translations}}{{newsgroup}}{{/i18n.Translations}}</th>
+      <th>{{#i18n.Translations}}{{posted}}{{/i18n.Translations}}</th>
+      <th>{{#i18n.Translations}}{{subject}}{{/i18n.Translations}}</th>
     </tr>
   </thead>
   <tbody>
diff --git a/contrib/templates/default/post.mustache b/contrib/templates/default/post.mustache
index e1ad1bd..c23e851 100644
--- a/contrib/templates/default/post.mustache
+++ b/contrib/templates/default/post.mustache
@@ -2,20 +2,20 @@
   <legend class="postheader">
     <span class="origin">
   {{#post.IsI2P}}
-    <img src="{{post.Prefix}}static/i2p.png" title="post from i2p" />
+    <img src="{{post.Prefix}}static/i2p.png" title="{{#i18n.Translations}}{{from_i2p}}{{/i18n.Translations}}" />
   {{/post.IsI2P}}
   {{#post.IsTor}}
-    <img src="{{post.Prefix}}static/tor.png" title="post from tor" />
+    <img src="{{post.Prefix}}static/tor.png" title="{{#i18n.Translations}}{{from_tor}}{{/i18n.Translations}}" />
   {{/post.IsTor}}
   {{#post.IsClearnet}}
-    <img src="{{post.Prefix}}static/clearnet.png" title="post from clearnet" />
+    <img src="{{post.Prefix}}static/clearnet.png" title="{{#i18n.Translations}}{{from_clearnet}}{{/i18n.Translations}}" />
   {{/post.IsClearnet}}
     </span>  
     <span class="subject">{{post.Subject}}</span>
     <span class="name">{{post.Name}}</span>
     <time datetime="{{post.DateRFC}}">{{post.Date}}</time>
     <a href="#" class="postnol">No.</a><a class="postno" onclick="nntpchan_backlink('{{post.ShortHash}}');" title="{{post.MessageID}}">{{post.ShortHash}}</a>
-    <a href="{{post.PostURL}}">[Reply]</a>
+    <a href="{{post.PostURL}}">[{{#i18n.Translations}}{{reply_label}}{{/i18n.Translations}}]</a>
     <span class="tripcode">{{{post.Pubkey}}}</span>  
   </legend>
   {{#post.Attachments}}
diff --git a/contrib/templates/default/post_fail.mustache b/contrib/templates/default/post_fail.mustache
index 1c5ee50..8d0bcf3 100644
--- a/contrib/templates/default/post_fail.mustache
+++ b/contrib/templates/default/post_fail.mustache
@@ -4,6 +4,6 @@
   <link rel="stylesheet" href="{{prefix}}static/user.css" />
   <meta http-equiv="refresh" content="1; {{redirect_url}}" />
   <body>
-    <p>post failed: {{reason}}</p>
+    <p>{{#i18n.Translations}}{{post_failed_label}}{{/i18n.Translations}}: {{reason}}</p>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/contrib/templates/default/post_retry.mustache b/contrib/templates/default/post_retry.mustache
index 93a79d9..071087e 100644
--- a/contrib/templates/default/post_retry.mustache
+++ b/contrib/templates/default/post_retry.mustache
@@ -24,7 +24,7 @@
           <tbody>
             <tr>
               <th>
-                Captcha
+                {{#i18n.Translations}}{{captcha}}{{/i18n.Translations}}
               </th>
               <td>
                 <img id="captcha_img" src="{{prefix}}captcha/{{captcha_id}}.png" alt="captcha" />
@@ -32,7 +32,7 @@
             </tr>
             <tr>
               <th>
-                Solution
+                {{#i18n.Translations}}{{solution}}{{/i18n.Translations}}
               </th>
               <td>
                 <input type="text" name="captcha" />
@@ -45,4 +45,4 @@
     </div>
     </form>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/contrib/templates/default/post_success.mustache b/contrib/templates/default/post_success.mustache
index aa3c468..956ab04 100644
--- a/contrib/templates/default/post_success.mustache
+++ b/contrib/templates/default/post_success.mustache
@@ -10,6 +10,6 @@
   <link rel="stylesheet" href="{{prefix}}static/user.css" />
   <meta http-equiv="refresh" content="2; {{redirect_url}}" />
   <body>
-    <pre>posted as {{message_id}}</pre>
+    <pre>{{#i18n.Translations}}{{posted_as_label}}{{/i18n.Translations}} {{message_id}}</pre>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/contrib/templates/default/postform.mustache b/contrib/templates/default/postform.mustache
index 6a5370e..6c69f93 100644
--- a/contrib/templates/default/postform.mustache
+++ b/contrib/templates/default/postform.mustache
@@ -17,7 +17,7 @@
        <tbody>
          <tr>
            <th>
-             Name
+             {{#i18n.Translations}}{{name}}{{/i18n.Translations}}
            </th>
            <td>
              <input type="text" name="name" value="" />
@@ -25,7 +25,7 @@
          </tr>
          <tr>
            <th>
-             Subject
+             {{#i18n.Translations}}{{subject}}{{/i18n.Translations}}
            </th>
            <td>
              <input type="text" name="subject" value="" />
@@ -34,7 +34,7 @@
          </tr>
          <tr>
            <th>
-             Comment
+             {{#i18n.Translations}}{{comment}}{{/i18n.Translations}}
            </th>
            <td>
              <textarea id="postform_message" name="message" cols=40 rows=5></textarea>
@@ -43,7 +43,7 @@
          {{#files}}
          <tr>
            <th>
-             File
+             {{#i18n.Translations}}{{file}}{{/i18n.Translations}}
            </th>
            <td>
              <input id="postform_attachment" type="file" name="attachment" />
@@ -52,7 +52,7 @@
          {{/files}}
          <tr>
           <th>
-             Get Dubs
+             {{#i18n.Translations}}{{dubs}}{{/i18n.Translations}}
            </th>
            <td>
              <input type="checkbox" name="dubs" />
@@ -60,7 +60,7 @@
          </tr>
          <tr>
            <th>
-             Captcha
+             {{#i18n.Translations}}{{captcha}}{{/i18n.Translations}}
            </th>
            <td>
              <img id="captcha_img" src="{{prefix}}captcha/img" alt="captcha" />
@@ -68,7 +68,7 @@
          </tr>
          <tr>
            <th>
-             Solution
+             {{#i18n.Translations}}{{solution}}{{/i18n.Translations}}
            </th>
            <td>
              <input type="text" name="captcha" autocomplete="off" />
diff --git a/contrib/templates/default/posts_graph.mustache b/contrib/templates/default/posts_graph.mustache
index 7dfd6a1..96c0262 100644
--- a/contrib/templates/default/posts_graph.mustache
+++ b/contrib/templates/default/posts_graph.mustache
@@ -8,8 +8,8 @@ parameters:
 <table id="posts_graph">
   <thead>
     <tr>
-      <th>Day</th>
-      <th>Posts</th>
+      <th>{{#i18n.Translations}}{{day}}{{/i18n.Translations}}</th>
+      <th>{{#i18n.Translations}}{{posts}}{{/i18n.Translations}}</th>
       <th></th>
     </tr>
   </thead>
diff --git a/contrib/templates/default/thread.mustache b/contrib/templates/default/thread.mustache
index 8bf06ad..6fbae1d 100644
--- a/contrib/templates/default/thread.mustache
+++ b/contrib/templates/default/thread.mustache
@@ -44,7 +44,7 @@
       {{/ thread.Replies}}
     </div>
     <hr/>
-    <div class="navLinks">[<a href="{{thread.BoardURL}}" accesskey="a">Return</a>] [<a href="{{thread.Prefix}}catalog-{{thread.Board}}.html" accesskey="r">Catalog</a>] [<a href="#thread_{{thread.OP.PostHash}}">Top</a>] [<a href="#navlinks" accesskey="r" onclick="location.reload();">Update</a>]</div>
+    <div class="navLinks">[<a href="{{thread.BoardURL}}" accesskey="a">{{#i18n.Translations}}{{return}}{{/i18n.Translations}}</a>] [<a href="{{thread.Prefix}}catalog-{{thread.Board}}.html" accesskey="r">{{#i18n.Translations}}{{catalog_label}}{{/i18n.Translations}}</a>] [<a href="#thread_{{thread.OP.PostHash}}">{{#i18n.Translations}}{{to_top_label}}{{/i18n.Translations}}</a>] [<a href="#navlinks" accesskey="r" onclick="location.reload();">{{#i18n.Translations}}{{update}}{{/i18n.Translations}}</a>]</div>
       <script type="text/javascript">
           var e = document.getElementById("nntpchan_banner");
           nntpchan_inject_banners(e, "{{thread.Prefix}}");
diff --git a/contrib/templates/default/ukko.mustache b/contrib/templates/default/ukko.mustache
index c934ea7..0f767eb 100644
--- a/contrib/templates/default/ukko.mustache
+++ b/contrib/templates/default/ukko.mustache
@@ -6,7 +6,7 @@
 }}
 <html>
   <head>
-    <title> ukko / overboard </title>
+    <title> {{#i18n.Translations}}{{overboard_title}}{{/i18n.Translations}} </title>
     <meta charset="utf-8" />
     <link rel="stylesheet" href="{{prefix}}static/site.css" />
     <link rel="stylesheet" href="{{prefix}}static/user.css" />
@@ -17,12 +17,12 @@
       <div id="nntpchan_banner">
       </div>
     </center>
-    <div class="board_header"> ukko / overboard </div>
+    <div class="board_header"> {{#i18n.Translations}}{{overboard_title}}{{/i18n.Translations}} </div>
     <div id="ukko_threads">
       {{#threads}}
         <div class="thread" id="thread_{{OP.PostHash}}">
 	<div class="ukko_thread_header">
-          <p>Posted on <a href="{{{BoardURL}}}"><span class="ukko_boardname">{{OP.Board}}</span></a></p>
+          <p>{{#i18n.Translations}}{{posted_on_label}}{{/i18n.Translations}} <a href="{{{BoardURL}}}"><span class="ukko_boardname">{{OP.Board}}</span></a></p>
         </div>
           {{{OP.Truncate.RenderPost}}}
           {{#Truncate.Replies}}
diff --git a/contrib/translations/en-US.ini b/contrib/translations/en-US.ini
index 11b038d..c4d37aa 100644
--- a/contrib/translations/en-US.ini
+++ b/contrib/translations/en-US.ini
@@ -4,4 +4,114 @@ month_date_format=2006-02
 day_date_format=01-02
 
 [strings]
-foo=bar
+
+#catalog
+catalog_title=Catalog for
+replies_short_label=R
+pictures_short_label=P
+
+#board
+catalog_label=Catalog
+
+#board list
+board_list_title=board list
+board_label=Board
+pph_label=Posts per Hour
+ppd_label=Posts per Day
+total=Total
+
+#front page
+posts_today=Posts Today
+posts_hour=Posts this Hour
+
+#history
+month=Month
+posts=Posts
+post_history_title=Post History
+
+#keygen
+new_tripcode_title=here is a new tripcode
+new_tripcode_label=New Tripcode
+secret_key=secret
+public_key=public
+tripcode=tripcode
+
+#login
+login=login
+
+#modpage
+modpage_title=nntpchan mod page
+post_actions_label=post actions
+target_label=target
+ban_url_prompt=ban (url)
+delete_url_prompt=delete (url)
+unban_ip_prompt=unban (ip)
+key_actions_label=key actions
+pubkey_label=pubkey
+add_key_prompt=add key
+remove_key_prompt=remove key
+nntp_login_label=nntp login
+username=username
+password=password
+add_user_prompt=add user
+remove_user_prompt=remove user
+board_actions_label=board actions
+board_name_title=board name
+add_board_prompt=add board
+regenerate_prompt=regenerate
+ban_prompt=ban
+unban_prompt=unban
+nuke_prompt=nuke
+light_actions_label=lightweight actions
+reload_templates_prompt=reload all templates
+heavy_actions_label=very load heavy actions, use with care
+regenerate_markup_prompt=regenerate all markup
+regenerate_thumbs_prompt=regenerate all thumbnails
+nojs_info=enable js to use the mod panel kthx
+
+#navbar
+navbar_on=on
+front_page_title=front page
+overboard_title=overboard
+
+#newboard
+new_board_title=create new board
+first_post_label=make your first post
+comment=Comment
+captcha=Captcha
+solution=Solution
+
+#overview
+newsgroup=Newsgroup
+posted=Posted
+subject=Subject
+
+#post
+from_i2p=posted from i2p
+from_tor=posted from tor
+from_clearnet=posted from clearnet
+reply_label=Reply
+
+#post failed
+post_failed_label=post failed
+
+#post form
+name=Name
+file=File
+dubs=Get Dubs
+
+#posts graph
+day=Day
+
+#post success
+posted_as_label=posted as
+
+#thread
+return=Return
+to_top_label=Top
+update=Update
+
+#ukko
+overboard_title=ukko / overboard
+posted_on_label=Posted on
+

From 60de698f2c85084e76757b86290e35a45f49656a Mon Sep 17 00:00:00 2001
From: ZiRo <z_i_r_o@ymail.com>
Date: Sun, 28 Feb 2016 13:57:51 +0100
Subject: [PATCH 5/7] Add German translation

---
 contrib/templates/default/navbar.mustache |   2 +-
 contrib/translations/de-DE.ini            | 117 ++++++++++++++++++++++
 2 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 contrib/translations/de-DE.ini

diff --git a/contrib/templates/default/navbar.mustache b/contrib/templates/default/navbar.mustache
index d07876b..5595497 100644
--- a/contrib/templates/default/navbar.mustache
+++ b/contrib/templates/default/navbar.mustache
@@ -37,7 +37,7 @@
      |
    </span>
    <span class="navbar-links"> 
-     <span class="navbar-link"><a href="{{prefix}}ukko.html">{{#i18n.Translations}}{{overboard_title}}{{/i18n.Translations}}</a></span>
+     <span class="navbar-link"><a href="{{prefix}}ukko.html">{{#i18n.Translations}}{{overboard_label}}{{/i18n.Translations}}</a></span>
    </span>
    <span class="navbar-sep">
      |
diff --git a/contrib/translations/de-DE.ini b/contrib/translations/de-DE.ini
new file mode 100644
index 0000000..b146e27
--- /dev/null
+++ b/contrib/translations/de-DE.ini
@@ -0,0 +1,117 @@
+[formats]
+full_date_format=15:04:05 01.02.2006
+month_date_format=02.2006
+day_date_format=02.01
+
+[strings]
+
+#catalog
+catalog_title=Katalog für
+replies_short_label=A
+pictures_short_label=B
+
+#board
+catalog_label=Katalog
+
+#board list
+board_list_title=Boardliste
+board_label=Board
+pph_label=Posts pro Stunde
+ppd_label=Posts pro Tag
+total=Gesamt
+
+#front page
+posts_today=Posts heute
+posts_hour=Posts diese Stunde
+
+#history
+month=Monat
+posts=Posts
+post_history_title=Postverlauf
+
+#keygen
+new_tripcode_title=Hier ist der neue Tripcode
+new_tripcode_label=Neuer Tripcode
+secret_key=Privater Schlüssel
+public_key=Öffentlicher Schlüssel
+tripcode=Tripcode
+
+#login
+login=Anmeldung
+
+#modpage
+modpage_title=nntpchan-Moderationsseite
+post_actions_label=Postfunktionen
+target_label=Ziel
+ban_url_prompt=Bannen (URL)
+delete_url_prompt=Löschen (URL)
+unban_ip_prompt=Bann aufheben (IP)
+key_actions_label=Schlüsselfunktionen
+pubkey_label=Öffentlicher Schlüssel
+add_key_prompt=Schlüssel hinzufügen
+remove_key_prompt=Schlüssen entfernen
+nntp_login_label=NNTP-Benutzer
+username=Benutzername
+password=Password
+add_user_prompt=Benutzer hinzufügen
+remove_user_prompt=Benutzer entfernen
+board_actions_label=Boardfunktionen
+board_name_title=Boardname
+add_board_prompt=Board hinzufügen
+regenerate_prompt=Regenerieren
+ban_prompt=Bannen
+unban_prompt=Bann aufheben
+nuke_prompt=Sprengen
+light_actions_label=Schnelle Funktionen
+reload_templates_prompt=Alle Templates erneut laden
+heavy_actions_label=Rechenintensive Funktionen (mit Vorsicht verwenden)
+regenerate_markup_prompt=Alle HTML-Seiten regenerieren
+regenerate_thumbs_prompt=Alle Vorschaubilder regenerieren
+nojs_info=Bitte aktivieren Sie JavaScript, um diese Seite zu nutzen.
+
+#navbar
+navbar_on=@
+front_page_title=Startseite
+overboard_label=Überboard
+
+#newboard
+new_board_title=Neues Board erstellen
+first_post_label=Machen Sie den ersten Post
+comment=Kommentar
+captcha=Captcha
+solution=Lösung
+
+#overview
+newsgroup=Newsgroup
+posted=Gepostet
+subject=Betreff
+
+#post
+from_i2p=Vom I2P-Netzwerk gepostet
+from_tor=Vom Tor-Netzwerk gepostet
+from_clearnet=Vom Clearnet gepostet
+reply_label=Antworten
+
+#post failed
+post_failed_label=Post fehlgeschlagen
+
+#post form
+name=Name
+file=Anhang
+dubs=Doppel?
+
+#posts graph
+day=Tag
+
+#post success
+posted_as_label=Gepostet als
+
+#thread
+return=Zurück
+to_top_label=Nach oben
+update=Updaten
+
+#ukko
+overboard_title=ukko / Überboard
+posted_on_label=Gepostet in
+

From a4f3e4ffa4555df549a85c0abce921c00247ed61 Mon Sep 17 00:00:00 2001
From: ZiRo <z_i_r_o@ymail.com>
Date: Sun, 28 Feb 2016 13:59:38 +0100
Subject: [PATCH 6/7] Fix date format

---
 contrib/translations/de-DE.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/translations/de-DE.ini b/contrib/translations/de-DE.ini
index b146e27..bf55f01 100644
--- a/contrib/translations/de-DE.ini
+++ b/contrib/translations/de-DE.ini
@@ -1,5 +1,5 @@
 [formats]
-full_date_format=15:04:05 01.02.2006
+full_date_format=15:04:05 02.01.2006
 month_date_format=02.2006
 day_date_format=02.01
 

From 5cf11d50d456d4fd8fca15031ad7e6ff28a266d0 Mon Sep 17 00:00:00 2001
From: ZiRo <z_i_r_o@ymail.com>
Date: Sun, 28 Feb 2016 14:00:22 +0100
Subject: [PATCH 7/7] Fix date format

---
 contrib/translations/de-DE.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/translations/de-DE.ini b/contrib/translations/de-DE.ini
index bf55f01..7fbb739 100644
--- a/contrib/translations/de-DE.ini
+++ b/contrib/translations/de-DE.ini
@@ -1,6 +1,6 @@
 [formats]
 full_date_format=15:04:05 02.01.2006
-month_date_format=02.2006
+month_date_format=01.2006
 day_date_format=02.01
 
 [strings]