summaryrefslogtreecommitdiffstats
path: root/config/locales
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2016-03-03 07:39:58 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2016-03-03 07:39:58 +0000
commit73405fe847fcdf77d3d154de171d0978ed876d93 (patch)
tree5ef1ef41aa79a1900a7e53a050f94764b3c27390 /config/locales
parent7788ed251f57832e483fe4197b61d9a0ac08ac73 (diff)
downloadredmine-73405fe847fcdf77d3d154de171d0978ed876d93.tar.gz
redmine-73405fe847fcdf77d3d154de171d0978ed876d93.zip
Merged r15167 from trunk to 3.2-stable (#21963, #22131)
German translations for 3.1-stable updated by Tobias Fischer. git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15169 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/de.yml19
1 files changed, 9 insertions, 10 deletions
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 7fc27bd99..254083d5a 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1145,15 +1145,14 @@ de:
setting_search_results_per_page: Suchergebnisse pro Seite
label_blank_value: leer
permission_copy_issues: Tickets kopieren
- error_password_expired: Your password has expired or the administrator requires you
- to change it.
- field_time_entries_visibility: Time logs visibility
- label_parent_task_attributes: Parent tasks attributes
- label_parent_task_attributes_derived: Calculated from subtasks
- label_parent_task_attributes_independent: Independent of subtasks
- label_time_entries_visibility_all: All time entries
- label_time_entries_visibility_own: Time entries created by the user
- label_member_management: Member management
+ error_password_expired: Ihr Passwort ist abgelaufen oder der Administrator verlangt eine Passwortänderung.
+ field_time_entries_visibility: Zeiten-Sichtbarkeit
+ label_parent_task_attributes: Eigenschaften übergeordneter Aufgaben
+ label_parent_task_attributes_derived: Abgeleitet von Unteraufgaben
+ label_parent_task_attributes_independent: Unabhängig von Unteraufgaben
+ label_time_entries_visibility_all: Alle Zeitaufwände
+ label_time_entries_visibility_own: Nur eigene Aufwände
+ label_member_management: Mitglieder verwalten
label_member_management_all_roles: Alle Rollen
label_member_management_selected_roles_only: Nur diese Rollen
label_total_spent_time: Aufgewendete Zeit aller Projekte anzeigen
@@ -1178,7 +1177,7 @@ de:
label_file_content_preview: File content preview
label_create_missing_values: Create missing values
button_import: Importieren
- field_total_estimated_hours: Total estimated time
+ field_total_estimated_hours: Summe des geschätzten Aufwands
label_api: API
label_total_plural: Totals
label_assigned_issues: Assigned issues