cleanup duplicate translation ids (#3001)

templates/activity/delete.html.twig

@@ -1,7 +1,7 @@
 {% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
 {% import "activity/actions.html.twig" as actions %}
 
-{% block page_title %}{{ 'admin_activity.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'activities'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.activity(activity, 'delete') }}{% endblock %}
 
 {% block main %}

templates/activity/details.html.twig

@@ -2,7 +2,7 @@
 {% import "macros/widgets.html.twig" as widgets %}
 {% import "activity/actions.html.twig" as actions %}
 
-{% block page_title %}{{ 'admin_activity.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'activities'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.activity(activity, 'activity_details') }}{% endblock %}
 
 {% block main %}

templates/activity/edit.html.twig

@@ -1,7 +1,7 @@
 {% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
 {% import "activity/actions.html.twig" as actions %}
 
-{% block page_title %}{{ 'admin_activity.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'activities'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.activity(activity, 'edit') }}{% endblock %}
 
 {% block main %}

templates/activity/index.html.twig

@@ -24,7 +24,7 @@
 
 {% set tableName = 'activity_admin' %}
 
-{% block page_title %}{{ 'admin_activity.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'activities'|trans }}{% endblock %}
 {% block page_search %}{{ search.searchModal(toolbarForm) }}{% endblock %}
 {% block page_actions %}{{ actions.activities('index', query) }}{% endblock %}
 

templates/activity/permissions.html.twig

@@ -1,7 +1,7 @@
 {% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
 {% import "activity/actions.html.twig" as actions %}
 
-{% block page_title %}{{ 'admin_activity.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'activities'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.activity(activity, 'permissions') }}{% endblock %}
 
 {% block main %}

templates/activity/rates.html.twig

@@ -1,7 +1,7 @@
 {% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
 {% import "activity/actions.html.twig" as actions %}
 
-{% block page_title %}{{ 'admin_activity.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'activities'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.activity(activity, 'rates') }}{% endblock %}
 
 {% block main %}

templates/customer/delete.html.twig

@@ -1,7 +1,7 @@
 {% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
 {% import "customer/actions.html.twig" as actions %}
 
-{% block page_title %}{{ 'admin_customer.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'customers'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.customer(customer, 'delete') }}{% endblock %}
 
 {% block main %}

templates/customer/details.html.twig

@@ -3,7 +3,7 @@
 {% import "customer/actions.html.twig" as actions %}
 
 {% block page_actions %}{{ actions.customer(customer, 'customer_details') }}{% endblock %}
-{% block page_title %}{{ 'admin_customer.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'customers'|trans }}{% endblock %}
 
 {% block main %}
     {% set can_edit = is_granted('edit', customer) %}

templates/customer/edit.html.twig

@@ -1,7 +1,7 @@
 {% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
 {% import "customer/actions.html.twig" as actions %}
 
-{% block page_title %}{{ 'admin_customer.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'customers'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.customer(customer, 'edit') }}{% endblock %}
 
 {% block main %}

templates/customer/embed_projects.html.twig

@@ -1,7 +1,7 @@
     {% embed '@AdminLTE/Widgets/box-widget.html.twig' with {'customer': customer, 'projects': projects, 'page': page} %}
         {% import "project/actions.html.twig" as actions %}
         {% import "macros/widgets.html.twig" as widgets %}
-        {% block box_title %}{{ 'menu.admin_project'|trans }}{% endblock %}
+        {% block box_title %}{{ 'projects'|trans }}{% endblock %}
         {% block box_attributes %}
             id="project_list_box" data-href="{{ path('customer_projects', {'id': customer.id}) }}" data-reload="kimai.projectUpdate kimai.projectDelete"
         {% endblock %}

templates/customer/index.html.twig

@@ -35,7 +35,7 @@
 
 {% set tableName = 'customer_admin' %}
 
-{% block page_title %}{{ 'admin_customer.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'customers'|trans }}{% endblock %}
 {% block page_search %}{{ search.searchModal(toolbarForm) }}{% endblock %}
 {% block page_actions %}{{ actions.customers('index', query) }}{% endblock %}
 

templates/customer/permissions.html.twig

@@ -1,7 +1,7 @@
 {% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
 {% import "customer/actions.html.twig" as actions %}
 
-{% block page_title %}{{ 'admin_customer.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'customers'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.customer(customer, 'permissions') }}{% endblock %}
 
 {% block main %}

templates/customer/rates.html.twig

@@ -1,7 +1,7 @@
 {% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
 {% import "customer/actions.html.twig" as actions %}
 
-{% block page_title %}{{ 'admin_customer.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'customers'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.customer(customer, 'rates') }}{% endblock %}
 
 {% block main %}

templates/project/delete.html.twig

@@ -1,7 +1,7 @@
 {% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
 {% import "project/actions.html.twig" as actions %}
 
-{% block page_title %}{{ 'admin_project.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'projects'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.project(project, 'delete') }}{% endblock %}
 
 {% block main %}

templates/project/details.html.twig

@@ -2,7 +2,7 @@
 {% import "macros/widgets.html.twig" as widgets %}
 {% import "project/actions.html.twig" as actions %}
 
-{% block page_title %}{{ 'admin_project.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'projects'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.project(project, 'project_details') }}{% endblock %}
 
 {% block main %}

templates/project/edit.html.twig

@@ -1,7 +1,7 @@
 {% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
 {% import "project/actions.html.twig" as actions %}
 
-{% block page_title %}{{ 'admin_project.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'projects'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.project(project, 'edit') }}{% endblock %}
 
 {% block main %}

templates/project/embed_activities.html.twig

@@ -1,7 +1,7 @@
     {% embed '@AdminLTE/Widgets/box-widget.html.twig' with {'project': project, 'activities': activities, 'page': page} %}
         {% import "activity/actions.html.twig" as actions %}
         {% import "macros/widgets.html.twig" as widgets %}
-        {% block box_title %}{{ 'menu.admin_activity'|trans }}{% endblock %}
+        {% block box_title %}{{ 'activities'|trans }}{% endblock %}
         {% block box_attributes %}
             id="activity_list_box" data-href="{{ path('project_activities', {'id': project.id}) }}" data-reload="kimai.activityUpdate kimai.activityDelete"
         {% endblock %}

templates/project/index.html.twig

@@ -28,7 +28,7 @@
 
 {% set tableName = 'project_admin' %}
 
-{% block page_title %}{{ 'admin_project.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'projects'|trans }}{% endblock %}
 {% block page_search %}{{ search.searchModal(toolbarForm) }}{% endblock %}
 {% block page_actions %}{{ actions.projects('index', query) }}{% endblock %}
 

templates/project/permissions.html.twig

@@ -1,7 +1,7 @@
 {% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
 {% import "project/actions.html.twig" as actions %}
 
-{% block page_title %}{{ 'admin_project.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'projects'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.project(project, 'permissions') }}{% endblock %}
 
 {% block main %}

templates/project/rates.html.twig

@@ -1,7 +1,7 @@
 {% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
 {% import "project/actions.html.twig" as actions %}
 
-{% block page_title %}{{ 'admin_project.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'projects'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.project(project, 'rates') }}{% endblock %}
 
 {% block main %}

templates/tags/edit.html.twig

@@ -2,7 +2,7 @@
 {% import "macros/widgets.html.twig" as widgets %}
 {% import "tags/actions.html.twig" as actions %}
 
-{% block page_title %}{{ 'menu.tags'|trans }}{% endblock %}
+{% block page_title %}{{ 'tags'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.tag(tag, 'edit') }}{% endblock %}
 
 {% block main %}

templates/tags/index.html.twig

@@ -4,7 +4,7 @@
 {% import "macros/search.html.twig" as search %}
 {% import "tags/actions.html.twig" as actions %}
 
-{% block page_title %}{{ 'menu.tags'|trans }}{% endblock %}
+{% block page_title %}{{ 'tags'|trans }}{% endblock %}
 {% block page_search %}{{ search.searchModal(toolbarForm) }}{% endblock %}
 {% block page_actions %}{{ actions.tags('index', query) }}{% endblock %}
 

templates/timesheet-team/edit.html.twig

@@ -1,7 +1,7 @@
 {% extends 'timesheet/layout-edit.html.twig' %}
 {% import "timesheet-team/actions.html.twig" as actions %}
 
-{% block page_title %}{{ 'admin_timesheet.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'menu.admin_timesheet'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.timesheet_team(timesheet, 'edit') }}{% endblock %}
 
 {% set route_back = 'admin_timesheet' %}

templates/timesheet-team/index.html.twig

@@ -8,7 +8,7 @@
 {% set canSeeUsername = true %}
 {% set allowMarkdown = false %}
 
-{% block page_title %}{{ 'admin_timesheet.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'menu.admin_timesheet'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.timesheets_team('index', query) }}{% endblock %}
 
 {% block row_action %}

templates/timesheet-team/multi-update.html.twig

@@ -1,6 +1,6 @@
 {% extends 'timesheet/layout-multi-update.html.twig' %}
 
-{% block page_title %}{{ 'admin_timesheet.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'menu.admin_timesheet'|trans }}{% endblock %}
 {% block page_actions %}
     {% import "timesheet-team/actions.html.twig" as actions %}
     {{ actions.timesheets_team_multi_update('multi-update') }}

templates/user/create.html.twig

@@ -1,6 +1,6 @@
 {% extends 'base.html.twig' %}
 
-{% block page_title %}{{ 'admin_user.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'users'|trans }}{% endblock %}
 
 {% block main %}
     {% set formEditTemplate = app.request.xmlHttpRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig' %}

templates/user/delete.html.twig

@@ -1,7 +1,7 @@
 {% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
 {% import "macros/widgets.html.twig" as widgets %}
 
-{% block page_title %}{{ 'admin_user.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'users'|trans }}{% endblock %}
 
 {% block main %}
 

templates/user/index.html.twig

@@ -26,7 +26,7 @@
 
 {% set tableName = 'user_admin' %}
 
-{% block page_title %}{{ 'admin_user.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'users'|trans }}{% endblock %}
 {% block page_search %}{{ search.searchModal(toolbarForm) }}{% endblock %}
 {% block page_actions %}{{ actions.users('index', query) }}{% endblock %}
 

templates/user/layout.html.twig

@@ -2,7 +2,7 @@
 {% import "user/actions.html.twig" as actions %}
 {% import "macros/widgets.html.twig" as widgets %}
 
-{% block page_title %}{{ 'admin_user.title'|trans }}{% endblock %}
+{% block page_title %}{{ 'users'|trans }}{% endblock %}
 {% block page_actions %}{{ actions.user(user, tab) }}{% endblock %}
 
 {% block main %}