Merge branch 'master' into rails4

Conflicts:
	Gemfile.lock
	config/routes.rb

config/locales/en.yml

@@ -333,6 +333,14 @@ en:
     hide_action_form_title: Hide new action form
     make_actions_dependent: Make actions dependent on each other
   states:
+    contexts:
+      hidden: Hidden contexts
+      active: Active contexts
+      closed: Closed contexts
+    projects:
+      hidden: Hidden projects
+      active: Active projects
+      closed: Closed projects
     hidden_plural: Hidden
     completed: Completed
     completed_plural: Completed
@@ -427,6 +435,8 @@ en:
       completed: Currently there are no completed actions
       title: No actions found
       not_done_with_tag: "Currently there are no incomplete actions with the tag '%{param}'"
+      not_done_project: Currently there are no incomplete actions in this project
+      not_done_context: Currently there are no incomplete actions in this context
       completed_recurring: Currently there are no completed recurring todos
       not_done: Currently there are no incomplete actions
       project: Currently there are no incomplete actions in this project
@@ -444,6 +454,7 @@ en:
       home_completed: Completed actions
       tag_completed: "Completed actions tagged with '%{param}'"
       home_without_project: "Actions without project"
+      context_without_project: "Actions without project in %{param}"
       project_project: "Actions in this project"
       project_deferred_pending: Deferred/pending actions in this project
       context_deferred_pending: Deferred/pending actions in this context
@@ -584,7 +595,6 @@ en:
       ends_on_number_times: Ends after %{number} times
       ends_on_date: Ends on %{date}
       every_work_day: Every work day
-      recurrence_on_due_date: the date that the todo is due
       weekly_options: Settings for weekly recurring actions
       weekly: Weekly
       monthly_options: Settings for monthly recurring actions
@@ -633,16 +643,18 @@ en:
         due: due
         until: until
         every_month: every month
-      show_option_always: always
       daily: Daily
       yearly_every_x_day: Every %{month} %{day}
-      recurrence_on_options: Set recurrence on
+      recurrence_on:
+        options: Use the calculated date to 
+        due_date: set the actions due date
+        show_options: Show the action
+        show_always: always
+        show_days_before: "not until %{days} days before the due date"
+        from_tickler: set the date the action should be shown (do not set a due date)
       daily_every_number_day: Every %{number} day(s)
-      show_options: Show the todo
       weekly_every_number_week: Returns every %{number} week on
       ends_on: Ends on
-      show_days_before: "%{days} days before the todo is due"
-      from_tickler: the date todo comes from tickler (no due date set)
       no_end_date: No end date
       day_x_on_every_x_month: Day %{day} on every %{month} month
       yearly_options: Settings for yearly recurring actions

config/routes.rb

@@ -5,7 +5,6 @@ Tracksapp::Application.routes.draw do
 
   post 'login' => 'login#login'
   get 'login' => 'login#login'
-  get 'login/expire_session' => 'login#expire_session'
   get 'login/check_expiry' => 'login#check_expiry'
   get 'logout' => 'login#logout'
 
@@ -102,9 +101,13 @@ Tracksapp::Application.routes.draw do
       post 'add_predecessor'
     end
   end
-  get 'todos/tag/:name' => 'todos#tag', :as => :tag
-  get 'tags.autocomplete' => "todos#tags", :format => 'autocomplete'
 
+  # match /todos/tag and put everything in :name, including extensions like .m and .txt. 
+  # This means the controller action needs to parse the extension and set format/content type
+  # Needed for /todos/tag/first.last.m to work
+  get 'todos/tag/:name' => 'todos#tag', :as => :tag, :format => false, :name => /.*/
+  
+  get 'tags.autocomplete' => "todos#tags", :format => 'autocomplete'
   get 'todos/done/tag/:name' => "todos#done_tag", :as => :done_tag
   get 'todos/all_done/tag/:name' => "todos#all_done_tag", :as => :all_done_tag
   get 'auto_complete_for_predecessor' => 'todos#auto_complete_for_predecessor'