[GNUnet-SVN] [taler-www] 05/05: i18n: fix conflicts in PO files

[gnunet]

This is an automated email from the git hooks/post-receive script.

tg pushed a commit to branch master
in repository www.

commit ad575cbedbbc6d109241aebf225b7e07bdb17555
Author: tg(x) <address@hidden>
AuthorDate: Thu Jan 19 19:00:08 2017 +0100

    i18n: fix conflicts in PO files
---
 locale/de/LC_MESSAGES/messages.po | 12 ++----------
 locale/it/LC_MESSAGES/messages.po |  6 +-----
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/locale/de/LC_MESSAGES/messages.po 
b/locale/de/LC_MESSAGES/messages.po
index d273e4e..5cd5b5f 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -757,11 +757,7 @@ msgstr "Vorteile für Regierungen"
 #: governments.html.j2:19 index.html.j2:23
 #, fuzzy
 msgid "Taxable"
-msgstr ""
-"#-#-#-#-#  index.de.po  #-#-#-#-#\n"
-"Taxierbar\n"
-"#-#-#-#-#  governments.de.po  #-#-#-#-#\n"
-"Besteuerbar"
+msgstr "Taxierbar"
 
 #: governments.html.j2:21
 msgid ""
@@ -824,11 +820,7 @@ msgstr ""
 #: governments.html.j2:40 index.html.j2:37
 #, fuzzy
 msgid "Libre"
-msgstr ""
-"#-#-#-#-#  index.de.po  #-#-#-#-#\n"
-"Liberal\n"
-"#-#-#-#-#  governments.de.po  #-#-#-#-#\n"
-"Freie Software"
+msgstr "Liberal"
 
 #: governments.html.j2:42
 msgid ""
diff --git a/locale/it/LC_MESSAGES/messages.po 
b/locale/it/LC_MESSAGES/messages.po
index 613c407..85954f2 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -815,11 +815,7 @@ msgstr ""
 #: governments.html.j2:40 index.html.j2:37
 #, fuzzy
 msgid "Libre"
-msgstr ""
-"#-#-#-#-#  index.it.po  #-#-#-#-#\n"
-"Libre\n"
-"#-#-#-#-#  governments.it.po  #-#-#-#-#\n"
-"Libero"
+msgstr "Libero"
 
 #: governments.html.j2:42
 msgid ""

-- 
To stop receiving notification emails like this one, please contact
address@hidden