diff options
| author | tg(x) <*@tg-x.net> | 2017-01-19 19:00:08 +0100 |
|---|---|---|
| committer | tg(x) <*@tg-x.net> | 2017-01-19 19:00:08 +0100 |
| commit | ad575cbedbbc6d109241aebf225b7e07bdb17555 (patch) | |
| tree | 05428e8c212c9a07a5050544abc1d8c403e2610d | |
| parent | 856556bb33ed4bd881f9ed866696fc6c1e5af37f (diff) | |
| download | www-ad575cbedbbc6d109241aebf225b7e07bdb17555.tar.gz www-ad575cbedbbc6d109241aebf225b7e07bdb17555.zip | |
i18n: fix conflicts in PO files
| -rw-r--r-- | locale/de/LC_MESSAGES/messages.po | 12 | ||||
| -rw-r--r-- | 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 d273e4ef..5cd5b5f5 100644 --- a/locale/de/LC_MESSAGES/messages.po +++ b/locale/de/LC_MESSAGES/messages.po | |||
| @@ -757,11 +757,7 @@ msgstr "Vorteile für Regierungen" | |||
| 757 | #: governments.html.j2:19 index.html.j2:23 | 757 | #: governments.html.j2:19 index.html.j2:23 |
| 758 | #, fuzzy | 758 | #, fuzzy |
| 759 | msgid "Taxable" | 759 | msgid "Taxable" |
| 760 | msgstr "" | 760 | msgstr "Taxierbar" |
| 761 | "#-#-#-#-# index.de.po #-#-#-#-#\n" | ||
| 762 | "Taxierbar\n" | ||
| 763 | "#-#-#-#-# governments.de.po #-#-#-#-#\n" | ||
| 764 | "Besteuerbar" | ||
| 765 | 761 | ||
| 766 | #: governments.html.j2:21 | 762 | #: governments.html.j2:21 |
| 767 | msgid "" | 763 | msgid "" |
| @@ -824,11 +820,7 @@ msgstr "" | |||
| 824 | #: governments.html.j2:40 index.html.j2:37 | 820 | #: governments.html.j2:40 index.html.j2:37 |
| 825 | #, fuzzy | 821 | #, fuzzy |
| 826 | msgid "Libre" | 822 | msgid "Libre" |
| 827 | msgstr "" | 823 | msgstr "Liberal" |
| 828 | "#-#-#-#-# index.de.po #-#-#-#-#\n" | ||
| 829 | "Liberal\n" | ||
| 830 | "#-#-#-#-# governments.de.po #-#-#-#-#\n" | ||
| 831 | "Freie Software" | ||
| 832 | 824 | ||
| 833 | #: governments.html.j2:42 | 825 | #: governments.html.j2:42 |
| 834 | msgid "" | 826 | msgid "" |
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po index 613c4073..85954f29 100644 --- a/locale/it/LC_MESSAGES/messages.po +++ b/locale/it/LC_MESSAGES/messages.po | |||
| @@ -815,11 +815,7 @@ msgstr "" | |||
| 815 | #: governments.html.j2:40 index.html.j2:37 | 815 | #: governments.html.j2:40 index.html.j2:37 |
| 816 | #, fuzzy | 816 | #, fuzzy |
| 817 | msgid "Libre" | 817 | msgid "Libre" |
| 818 | msgstr "" | 818 | msgstr "Libero" |
| 819 | "#-#-#-#-# index.it.po #-#-#-#-#\n" | ||
| 820 | "Libre\n" | ||
| 821 | "#-#-#-#-# governments.it.po #-#-#-#-#\n" | ||
| 822 | "Libero" | ||
| 823 | 819 | ||
| 824 | #: governments.html.j2:42 | 820 | #: governments.html.j2:42 |
| 825 | msgid "" | 821 | msgid "" |