Refined permissions by existing feature structure (closes #971, references #960)

localization/en/permissions.po

@@ -13,73 +13,91 @@ msgstr ""
 "X-Domain: grocy/permissions\n"
 
 msgid "ADMIN"
-msgstr ""
+msgstr "All permissions"
 
-msgid "CREATE_USER"
-msgstr "Create new users"
+msgid "USERS_CREATE"
+msgstr "Create users"
 
-msgid "EDIT_USER"
-msgstr "Edit existing users (including passwords)"
+msgid "USERS_EDIT"
+msgstr "Edit users (including passwords)"
 
-msgid "READ_USER"
-msgstr "View user data"
+msgid "USERS_READ"
+msgstr "Show users"
 
-msgid "EDIT_SELF"
-msgstr "Edit own user data, e.g. password and name"
+msgid "USERS_EDIT_SELF"
+msgstr "Edit own user data / change own password"
 
-msgid "BATTERY_UNDO_TRACK_CHARGE_CYCLE"
-msgstr "Batteries: undo tracking of charge cycles"
+msgid "BATTERIES_UNDO_CHARGE_CYCLE"
+msgstr "Undo charge cycle"
 
-msgid "BATTERY_TRACK_CHARGE_CYCLE"
-msgstr "Batteries: track charge cycle"
+msgid "BATTERIES_TRACK_CHARGE_CYCLE"
+msgstr "Track charge cycle"
 
-msgid "CHORE_TRACK"
-msgstr "Chores: track execution"
+msgid "CHORE_TRACK_EXECUTION"
+msgstr "Track execution"
 
-msgid "CHORE_TRACK_OTHERS"
-msgstr "Chores: Track execution for others"
-
-msgid "CHORE_EDIT"
-msgstr "Chores: Edit chore data"
-
-msgid "CHORE_UNDO"
-msgstr "Chores: undo tracked execution"
-
-msgid "UPLOAD_FILE"
-msgstr "Upload files, e.g. product images"
-
-msgid "DELETE_FILE"
-msgstr "Delete (uploaded) files"
+msgid "CHORE_UNDO_EXECUTION"
+msgstr "Undo execution"
 
 msgid "MASTER_DATA_EDIT"
-msgstr "Edit Master data (e.g. products)"
+msgstr "Edit master data"
 
-msgid "TASKS_UNDO"
-msgstr "Tasks: undo tracked execution"
+msgid "TASKS_UNDO_EXECUTION"
+msgstr "Undo execution"
 
 msgid "TASKS_MARK_COMPLETED"
-msgstr "Tasks: mark as completed"
+msgstr "Mark completed"
 
 msgid "STOCK_EDIT"
-msgstr "Stock: edit entries"
+msgstr "Edit stock entries"
 
 msgid "STOCK_TRANSFER"
-msgstr "Stock: transfer products between locations"
+msgstr "Transfer"
 
-msgid "STOCK_CORRECTION"
-msgstr "Stock: correct wrong entries"
+msgid "STOCK_INVENTORY"
+msgstr "Inventory"
 
-msgid "PRODUCT_CONSUME"
-msgstr "Consume Products"
+msgid "STOCK_CONSUME"
+msgstr "Consume"
 
-msgid "PRODUCT_OPEN"
+msgid "STOCK_OPEN"
 msgstr "Open products"
 
-msgid "PRODUCT_PURCHASE"
-msgstr "Purchase new products and add them to stock"
+msgid "STOCK_PURCHASE"
+msgstr "Purchase"
 
 msgid "SHOPPINGLIST_ITEMS_ADD"
-msgstr "Add items to shopping list"
+msgstr "Add items"
 
 msgid "SHOPPINGLIST_ITEMS_DELETE"
-msgstr "Remove items from shopping list"
+msgstr "Remove items"
+
+msgid "USERS"
+msgstr "User management"
+
+msgid "STOCK"
+msgstr "Stock"
+
+msgid "SHOPPINGLIST"
+msgstr "Shopping list"
+
+msgid "CHORES"
+msgstr "Chores"
+
+msgid "BATTERIES"
+msgstr "Batteries"
+
+msgid "TASKS"
+msgstr "Tasks"
+
+msgid "RECIPES"
+msgstr "Recipes"
+
+msgid "EQUIPMENT"
+msgstr "Equipment"
+
+msgid "CALENDAR"
+msgstr "Calendar"
+
+msgid "RECIPES_MEALPLAN"
+msgstr "Meal plan"

localization/permissions.pot

@@ -12,74 +12,122 @@ msgstr ""
 "Language: en\n"
 "X-Domain: grocy/permissions\n"
 
+# All permissions
 msgid "ADMIN"
 msgstr ""
 
-msgid "CREATE_USER"
+# Create users
+msgid "USERS_CREATE"
 msgstr ""
 
-msgid "EDIT_USER"
+#Edit users (including passwords)
+msgid "USERS_EDIT"
 msgstr ""
 
-msgid "READ_USER"
+# Show users
+msgid "USERS_READ"
 msgstr ""
 
-msgid "EDIT_SELF"
+# Edit own user data / change own password
+msgid "USERS_EDIT_SELF"
 msgstr ""
 
-msgid "BATTERY_UNDO_TRACK_CHARGE_CYCLE"
+# Undo charge cycle
+msgid "BATTERIES_UNDO_CHARGE_CYCLE"
 msgstr ""
 
-msgid "BATTERY_TRACK_CHARGE_CYCLE"
+# Track charge cycle
+msgid "BATTERIES_TRACK_CHARGE_CYCLE"
 msgstr ""
 
-msgid "CHORE_TRACK"
+# Track execution
+msgid "CHORE_TRACK_EXECUTION"
 msgstr ""
 
-msgid "CHORE_TRACK_OTHERS"
-msgstr ""
-
-msgid "CHORE_EDIT"
-msgstr ""
-
-msgid "CHORE_UNDO"
-msgstr ""
-
-msgid "UPLOAD_FILE"
-msgstr ""
-
-msgid "DELETE_FILE"
+# Undo execution
+msgid "CHORE_UNDO_EXECUTION"
 msgstr ""
 
+# Edit master data
 msgid "MASTER_DATA_EDIT"
 msgstr ""
 
-msgid "TASKS_UNDO"
+# Undo execution
+msgid "TASKS_UNDO_EXECUTION"
 msgstr ""
 
+# Mark completed
 msgid "TASKS_MARK_COMPLETED"
 msgstr ""
 
+# Edit stock entries
 msgid "STOCK_EDIT"
 msgstr ""
 
+# Transfer
 msgid "STOCK_TRANSFER"
 msgstr ""
 
-msgid "STOCK_CORRECTION"
+# Inventory
+msgid "STOCK_INVENTORY"
 msgstr ""
 
-msgid "PRODUCT_CONSUME"
+# Consume
+msgid "STOCK_CONSUME"
 msgstr ""
 
-msgid "PRODUCT_OPEN"
+# Open products
+msgid "STOCK_OPEN"
 msgstr ""
 
-msgid "PRODUCT_PURCHASE"
+# Purchase
+msgid "STOCK_PURCHASE"
 msgstr ""
 
+# Add items
 msgid "SHOPPINGLIST_ITEMS_ADD"
 msgstr ""
 
+# Remove items
 msgid "SHOPPINGLIST_ITEMS_DELETE"
 msgstr ""
+
+# User management
+msgid "USERS"
+msgstr ""
+
+# Stock
+msgid "STOCK"
+msgstr ""
+
+# Shopping list
+msgid "SHOPPINGLIST"
+msgstr ""
+
+# Chores
+msgid "CHORES"
+msgstr ""
+
+# Batteries
+msgid "BATTERIES"
+msgstr ""
+
+# Tasks
+msgid "TASKS"
+msgstr ""
+
+# Recipes
+msgid "RECIPES"
+msgstr ""
+
+# Equipment
+msgid "EQUIPMENT"
+msgstr ""
+
+# Calendar
+msgid "CALENDAR"
+msgstr ""
+
+# Meal plan
+msgid "RECIPES_MEALPLAN"
+msgstr ""

localization/strings.pot

@@ -1853,7 +1853,7 @@ msgstr ""
 msgid "Permissions for user %s"
 msgstr ""
 
-msgid "Are you sure you want to stop being an ADMIN?"
+msgid "Are you sure you want to remove full permissions for yourself?"
 msgstr ""
 
 msgid "Permissions saved"