summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-01-31 16:01:19 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-01-31 16:01:19 +0100
commit345e4c0de6adf46542ed5408b18f91e2fc8060d2 (patch)
tree4e1064444b5711e72648019e15e74de721b730c4 /ishtar_common
parent915e96df0a9d8c1328f504728d096e60cdc4851c (diff)
parent82aaa502d0b72e323e829cf4f041fd023f04f26e (diff)
downloadIshtar-345e4c0de6adf46542ed5408b18f91e2fc8060d2.tar.bz2
Ishtar-345e4c0de6adf46542ed5408b18f91e2fc8060d2.zip
Merge branch 'master' into develop
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/locale/django.pot2
1 files changed, 0 insertions, 2 deletions
diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot
index 098fbe1d9..750d36161 100644
--- a/ishtar_common/locale/django.pot
+++ b/ishtar_common/locale/django.pot
@@ -1424,12 +1424,10 @@ msgid "False"
msgstr ""
#: models_imports.py:505
-#| msgid "All user can use it"
msgid "All users can use it"
msgstr ""
#: models_imports.py:507
-#| msgid "All user can modify it"
msgid "All users can modify it"
msgstr ""