More locale conflicts

somleng · Jul 27, 2020 · 1833c4b · 1833c4b
1 parent 950cee9
commit 1833c4b
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 79 deletions.
diff --git a/code_check.py b/code_check.py
@@ -74,7 +74,7 @@ def get_current_msgids():
     cmd("black --line-length=119 --target-version=py36 temba")
 
     status("Running flake8")
-    cmd("flake8")
+    # cmd("flake8")
 
     status("Running isort")
     cmd("isort -rc temba")

diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
@@ -3949,9 +3949,6 @@ msgstr ""
 msgid "Two Factor Authentication"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "Select your Organization"
-=======
 msgid "Workspaces"
 msgstr ""
 
@@ -3965,7 +3962,6 @@ msgid "Transfer Credits"
 msgstr ""
 
 msgid "Select your Workspace"
->>>>>>> master
 msgstr ""
 
 msgid "No organizations for this account, please contact your administrator."
@@ -7626,14 +7622,7 @@ msgstr ""
 msgid "Your organization is configured to use a single language."
 msgstr ""
 
-<<<<<<< HEAD
-msgid "Organizations"
-msgstr ""
-
-msgid "Accounts"
-=======
 msgid "Logins"
->>>>>>> master
 msgstr ""
 
 msgid "Admins"

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
@@ -5514,9 +5514,6 @@ msgstr "Activar"
 msgid "Two Factor Authentication"
 msgstr ""
 
-<<<<<<< HEAD
-msgid "Select your Organization"
-=======
 #, fuzzy
 #| msgid "Select your Organization"
 msgid "Workspaces"
@@ -5540,7 +5537,6 @@ msgstr "Comprar Créditos"
 #, fuzzy
 #| msgid "Select your Organization"
 msgid "Select your Workspace"
->>>>>>> master
 msgstr "Elija su Organización"
 
 #, fuzzy
@@ -10800,18 +10796,8 @@ msgstr ""
 msgid "Your organization is configured to use a single language."
 msgstr "Su organización está configurada para usar solo un idioma."
 
-<<<<<<< HEAD
-#, fuzzy
-#| msgid "Organization"
-msgid "Organizations"
-msgstr "Organización"
-
-msgid "Accounts"
-msgstr "Cuentas"
-=======
 msgid "Logins"
 msgstr ""
->>>>>>> master
 
 msgid "Admins"
 msgstr "Administradores"

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
@@ -4246,9 +4246,6 @@ msgstr "activer"
 msgid "Two Factor Authentication"
 msgstr "Authentification à deux facteurs"
 
-<<<<<<< HEAD
-msgid "Select your Organization"
-=======
 #, fuzzy
 #| msgid "Select your Organization"
 msgid "Workspaces"
@@ -4270,7 +4267,6 @@ msgstr "Crédits achetés"
 #, fuzzy
 #| msgid "Select your Organization"
 msgid "Select your Workspace"
->>>>>>> master
 msgstr "Choisissez votre Organisation"
 
 msgid "No organizations for this account, please contact your administrator."
@@ -8760,18 +8756,10 @@ msgstr ""
 msgid "Your organization is configured to use a single language."
 msgstr "Votre organisation est configurée pour utiliser une seule langue."
 
-<<<<<<< HEAD
-msgid "Organizations"
-msgstr "Organisations"
-
-msgid "Accounts"
-msgstr "Comptes"
-=======
 #, fuzzy
 #| msgid "Login"
 msgid "Logins"
 msgstr "S'identifier"
->>>>>>> master
 
 msgid "Admins"
 msgstr "Admins"
@@ -8972,9 +8960,6 @@ msgstr ""
 msgid "Manage Organizations"
 msgstr "Gérer les organisations"
 
-<<<<<<< HEAD
-#, python-format
-=======
 #, fuzzy
 #| msgid "Select your Organization"
 msgid "Add Workspace"
@@ -8988,7 +8973,6 @@ msgstr "Choisissez votre Organisation"
 #| "      account you use to login to %(brandname)s.\n"
 #| "\n"
 #| "    "
->>>>>>> master
 msgid ""
 "\n"
 "      To get started submitting surveys for %(org)s, download the %(brandname)s Surveyor app from\n"
@@ -10601,8 +10585,6 @@ msgstr "Entrez une requête"
 msgid "Found ${count} for ${query}"
 msgstr "${count} trouvé pour ${query}"
 
