rebase to master to include i18n changes and fix merge conflicts

app/views/projects/update.js.erb

@@ -11,6 +11,10 @@
   TracksPages.show_edit_errors(html_for_error_messages());
 <% end %>
 
+<% if @saved
+   # only add these js functions if the project is saved
+-%>
+
 function update_project_list_page() {
   <% if @state_changed -%>
     remove_and_re_add_project();
@@ -82,6 +86,9 @@ function html_for_project_settings() {
   return "<%= source_view_is(:project) ? escape_javascript(render(:partial => 'project_settings', :object => @project )) : "" %>";
 }
 
+<% end # if @saved
+-%>
+
 function html_for_error_messages() {
   return "<%= escape_javascript(error_messages_for('project')) %>";
 }

app/views/todos/create_multiple.js.erb

@@ -21,13 +21,7 @@
 -%>
 
 function set_notification() {
-  <%-
-  status_message = 'Added new next action'
-  status_message += 's' if @todos.size > 1
-  status_message = 'Added new project / ' + status_message if @new_project_created
-  status_message = 'Added new context / ' + status_message if @new_context_created
-  -%>
- TracksPages.page_notify('notice', "<%=status_message%>", 5);
+ TracksPages.page_notify('notice', "<%=@status_message%>", 5);
 }
 
 function clear_form() {

app/views/todos/destroy.js.erb

@@ -49,10 +49,10 @@ function show_new_todo_if_todo_was_recurring() {
       TodoItemsContainer.ensureVisibleWithEffectAppear("<%=item_container_id(@new_recurring_todo)%>");
       $('#<%=item_container_id(@new_recurring_todo)%>').append(html_for_new_recurring_todo());
       $('#<%= dom_id(@new_recurring_todo, 'line')%>').effect('highlight', {}, 2000 );
-      TracksPages.page_notify('notice', "Action was deleted. Because this action is recurring, a new action was added", 5);
+      TracksPages.page_notify('notice', "<%=t('todos.recurring_action_deleted')%>", 5);
     <% else -%>
       <% if @todo.recurring_todo.todos.active.count == 0 && @new_recurring_todo.nil? -%>
-        TracksPages.page_notify('notice', "There is no next action after the recurring action you just deleted. The recurrence is completed", 5);
+        TracksPages.page_notify('notice', "<%=t('todos.completed_recurrence_completed')%>", 5);
       <% end -%>
     <% end -%>
   <% end -%>
@@ -75,5 +75,4 @@ function html_for_new_recurring_todo() {
 
 <% end 
   # if @saved
--%>
->>>>>>> get destroying of actions working
+-%>