Merge branch 'master' into new-gui

config/application.rb

@@ -59,7 +59,7 @@ module Tracksapp
     config.assets.paths << Rails.root.join("app", "assets", "swfs")
 
     # add print and login css to assets
-    config.assets.precompile += %w(login.css print.css)
+    config.assets.precompile += %w(login.css print.css mobile.css)
         
     # configure Tracks to handle deployment in a subdir
     config.action_controller.relative_url_root = SITE_CONFIG['subdir'] if SITE_CONFIG['subdir']

config/locales/en.yml

@@ -593,7 +593,7 @@ en:
       due_this_week: Due in rest of this week
       due_next_week: Due next week
       due_this_month: Due in rest of %{month}
-      due_after_this_month: Due in %{month} and later
+      due_after_this_month: Due in %{next_month} and later
     show_tomorrow: Show Tomorrow
     tagged_page_title: "TRACKS::Tagged with '%{tag_name}'"
     action_deferred: "The action '%{description}' was deferred"
@@ -653,7 +653,7 @@ en:
       daily: Daily
       yearly_every_x_day: Every %{month} %{day}
       recurrence_on:
-        options: Use the calculated date to 
+        options: Use the calculated date to
         due_date: set the actions due date
         show_options: Show the action
         show_always: always
@@ -1022,4 +1022,4 @@ en:
     notes_matching_query: Notes matching query
     no_results: Your search yielded no results.
     todos_matching_query: Todos matching query
-    projects_matching_query: Projects matching query 
+    projects_matching_query: Projects matching query

config/locales/nl.yml

@@ -194,7 +194,7 @@ nl:
     - Vr
     - Za
     abbr_month_names:
-    - 
+    -
     - Jan
     - Feb
     - Maa
@@ -223,7 +223,7 @@ nl:
       only_day: '%e'
       short: '%e %b'
     month_names:
-    - 
+    -
     - Januari
     - Februari
     - Maart
@@ -819,7 +819,7 @@ nl:
       due_this_week: Deadline in rest van deze week
       due_today: Deadline vandaag
       get_in_ical_format: Ontvang deze agenda in iCal-formaat
-      due_after_this_month: Deadline in %{month} en later
+      due_after_this_month: Deadline in %{next_month} en later
     calendar_page_title: TRACKS::Agenda
     cannot_add_dependency_to_completed_todo: Kan deze actie niet als een afhankelijkheid
       van een voltooide actie toevoegen!
@@ -957,7 +957,7 @@ nl:
         from: vanaf
         last: laatste
         month_names:
-        - 
+        -
         - januari
         - februari
         - maart