summaryrefslogtreecommitdiff
path: root/ishtar_common/ishtar_menu.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-01-10 01:18:28 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-01-10 01:18:28 +0100
commita95e41815be353f717e5a9347166e0bbc486c687 (patch)
treea4aec468c53ba6d5baa688df0dba3fbb8a588fb4 /ishtar_common/ishtar_menu.py
parent99f0621b864550817931a46850e5194f571c9d81 (diff)
parent7475ae571619c3726e63c5cefc0215930cb83278 (diff)
downloadIshtar-a95e41815be353f717e5a9347166e0bbc486c687.tar.bz2
Ishtar-a95e41815be353f717e5a9347166e0bbc486c687.zip
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'ishtar_common/ishtar_menu.py')
-rw-r--r--ishtar_common/ishtar_menu.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ishtar_common/ishtar_menu.py b/ishtar_common/ishtar_menu.py
index 1f30bec0f..5ed8cad37 100644
--- a/ishtar_common/ishtar_menu.py
+++ b/ishtar_common/ishtar_menu.py
@@ -30,7 +30,7 @@ MENU_SECTIONS = [
childs=[
SectionItem(
'account', _(u"Account"),
- childs=[MenuItem('account_management', _(u"Add/modify"),
+ childs=[MenuItem('account_management', _(u"Addition/modification"),
model=models.IshtarUser,
access_controls=['add_ishtaruser', ]),
MenuItem('account_deletion', _(u"Deletion"),
@@ -67,7 +67,7 @@ MENU_SECTIONS = [
model=models.Person,
access_controls=['merge_person']),
MenuItem(
- 'person_deletion', _(u"Delete"),
+ 'person_deletion', _(u"Deletion"),
model=models.Person,
access_controls=['change_person', 'change_own_person']),
]),
@@ -98,7 +98,7 @@ MENU_SECTIONS = [
model=models.Organization,
access_controls=['merge_organization']),
MenuItem(
- 'organization_deletion', _(u"Delete"),
+ 'organization_deletion', _(u"Deletion"),
model=models.Organization,
access_controls=['change_organization',
'change_own_organization']),