Merge branch 'release' into master

adobe · Jul 3, 2017 · ce77877 · ce77877
2 parents 6ac21ff + 189f6d3
commit ce77877
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/nls/fr/strings.js b/src/nls/fr/strings.js
@@ -412,7 +412,7 @@ define({
 	"CMD_GOTO_LINE": "Atteindre la ligne",
 	"CMD_GOTO_DEFINITION": "Accès rapide à la définition",
 	"CMD_GOTO_FIRST_PROBLEM": "Accéder au premier problème",
-	"CMD_TOGGLE_QUICK_EDIT": "Édition rapide",
+	"CMD_TOGGLE_QUICK_EDIT": "Edition rapide",
 	"CMD_TOGGLE_QUICK_DOCS": "Documentation rapide",
 	"CMD_QUICK_EDIT_PREV_MATCH": "Correspondance précédente",
 	"CMD_QUICK_EDIT_NEXT_MATCH": "Correspondance suivante",
@@ -441,7 +441,7 @@ define({
 	"CMD_HEALTH_DATA_STATISTICS": "Rapport d’intégrité",
 	"CMD_HOMEPAGE": "Page d’accueil de {APP_TITLE}",
 	"CMD_TWITTER": "{TWITTER_NAME} sur Twitter",
-	"CMD_ABOUT": "À propos de {APP_TITLE}",
+	"CMD_ABOUT": "A propos de {APP_TITLE}",
 	"CMD_OPEN_PREFERENCES": "Ouvrir le fichier de préférences",
 	"CMD_OPEN_KEYMAP": "Ouvrir le mappage de touches utilisateur",
 
@@ -453,7 +453,7 @@ define({
 	"KEEP_CHANGES_IN_EDITOR": "Conserver les modifications dans l’éditeur",
 	"CLOSE_DONT_SAVE": "Fermer (sans enregistrer)",
 	"RELAUNCH_CHROME": "Relancer Chrome",
-	"ABOUT": "À propos",
+	"ABOUT": "A propos",
 	"CLOSE": "Fermer",
 	"ABOUT_TEXT_LINE1": "Version {VERSION_MAJOR}.{VERSION_MINOR} {BUILD_TYPE} {VERSION}",
 	"ABOUT_TEXT_BUILD_TIMESTAMP": "Horodatage de la version : ",

diff --git a/src/nls/ja/strings.js b/src/nls/ja/strings.js
@@ -158,7 +158,7 @@ define({
 	"FIND_HISTORY_MAX_COUNT": "検索履歴内の検索項目の最大数",
 	"REPLACE_PLACEHOLDER": "\u2026 に置換",
 	"BUTTON_REPLACE_ALL": "すべて置換",
-	"BUTTON_REPLACE_BATCH": "バッチ\u2026",
+	"BUTTON_REPLACE_BATCH": "バッチ¥u2026",
 	"BUTTON_REPLACE_ALL_IN_FILES": "置換\u2026",
 	"BUTTON_REPLACE": "置換",
 	"BUTTON_NEXT": "\u25B6",