rebase to master to include i18n changes and fix merge conflicts

features/step_definitions/context_steps.rb

@@ -74,9 +74,4 @@ end
 
 Then /^he should see that a context named "([^\"]*)" is not present$/ do |context_name|
   Then "I should not see \"#{context_name} (\""
-end
-
-Then /^I should see feeds for "([^"]*)" in list of "([^"]*)"$/ do |name, list_type|
-  xpath= "//div[@id='feeds-for-#{list_type}']//strong"
-  name.should == response.selenium.get_text("xpath=#{xpath}")
-end
+end

features/step_definitions/feedlist_steps.rb

@@ -1,9 +1,9 @@
 Then /^I should see a message that you need a context to get feeds for contexts$/ do
-  Then "I should see \"There need to be at least one context before you can request a feed\""
+  Then "I should see \"There needs to be at least one context before you can request a feed\""
 end
 
 Then /^I should see a message that you need a project to get feeds for projects$/ do
-  Then "I should see \"There need to be at least one project before you can request a feed\""
+  Then "I should see \"There needs to be at least one project before you can request a feed\""
 end
 
 Then /^I should see feeds for projects$/ do
@@ -29,3 +29,9 @@ Then /^I should see "([^"]*)" as the selected context$/ do |context_name|
     scope.should have_selector("option[selected=\"selected\"]", :content => context_name)
   end
 end
+
+Then /^I should see feeds for "([^"]*)" in list of "([^"]*)"$/ do |name, list_type|
+  selenium.wait_for :wait_for => :ajax, :javascript_framework => :jquery
+  xpath= "//div[@id='feeds-for-#{list_type}']//strong"
+  name.should == response.selenium.get_text("xpath=#{xpath}")
+end

features/step_definitions/shared_new_todo_steps.rb

@@ -12,5 +12,4 @@ end
 
 Then /^the multiple action form should not be visible$/ do
   selenium.is_visible("todo_multi_add").should == false
-end
-
+end

features/step_definitions/todo_steps.rb

@@ -236,4 +236,4 @@ end
 
 Then /^a confirmation for adding a new context "([^"]*)" should be asked$/ do |context_name|
   selenium.get_confirmation.should == "New context \"#{context_name}\" will be also created. Are you sure?"
-end
+end