From af8ba96100788afd65e3abed027d81c37ce1175e Mon Sep 17 00:00:00 2001 From: Edward Vielmetti Date: Fri, 24 Feb 2017 12:17:40 -0500 Subject: [PATCH 1/3] fix "yourchanges" typo This needs to also be fixed in all other messages. --- localwiki/locale/ca/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localwiki/locale/ca/LC_MESSAGES/django.po b/localwiki/locale/ca/LC_MESSAGES/django.po index 8be1d8f7..a4ad36d8 100644 --- a/localwiki/locale/ca/LC_MESSAGES/django.po +++ b/localwiki/locale/ca/LC_MESSAGES/django.po @@ -2413,7 +2413,7 @@ msgstr "" #: versionutils/merging/forms.py:55 msgid "" -"Someone else made changes before you but yourchanges were successfully " +"Someone else made changes before you but your changes were successfully " "merged." msgstr "" From 928dd5926c5bc838f55e36e72461a7d5f9501646 Mon Sep 17 00:00:00 2001 From: Edward Vielmetti Date: Fri, 24 Feb 2017 12:20:33 -0500 Subject: [PATCH 2/3] your changes typo fix --- localwiki/locale/da/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localwiki/locale/da/LC_MESSAGES/django.po b/localwiki/locale/da/LC_MESSAGES/django.po index 2e31678a..936f481b 100755 --- a/localwiki/locale/da/LC_MESSAGES/django.po +++ b/localwiki/locale/da/LC_MESSAGES/django.po @@ -2413,7 +2413,7 @@ msgstr "Advarsel: En anden bruger har lavet ændringer mens du redigerede dette. #: versionutils/merging/forms.py:55 msgid "" -"Someone else made changes before you but yourchanges were successfully " +"Someone else made changes before you but your changes were successfully " "merged." msgstr "En anden bruger har lavet ændringer mens du redigerede dette men det er lykkedes at sammenføje dine ændringer til den anden brugers" From fa9015a4ed11bf936328b92a70d21cecd818eede Mon Sep 17 00:00:00 2001 From: Edward Vielmetti Date: Fri, 24 Feb 2017 12:26:26 -0500 Subject: [PATCH 3/3] fix yourchanges typo as your changes --- localwiki/locale/de/LC_MESSAGES/django.po | 2 +- localwiki/locale/en/LC_MESSAGES/django.po | 2 +- localwiki/locale/es/LC_MESSAGES/django.po | 2 +- localwiki/locale/fr/LC_MESSAGES/django.po | 2 +- localwiki/locale/hu/LC_MESSAGES/django.po | 2 +- localwiki/locale/it/LC_MESSAGES/django.po | 2 +- localwiki/locale/ja/LC_MESSAGES/django.po | 2 +- localwiki/locale/nl/LC_MESSAGES/django.po | 2 +- localwiki/locale/pt/LC_MESSAGES/django.po | 2 +- localwiki/locale/ru/LC_MESSAGES/django.po | 2 +- localwiki/locale/uk/LC_MESSAGES/django.po | 2 +- localwiki/locale/zh/LC_MESSAGES/django.po | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/localwiki/locale/de/LC_MESSAGES/django.po b/localwiki/locale/de/LC_MESSAGES/django.po index c7cc1aa3..12ec2c37 100755 --- a/localwiki/locale/de/LC_MESSAGES/django.po +++ b/localwiki/locale/de/LC_MESSAGES/django.po @@ -2418,7 +2418,7 @@ msgstr "Warnung: jemand anderes hat für Dich Änderungen vorgenommen. Bitte üb #: versionutils/merging/forms.py:55 msgid "" -"Someone else made changes before you but yourchanges were successfully " +"Someone else made changes before you but your changes were successfully " "merged." msgstr "Jemand anderes hat für Dich Änderungen vorgenommen, aber Deine Änderungen wurden erfolgreich vereinigt." diff --git a/localwiki/locale/en/LC_MESSAGES/django.po b/localwiki/locale/en/LC_MESSAGES/django.po index b6715cf9..89d92ae7 100755 --- a/localwiki/locale/en/LC_MESSAGES/django.po +++ b/localwiki/locale/en/LC_MESSAGES/django.po @@ -2477,7 +2477,7 @@ msgstr "" #: versionutils/merging/forms.py:55 msgid "" -"Someone else made changes before you but yourchanges were successfully " +"Someone else made changes before you but your changes were successfully " "merged." msgstr "" diff --git a/localwiki/locale/es/LC_MESSAGES/django.po b/localwiki/locale/es/LC_MESSAGES/django.po index b9ca4851..ca2a46fc 100755 --- a/localwiki/locale/es/LC_MESSAGES/django.po +++ b/localwiki/locale/es/LC_MESSAGES/django.po @@ -2419,7 +2419,7 @@ msgstr "Atención: alguien más realizó cambios antes de ti. Por favor revisa l #: versionutils/merging/forms.py:55 msgid "" -"Someone else made changes before you but yourchanges were successfully " +"Someone else made changes before you but your changes were successfully " "merged." msgstr "Alguien más hizo cambios antes de ti pero sus cambios fueron combinados satisfactoriamente." diff --git a/localwiki/locale/fr/LC_MESSAGES/django.po b/localwiki/locale/fr/LC_MESSAGES/django.po index 78d686bd..388a1606 100644 --- a/localwiki/locale/fr/LC_MESSAGES/django.po +++ b/localwiki/locale/fr/LC_MESSAGES/django.po @@ -2417,7 +2417,7 @@ msgstr "Attention: quelqu\\'un d\\'autre à effectué des changements avant vous #: versionutils/merging/forms.py:55 msgid "" -"Someone else made changes before you but yourchanges were successfully " +"Someone else made changes before you but your changes were successfully " "merged." msgstr "Quelqu\\'un/e d\\'autre à effectué des changement avant vous mais vos modifications on été ajoutées avec succés." diff --git a/localwiki/locale/hu/LC_MESSAGES/django.po b/localwiki/locale/hu/LC_MESSAGES/django.po index 0e3b1afe..4b42d1fe 100644 --- a/localwiki/locale/hu/LC_MESSAGES/django.po +++ b/localwiki/locale/hu/LC_MESSAGES/django.po @@ -2417,7 +2417,7 @@ msgstr "Figyelem: valaki már módosítást hajtott végre. Először nézd meg #: versionutils/merging/forms.py:55 msgid "" -"Someone else made changes before you but yourchanges were successfully " +"Someone else made changes before you but your changes were successfully " "merged." msgstr "Valaki már módosította, de a te változtatásaiddal sikeresen összevontuk." diff --git a/localwiki/locale/it/LC_MESSAGES/django.po b/localwiki/locale/it/LC_MESSAGES/django.po index 269fea7d..e53d2372 100755 --- a/localwiki/locale/it/LC_MESSAGES/django.po +++ b/localwiki/locale/it/LC_MESSAGES/django.po @@ -2413,7 +2413,7 @@ msgstr "Attenzione: qualcun altro ha fatto delle modifiche prima di te. Per favo #: versionutils/merging/forms.py:55 msgid "" -"Someone else made changes before you but yourchanges were successfully " +"Someone else made changes before you but your changes were successfully " "merged." msgstr "Qualcun altro ha fatto delle modifiche prima di te, ma le tue modifiche sono state inserite correttamente." diff --git a/localwiki/locale/ja/LC_MESSAGES/django.po b/localwiki/locale/ja/LC_MESSAGES/django.po index 39de4fe4..173b14e8 100755 --- a/localwiki/locale/ja/LC_MESSAGES/django.po +++ b/localwiki/locale/ja/LC_MESSAGES/django.po @@ -2413,7 +2413,7 @@ msgstr "警告： あなたの前に別の人が変更しました。変更を #: versionutils/merging/forms.py:55 msgid "" -"Someone else made changes before you but yourchanges were successfully " +"Someone else made changes before you but your changes were successfully " "merged." msgstr "あなたの前に別の人が変更しましたが、あなたの変更は正しくマージされました。" diff --git a/localwiki/locale/nl/LC_MESSAGES/django.po b/localwiki/locale/nl/LC_MESSAGES/django.po index ee610379..62950a63 100644 --- a/localwiki/locale/nl/LC_MESSAGES/django.po +++ b/localwiki/locale/nl/LC_MESSAGES/django.po @@ -2416,7 +2416,7 @@ msgstr "Waarschuwing: iemand anders heeft reeds wijzigingen aangebracht. Bekijk #: versionutils/merging/forms.py:55 msgid "" -"Someone else made changes before you but yourchanges were successfully " +"Someone else made changes before you but your changes were successfully " "merged." msgstr "Iemand anders voor jou heeft reeds wijzigingen gemaakt, maar je wijzigingen zijn succesvol samengevoegd. " diff --git a/localwiki/locale/pt/LC_MESSAGES/django.po b/localwiki/locale/pt/LC_MESSAGES/django.po index 498556ff..48aae921 100755 --- a/localwiki/locale/pt/LC_MESSAGES/django.po +++ b/localwiki/locale/pt/LC_MESSAGES/django.po @@ -2414,7 +2414,7 @@ msgstr "Aviso: alguém gravou alterações antes de si. Por favor verifique as a #: versionutils/merging/forms.py:55 msgid "" -"Someone else made changes before you but yourchanges were successfully " +"Someone else made changes before you but your changes were successfully " "merged." msgstr "Alguém gravou alterações antes de si mas as suas alterações foram introduzidas com sucesso." diff --git a/localwiki/locale/ru/LC_MESSAGES/django.po b/localwiki/locale/ru/LC_MESSAGES/django.po index 5fab2020..2a405a32 100755 --- a/localwiki/locale/ru/LC_MESSAGES/django.po +++ b/localwiki/locale/ru/LC_MESSAGES/django.po @@ -2417,7 +2417,7 @@ msgstr "Внимание! Кто-то изменил и сохранил ран #: versionutils/merging/forms.py:55 msgid "" -"Someone else made changes before you but yourchanges were successfully " +"Someone else made changes before you but your changes were successfully " "merged." msgstr "Кто-то изменил и сохранил раньше вас, но ваши правки удалось объединить." diff --git a/localwiki/locale/uk/LC_MESSAGES/django.po b/localwiki/locale/uk/LC_MESSAGES/django.po index 0b53f743..0e6f2303 100644 --- a/localwiki/locale/uk/LC_MESSAGES/django.po +++ b/localwiki/locale/uk/LC_MESSAGES/django.po @@ -2419,7 +2419,7 @@ msgstr "Увага! Хтось змінив та зберіг раніше за #: versionutils/merging/forms.py:55 msgid "" -"Someone else made changes before you but yourchanges were successfully " +"Someone else made changes before you but your changes were successfully " "merged." msgstr "Хтось змінив та зберіг раніше за вас, проте ваші зміни вдалося об'єднати." diff --git a/localwiki/locale/zh/LC_MESSAGES/django.po b/localwiki/locale/zh/LC_MESSAGES/django.po index 311a84de..9961bcae 100644 --- a/localwiki/locale/zh/LC_MESSAGES/django.po +++ b/localwiki/locale/zh/LC_MESSAGES/django.po @@ -2415,7 +2415,7 @@ msgstr "" #: versionutils/merging/forms.py:55 msgid "" -"Someone else made changes before you but yourchanges were successfully " +"Someone else made changes before you but your changes were successfully " "merged." msgstr ""