Imported Upstream version 5upstream/5

11 files changed, 70 insertions, 54 deletions

diff --git a/nikola/data/themes/default/messages/de.py b/nikola/data/themes/default/messages/de.py
index f58b0a1..6e16a21 100644
--- a/nikola/data/themes/default/messages/de.py
+++ b/nikola/data/themes/default/messages/de.py
@@ -4,16 +4,18 @@ MESSAGES = {
     u"LANGUAGE": u"Deutsch",
     u"Posts for year %s": u"Einträge aus dem Jahr %s",
     u"Archive": u"Archiv",
-    u"Posts about %s:": u"Einträge über %s",
+    u"Posts about %s": u"Einträge über %s",
     u"Tags": u"Tags",
-    u"Also available in: ": u"Auch verfügbar in: ",
+    u"Also available in": u"Auch verfügbar in",
     u"More posts about": u"Weitere Einträge über",
-    u"Posted:": u"Veröffentlicht:",
+    u"Posted": u"Veröffentlicht",
     u"Original site": u"Original-Seite",
     u"Read in English": u"Auf Deutsch lesen",
-    u"Older posts →": u"Ältere Einträge →",
-    u"← Newer posts": u"← Neuere Einträge",
-    u"← Previous post": u"← Vorheriger Eintrag",
-    u"Next post →": u"Nächster Eintrag →",
+    u"Older posts": u"Ältere Einträge",
+    u"Newer posts": u"Neuere Einträge",
+    u"Previous post": u"Vorheriger Eintrag",
+    u"Next post": u"Nächster Eintrag",
     u"Source": u"Source",
+    u"Read more": u"Weiterlesen",
+    u"old posts page %d": u'Vorherige Einträge %d'
 }
