summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortg(x) <*@tg-x.net>2017-01-19 19:00:08 +0100
committertg(x) <*@tg-x.net>2017-01-19 19:00:08 +0100
commitad575cbedbbc6d109241aebf225b7e07bdb17555 (patch)
tree05428e8c212c9a07a5050544abc1d8c403e2610d
parent856556bb33ed4bd881f9ed866696fc6c1e5af37f (diff)
downloadwww-ad575cbedbbc6d109241aebf225b7e07bdb17555.tar.gz
www-ad575cbedbbc6d109241aebf225b7e07bdb17555.tar.bz2
www-ad575cbedbbc6d109241aebf225b7e07bdb17555.zip
i18n: fix conflicts in PO files
-rw-r--r--locale/de/LC_MESSAGES/messages.po12
-rw-r--r--locale/it/LC_MESSAGES/messages.po6
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 ""