update files with conflicts

2025-07-18 06:06:06 -04:00 · 2019-07-22 17:28:59 +02:00
parent 56930a8921 ae81dd94a5
commit 5930470023
244 changed files with 62138 additions and 14005 deletions
--- a/src/locales/EU/LC_MESSAGES/twblue.po
+++ b/src/locales/EU/LC_MESSAGES/twblue.po
--- a/src/locales/ar/lc_messages/twblue.po
+++ b/src/locales/ar/lc_messages/twblue.po
--- a/src/locales/ca/LC_MESSAGES/twblue
+++ b/src/locales/ca/LC_MESSAGES/twblue
--- a/src/locales/ca/LC_MESSAGES/twblue.mo
+++ b/src/locales/ca/LC_MESSAGES/twblue.mo
--- a/src/locales/ca/LC_MESSAGES/twblue.po
+++ b/src/locales/ca/LC_MESSAGES/twblue.po
--- a/src/locales/da/LC_MESSAGES/twblue
+++ b/src/locales/da/LC_MESSAGES/twblue
--- a/src/locales/da/LC_MESSAGES/twblue
+++ b/src/locales/da/LC_MESSAGES/twblue
--- a/src/locales/da/LC_MESSAGES/twblue.mo
+++ b/src/locales/da/LC_MESSAGES/twblue.mo
--- a/src/locales/da/LC_MESSAGES/twblue.po
+++ b/src/locales/da/LC_MESSAGES/twblue.po
--- a/src/locales/de/LC_MESSAGES/twblue.mo
+++ b/src/locales/de/LC_MESSAGES/twblue.mo
--- a/src/locales/de/LC_MESSAGES/twblue.po
+++ b/src/locales/de/LC_MESSAGES/twblue.po
--- a/src/locales/es/LC_MESSAGES/twblue.mo
+++ b/src/locales/es/LC_MESSAGES/twblue.mo
--- a/src/locales/es/LC_MESSAGES/twblue.po
+++ b/src/locales/es/LC_MESSAGES/twblue.po
--- a/src/locales/fi/LC_MESSAGES/twblue.mo
+++ b/src/locales/fi/LC_MESSAGES/twblue.mo
--- a/src/locales/fi/LC_MESSAGES/twblue.po
+++ b/src/locales/fi/LC_MESSAGES/twblue.po
--- a/src/locales/gl/LC_MESSAGES/twblue
+++ b/src/locales/gl/LC_MESSAGES/twblue
--- a/src/locales/gl/LC_MESSAGES/twblue.mo
+++ b/src/locales/gl/LC_MESSAGES/twblue.mo
--- a/src/locales/gl/LC_MESSAGES/twblue.po
+++ b/src/locales/gl/LC_MESSAGES/twblue.po
--- a/src/locales/he_il/lc_messages/twblue.mo
+++ b/src/locales/he_il/lc_messages/twblue.mo
--- a/src/locales/he_il/lc_messages/twblue.po
+++ b/src/locales/he_il/lc_messages/twblue.po
--- a/src/locales/hr/LC_MESSAGES/twblue.mo
+++ b/src/locales/hr/LC_MESSAGES/twblue.mo
--- a/src/locales/hr/LC_MESSAGES/twblue.po
+++ b/src/locales/hr/LC_MESSAGES/twblue.po
--- a/src/locales/hu/LC_MESSAGES/twblue.po
+++ b/src/locales/hu/LC_MESSAGES/twblue.po
--- a/src/locales/it/LC_MESSAGES/twblue
+++ b/src/locales/it/LC_MESSAGES/twblue
--- a/src/locales/it/LC_MESSAGES/twblue.mo
+++ b/src/locales/it/LC_MESSAGES/twblue.mo
--- a/src/locales/it/LC_MESSAGES/twblue.po
+++ b/src/locales/it/LC_MESSAGES/twblue.po
--- a/src/locales/ja/lc_messages/twblue
+++ b/src/locales/ja/lc_messages/twblue
--- a/src/locales/ja/lc_messages/twblue.mo
+++ b/src/locales/ja/lc_messages/twblue.mo
--- a/src/locales/ja/lc_messages/twblue.po
+++ b/src/locales/ja/lc_messages/twblue.po
--- a/src/locales/mn/lc_messages/twblue.mo
+++ b/src/locales/mn/lc_messages/twblue.mo
--- a/src/locales/mn/lc_messages/twblue.po
+++ b/src/locales/mn/lc_messages/twblue.po
--- a/src/locales/pl/LC_MESSAGES/twblue.mo
+++ b/src/locales/pl/LC_MESSAGES/twblue.mo
--- a/src/locales/pl/LC_MESSAGES/twblue.po
+++ b/src/locales/pl/LC_MESSAGES/twblue.po
--- a/src/locales/pt/LC_MESSAGES/twblue.po
+++ b/src/locales/pt/LC_MESSAGES/twblue.po
--- a/src/locales/ro/LC_MESSAGES/twblue.mo
+++ b/src/locales/ro/LC_MESSAGES/twblue.mo
--- a/src/locales/ro/LC_MESSAGES/twblue.po
+++ b/src/locales/ro/LC_MESSAGES/twblue.po
--- a/src/locales/ru/LC_MESSAGES/twblue.po
+++ b/src/locales/ru/LC_MESSAGES/twblue.po
--- a/src/locales/sr/LC_MESSAGES/twblue.po
+++ b/src/locales/sr/LC_MESSAGES/twblue.po
--- a/src/locales/tr/LC_MESSAGES/twblue.mo
+++ b/src/locales/tr/LC_MESSAGES/twblue.mo
--- a/src/locales/tr/LC_MESSAGES/twblue.po
+++ b/src/locales/tr/LC_MESSAGES/twblue.po