diff --git a/admin/themes/default/template/albums.tpl b/admin/themes/default/template/albums.tpl
index 4686b3cae..5b8f4780e 100644
--- a/admin/themes/default/template/albums.tpl
+++ b/admin/themes/default/template/albums.tpl
@@ -1,28 +1,28 @@
 {footer_script}
 var data = {json_encode($album_data)};
 var pwg_token = "{$PWG_TOKEN}";
-var str_show_sub = "{'Show sub-albums'|@translate}";
-var str_hide_sub = "{'Hide sub-albums'|@translate}";
-var str_manage_sub_album = "{'Manage sub-albums'|@translate}";
-var str_apply_order_raw = "{'apply automatic sort order'|translate}";
+var str_show_sub = "{'Show sub-albums'|@translate|escape:javascript}";
+var str_hide_sub = "{'Hide sub-albums'|@translate|escape:javascript}";
+var str_manage_sub_album = "{'Manage sub-albums'|@translate|escape:javascript}";
+var str_apply_order_raw = "{'apply automatic sort order'|translate|escape:javascript}";
 var str_apply_order = str_apply_order_raw.charAt(0).toUpperCase() + str_apply_order_raw.slice(1);
-var str_edit = "{'Edit album'|@translate}";
-var str_are_you_sure = "{'The status of the album \'%s\' and its sub-albums will change to private. Are you sure?'|@translate}";
-var str_yes_change_parent = "{'Yes change parent anyway'|@translate}";
-var str_no_change_parent = "{'No, don\'t move this album here'|@translate}";
-var str_root = "{'Root'|@translate}";
+var str_edit = "{'Edit album'|@translate|escape:javascript}";
+var str_are_you_sure = "{'The status of the album \'%s\' and its sub-albums will change to private. Are you sure?'|@translate|escape:javascript}";
+var str_yes_change_parent = "{'Yes change parent anyway'|@translate|escape:javascript}";
+var str_no_change_parent = "{'No, don\'t move this album here'|@translate|escape:javascript}";
+var str_root = "{'Root'|@translate|escape:javascript}";
 var openCat = {$open_cat};
 var nb_albums = {$nb_albums};
 var light_album_manager = {$light_album_manager};
 
-var x_nb_subcats = "{'%d sub-albums'|@translate}";
-var x_nb_images = "{'%d photos'|@translate}";
-var x_nb_sub_photos = "{'%d pictures in sub-albums'|@translate}";
+var x_nb_subcats = "{'%d sub-albums'|@translate|escape:javascript}";
+var x_nb_images = "{'%d photos'|@translate|escape:javascript}";
+var x_nb_sub_photos = "{'%d pictures in sub-albums'|@translate|escape:javascript}";
 
-var str_albums_found = '{"<b>%d</b> albums found"|translate}';
-var str_album_found = '{"<b>1</b> album found"|translate}';
+var str_albums_found = '{"<b>%d</b> albums found"|translate|escape:javascript}';
+var str_album_found = '{"<b>1</b> album found"|translate|escape:javascript}';
 var str_result_limit = '{"<b>%d+</b> albums found, try to refine the search"|translate|escape:javascript}';
-const str_albs_drag_drop = '{"Drag and drop to reorder albums"|translate}';
+const str_albs_drag_drop = '{"Drag and drop to reorder albums"|translate|escape:javascript}';
 
 var delay_autoOpen = {$delay_before_autoOpen}
 
diff --git a/admin/themes/default/template/include/album_selector.inc.tpl b/admin/themes/default/template/include/album_selector.inc.tpl
index 8ecb7c7fc..4c3809326 100644
--- a/admin/themes/default/template/include/album_selector.inc.tpl
+++ b/admin/themes/default/template/include/album_selector.inc.tpl
@@ -12,8 +12,8 @@
   const str_album_selected = "{'Album already selected'|@translate|escape:javascript}"
   const str_already_in_related_cats = '{'This albums is already in related categories list'|translate|escape:javascript}';
   const str_no_search_in_progress = '{'No search in progress'|@translate|escape:javascript}';
-  const str_albums_found = '{"<b>%d</b> albums found"|translate}';
-  const str_album_found = '{"<b>1</b> album found"|translate}';
+  const str_albums_found = '{"<b>%d</b> albums found"|translate|escape:javascript}';
+  const str_album_found = '{"<b>1</b> album found"|translate|escape:javascript}';
   const str_result_limit = '{"<b>%d+</b> albums found, try to refine the search"|translate|escape:javascript}';
   const str_add_subcat_of = '{"Add a sub-album to “%s”"|translate|escape:javascript}';
   const str_create_and_select = '{"Create and select"|translate|escape:javascript}';
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index f9f638c61..5353923c8 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -39,17 +39,17 @@ const nb_albums = {$NB_ALBUMS|escape:javascript};
 const chunk_size = '{$chunk_size}kb';
 const max_file_size = '{$max_file_size}mb';
 var pwg_token = '{$pwg_token}';
-var photosUploaded_label = "{'%d photos uploaded'|translate}";
-var formatsUploaded_label = "{'%d formats uploaded for %d photos'|translate}";
-var batch_Label = "{'Manage this set of %d photos'|translate}";
-var albumSummary_label = "{'Album "%s" now contains %d photos'|translate|escape}";
-var str_format_warning = "{'Error when trying to detect formats'|translate}";
-var str_ok = "{'Ok'|translate}";
-var str_format_warning_multiple = "{'There is multiple image in the database with the following names : %s.'|translate}";
-var str_format_warning_notFound = "{'No picture found with the following name : %s.'|translate}";
-var str_and_X_others = "{'and %d more'|translate}";
-const str_upload_in_progress = "{'Upload in progress'|translate|escape}";
-const str_drop_album_ab = '{'Drop into album'|@translate}';
+var photosUploaded_label = "{'%d photos uploaded'|translate|escape:javascript}";
+var formatsUploaded_label = "{'%d formats uploaded for %d photos'|translate|escape:javascript}";
+var batch_Label = "{'Manage this set of %d photos'|translate|escape:javascript}";
+var albumSummary_label = "{'Album "%s" now contains %d photos'|translate|escape:javascript}";
+var str_format_warning = "{'Error when trying to detect formats'|translate|escape:javascript}";
+var str_ok = "{'Ok'|translate|escape:javascript}";
+var str_format_warning_multiple = "{'There is multiple image in the database with the following names : %s.'|translate|escape:javascript}";
+var str_format_warning_notFound = "{'No picture found with the following name : %s.'|translate|escape:javascript}";
+var str_and_X_others = "{'and %d more'|translate|escape:javascript}";
+const str_upload_in_progress = "{'Upload in progress'|translate|escape:javascript}";
+const str_drop_album_ab = '{'Drop into album'|@translate|escape:javascript}';
 var file_ext = "{$file_exts}";
 var format_ext = "{$format_ext}"; 
 var uploadedPhotos = [];