diff --git a/nikola/data/themes/default/messages/en.py b/nikola/data/themes/default/messages/en.py
index 5a4a9bd..95b1210 100644
--- a/nikola/data/themes/default/messages/en.py
+++ b/nikola/data/themes/default/messages/en.py
@@ -1,17 +1,17 @@
 MESSAGES = [
     u"Posts for year %s",
     u"Archive",
-    u"Posts about %s:",
+    u"Posts about %s",
     u"Tags",
-    u"Also available in: ",
+    u"Also available in",
     u"More posts about",
-    u"Posted:",
+    u"Posted",
     u"Original site",
     u"Read in English",
-    u"← Newer posts",
-    u"Older posts →",
-    u"← Previous post",
-    u"Next post →",
+    u"Newer posts",
+    u"Older posts",
+    u"Previous post",
+    u"Next post",
     u"old posts page %d",
     u"Read more",
     u"Source",
diff --git a/nikola/data/themes/default/messages/es.py b/nikola/data/themes/default/messages/es.py
index 82d2300..78de676 100644
--- a/nikola/data/themes/default/messages/es.py
+++ b/nikola/data/themes/default/messages/es.py
@@ -4,18 +4,18 @@ MESSAGES = {
     u"LANGUAGE": u"Español",
     u"Posts for year %s": u"Posts del año %s",
     u"Archive": u"Archivo",
-    u"Posts about %s:": u"Posts sobre %s",
+    u"Posts about %s": u"Posts sobre %s",
     u"Tags": u"Tags",
-    u"Also available in: ": u"También disponible en: ",
+    u"Also available in": u"También disponible en",
     u"More posts about": u"Más posts sobre",
-    u"Posted:": u"Publicado:",
+    u"Posted": u"Publicado",
     u"Original site": u"Sitio original",
     u"Read in English": u"Leer en español",
-    u"Older posts →": u"Posts anteriores →",
-    u"← Newer posts": u"← Posts posteriores",
-    u"← Previous post": u"← Post anterior",
-    u"Next post →": u"Siguiente post →",
+    u"Older posts": u"Posts anteriores",
+    u"Newer posts": u"Posts posteriores",
+    u"Previous post": u"Post anterior",
+    u"Next post": u"Siguiente post",
     u"old posts page %d": u"posts antiguos página %d",
-    u"Read more": u"Leer mas",
+    u"Read more": u"Leer más",
     u"Source": u"Código",
 }
diff --git a/nikola/data/themes/default/messages/fr.py b/nikola/data/themes/default/messages/fr.py
index d4bf0a6..5db1a1f 100644
--- a/nikola/data/themes/default/messages/fr.py
+++ b/nikola/data/themes/default/messages/fr.py
@@ -4,14 +4,14 @@ MESSAGES = {
     u"LANGUAGE": u"Français",
     u"Posts for year %s": u"Billets de l'année %s",
     u"Archive": u"Archives",
-    u"Posts about %s:": u"Billets sur %s",
+    u"Posts about %s": u"Billets sur %s",
     u"Tags": u"Étiquettes",
-    u"Also available in: ": u"Disponible aussi en : ",
+    u"Also available in": u"Disponible aussi en",
     u"More posts about": u"Plus de billets sur",
-    u"Posted:": u"Publié :",
+    u"Posted": u"Publié",
     u"Original site": u"Site d'origine",
     u"Read in English": u"Lire en français",
-    u"← Newer posts": u"← Billets récents",
-    u"Older posts →": u"Anciens billets →",
+    u"Newer posts": u"Billets récents",
+    u"Older posts": u"Anciens billets",
     u"Source": u"Source",
 }
diff --git a/nikola/data/themes/default/messages/gr.py b/nikola/data/themes/default/messages/gr.py
index 62139c9..fa6bb32 100644
--- a/nikola/data/themes/default/messages/gr.py
+++ b/nikola/data/themes/default/messages/gr.py
@@ -4,17 +4,17 @@ MESSAGES = {
     u"LANGUAGE": u"Ελληνικά",
     u"Posts for year %s": u"Αναρτήσεις για τη χρονιά %s",
     u"Archive": u"Αρχείο",
-    u"Posts about %s:": u"Αναρτήσεις για %s",
+    u"Posts about %s": u"Αναρτήσεις για %s",
     u"Tags": u"Ετικέτες",
-    u"Also available in: ": u"Διαθέσιμο και στο: ",
+    u"Also available in": u"Διαθέσιμο και στο",
     u"More posts about": u"Περισσότερες αναρτήσεις για",
-    u"Posted:": u"Αναρτήθηκε :",
+    u"Posted": u"Αναρτήθηκε",
     u"Original site": u"Ιστοσελίδα αρχικής ανάρτησης",
     u"Read in English": u"Διαβάστε στα Ελληνικά",
-    u"← Newer posts": u"← Νεότερες αναρτήσεις",
-    u"Older posts →": u"Παλαιότερες αναρτήσεις →",
-    u"← Previous post": u"← Προηγούμενη ανάρτηση",
-    u"Next post →": u"Επόμενη ανάρτηση →",
+    u"Newer posts": u"Νεότερες αναρτήσεις",
+    u"Older posts": u"Παλαιότερες αναρτήσεις",
+    u"Previous post": u"Προηγούμενη ανάρτηση",
+    u"Next post": u"Επόμενη ανάρτηση",
     u"old posts page %d": u"σελίδα παλαιότερων αναρτήσεων %d",
     u"Source": u"Source",
 }
diff --git a/nikola/data/themes/default/messages/it.py b/nikola/data/themes/default/messages/it.py
index a4f37f0..01a97d5 100644
--- a/nikola/data/themes/default/messages/it.py
+++ b/nikola/data/themes/default/messages/it.py
@@ -2,18 +2,18 @@ MESSAGES = {
     u"LANGUAGE": u"Italiano",
     u"Posts for year %s": u"Articoli per l'anno %s",
     u"Archive": u"Archivio",
-    u"Posts about %s:": u"Articoli su %s",
+    u"Posts about %s": u"Articoli su %s",
     u"Tags": u"Tags",
-    u"Also available in: ": u"Anche disponibile in: ",
+    u"Also available in": u"Anche disponibile in",
     u"More posts about": u"Altri articoli su",
-    u"Posted:": u"Pubblicato:",
+    u"Posted": u"Pubblicato",
     u"Original site": u"Sito originale",
     u"Read in English": u"Leggi in italiano",
-    u"← Newer posts": u"← Articoli recenti",
-    u"Older posts →": u"Articoli più vecchi",
-    u"Older posts →": u"Articoli vecchi",
-    u"← Previous post": u"← Articolo precedente",
-    u"Next post →": u"← Articolo successivo",
+    u"Newer posts": u"Articoli recenti",
+    u"Older posts": u"Articoli più vecchi",
+    u"Older posts": u"Articoli vecchi",
+    u"Previous post": u"Articolo precedente",
+    u"Next post": u"Articolo successivo",
     u"old posts page %d": u"pagina dei vecchi articoli %d",
     u"Read more": u"Espandi",
     u"Source": u"Source",
diff --git a/nikola/data/themes/default/messages/ru.py b/nikola/data/themes/default/messages/ru.py
index 2bd652b..5d5cb01 100644
--- a/nikola/data/themes/default/messages/ru.py
+++ b/nikola/data/themes/default/messages/ru.py
@@ -4,14 +4,18 @@ MESSAGES = {
     u"LANGUAGE": u"Русский",
     u"Posts for year %s": u"Записи за %s год",
     u"Archive": u"Архив",
-    u"Posts about %s:": u"Записи с тэгом %s:",
+    u"Posts about %s": u"Записи с тэгом %s:",
     u"Tags": u"Тэги",
-    u"Also available in: ": u"Также доступно в: ",
+    u"Also available in": u"Также доступно в",
     u"More posts about": u"Больше записей о",
-    u"Posted:": u"Опубликовано",
+    u"Posted": u"Опубликовано",
     u"Original site": u"Оригинальный сайт",
     u"Read in English": u"Прочесть по-русски",
-    u"Older posts →": u"Старые записи →",
-    u"← Newer posts": u"← Новые записи",
+    u"Older posts": u"Старые записи",
+    u"Newer posts": u"Новые записи",
+    u"Previous post": u"Предыдущая запись",
+    u"Next post": u"Следующая запись",
+    u"old posts page %d": u"страница со старыми записями %d",
+    u"Read more": u"Продолжить чтение",
     u"Source": u"Source",
 }
diff --git a/nikola/data/themes/default/templates/base.tmpl b/nikola/data/themes/default/templates/base.tmpl
index b031423..cb5e0dd 100644
--- a/nikola/data/themes/default/templates/base.tmpl
+++ b/nikola/data/themes/default/templates/base.tmpl
@@ -53,7 +53,7 @@
         <%block name="belowtitle">
         %if len(translations) > 1:
         <small>
-            ${(messages[lang][u"Also available in: "])}
+            ${(messages[lang][u"Also available in"])}:&nbsp;
             %for langname in translations.keys():
                 %if langname != lang:
                     <a href="${_link("index", None, langname)}">${messages[langname]["LANGUAGE"]}</a>
diff --git a/nikola/data/themes/default/templates/gallery.tmpl b/nikola/data/themes/default/templates/gallery.tmpl
index 3c48413..37d749f 100644
--- a/nikola/data/themes/default/templates/gallery.tmpl
+++ b/nikola/data/themes/default/templates/gallery.tmpl
@@ -3,11 +3,21 @@
 <%block name="sourcelink"></%block>
 
 <%block name="content">
+    <ul class="breadcrumb">
+        % for link, crumb in crumbs:
+            <li><a href="${link}">/ ${crumb}</a></li>
+        % endfor
+    </ul>
     %if text:
     <p>
         ${text}
     </p>
     %endif
+    <ul>
+    % for folder in folders:
+        <li><a href="${folder}"><i class="icon-folder-open"></i>&nbsp;${folder}</a></li>
+    % endfor
+    </ul>
     <ul class="thumbnails">
         %for image in images:
             <li><a href="${image[0]}" class="thumbnail image-reference" ${image[2]}>
diff --git a/nikola/data/themes/default/templates/index.tmpl b/nikola/data/themes/default/templates/index.tmpl
index 45e2172..2c7b4be 100644
--- a/nikola/data/themes/default/templates/index.tmpl
+++ b/nikola/data/themes/default/templates/index.tmpl
@@ -5,7 +5,7 @@
         <div class="postbox">
         <h1><a href="${post.permalink(lang)}">${post.title(lang)}</a>
         <small>&nbsp;&nbsp;
-             ${messages[lang]["Posted:"]} ${post.date}
+             ${messages[lang]["Posted"]}: ${post.date}
         </small></h1>
         <hr>
         ${post.text(lang, index_teasers)}
@@ -19,12 +19,12 @@
 <ul class="pager">
   %if prevlink:
     <li class="previous">
-        <a href="${prevlink}">${messages[lang]["&larr; Newer posts"]}</a>
+        <a href="${prevlink}">&larr; ${messages[lang]["Newer posts"]}</a>
     </li>
   %endif
   %if nextlink:
     <li class="next">
-        <a href="${nextlink}">${messages[lang]["Older posts &rarr;"]}</a>
+        <a href="${nextlink}">${messages[lang]["Older posts"]} &rarr;</a>
     </li>
   %endif
 </ul>
diff --git a/nikola/data/themes/default/templates/post.tmpl b/nikola/data/themes/default/templates/post.tmpl
index b40ff89..6bbb460 100644
--- a/nikola/data/themes/default/templates/post.tmpl
+++ b/nikola/data/themes/default/templates/post.tmpl
@@ -8,7 +8,7 @@
     % endif
     <hr>
     <small>
-        ${messages[lang]["Posted:"]} ${post.date}&nbsp;&nbsp;|&nbsp;&nbsp;
+        ${messages[lang]["Posted"]}: ${post.date}&nbsp;&nbsp;|&nbsp;&nbsp;
 
         %if len(translations) > 1:
             %for langname in translations.keys():
@@ -32,12 +32,12 @@
     <ul class="pager">
     %if post.prev_post:
         <li class="previous">
-            <a href="${post.prev_post.permalink(lang)}">${messages[lang]["&larr; Previous post"]}</a>
+            <a href="${post.prev_post.permalink(lang)}">&larr; ${messages[lang]["Previous post"]}</a>
         </li>
     %endif
     %if post.next_post:
         <li class="next">
-            <a href="${post.next_post.permalink(lang)}">${messages[lang]["Next post &rarr;"]}</a>
+            <a href="${post.next_post.permalink(lang)}">${messages[lang]["Next post"]}  &rarr;</a>
         </li>
     %endif
     </ul>