From 1231d0ca92c66cf4295e1bee384150c7ebfb6571 Mon Sep 17 00:00:00 2001
From: Bram de Leeuw <bram-de-leeuw@hotmail.com>
Date: Fri, 10 Jun 2016 13:04:15 +0200
Subject: [PATCH] added localisation for multiple authors in the entry meta

---
 lang/de.yml                     | 1 +
 lang/en.yml                     | 1 +
 lang/eo.yml                     | 2 +-
 lang/fa_IR.yml                  | 1 +
 lang/fi.yml                     | 1 +
 lang/fr.yml                     | 1 +
 lang/it.yml                     | 1 +
 lang/nl.yml                     | 1 +
 lang/ru.yml                     | 1 +
 lang/sv.yml                     | 1 +
 templates/Includes/EntryMeta.ss | 2 +-
 11 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lang/de.yml b/lang/de.yml
index 679c876..cf52379 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -5,6 +5,7 @@ de:
   Blog:
     Archive: Archiv
     By: von
+    AND: und
     CONTRIBUTOR: Mitwirkende
     Categories: Kategorien
     Category: Kategorie
diff --git a/lang/en.yml b/lang/en.yml
index 6e4a7d2..67ab15c 100755
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -5,6 +5,7 @@ en:
   Blog:
     Archive: Archive
     By: by
+    AND: and
     CONTRIBUTOR: Contributor
     Categories: Categories
     Category: Category
diff --git a/lang/eo.yml b/lang/eo.yml
index 9bec566..80dcb8e 100644
--- a/lang/eo.yml
+++ b/lang/eo.yml
@@ -4,7 +4,7 @@ eo:
     SINGULARNAME: 'Enarĥivi fenestraĵon'
   Blog:
     Archive: Arkivo
-    By: de
+    By: ja
     CONTRIBUTOR: Kontribuinto
     Categories: Kategorioj
     Category: Kategorio
diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml
index 2a3eb92..62a1190 100644
--- a/lang/fa_IR.yml
+++ b/lang/fa_IR.yml
@@ -5,6 +5,7 @@ fa_IR:
   Blog:
     Archive: بایگانی
     By: توسط
+    AND: و
     CONTRIBUTOR: مشارکت‌کننده
     Categories: مجموعه‌ها
     Category: مجموعه
diff --git a/lang/fi.yml b/lang/fi.yml
index f20f063..c946ef2 100755
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -5,6 +5,7 @@ fi:
   Blog:
     Archive: Arkisto
     By: kirjoittanut
+    AND: ja
     CONTRIBUTOR: Avustaja
     Categories: Kategoriat
     Category: Kategoria
diff --git a/lang/fr.yml b/lang/fr.yml
index 77dc8b3..40392c2 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -5,6 +5,7 @@ fr:
   Blog:
     Archive: Archive
     By: par
+    AND: et
     CONTRIBUTOR: Contributeur
     Categories: Catégories
     Category: Catégorie
diff --git a/lang/it.yml b/lang/it.yml
index 9ffc61e..6020e77 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -2,6 +2,7 @@ it:
   Blog:
     Archive: Archivia
     By: di
+    AND: e
     CONTRIBUTOR: Collaboratore
     Categories: Categorie
     Category: Categoria
diff --git a/lang/nl.yml b/lang/nl.yml
index a93bfde..fbd372e 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -5,6 +5,7 @@ nl:
   Blog:
     Archive: Archief
     By: door
+    AND: en
     CONTRIBUTOR: Co-auteur
     Categories: Categorieën
     Category: Categorie
diff --git a/lang/ru.yml b/lang/ru.yml
index 464c3a0..b706e0f 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -5,6 +5,7 @@ ru:
   Blog:
     Archive: Архив
     By: 'автор:'
+    AND: а также
     Categories: Категории
     Category: Категория
     Comments: Комментарии
diff --git a/lang/sv.yml b/lang/sv.yml
index 1337843..7f3a2ef 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -5,6 +5,7 @@ sv:
   Blog:
     Archive: Arkiv
     By: av
+    AND: och
     CONTRIBUTOR: Bidragsgivare
     Categories: Kategorier
     Category: Kategori
diff --git a/templates/Includes/EntryMeta.ss b/templates/Includes/EntryMeta.ss
index e9cc973..197ed74 100644
--- a/templates/Includes/EntryMeta.ss
+++ b/templates/Includes/EntryMeta.ss
@@ -25,7 +25,7 @@
 
 	<% if $Credits %>
 		<%t Blog.By "by" %>
-		<% loop $Credits %><% if not $First && not $Last %>, <% end_if %><% if not $First && $Last %> and <% end_if %><% if $URLSegment %><a href="$URL">$Name.XML</a><% else %>$Name.XML<% end_if %><% end_loop %>
+		<% loop $Credits %><% if not $First && not $Last %>, <% end_if %><% if not $First && $Last %> <%t Blog.AND "and" %> <% end_if %><% if $URLSegment %><a href="$URL">$Name.XML</a><% else %>$Name.XML<% end_if %><% end_loop %>
 	<% end_if %>
 
 </p>