diff --git a/src/Command/TranslationCommand.php b/src/Command/TranslationCommand.php
index e70ea7a1..2ce70ee7 100644
--- a/src/Command/TranslationCommand.php
+++ b/src/Command/TranslationCommand.php
@@ -43,6 +43,7 @@ class TranslationCommand extends Command
->setDescription('Translation adjustments')
->addOption('resname', null, InputOption::VALUE_NONE, 'Fix the resname vs. id attribute')
->addOption('duplicates', null, InputOption::VALUE_NONE, 'Find duplicate translation keys')
+ ->addOption('delete-resname', null, InputOption::VALUE_REQUIRED, 'Deletes the translation by resname')
->addOption('extension', null, InputOption::VALUE_NONE, 'Find translation files with wrong extensions')
;
}
@@ -61,6 +62,13 @@ class TranslationCommand extends Command
'plugins' => $this->projectDirectory . Kernel::PLUGIN_DIRECTORY . '/*/Resources/translations',
];
+ if ($input->getOption('delete-resname')) {
+ $files = glob($bases['core'] . '/*.xlf');
+ foreach ($files as $file) {
+ $this->removeKey($file, $input->getOption('delete-resname'));
+ }
+ }
+
if ($input->getOption('resname')) {
foreach ($bases as $id => $directory) {
$files = glob($directory . '/*.xlf');
@@ -132,4 +140,29 @@ class TranslationCommand extends Command
file_put_contents($file, $xmlDocument->saveXML());
}
+
+ private function removeKey(string $file, string $key): void
+ {
+ $xml = simplexml_load_file($file);
+
+ /** @var \SimpleXMLElement $unit */
+ foreach ($xml->file->body->{'trans-unit'} as $unit) {
+ if (!isset($unit['resname'])) {
+ continue;
+ }
+
+ if ((string) $unit['resname'] === $key) {
+ $dom = dom_import_simplexml($unit);
+ $dom->parentNode->removeChild($dom);
+ break;
+ }
+ }
+
+ $xmlDocument = new \DOMDocument('1.0');
+ $xmlDocument->preserveWhiteSpace = false;
+ $xmlDocument->formatOutput = true;
+ $xmlDocument->loadXML($xml->asXML());
+
+ file_put_contents($file, $xmlDocument->saveXML());
+ }
}
diff --git a/src/EventSubscriber/Actions/ActivitySubscriber.php b/src/EventSubscriber/Actions/ActivitySubscriber.php
index b294ca16..f0344e55 100644
--- a/src/EventSubscriber/Actions/ActivitySubscriber.php
+++ b/src/EventSubscriber/Actions/ActivitySubscriber.php
@@ -54,7 +54,7 @@ class ActivitySubscriber extends AbstractActionsSubscriber
$parameters['customers[]'] = $activity->getProject()->getCustomer()->getId();
$parameters['projects[]'] = $activity->getProject()->getId();
}
- $event->addActionToSubmenu('filter', 'timesheet', ['title' => 'timesheet', 'translation_domain' => 'actions', 'url' => $this->path('admin_timesheet', $parameters)]);
+ $event->addActionToSubmenu('filter', 'timesheet', ['title' => 'timesheet.filter', 'translation_domain' => 'actions', 'url' => $this->path('admin_timesheet', $parameters)]);
}
if ($event->hasSubmenu('filter')) {
diff --git a/src/EventSubscriber/Actions/CustomerSubscriber.php b/src/EventSubscriber/Actions/CustomerSubscriber.php
index 015e2378..fd892033 100644
--- a/src/EventSubscriber/Actions/CustomerSubscriber.php
+++ b/src/EventSubscriber/Actions/CustomerSubscriber.php
@@ -49,15 +49,15 @@ class CustomerSubscriber extends AbstractActionsSubscriber
}
if ($this->isGranted('view_project') || $this->isGranted('view_teamlead_project') || $this->isGranted('view_team_project')) {
- $event->addActionToSubmenu('filter', 'project', ['title' => 'project', 'translation_domain' => 'actions', 'url' => $this->path('admin_project', ['customers[]' => $customer->getId()])]);
+ $event->addActionToSubmenu('filter', 'project', ['title' => 'project.filter', 'translation_domain' => 'actions', 'url' => $this->path('admin_project', ['customers[]' => $customer->getId()])]);
}
if ($this->isGranted('view_activity')) {
- $event->addActionToSubmenu('filter', 'activity', ['title' => 'activity', 'translation_domain' => 'actions', 'url' => $this->path('admin_activity', ['customers[]' => $customer->getId()])]);
+ $event->addActionToSubmenu('filter', 'activity', ['title' => 'activity.filter', 'translation_domain' => 'actions', 'url' => $this->path('admin_activity', ['customers[]' => $customer->getId()])]);
}
if ($this->isGranted('view_other_timesheet')) {
- $event->addActionToSubmenu('filter', 'timesheet', ['title' => 'timesheet', 'translation_domain' => 'actions', 'url' => $this->path('admin_timesheet', ['customers[]' => $customer->getId()])]);
+ $event->addActionToSubmenu('filter', 'timesheet', ['title' => 'timesheet.filter', 'translation_domain' => 'actions', 'url' => $this->path('admin_timesheet', ['customers[]' => $customer->getId()])]);
}
if ($event->hasSubmenu('filter')) {
diff --git a/src/EventSubscriber/Actions/ProjectSubscriber.php b/src/EventSubscriber/Actions/ProjectSubscriber.php
index da6771f1..0b32d5fb 100644
--- a/src/EventSubscriber/Actions/ProjectSubscriber.php
+++ b/src/EventSubscriber/Actions/ProjectSubscriber.php
@@ -49,11 +49,11 @@ class ProjectSubscriber extends AbstractActionsSubscriber
}
if ($this->isGranted('view_activity')) {
- $event->addActionToSubmenu('filter', 'activity', ['title' => 'activity', 'translation_domain' => 'actions', 'url' => $this->path('admin_activity', ['customers[]' => $project->getCustomer()->getId(), 'projects[]' => $project->getId()])]);
+ $event->addActionToSubmenu('filter', 'activity', ['title' => 'activity.filter', 'translation_domain' => 'actions', 'url' => $this->path('admin_activity', ['customers[]' => $project->getCustomer()->getId(), 'projects[]' => $project->getId()])]);
}
if ($this->isGranted('view_other_timesheet')) {
- $event->addActionToSubmenu('filter', 'timesheet', ['title' => 'timesheet', 'translation_domain' => 'actions', 'url' => $this->path('admin_timesheet', ['customers[]' => $project->getCustomer()->getId(), 'projects[]' => $project->getId()])]);
+ $event->addActionToSubmenu('filter', 'timesheet', ['title' => 'timesheet.filter', 'translation_domain' => 'actions', 'url' => $this->path('admin_timesheet', ['customers[]' => $project->getCustomer()->getId(), 'projects[]' => $project->getId()])]);
}
if ($event->hasSubmenu('filter')) {
diff --git a/src/EventSubscriber/Actions/TagSubscriber.php b/src/EventSubscriber/Actions/TagSubscriber.php
index b61ccb09..e0b716c0 100644
--- a/src/EventSubscriber/Actions/TagSubscriber.php
+++ b/src/EventSubscriber/Actions/TagSubscriber.php
@@ -47,7 +47,7 @@ class TagSubscriber extends AbstractActionsSubscriber
}
if ($this->isGranted('view_other_timesheet')) {
- $event->addActionToSubmenu('filter', 'timesheet', ['title' => 'timesheet', 'translation_domain' => 'actions', 'url' => $this->path('admin_timesheet', ['tags' => $name])]);
+ $event->addActionToSubmenu('filter', 'timesheet', ['title' => 'timesheet.filter', 'translation_domain' => 'actions', 'url' => $this->path('admin_timesheet', ['tags' => $name])]);
}
if ($event->isIndexView() && $this->isGranted('delete_tag')) {
diff --git a/src/EventSubscriber/Actions/UserSubscriber.php b/src/EventSubscriber/Actions/UserSubscriber.php
index 1a809286..e48afba7 100644
--- a/src/EventSubscriber/Actions/UserSubscriber.php
+++ b/src/EventSubscriber/Actions/UserSubscriber.php
@@ -67,7 +67,7 @@ class UserSubscriber extends AbstractActionsSubscriber
}
if ($viewOther && $user->isEnabled()) {
- $event->addAction('timesheet', ['url' => $this->path('admin_timesheet', ['users[]' => $user->getId()])]);
+ $event->addAction('timesheet', ['title' => 'timesheet.filter', 'translation_domain' => 'actions', 'url' => $this->path('admin_timesheet', ['users[]' => $user->getId()])]);
}
if ($event->isIndexView() && $this->isGranted('delete', $user)) {
diff --git a/src/EventSubscriber/MenuSubscriber.php b/src/EventSubscriber/MenuSubscriber.php
index 349b6a01..25faa073 100644
--- a/src/EventSubscriber/MenuSubscriber.php
+++ b/src/EventSubscriber/MenuSubscriber.php
@@ -97,26 +97,26 @@ final class MenuSubscriber implements EventSubscriberInterface
}
if ($auth->isGranted('view_customer') || $auth->isGranted('view_teamlead_customer') || $auth->isGranted('view_team_customer')) {
- $customers = new MenuItemModel('customer_admin', 'menu.admin_customer', 'admin_customer', [], $icons->icon('customer'));
+ $customers = new MenuItemModel('customer_admin', 'customers', 'admin_customer', [], $icons->icon('customer'));
$customers->setChildRoutes(['admin_customer_create', 'admin_customer_permissions', 'customer_details', 'admin_customer_edit', 'admin_customer_delete']);
$menu->addChild($customers);
}
if ($auth->isGranted('view_project') || $auth->isGranted('view_teamlead_project') || $auth->isGranted('view_team_project')) {
- $projects = new MenuItemModel('project_admin', 'menu.admin_project', 'admin_project', [], $icons->icon('project'));
+ $projects = new MenuItemModel('project_admin', 'projects', 'admin_project', [], $icons->icon('project'));
$projects->setChildRoutes(['admin_project_permissions', 'admin_project_create', 'project_details', 'admin_project_edit', 'admin_project_delete']);
$menu->addChild($projects);
}
if ($auth->isGranted('view_activity') || $auth->isGranted('view_teamlead_activity') || $auth->isGranted('view_team_activity')) {
- $activities = new MenuItemModel('activity_admin', 'menu.admin_activity', 'admin_activity', [], $icons->icon('activity'));
+ $activities = new MenuItemModel('activity_admin', 'activities', 'admin_activity', [], $icons->icon('activity'));
$activities->setChildRoutes(['admin_activity_create', 'activity_details', 'admin_activity_edit', 'admin_activity_delete']);
$menu->addChild($activities);
}
if ($auth->isGranted('view_tag')) {
$menu->addChild(
- new MenuItemModel('tags', 'menu.tags', 'tags', [], 'fas fa-tags')
+ new MenuItemModel('tags', 'tags', 'tags', [], 'fas fa-tags')
);
}
@@ -124,7 +124,7 @@ final class MenuSubscriber implements EventSubscriberInterface
$menu = $event->getSystemMenu();
if ($auth->isGranted('view_user')) {
- $users = new MenuItemModel('user_admin', 'menu.admin_user', 'admin_user', [], $icons->icon('users'));
+ $users = new MenuItemModel('user_admin', 'users', 'admin_user', [], $icons->icon('users'));
$users->setChildRoutes(['admin_user_create', 'admin_user_delete', 'user_profile', 'user_profile_edit', 'user_profile_password', 'user_profile_api_token', 'user_profile_roles', 'user_profile_teams', 'user_profile_preferences']);
$menu->addChild($users);
}
diff --git a/src/Form/Type/InitialViewType.php b/src/Form/Type/InitialViewType.php
index 471f743c..be059044 100644
--- a/src/Form/Type/InitialViewType.php
+++ b/src/Form/Type/InitialViewType.php
@@ -33,10 +33,10 @@ class InitialViewType extends AbstractType
'my_profile' => 'profile.title',
'admin_timesheet' => 'menu.admin_timesheet',
'invoice' => 'menu.invoice',
- 'admin_user' => 'menu.admin_user',
- 'admin_customer' => 'menu.admin_customer',
- 'admin_project' => 'menu.admin_project',
- 'admin_activity' => 'menu.admin_activity',
+ 'admin_user' => 'users',
+ 'admin_customer' => 'customers',
+ 'admin_project' => 'projects',
+ 'admin_activity' => 'activities',
];
private const ROUTE_PERMISSION = [
diff --git a/templates/activity/delete.html.twig b/templates/activity/delete.html.twig
index 566f7650..7c86bc74 100644
--- a/templates/activity/delete.html.twig
+++ b/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 %}
diff --git a/templates/activity/details.html.twig b/templates/activity/details.html.twig
index e5f0815a..fbd4acf6 100644
--- a/templates/activity/details.html.twig
+++ b/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 %}
diff --git a/templates/activity/edit.html.twig b/templates/activity/edit.html.twig
index cc041c55..140dd2fb 100644
--- a/templates/activity/edit.html.twig
+++ b/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 %}
diff --git a/templates/activity/index.html.twig b/templates/activity/index.html.twig
index 4bc76795..d65b85e9 100644
--- a/templates/activity/index.html.twig
+++ b/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 %}
diff --git a/templates/activity/permissions.html.twig b/templates/activity/permissions.html.twig
index ea90a4d5..d43aea39 100644
--- a/templates/activity/permissions.html.twig
+++ b/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 %}
diff --git a/templates/activity/rates.html.twig b/templates/activity/rates.html.twig
index a29b21e9..1c45c934 100644
--- a/templates/activity/rates.html.twig
+++ b/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 %}
diff --git a/templates/customer/delete.html.twig b/templates/customer/delete.html.twig
index f2cb35ef..3fb487ee 100644
--- a/templates/customer/delete.html.twig
+++ b/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 %}
diff --git a/templates/customer/details.html.twig b/templates/customer/details.html.twig
index 097c4445..0d5f19c8 100644
--- a/templates/customer/details.html.twig
+++ b/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) %}
diff --git a/templates/customer/edit.html.twig b/templates/customer/edit.html.twig
index 0c4ebf48..56b38a8e 100644
--- a/templates/customer/edit.html.twig
+++ b/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 %}
diff --git a/templates/customer/embed_projects.html.twig b/templates/customer/embed_projects.html.twig
index 4f02a624..8e975558 100644
--- a/templates/customer/embed_projects.html.twig
+++ b/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 %}
diff --git a/templates/customer/index.html.twig b/templates/customer/index.html.twig
index adfda5bb..29a9bfdd 100644
--- a/templates/customer/index.html.twig
+++ b/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 %}
diff --git a/templates/customer/permissions.html.twig b/templates/customer/permissions.html.twig
index b6de737d..f2affdef 100644
--- a/templates/customer/permissions.html.twig
+++ b/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 %}
diff --git a/templates/customer/rates.html.twig b/templates/customer/rates.html.twig
index b33d183d..f5908927 100644
--- a/templates/customer/rates.html.twig
+++ b/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 %}
diff --git a/templates/project/delete.html.twig b/templates/project/delete.html.twig
index f33aec40..deacbb10 100644
--- a/templates/project/delete.html.twig
+++ b/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 %}
diff --git a/templates/project/details.html.twig b/templates/project/details.html.twig
index a4d2ec4b..a1392b38 100644
--- a/templates/project/details.html.twig
+++ b/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 %}
diff --git a/templates/project/edit.html.twig b/templates/project/edit.html.twig
index a045d976..d496c7be 100644
--- a/templates/project/edit.html.twig
+++ b/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 %}
diff --git a/templates/project/embed_activities.html.twig b/templates/project/embed_activities.html.twig
index 3fc77f94..06213cdb 100644
--- a/templates/project/embed_activities.html.twig
+++ b/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 %}
diff --git a/templates/project/index.html.twig b/templates/project/index.html.twig
index b7ce8cca..b835a975 100644
--- a/templates/project/index.html.twig
+++ b/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 %}
diff --git a/templates/project/permissions.html.twig b/templates/project/permissions.html.twig
index cf788063..4860cb24 100644
--- a/templates/project/permissions.html.twig
+++ b/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 %}
diff --git a/templates/project/rates.html.twig b/templates/project/rates.html.twig
index 4c0daeba..9b6ecd82 100644
--- a/templates/project/rates.html.twig
+++ b/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 %}
diff --git a/templates/tags/edit.html.twig b/templates/tags/edit.html.twig
index 032d5052..ba81940d 100644
--- a/templates/tags/edit.html.twig
+++ b/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 %}
diff --git a/templates/tags/index.html.twig b/templates/tags/index.html.twig
index 13c803d5..ce554306 100644
--- a/templates/tags/index.html.twig
+++ b/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 %}
diff --git a/templates/timesheet-team/edit.html.twig b/templates/timesheet-team/edit.html.twig
index b25cbc0b..3c8df83d 100644
--- a/templates/timesheet-team/edit.html.twig
+++ b/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' %}
diff --git a/templates/timesheet-team/index.html.twig b/templates/timesheet-team/index.html.twig
index e7bb851d..e2c1918a 100644
--- a/templates/timesheet-team/index.html.twig
+++ b/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 %}
diff --git a/templates/timesheet-team/multi-update.html.twig b/templates/timesheet-team/multi-update.html.twig
index 8378d6f8..53bbe3b8 100644
--- a/templates/timesheet-team/multi-update.html.twig
+++ b/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') }}
diff --git a/templates/user/create.html.twig b/templates/user/create.html.twig
index bab9e1e8..b91a8e9f 100644
--- a/templates/user/create.html.twig
+++ b/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' %}
diff --git a/templates/user/delete.html.twig b/templates/user/delete.html.twig
index 5b86aac3..621a678f 100644
--- a/templates/user/delete.html.twig
+++ b/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 %}
diff --git a/templates/user/index.html.twig b/templates/user/index.html.twig
index a01e40c0..be448110 100644
--- a/templates/user/index.html.twig
+++ b/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 %}
diff --git a/templates/user/layout.html.twig b/templates/user/layout.html.twig
index 2d05d8cc..a0f59e8f 100644
--- a/templates/user/layout.html.twig
+++ b/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 %}
diff --git a/translations/actions.ar.xlf b/translations/actions.ar.xlf
index 993c6d25..8b2e58ae 100644
--- a/translations/actions.ar.xlf
+++ b/translations/actions.ar.xlf
@@ -34,20 +34,20 @@
settings
تفضيلات
-
- timesheet
+
+ Filter timesheets
الجداول الزمنية
-
- customer
+
+ Filter customers
فلتر العملاء
-
- project
+
+ Filter projects
فلتر المشاريع
-
- activity
+
+ Filter activities
فلتر الأنشطة
diff --git a/translations/actions.cs.xlf b/translations/actions.cs.xlf
index f41ac7bf..11fd3df9 100644
--- a/translations/actions.cs.xlf
+++ b/translations/actions.cs.xlf
@@ -34,20 +34,20 @@
settings
Nastavení
-
- timesheet
+
+ Filter timesheets
Pracovní výkaz
-
- customer
+
+ Filter customers
Filtr zákazníků
-
- project
+
+ Filter projects
Filtr projektů
-
- activity
+
+ Filter activities
Filtr aktivit
diff --git a/translations/actions.da.xlf b/translations/actions.da.xlf
index d31d8281..a6763cd2 100644
--- a/translations/actions.da.xlf
+++ b/translations/actions.da.xlf
@@ -34,20 +34,20 @@
settings
Indstillinger
-
- timesheet
+
+ Filter timesheets
Timeseddel
-
- customer
+
+ Filter customers
Filtrer kunder
-
- project
+
+ Filter projects
Filtrer projekter
-
- activity
+
+ Filter activities
Filtrer aktiviteter
diff --git a/translations/actions.de.xlf b/translations/actions.de.xlf
index 5c063084..40c4aae4 100644
--- a/translations/actions.de.xlf
+++ b/translations/actions.de.xlf
@@ -34,20 +34,20 @@
settings
Einstellungen
-
- timesheet
- Stundenzettel
+
+ Filter timesheets
+ Stundenzettel filtern
-
- customer
+
+ Filter customers
Kunden filtern
-
- project
+
+ Filter projects
Projekte filtern
-
- activity
+
+ Filter activities
Tätigkeiten filtern
diff --git a/translations/actions.el.xlf b/translations/actions.el.xlf
index 94f35c54..0cc135be 100644
--- a/translations/actions.el.xlf
+++ b/translations/actions.el.xlf
@@ -34,20 +34,20 @@
settings
Προτιμήσεις
-
- timesheet
+
+ Filter timesheets
Δελτία ωρών
-
- customer
+
+ Filter customers
Φίλτρο πελατών
-
- project
+
+ Filter projects
Φίλτρο έργων
-
- activity
+
+ Filter activities
Φίλτρο δραστηριοτήτων
diff --git a/translations/actions.en.xlf b/translations/actions.en.xlf
index 51687e0d..374002b0 100644
--- a/translations/actions.en.xlf
+++ b/translations/actions.en.xlf
@@ -34,20 +34,20 @@
settings
Preferences
-
- timesheet
- Timesheets
+
+ Filter timesheets
+ Filter timesheets
-
- customer
+
+ Filter customers
Filter customers
-
- project
+
+ Filter projects
Filter projects
-
- activity
+
+ Filter activities
Filter activities
diff --git a/translations/actions.eo.xlf b/translations/actions.eo.xlf
index c56a5ccb..71e52bac 100644
--- a/translations/actions.eo.xlf
+++ b/translations/actions.eo.xlf
@@ -34,20 +34,20 @@
settings
Agordoj
-
- timesheet
+
+ Filter timesheets
Temposlipoj
-
- customer
+
+ Filter customers
Filtri klientojn
-
- project
+
+ Filter projects
Filtri projektojn
-
- activity
+
+ Filter activities
Filtri aktivaĵojn
diff --git a/translations/actions.es.xlf b/translations/actions.es.xlf
index e50e31b1..57d6e245 100644
--- a/translations/actions.es.xlf
+++ b/translations/actions.es.xlf
@@ -34,20 +34,20 @@
settings
Preferencias
-
- timesheet
+
+ Filter timesheets
Partes de horas
-
- customer
+
+ Filter customers
Filtrar clientes
-
- project
+
+ Filter projects
Filtrar proyectos
-
- activity
+
+ Filter activities
Filtrar actividades
diff --git a/translations/actions.eu.xlf b/translations/actions.eu.xlf
index 8d208474..444c4d6f 100644
--- a/translations/actions.eu.xlf
+++ b/translations/actions.eu.xlf
@@ -34,20 +34,20 @@
settings
Dohiketak
-
- timesheet
+
+ Filter timesheets
Ordu taula
-
- customer
+
+ Filter customers
Bezeroak aukeratu
-
- project
+
+ Filter projects
Proiektuak aukeratu
-
- activity
+
+ Filter activities
Jarduerak aukeratu
diff --git a/translations/actions.fi.xlf b/translations/actions.fi.xlf
index c7c3d0b0..b6134f5d 100644
--- a/translations/actions.fi.xlf
+++ b/translations/actions.fi.xlf
@@ -34,20 +34,20 @@
settings
Asetukset
-
- timesheet
+
+ Filter timesheets
Työajanseuranta
-
- customer
+
+ Filter customers
Suodata asiakkaita
-
- project
+
+ Filter projects
Suodata projekteja
-
- activity
+
+ Filter activities
Suodata työtehtäviä
diff --git a/translations/actions.fr.xlf b/translations/actions.fr.xlf
index c153d76e..a1858d06 100644
--- a/translations/actions.fr.xlf
+++ b/translations/actions.fr.xlf
@@ -26,20 +26,20 @@
settings
Préférences
-
- timesheet
+
+ Filter timesheets
Feuille d'heures
-
- customer
+
+ Filter customers
Filtrer les clients
-
- project
+
+ Filter projects
Filtrer les projets
-
- activity
+
+ Filter activities
Filtrer les activités
diff --git a/translations/actions.he.xlf b/translations/actions.he.xlf
index a987ffb6..dfe1b8ec 100644
--- a/translations/actions.he.xlf
+++ b/translations/actions.he.xlf
@@ -34,20 +34,20 @@
settings
העדפות
-
- timesheet
+
+ Filter timesheets
גיליונות שעות
-
- customer
+
+ Filter customers
סנן לקוחות
-
- project
+
+ Filter projects
סנן פרויקטים
-
- activity
+
+ Filter activities
סנן פעילויות
diff --git a/translations/actions.hr.xlf b/translations/actions.hr.xlf
index 8ca826f9..3d0f7d38 100644
--- a/translations/actions.hr.xlf
+++ b/translations/actions.hr.xlf
@@ -34,20 +34,20 @@
settings
Postavke
-
- timesheet
+
+ Filter timesheets
Vremenske tablice
-
- customer
+
+ Filter customers
Filtriraj kupce
-
- project
+
+ Filter projects
Filtriraj projekte
-
- activity
+
+ Filter activities
Filtriraj aktivnosti
diff --git a/translations/actions.hu.xlf b/translations/actions.hu.xlf
index 9ce3fbeb..4b1eda05 100644
--- a/translations/actions.hu.xlf
+++ b/translations/actions.hu.xlf
@@ -34,20 +34,20 @@
settings
Beállítások
-
- timesheet
+
+ Filter timesheets
Rögzített órák
-
- customer
+
+ Filter customers
Ügyfelek szűrése
-
- project
+
+ Filter projects
Projektek szűrése
-
- activity
+
+ Filter activities
Tevékenységek szűrése
diff --git a/translations/actions.it.xlf b/translations/actions.it.xlf
index 137e9281..0e6abe20 100644
--- a/translations/actions.it.xlf
+++ b/translations/actions.it.xlf
@@ -34,20 +34,20 @@
settings
Preferenze
-
- timesheet
+
+ Filter timesheets
Schede attività
-
- customer
+
+ Filter customers
Filtro clienti
-
- project
+
+ Filter projects
Filtro progetti
-
- activity
+
+ Filter activities
Filtro attività
diff --git a/translations/actions.ko.xlf b/translations/actions.ko.xlf
index 5dea349d..2de62a07 100644
--- a/translations/actions.ko.xlf
+++ b/translations/actions.ko.xlf
@@ -34,20 +34,20 @@
settings
설정
-
- timesheet
+
+ Filter timesheets
타임시트
-
- customer
+
+ Filter customers
필터 고객들
-
- project
+
+ Filter projects
필터 프로젝트들
-
- activity
+
+ Filter activities
필터 활동들
diff --git a/translations/actions.nl.xlf b/translations/actions.nl.xlf
index d1c5d418..3170a332 100644
--- a/translations/actions.nl.xlf
+++ b/translations/actions.nl.xlf
@@ -34,20 +34,20 @@
settings
Voorkeuren
-
- timesheet
+
+ Filter timesheets
Tijden
-
- customer
+
+ Filter customers
Filter op klant
-
- project
+
+ Filter projects
Filter op project
-
- activity
+
+ Filter activities
Filter op activiteiten
diff --git a/translations/actions.pl.xlf b/translations/actions.pl.xlf
index ae932b66..2d536b94 100644
--- a/translations/actions.pl.xlf
+++ b/translations/actions.pl.xlf
@@ -34,20 +34,20 @@
settings
Ustawienia
-
- timesheet
+
+ Filter timesheets
Ewidencje
-
- customer
+
+ Filter customers
Filt klienta
-
- project
+
+ Filter projects
Filtr projektu
-
- activity
+
+ Filter activities
Filt aktywności
diff --git a/translations/actions.pt.xlf b/translations/actions.pt.xlf
index a4db200f..acb5cafc 100644
--- a/translations/actions.pt.xlf
+++ b/translations/actions.pt.xlf
@@ -34,20 +34,20 @@
settings
Preferências
-
- timesheet
+
+ Filter timesheets
Quadro de horários
-
- customer
+
+ Filter customers
Filtrar clientes
-
- project
+
+ Filter projects
Filtrar projetos
-
- activity
+
+ Filter activities
Filtrar atividades
diff --git a/translations/actions.pt_BR.xlf b/translations/actions.pt_BR.xlf
index 8304f8d8..169b12bf 100644
--- a/translations/actions.pt_BR.xlf
+++ b/translations/actions.pt_BR.xlf
@@ -34,20 +34,20 @@
settings
Preferências
-
- timesheet
+
+ Filter timesheets
Horários
-
- customer
+
+ Filter customers
Filtrar clientes
-
- project
+
+ Filter projects
Filtrar projetos
-
- activity
+
+ Filter activities
Filtrar atividades
diff --git a/translations/actions.ro.xlf b/translations/actions.ro.xlf
index 41e4e8a2..06ff7623 100644
--- a/translations/actions.ro.xlf
+++ b/translations/actions.ro.xlf
@@ -34,20 +34,20 @@
settings
Preferințe
-
- timesheet
+
+ Filter timesheets
Fișe de pontaj
-
- customer
+
+ Filter customers
Filtrează clienții
-
- project
+
+ Filter projects
Filtrează proiectele
-
- activity
+
+ Filter activities
Filtrează activitățile
diff --git a/translations/actions.ru.xlf b/translations/actions.ru.xlf
index 36298418..cdddd0b0 100644
--- a/translations/actions.ru.xlf
+++ b/translations/actions.ru.xlf
@@ -30,20 +30,20 @@
settings
Настройки
-
- timesheet
+
+ Filter timesheets
Расписания
-
- customer
+
+ Filter customers
Фильтр клиентов
-
- project
+
+ Filter projects
Фильтр проектов
-
- activity
+
+ Filter activities
Фильтр действий
diff --git a/translations/actions.sk.xlf b/translations/actions.sk.xlf
index b436820d..f12c3f6b 100644
--- a/translations/actions.sk.xlf
+++ b/translations/actions.sk.xlf
@@ -34,20 +34,20 @@
settings
Nastavenia
-
- timesheet
+
+ Filter timesheets
Pracovné výkazy
-
- customer
+
+ Filter customers
Zákazník
-
- project
+
+ Filter projects
Projekt
-
- activity
+
+ Filter activities
Činnosť
diff --git a/translations/actions.sv.xlf b/translations/actions.sv.xlf
index 8c17483e..a23564d1 100644
--- a/translations/actions.sv.xlf
+++ b/translations/actions.sv.xlf
@@ -34,20 +34,20 @@
settings
Inställningar
-
- timesheet
+
+ Filter timesheets
Tidrapport
-
- customer
+
+ Filter customers
Filtrera kunder
-
- project
+
+ Filter projects
Filtrera projekt
-
- activity
+
+ Filter activities
Filtrera aktiviter
diff --git a/translations/actions.tr.xlf b/translations/actions.tr.xlf
index cd4ff959..1b12a60a 100644
--- a/translations/actions.tr.xlf
+++ b/translations/actions.tr.xlf
@@ -34,20 +34,20 @@
settings
Ayarlar
-
- timesheet
+
+ Filter timesheets
Çizelgeler
-
- customer
+
+ Filter customers
Müşterileri filtrele
-
- project
+
+ Filter projects
Projeleri filtrele
-
- activity
+
+ Filter activities
Etkinlikleri filtrele
diff --git a/translations/actions.vi.xlf b/translations/actions.vi.xlf
index f4a8debe..1eae8633 100644
--- a/translations/actions.vi.xlf
+++ b/translations/actions.vi.xlf
@@ -34,20 +34,20 @@
settings
Sở thích
-
- timesheet
+
+ Filter timesheets
Bảng chấm công
-
- customer
+
+ Filter customers
Lọc khách hàng
-
- project
+
+ Filter projects
Lọc dự án
-
- activity
+
+ Filter activities
Lọc hoạt động
diff --git a/translations/actions.zh_CN.xlf b/translations/actions.zh_CN.xlf
index b6e1cdf0..f314f5e1 100644
--- a/translations/actions.zh_CN.xlf
+++ b/translations/actions.zh_CN.xlf
@@ -34,20 +34,20 @@
settings
参数选择
-
- timesheet
+
+ Filter timesheets
时间表
-
- customer
+
+ Filter customers
筛选用户
-
- project
+
+ Filter projects
筛选项目
-
- activity
+
+ Filter activities
筛选活动
diff --git a/translations/messages.ar.xlf b/translations/messages.ar.xlf
index 51039d27..313fe421 100644
--- a/translations/messages.ar.xlf
+++ b/translations/messages.ar.xlf
@@ -87,20 +87,20 @@
menu.admin_timesheet
الجداول الزمنية
-
- menu.admin_customer
+
+ customers
زبون
-
- menu.admin_project
+
+ projects
مشاريع
-
- menu.admin_activity
+
+ activities
أنشطة
-
- menu.admin_user
+
+ users
المستخدم
-
- admin_timesheet.title
- الجداول الزمنية
-
-
-
- admin_project.title
- مشاريع
-
-
-
- admin_activity.title
- أنشطة
-
-
- admin_customer.title
- زبون
-
label.number
حساب
@@ -407,10 +385,6 @@
-
- admin_user.title
- المستخدم
-
label.alias
اسم
@@ -734,8 +708,8 @@
menu.doctor
طبيب
-
- menu.tags
+
+ tags
الوسوم
diff --git a/translations/messages.cs.xlf b/translations/messages.cs.xlf
index ec9f0d0f..0437062f 100644
--- a/translations/messages.cs.xlf
+++ b/translations/messages.cs.xlf
@@ -114,20 +114,20 @@
menu.admin_timesheet
Pracovní výkaz
-
- menu.admin_customer
+
+ customers
Zákazníci
-
- menu.admin_project
+
+ projects
Projekty
-
- menu.admin_activity
+
+ activities
Aktivity
-
- menu.admin_user
+
+ users
Uživatelé
@@ -142,8 +142,8 @@
menu.system_configuration
Nastavení
-
- menu.tags
+
+ tags
Štítky
-
- admin_timesheet.title
- Pracovní výkaz
-
-
-
- admin_project.title
- Projekt
-
-
-
- admin_activity.title
- Aktivity
-
-
- admin_customer.title
- Zákazník
-
label.number
Účet
@@ -518,10 +496,6 @@
-
- admin_user.title
- Uživatel
-
label.alias
Jméno
diff --git a/translations/messages.da.xlf b/translations/messages.da.xlf
index 98413d01..9311ec0d 100644
--- a/translations/messages.da.xlf
+++ b/translations/messages.da.xlf
@@ -130,20 +130,20 @@
menu.admin_timesheet
Timesedler
-
- menu.admin_customer
+
+ customers
Kunder
-
- menu.admin_project
+
+ projects
Projekter
-
- menu.admin_activity
+
+ activities
Aktiviteter
-
- menu.admin_user
+
+ users
Brugere
@@ -158,8 +158,8 @@
menu.system_configuration
Indstillinger
-
- menu.tags
+
+ tags
Etiketter
@@ -486,31 +486,9 @@
-
- admin_timesheet.title
- Timesedler
-
-
-
- admin_project.title
- Projekter
-
-
-
- admin_activity.title
- Aktiviteter
-
-
- admin_customer.title
- Kunde
-
label.number
Bruger
@@ -566,10 +544,6 @@
-
- admin_user.title
- Bruger
-
label.alias
Navn
diff --git a/translations/messages.de.xlf b/translations/messages.de.xlf
index b0b70aba..a5f11afe 100644
--- a/translations/messages.de.xlf
+++ b/translations/messages.de.xlf
@@ -199,20 +199,20 @@
menu.admin_timesheet
Zeiterfassung
-
- menu.admin_customer
+
+ customers
Kunden
-
- menu.admin_project
+
+ projects
Projekte
-
- menu.admin_activity
+
+ activities
Tätigkeiten
-
- menu.admin_user
+
+ users
Benutzer
@@ -227,8 +227,8 @@
menu.system_configuration
Einstellungen
-
- menu.tags
+
+ tags
Schlagworte
@@ -631,17 +631,9 @@
-
- admin_timesheet.title
- Zeiterfassung
-
-
- admin_project.title
- Projekte
-
label.project_start
Projekt Start
@@ -650,20 +642,9 @@
label.project_end
Projekt Ende
-
-
- admin_activity.title
- Tätigkeiten
-
-
- admin_customer.title
- Kunden
-
label.number
Kundennummer
@@ -723,10 +704,6 @@
-
- admin_user.title
- Benutzer
-
label.alias
Name
diff --git a/translations/messages.de_CH.xlf b/translations/messages.de_CH.xlf
index b79ceeea..64650731 100644
--- a/translations/messages.de_CH.xlf
+++ b/translations/messages.de_CH.xlf
@@ -465,10 +465,6 @@
label.alias
Name
-
- admin_user.title
- Benutzer
-
label.currency
Währung
@@ -513,14 +509,6 @@
label.number
Kundennummer
-
- admin_customer.title
- Kunden
-
-
- admin_activity.title
- Tätigkeiten
-
label.project_end
Projekt Ende
@@ -529,14 +517,6 @@
label.project_start
Projekt Start
-
- admin_project.title
- Projekte
-
-
- admin_timesheet.title
- Zeiterfassung
-
calendar.title
Kalender
@@ -881,8 +861,8 @@
menu.doctor
Doktor
-
- menu.tags
+
+ tags
Schlagworte
@@ -897,20 +877,20 @@
menu.admin_team
Teams
-
- menu.admin_user
+
+ users
Benutzer
-
- menu.admin_activity
+
+ activities
Tätigkeiten
-
- menu.admin_project
+
+ projects
Projekte
-
- menu.admin_customer
+
+ customers
Kunden
diff --git a/translations/messages.el.xlf b/translations/messages.el.xlf
index 31a05e50..5f8bad24 100644
--- a/translations/messages.el.xlf
+++ b/translations/messages.el.xlf
@@ -183,20 +183,20 @@
menu.admin_timesheet
Δελτία ωρών
-
- menu.admin_customer
+
+ customers
Πελάτες
-
- menu.admin_project
+
+ projects
Έργα
-
- menu.admin_activity
+
+ activities
Δραστηριότητες
-
- menu.admin_user
+
+ users
Χρήστες
@@ -211,8 +211,8 @@
menu.system_configuration
Ρυθμίσεις
-
- menu.tags
+
+ tags
Ετικέτες
@@ -599,17 +599,9 @@
-
- admin_timesheet.title
- Δελτία ωρών
-
-
- admin_project.title
- Έργα
-
label.project_start
Εκκίνηση έργου
@@ -618,20 +610,9 @@
label.project_end
Τερματισμός έργου
-
-
- admin_activity.title
- Δραστηριότητες
-
-
- admin_customer.title
- Πελάτης
-
label.number
Λογαριασμός
@@ -691,10 +672,6 @@
-
- admin_user.title
- Χρήστης
-
label.alias
Όνομα
diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index d3b0171c..0b608a29 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -199,20 +199,20 @@
menu.admin_timesheet
Timesheets
-
- menu.admin_customer
+
+ customers
Customers
-
- menu.admin_project
+
+ projects
Projects
-
- menu.admin_activity
+
+ activities
Activities
-
- menu.admin_user
+
+ users
Users
@@ -227,8 +227,8 @@
menu.system_configuration
Settings
-
- menu.tags
+
+ tags
Tags
@@ -631,17 +631,9 @@
-
- admin_timesheet.title
- Timesheets
-
-
- admin_project.title
- Projects
-
label.project_start
Project start
@@ -650,20 +642,9 @@
label.project_end
Project end
-
-
- admin_activity.title
- Activities
-
-
- admin_customer.title
- Customer
-
label.number
Account
@@ -723,10 +704,6 @@
-
- admin_user.title
- User
-
label.alias
Name
diff --git a/translations/messages.eo.xlf b/translations/messages.eo.xlf
index 01c46487..96988b30 100644
--- a/translations/messages.eo.xlf
+++ b/translations/messages.eo.xlf
@@ -146,20 +146,20 @@
menu.admin_timesheet
Temposlipoj
-
- menu.admin_customer
+
+ customers
Klientoj
-
- menu.admin_project
+
+ projects
Projektoj
-
- menu.admin_activity
+
+ activities
Aktivaĵoj
-
- menu.admin_user
+
+ users
Uzantoj
@@ -174,8 +174,8 @@
menu.system_configuration
Agordoj
-
- menu.tags
+
+ tags
Etikedoj
@@ -518,17 +518,9 @@
-
- admin_timesheet.title
- Temposlipoj
-
-
- admin_project.title
- Projektoj
-
label.project_start
Komenco de projekto
@@ -537,20 +529,9 @@
label.project_end
Fino de projekto
-
-
- admin_activity.title
- Aktivaĵoj
-
-
- admin_customer.title
- Kliento
-
label.number
Konto
@@ -606,10 +587,6 @@
-
- admin_user.title
- Uzanto
-
label.alias
Nomo
diff --git a/translations/messages.es.xlf b/translations/messages.es.xlf
index 454fe7cb..99994901 100644
--- a/translations/messages.es.xlf
+++ b/translations/messages.es.xlf
@@ -123,20 +123,20 @@
menu.admin_timesheet
Partes de horas
-
- menu.admin_customer
+
+ customers
Clientes
-
- menu.admin_project
+
+ projects
Proyectos
-
- menu.admin_activity
+
+ activities
Actividades
-
- menu.admin_user
+
+ users
Usuarios
@@ -151,8 +151,8 @@
menu.system_configuration
Configuración
-
- menu.tags
+
+ tags
Etiquetas
@@ -471,31 +471,9 @@
-
- admin_timesheet.title
- Partes de horas
-
-
-
- admin_project.title
- Proyectos
-
-
-
- admin_activity.title
- Actividades
-
-
- admin_customer.title
- Cliente
-
label.number
Cuenta
@@ -547,10 +525,6 @@
-
- admin_user.title
- Usuario
-
label.alias
Nombre
diff --git a/translations/messages.eu.xlf b/translations/messages.eu.xlf
index 24dfecdd..5d063228 100644
--- a/translations/messages.eu.xlf
+++ b/translations/messages.eu.xlf
@@ -131,20 +131,20 @@
menu.admin_timesheet
Ordu taula
-
- menu.admin_customer
+
+ customers
Bezeroak
-
- menu.admin_project
+
+ projects
Proiektuak
-
- menu.admin_activity
+
+ activities
Jarduerak
-
- menu.admin_user
+
+ users
Erabiltzaileak
@@ -159,8 +159,8 @@
menu.system_configuration
Konfigurazioa
-
- menu.tags
+
+ tags
Etiketak
@@ -483,17 +483,9 @@
-
- admin_timesheet.title
- Ordu taula
-
-
- admin_project.title
- Proiektuak
-
label.project_start
Proiektu hasiera
@@ -502,20 +494,9 @@
label.project_end
Proiektu bukaera
-
-
- admin_activity.title
- Jarduerak
-
-
- admin_customer.title
- Bezeroak
-
label.number
Kontua
@@ -571,10 +552,6 @@
-
- admin_user.title
- Erabiltzailea
-
label.alias
Izena
diff --git a/translations/messages.fa.xlf b/translations/messages.fa.xlf
index bec61f23..be2fdd33 100644
--- a/translations/messages.fa.xlf
+++ b/translations/messages.fa.xlf
@@ -355,8 +355,8 @@
menu.doctor
دکتر
-
- menu.tags
+
+ tags
برچسب ها
@@ -371,20 +371,20 @@
menu.admin_team
تیم ها
-
- menu.admin_user
+
+ users
کاربران
-
- menu.admin_activity
+
+ activities
فعالیت ها
-
- menu.admin_project
+
+ projects
پروژه ها
-
- menu.admin_customer
+
+ customers
مشتریان
diff --git a/translations/messages.fi.xlf b/translations/messages.fi.xlf
index f29d35aa..67d3b562 100644
--- a/translations/messages.fi.xlf
+++ b/translations/messages.fi.xlf
@@ -150,20 +150,20 @@
menu.admin_timesheet
Työajanseurannat
-
- menu.admin_customer
+
+ customers
Asiakkaat
-
- menu.admin_project
+
+ projects
Projektit
-
- menu.admin_activity
+
+ activities
Työtehtävät
-
- menu.admin_user
+
+ users
Käyttäjät
@@ -178,8 +178,8 @@
menu.system_configuration
Asetukset
-
- menu.tags
+
+ tags
Tunnisteet
@@ -554,17 +554,9 @@
-
- admin_timesheet.title
- Tuntilomakkeet
-
-
- admin_project.title
- Projektit
-
label.project_start
Projektin aloitus
@@ -573,20 +565,9 @@
label.project_end
Projektin lopetus
-
-
- admin_activity.title
- Työtehtävät
-
-
- admin_customer.title
- Asiakas
-
label.number
Tili
@@ -642,10 +623,6 @@
-
- admin_user.title
- Käyttäjä
-
label.alias
Nimi
diff --git a/translations/messages.fo.xlf b/translations/messages.fo.xlf
index b2608a2a..266593c5 100644
--- a/translations/messages.fo.xlf
+++ b/translations/messages.fo.xlf
@@ -61,16 +61,16 @@
menu.export
Útflyt
-
- menu.admin_customer
+
+ customers
Kundar
-
- menu.admin_project
+
+ projects
Verkætlanir
-
- menu.admin_user
+
+ users
Brúkarar
@@ -199,14 +199,6 @@
label.avatar
Vanga mynd
-
- admin_customer.title
- Kundi
-
-
- admin_timesheet.title
- Arbeiðsseðlar
-
calendar.title
Kalendari
@@ -243,10 +235,6 @@
label.alias
Navn
-
- admin_user.title
- Brúkari
-
label.currency
Gjaldoyra
@@ -279,10 +267,6 @@
label.number
Konta
-
- admin_project.title
- Verkætlanir
-
agendaDay
Dagur
@@ -567,8 +551,8 @@
entryState.stopped
Steðga
-
- menu.tags
+
+ tags
Frámerki
@@ -727,12 +711,8 @@
stats.activityTotal
Virksemi
-
- admin_activity.title
- Virksemi
-
-
- menu.admin_activity
+
+ activities
Virksemi
diff --git a/translations/messages.fr.xlf b/translations/messages.fr.xlf
index 015f7b99..4bf7c3f1 100644
--- a/translations/messages.fr.xlf
+++ b/translations/messages.fr.xlf
@@ -111,20 +111,20 @@
menu.admin_timesheet
Fiches de temps
-
- menu.admin_customer
+
+ customers
Clients
-
- menu.admin_project
+
+ projects
Projets
-
- menu.admin_activity
+
+ activities
Activités
-
- menu.admin_user
+
+ users
Utilisateurs
@@ -135,8 +135,8 @@
menu.system_configuration
Paramètres
-
- menu.tags
+
+ tags
Mots-clés
-
- admin_timesheet.title
- Fiches de temps
-
-
-
- admin_project.title
- Projets
-
-
-
- admin_activity.title
- Activités
-
-
- admin_customer.title
- Clients
-
label.number
Compte
@@ -495,10 +473,6 @@
-
- admin_user.title
- Utilisateur
-
label.alias
Nom
diff --git a/translations/messages.he.xlf b/translations/messages.he.xlf
index 8b7e76d5..0fcb7b69 100644
--- a/translations/messages.he.xlf
+++ b/translations/messages.he.xlf
@@ -137,20 +137,20 @@
menu.admin_timesheet
גיליון שעות
-
- menu.admin_customer
+
+ customers
לקוחות
-
- menu.admin_project
+
+ projects
מיזמים
-
- menu.admin_activity
+
+ activities
פעילויות
-
- menu.admin_user
+
+ users
משתמשים
@@ -165,8 +165,8 @@
menu.system_configuration
הגדרות
-
- menu.tags
+
+ tags
תגיות
@@ -501,14 +501,6 @@
calendar.title
לוח שנה
-
- admin_timesheet.title
- גיליון שעות
-
-
- admin_project.title
- מיזמים
-
label.project_start
תחילת מיזם
@@ -517,14 +509,6 @@
label.project_end
סוף מיזם
-
- admin_activity.title
- פעילויות
-
-
- admin_customer.title
- לקוח
-
label.number
חשבון
@@ -577,10 +561,6 @@
label.currency
מטבע
-
- admin_user.title
- משתמש
-
label.alias
שם
diff --git a/translations/messages.hr.xlf b/translations/messages.hr.xlf
index 973d0fbd..32d3887c 100644
--- a/translations/messages.hr.xlf
+++ b/translations/messages.hr.xlf
@@ -191,20 +191,20 @@
menu.admin_timesheet
Vremenske tablice
-
- menu.admin_customer
+
+ customers
Kupci
-
- menu.admin_project
+
+ projects
Projekti
-
- menu.admin_activity
+
+ activities
Aktivnosti
-
- menu.admin_user
+
+ users
Korisnici
@@ -219,8 +219,8 @@
menu.system_configuration
Postavke
-
- menu.tags
+
+ tags
Oznake
@@ -611,17 +611,6 @@
-
- admin_timesheet.title
- Vremenske tablice
-
-
-
- admin_project.title
- Projekti
-
label.project_start
Početak projekta
@@ -630,20 +619,9 @@
label.project_end
Kraj projekta
-
-
- admin_activity.title
- Aktivnosti
-
-
- admin_customer.title
- Kupac
-
label.number
Račun
@@ -703,10 +681,6 @@
-
- admin_user.title
- Korisnik
-
label.alias
Ime
diff --git a/translations/messages.hu.xlf b/translations/messages.hu.xlf
index c8aadee3..21589c22 100644
--- a/translations/messages.hu.xlf
+++ b/translations/messages.hu.xlf
@@ -114,20 +114,20 @@
menu.admin_timesheet
Rögzített órák
-
- menu.admin_customer
+
+ customers
Ügyfelek
-
- menu.admin_project
+
+ projects
Projektek
-
- menu.admin_activity
+
+ activities
Tevékenységek
-
- menu.admin_user
+
+ users
Felhasználók
@@ -138,8 +138,8 @@
menu.system_configuration
Rendszer beállítások
-
- menu.tags
+
+ tags
Címkék
-
- admin_timesheet.title
- Rögzített órák
-
-
-
- admin_project.title
- Projektek
-
-
-
- admin_activity.title
- Tevékenységek
-
-
- admin_customer.title
- Ügyfél
-
label.number
Adószám
@@ -498,10 +476,6 @@
-
- admin_user.title
- Felhasználó
-
label.alias
Név
diff --git a/translations/messages.it.xlf b/translations/messages.it.xlf
index 02d45768..fcc1e2bf 100644
--- a/translations/messages.it.xlf
+++ b/translations/messages.it.xlf
@@ -150,20 +150,20 @@
menu.admin_timesheet
Registrazioni
-
- menu.admin_customer
+
+ customers
Clienti
-
- menu.admin_project
+
+ projects
Progetti
-
- menu.admin_activity
+
+ activities
Attività
-
- menu.admin_user
+
+ users
Utenti
@@ -178,8 +178,8 @@
menu.system_configuration
Impostazioni
-
- menu.tags
+
+ tags
Etichette
@@ -554,17 +554,9 @@
-
- admin_timesheet.title
- Registrazioni
-
-
- admin_project.title
- Progetti
-
label.project_start
Inizio progetto
@@ -573,20 +565,9 @@
label.project_end
Fine progetto
-
-
- admin_activity.title
- Attività
-
-
- admin_customer.title
- Cliente
-
label.number
Account
@@ -642,10 +623,6 @@
-
- admin_user.title
- Utente
-
label.alias
Nome
diff --git a/translations/messages.ja.xlf b/translations/messages.ja.xlf
index 14e909af..f7b0dbfc 100644
--- a/translations/messages.ja.xlf
+++ b/translations/messages.ja.xlf
@@ -114,20 +114,20 @@
menu.admin_timesheet
タイムシート
-
- menu.admin_customer
+
+ customers
得意先
-
- menu.admin_project
+
+ projects
プロジェクト
-
- menu.admin_activity
+
+ activities
アクティビティ
-
- menu.admin_user
+
+ users
ユーザー
@@ -138,8 +138,8 @@
menu.system_configuration
設定
-
- menu.tags
+
+ tags
タグ
-
- admin_timesheet.title
- タイムシート
-
-
-
- admin_project.title
- プロジェクト
-
-
-
- admin_activity.title
- アクティビティ
-
-
- admin_customer.title
- 得意先
-
label.number
口座
@@ -498,10 +476,6 @@
-
- admin_user.title
- ユーザー
-
label.alias
名前
diff --git a/translations/messages.ko.xlf b/translations/messages.ko.xlf
index a424ef40..3dede00b 100644
--- a/translations/messages.ko.xlf
+++ b/translations/messages.ko.xlf
@@ -114,20 +114,20 @@
menu.admin_timesheet
시간기록표
-
- menu.admin_customer
+
+ customers
고객
-
- menu.admin_project
+
+ projects
프로젝트
-
- menu.admin_activity
+
+ activities
업무
-
- menu.admin_user
+
+ users
사용자
@@ -142,8 +142,8 @@
menu.system_configuration
설정
-
- menu.tags
+
+ tags
태그
-
- admin_timesheet.title
- 시간 기록표
-
-
-
- admin_project.title
- 프로젝트
-
-
-
- admin_activity.title
- 활동
-
-
- admin_customer.title
- 고객
-
label.number
고객번호
@@ -514,10 +492,6 @@
-
- admin_user.title
- 사용자
-
label.alias
이름
diff --git a/translations/messages.nb-NO.xlf b/translations/messages.nb-NO.xlf
index ef47114c..d705d91b 100644
--- a/translations/messages.nb-NO.xlf
+++ b/translations/messages.nb-NO.xlf
@@ -317,10 +317,6 @@
calendar.title
Kalender
-
- admin_project.title
- Prosjekter
-
label.project_start
Prosjektstart
@@ -329,20 +325,9 @@
label.project_end
Prosjektslutt
-
-
- admin_activity.title
- Aktiviteter
-
-
- admin_customer.title
- Kunde
-
label.number
Konto
@@ -390,10 +375,6 @@
-
- admin_user.title
- Bruker
-
label.alias
Navn
@@ -563,20 +544,20 @@
menu.reporting
Rapportering
-
- menu.admin_customer
+
+ customers
Kunder
-
- menu.admin_project
+
+ projects
Prosjekter
-
- menu.admin_activity
+
+ activities
Aktiviteter
-
- menu.admin_user
+
+ users
Brukere
@@ -795,10 +776,6 @@
label.timesheet.export_decimal
Bruk desimalvarighet i eksport
-
- admin_timesheet.title
- Tidstabeller
-
label.vat_id
Moms-ID
@@ -1119,8 +1096,8 @@
menu.doctor
Doktor
-
- menu.tags
+
+ tags
Etiketter
diff --git a/translations/messages.nl.xlf b/translations/messages.nl.xlf
index 6249f9b6..00a0d192 100644
--- a/translations/messages.nl.xlf
+++ b/translations/messages.nl.xlf
@@ -123,20 +123,20 @@
menu.admin_timesheet
Prestaties
-
- menu.admin_customer
+
+ customers
Klanten
-
- menu.admin_project
+
+ projects
Projecten
-
- menu.admin_activity
+
+ activities
Activiteiten
-
- menu.admin_user
+
+ users
Gebruikers
@@ -151,8 +151,8 @@
menu.system_configuration
Instellingen
-
- menu.tags
+
+ tags
Labels
@@ -471,31 +471,9 @@
-
- admin_timesheet.title
- Prestaties
-
-
-
- admin_project.title
- Projecten
-
-
-
- admin_activity.title
- Activiteiten
-
-
- admin_customer.title
- Klanten
-
label.number
Rekening
@@ -547,10 +525,6 @@
-
- admin_user.title
- Gebruikers
-
label.alias
Naam
diff --git a/translations/messages.pl.xlf b/translations/messages.pl.xlf
index 69e52b73..9dce48a5 100644
--- a/translations/messages.pl.xlf
+++ b/translations/messages.pl.xlf
@@ -134,20 +134,20 @@
menu.admin_timesheet
Ewidencje
-
- menu.admin_customer
+
+ customers
Klienci
-
- menu.admin_project
+
+ projects
Projekty
-
- menu.admin_activity
+
+ activities
Aktywności
-
- menu.admin_user
+
+ users
Użytkownicy
@@ -162,8 +162,8 @@
menu.system_configuration
Ustawienia
-
- menu.tags
+
+ tags
Tagi
@@ -498,17 +498,6 @@
-
-