From 66e0bbc3485f01479e1557db9351d769c4e591b4 Mon Sep 17 00:00:00 2001 From: wvengen Date: Thu, 11 Jul 2013 22:09:58 +0200 Subject: [PATCH] cleanup translation changes introduced by last merge --- config/locales/en.yml | 11 ----------- config/locales/nl.yml | 29 +++++++++++++++-------------- 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 722db99e..ba8d92e7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1633,12 +1633,6 @@ en: role_finance: Finances role_orders: Order management role_suppliers: Suppliers - task_description: Description - task_duration: Duration in hours - task_name: Task name - task_required_users: People required - weekday: Weekday - weekly_task: Define monthly task? 'no': 'No' required: mark: ! '*' @@ -1819,11 +1813,6 @@ en: workgroup: title: Tasks for %{workgroup} title_all: All group tasks - weekly: - desc: ! '

Every %{weekday} this workgroup has the following job: %{task}

The weektask has been created by Foodsoft automatically. You still have to sign up for it yourself.

' - edit: Edit weekly tasks - empty: No weekly tasks created yet. - title: Weekly tasks time: am: morning formats: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index c8965b3d..378d988e 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -81,6 +81,11 @@ nl: too_long: is te lang (niet meer dan %{count} tekens) too_short: is te kort (niet minder dan %{count} tekens) wrong_length: heeft de verkeerde lengte (moet precies %{count} tekens zijn) + models: + task: + attributes: + done: + exclusion: template: body: ! 'Controleer de volgende velden:' header: @@ -1513,16 +1518,10 @@ nl: workgroup: next_weekly_tasks_number: role_admin: - role_article_meta: - role_finance: + role_article_meta: Artikelbestand + role_finance: Financiƫn role_orders: - role_suppliers: - task_description: - task_duration: - task_name: - task_required_users: - weekday: - weekly_task: + role_suppliers: Leveranciers 'no': Nee required: mark: ! '*' @@ -1647,12 +1646,15 @@ nl: notice: edit: title: + warning_periodic: error_not_found: form: search: hint: noresult: placeholder: + submit: + periodic: index: show_group_tasks: title: @@ -1676,10 +1678,13 @@ nl: new_task: new: title: + repeated: set_done: notice: show: accept_task: + confirm_delete_group: + delete_group: due_date: hours: mark_done: @@ -1687,6 +1692,7 @@ nl: title: update: notice: + notice_converted: user: more: tasks_link: @@ -1696,11 +1702,6 @@ nl: workgroup: title: title_all: - weekly: - desc: - edit: - empty: - title: time: am: morgen formats: