Merge branch 'master' into redesign
[rails.git] / config / i18n-js.yml
index 261fb6c0f93649a94f2fb4aac1a78ed79f015532..4882a4357c4a7f56cb38983e5b34581d3fff2ca3 100644 (file)
 translations:
   - file: "app/assets/javascripts/i18n/translations.js"
     only:
+    - "*.date"
+    - "*.time"
     - "*.browse.start_rjs.*"
     - "*.export.start_rjs.*"
     - "*.javascripts.*"
+    - "*.site.index.remote_failed"
+    - "*.site.sidebar.search_results"
+    - "*.diary_entry.edit.marker_text"