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 /locale/it | |
| parent | 856556bb33ed4bd881f9ed866696fc6c1e5af37f (diff) | |
| download | www-ad575cbedbbc6d109241aebf225b7e07bdb17555.tar.gz www-ad575cbedbbc6d109241aebf225b7e07bdb17555.zip | |
i18n: fix conflicts in PO files
Diffstat (limited to 'locale/it')
| -rw-r--r-- | locale/it/LC_MESSAGES/messages.po | 6 |
1 files changed, 1 insertions, 5 deletions
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 "" |