summaryrefslogtreecommitdiffstats
path: root/config/locales
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-01-26 18:37:09 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-01-26 18:37:09 +0000
commit9f127793be20c1e23f31c66b5efd4a0acaea2642 (patch)
treec3b45ebf7959f1fb6c9693077e12d829567109f8 /config/locales
parent134b66cb290f084a06a8a4ad7a21913cf002ca85 (diff)
downloadredmine-9f127793be20c1e23f31c66b5efd4a0acaea2642.tar.gz
redmine-9f127793be20c1e23f31c66b5efd4a0acaea2642.zip
Make JSONP support optional and disabled by default (#12992).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11272 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/en.yml1
-rw-r--r--config/locales/fr.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9dac5ed2a..05ec1d32f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -397,6 +397,7 @@ en:
setting_thumbnails_enabled: Display attachment thumbnails
setting_thumbnails_size: Thumbnails size (in pixels)
setting_non_working_week_days: Non-working days
+ setting_jsonp_enabled: Enable JSONP support
permission_add_project: Create project
permission_add_subprojects: Create subprojects
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index db6220e00..f39943472 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -394,6 +394,7 @@ fr:
setting_thumbnails_enabled: Afficher les vignettes des images
setting_thumbnails_size: Taille des vignettes (en pixels)
setting_non_working_week_days: Jours non travaillés
+ setting_jsonp_enabled: Activer le support JSONP
permission_add_project: Créer un projet
permission_add_subprojects: Créer des sous-projets