rebase to master to include i18n changes and fix merge conflicts

This commit is contained in:
Reinier Balt 2011-01-19 10:13:56 +01:00
parent 7a74025253
commit 97e8602ef9
13 changed files with 43 additions and 34 deletions

View file

@ -528,8 +528,11 @@ en:
completed_in_archive: "There are {{count}} completed actions in the archive."
completed_more_than_x_days_ago: "Completed more than {{count}} days ago"
added_new_next_action: "Added new next action"
added_new_next_action_singular: "Added new next action"
added_new_next_action_plural: "Added new next actions"
to_tickler: "to tickler"
in_pending_state: "in pending state"
in_hidden_state: "in hidden state"
recurring_action_deleted: "Action was deleted. Because this action is recurring, a new action was added"
completed_recurrence_completed: "There is no next action after the recurring action you just deleted. The recurrence is completed"
error_deleting_item: "There was an error deleting the item {{description}}"