Merge branch '2.3_branch' into master

config/locales/cs.yml

@@ -308,9 +308,6 @@ cs:
   footer:
     send_feedback: Poslat zpětnou vazbu na %{version}
   integrations:
-    applescript_next_action_prompt: 'Popis úkolu:'
-    applescript_success_after_id: vytvořen
-    applescript_success_before_id: Nový úkol s ID
     gmail_description: Gadget pro Tracks do Gmailu
     opensearch_description: Prohledat Tracks
   layouts:

config/locales/de.yml

@@ -313,9 +313,6 @@ de:
   footer:
     send_feedback: Senden Sie Feedback zu %{version}
   integrations:
-    applescript_next_action_prompt: 'Beschreibung der nächsten Aufgabe:'
-    applescript_success_after_id: erstellt
-    applescript_success_before_id: Nächste neue Aufgabe mit ID
     gmail_description: Gadget, um Tracks als Gadget zu Googlemail hinzuzufügen
     opensearch_description: In Tracks suchen
   layouts:

config/locales/en.yml

@@ -796,10 +796,7 @@ en:
     save_status_message: "Note %{id} was saved"    
   integrations:
     opensearch_description: Search in Tracks
-    applescript_next_action_prompt: "Description of next action:"
     gmail_description: Gadget to add Tracks to Gmail as a gadget
-    applescript_success_after_id: created
-    applescript_success_before_id: New next action with ID
   preferences:
     open_id_url: Your OpenID URL is
     staleness_starts_after: Staleness starts after %{days} days

config/locales/es.yml

@@ -310,9 +310,6 @@ es:
   footer:
     send_feedback: Envía comentarios sobre el %{version}
   integrations:
-    applescript_next_action_prompt: 'Descripción de la próxima tarea:'
-    applescript_success_after_id: creado
-    applescript_success_before_id: Nueva acción junto con la identificación
     gmail_description: Gadget para añadir pistas a Gmail como un gadget
     opensearch_description: Buscar en las Tracks
   layouts:

config/locales/fr.yml

@@ -340,9 +340,6 @@ fr:
       submit: Sauvegarder %{model}
       update: Mettre à jour %{model}
   integrations:
-    applescript_next_action_prompt: 'Description de l''action suivante :'
-    applescript_success_after_id: Créé
-    applescript_success_before_id: Nouvelle action suivante avec ID
     gmail_description: Gadget pour ajouter Tracks à Gmail
     opensearch_description: Rechercher dans Tracks
   layouts:

config/locales/he.yml

@@ -257,9 +257,6 @@ he:
   footer:
     send_feedback: "שליחת משוב על גירסא %{version}"
   integrations:
-    applescript_next_action_prompt: "תיאור הפעולות הבאות:"
-    applescript_success_after_id: "נוצר"
-    applescript_success_before_id: "פעולת המשך עם זיהוי"
     gmail_description: "חֲפִיץ להוספת מסלולים ל-Gmail"
     opensearch_description: "חיפוש במסלולים"
   layouts:

config/locales/nl.yml

@@ -358,9 +358,6 @@ nl:
       submit: Bewaar %{model}
       update: Bijwerken %{model}
   integrations:
-    applescript_next_action_prompt: 'Omschrijving van de actie:'
-    applescript_success_after_id: gemaakt
-    applescript_success_before_id: Nieuwe actie met ID
     gmail_description: Gadget om Tracks toe te voegen aan Gmail als een gadget
     opensearch_description: Zoek in Tracks
   layouts:

config/locales/ru.yml

@@ -376,9 +376,6 @@ ru:
       submit: "Сохранить %{model}"
       update: "Обновить %{model}"
   integrations:
-    applescript_next_action_prompt: "Описание следующего действия:"
-    applescript_success_after_id: "создано"
-    applescript_success_before_id: "Новое действие с ID"
     gmail_description: "Гаджет для добавления Tracks в Gmail как гаджета боковой панели"
     opensearch_description: "Искать в Tracks"
   layouts:

config/routes.rb

@@ -29,9 +29,6 @@ Rails.application.routes.draw do
   post 'integrations/cloudmailin' => 'integrations#cloudmailin'
   get 'integrations/search_plugin' => "integrations#search_plugin", :as => 'search_plugin'
   get 'integrations/google_gadget.xml' => 'integrations#google_gadget', :as => 'google_gadget'
-  get 'integrations/get_applescript1.js' => 'integrations#get_applescript1'
-  get 'integrations/get_applescript2.js' => 'integrations#get_applescript2'
-  get 'integrations/get_quicksilver_applescript.js' => 'integrations#get_quicksilver_applescript'
 
   get 'preferences' => "preferences#index"
   get 'preferences/render_date_format' => "preferences#render_date_format"