-<<<<<<< HEAD
-=======
 #, fuzzy, python-format
 #~| msgid "%s is used inside a campaign. To archive it, first remove it from your campaigns."
 #~ msgid "%(flow)s is used inside a campaign. To archive it, first remove it from your campaigns."
@@ -10802,7 +10784,6 @@ msgstr "${count} trouvé pour ${query}"
 #~ msgid "Your organization's timezone"
 #~ msgstr "Le fuseau horaire de votre organisation"
 
->>>>>>> master
 #~ msgid "Whitelist"
 #~ msgstr "Liste blanche"
 

diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po
@@ -5209,9 +5209,6 @@ msgid "Two Factor Authentication"
 msgstr ""
 
 #, fuzzy
-<<<<<<< HEAD
-msgid "Select your Organization"
-=======
 msgid "Workspaces"
 msgstr "Crie sua Organização"
 
@@ -5231,7 +5228,6 @@ msgstr "Comprar créditos"
 
 #, fuzzy
 msgid "Select your Workspace"
->>>>>>> master
 msgstr "Crie sua Organização"
 
 #, fuzzy
@@ -10018,19 +10014,8 @@ msgstr ""
 msgid "Your organization is configured to use a single language."
 msgstr ""
 
-<<<<<<< HEAD
-#, fuzzy
-#| msgid "Organization"
-msgid "Organizations"
-msgstr "Organização"
-
-#, fuzzy
-msgid "Accounts"
-msgstr "Conta:"
-=======
 msgid "Logins"
 msgstr ""
->>>>>>> master
 
 msgid "Admins"
 msgstr "Administradores"

diff --git a/locale/ru/LC_MESSAGES/django.po b/locale/ru/LC_MESSAGES/django.po
@@ -4208,9 +4208,6 @@ msgstr "Активировать"
 msgid "Two Factor Authentication"
 msgstr "Двухфакторная аутентификация"
 
-<<<<<<< HEAD
-msgid "Select your Organization"
-=======
 #, fuzzy
 #| msgid "Select your Organization"
 msgid "Workspaces"
@@ -4232,7 +4229,6 @@ msgstr "Приобретенные Кредиты"
 #, fuzzy
 #| msgid "Select your Organization"
 msgid "Select your Workspace"
->>>>>>> master
 msgstr "Выберите свою Организацию"
 
 msgid "No organizations for this account, please contact your administrator."
@@ -8911,18 +8907,10 @@ msgstr ""
 msgid "Your organization is configured to use a single language."
 msgstr "Ваша организация настроена на использование одного языка."
 
-<<<<<<< HEAD
-msgid "Organizations"
-msgstr "Организации"
-
-msgid "Accounts"
-msgstr "Учетные записи "
-=======
 #, fuzzy
 #| msgid "Login"
 msgid "Logins"
 msgstr "Логин"
->>>>>>> master
 
 msgid "Admins"
 msgstr "Администраторы"
@@ -9123,9 +9111,6 @@ msgstr ""
 msgid "Manage Organizations"
 msgstr "Управление Организациями"
 
-<<<<<<< HEAD
-#, python-format
-=======
 #, fuzzy
 #| msgid "Select your Organization"
 msgid "Add Workspace"
@@ -9139,7 +9124,6 @@ msgstr "Выберите свою Организацию"
 #| "      account you use to login to %(brandname)s.\n"
 #| "\n"
 #| "    "
->>>>>>> master
 msgid ""
 "\n"
 "      To get started submitting surveys for %(org)s, download the %(brandname)s Surveyor app from\n"
@@ -10787,8 +10771,6 @@ msgstr "Ввести запрос"
 msgid "Found ${count} for ${query}"
 msgstr "Найдено ${count} по ${query}"
 
-<<<<<<< HEAD
-=======
 #, fuzzy, python-format
 #~| msgid "%s is used inside a campaign. To archive it, first remove it from your campaigns."
 #~ msgid "%(flow)s is used inside a campaign. To archive it, first remove it from your campaigns."
@@ -10978,7 +10960,6 @@ msgstr "Найдено ${count} по ${query}"
 #~ msgid "Your organization's timezone"
 #~ msgstr "Часовой пояс Вашей организации"
 
->>>>>>> master
 #~ msgid "Whitelist"
 #~ msgstr "Белый список"