diff --git a/app/views/pages/_form.html.haml b/app/views/pages/_form.html.haml
index 2cc60ab8..a3de5652 100644
--- a/app/views/pages/_form.html.haml
+++ b/app/views/pages/_form.html.haml
@@ -79,7 +79,7 @@
[http://example.net #{t '.help.external_link_ex'}]
%tr
%td(colspan=2)
- %b Tabellenformatierung
+ %b= t '.help.section_table'
%tr
%td!= t '.help.see_tables', tables_link: link_to(t('.help.tables_link'), "http://www.mediawiki.org/wiki/Help:Tables", :target => '_blank')
diff --git a/config/locales/en/en.deliveries.yml b/config/locales/en/en.deliveries.yml
new file mode 100644
index 00000000..b29eb383
--- /dev/null
+++ b/config/locales/en/en.deliveries.yml
@@ -0,0 +1,42 @@
+en:
+ deliveries:
+ suppliers_overview: 'Supplier overview'
+ invoice_amount: 'Invoice amount'
+ invoice_net_amount: 'Invoice net amount'
+ edit:
+ title: 'Edit suppliers'
+ form:
+ remove_article: 'Remove article from delivery'
+ add_article: 'Add stock article to delivery'
+ note_new_article: 'When an article is not yet in the inventory, you have to %{new_link} it first.'
+ note_new_article_link: 'create'
+ new_article:
+ title: 'Create new stock article'
+ search: 'Search for articles in the %{supplier} catalogue'
+ index:
+ title: '%{supplier}/deliveries'
+ confirm_delete: 'Are you sure?'
+ new_delivery: 'Create new delivery for %{supplier} '
+ new:
+ title: 'New delivery from %{supplier}'
+ show:
+ title: 'Show delivery'
+ title_articles: 'Article'
+ article: 'Article'
+ unit: 'Unit'
+ amount: 'Amount'
+ price: 'Netprice'
+ sum: 'Sum'
+ sum_net: 'Net sum'
+ sum_gross: 'Gross sum'
+ sum_diff: 'Gross - adjusted invoice ammount'
+ stock_change:
+ remove_article: 'Remove articles from delivery'
+
+ # used by controller
+ create:
+ notice: 'Delivery was created. Please don’t forget to create invoice!'
+ update:
+ notice: 'Delivery was updated.'
+ destroy:
+ notice: 'Delivery was deleted.'
diff --git a/config/locales/en/en.pages.yml b/config/locales/en/en.pages.yml
new file mode 100644
index 00000000..73d1fa98
--- /dev/null
+++ b/config/locales/en/en.pages.yml
@@ -0,0 +1,73 @@
+en:
+ pages:
+ title: 'Title'
+ last_updated: 'Last updated'
+ all:
+ title: 'All Wiki pages'
+ new_page: 'Create new page'
+ recent_changes: 'Recent changes'
+ title_list: 'List of pages'
+ site_map: 'Sitemap'
+ search:
+ placeholder: 'Page title ..'
+ action: 'Search'
+ body:
+ title_toc: 'Content'
+ edit:
+ title: 'Edit page'
+ form:
+ preview: 'Preview'
+ help:
+ title: 'Quick formatting help'
+ section_character: 'Character formatting'
+ italic: 'italic'
+ bold: 'bold'
+ noformat: 'No wiki-formatting'
+ text: 'text'
+ section_block: 'Block formatting'
+ headings: 'Heading'
+ heading: 'level %{level}'
+ unordered_list: 'Item list'
+ list_item_1: 'First list item'
+ list_item_2: 'Secound list item'
+ ordered_list: 'Numbered list'
+ section_link: 'Link formatting'
+ wiki_links: 'Wiki-links'
+ wiki_link_ex: 'Foodsoft Wiki Page'
+ external_links: 'External links'
+ external_link_ex: 'External page'
+ section_table: 'Table formatting'
+ see_tables: 'see %{tables_link}'
+ tables_link: 'Tables'
+ new:
+ title: 'Create new wiki page'
+ page_list_item:
+ date_format: '%a, %d %B %Y %H:%M:%S'
+ show:
+ edit: 'Edit page'
+ versions: 'Versions (%{count})'
+ subpages: 'subpages'
+ title_versions: 'Versions'
+ date_format: '%d-%m-%y %H:%M'
+ delete: 'Delete page'
+ delete_confirm: 'Warning: all subpages will be deleted as well. Are you sure?'
+ last_updated: 'Last updated by %{user} on %{when}'
+ version:
+ title: '%{title} - version %{version}'
+ title_version: 'Version'
+ date_format: '%a, %d-%m-%Y, %H:%M'
+ author: 'Author: %{user}'
+ view_current: 'See current version'
+ revert: 'Revert to this version'
+
+ # used by controller
+ cshow:
+ error_noexist: 'Page doesn’t exist!'
+ redirect_notice: 'Redirected from %{page} ..'
+ create:
+ notice: 'Page was created'
+ update:
+ notice: 'Page was updated'
+ destroy:
+ notice: "The page '%{page}' and all subpages have been deleted successfully."
+ error_stale_object: 'Warning, the page has just been edited by someone else. Please try again.'
diff --git a/config/locales/en/en.tasks.yml b/config/locales/en/en.tasks.yml
new file mode 100644
index 00000000..09e40d37
--- /dev/null
+++ b/config/locales/en/en.tasks.yml
@@ -0,0 +1,75 @@
+en:
+ tasks:
+ archive:
+ title: 'Task archive'
+ archive_tasks:
+ due_date: 'Due date'
+ task: 'Subject'
+ who: 'People in charge'
+ task_format: '%{name} (%{duration}h)'
+ edit:
+ title: 'Edit task'
+ form:
+ search:
+ hint: "Search for user"
+ noresult: 'No user found'
+ placeholder: 'Search ...'
+ index:
+ title: 'Tasks'
+ title_non_group: 'Tasks for all!'
+ show_group_tasks: 'Show group tasks'
+ list:
+ due_date: 'Due date'
+ task: 'subject'
+ who: 'Who is doing it?'
+ who_hint: '(How much are still needed?)'
+ task_format: '%{name} (%{duration}h)'
+ accept_task: 'Accept task'
+ reject_task: 'Reject task'
+ mark_done: 'Mark task as done'
+ done_q: 'Done?'
+ done: 'Done'
+ nav:
+ new_task: 'Create new task'
+ my_tasks: 'My tasks'
+ all_tasks: 'All tasks'
+ archive: 'Completed tasks (archive)'
+ group_tasks: 'Group tasks'
+ new:
+ title: 'Create new tasks'
+ show:
+ title: 'Show task'
+ hours: '%{count}h'
+ due_date: 'Due date'
+ accept_task: 'Accept task'
+ reject_task: 'Reject task'
+ mark_done: 'Mark task as done'
+ user:
+ title: 'My tasks'
+ title_open: 'Open tasks'
+ title_accepted: 'Accepted tasks'
+ more: 'Nothing to do? %{tasks_link} are tasks for sure.'
+ tasks_link: 'Here'
+ workgroup:
+ title: 'Tasks for %{workgroup}'
+ weekly:
+ title: 'Weekly tasks'
+ 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.
+ empty: 'No weekly tasks created yet.'
+ edit: 'Edit weekly tasks'
+ title_all: 'All group tasks'
+
+ # used by controller
+ create:
+ notice: 'Task has been created'
+ update:
+ notice: 'Task has been updated'
+ destroy:
+ notice: 'Task has been deleted'
+ accept:
+ notice: 'You have accepted the task'
+ set_done:
+ notice: 'The state of the task has been updated'
+ error_not_found: 'No workgroup found'