From 783612a30c00d9a2dafa76696ce95161cee551f8 Mon Sep 17 00:00:00 2001 From: Saurabh Kathpalia Date: Mon, 19 Jun 2017 16:24:10 +0530 Subject: [PATCH 1/4] Added strings for translation for 1.10 Release --- src/nls/root/strings.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 2ab813f6a96..3b8a2669f34 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -135,6 +135,9 @@ define({ "EXT_MODIFIED_WARNING" : "{0} has been modified on disk outside of {APP_NAME}.

Do you want to save the file and overwrite those changes?", "EXT_MODIFIED_MESSAGE" : "{0} has been modified on disk outside of {APP_NAME}, but also has unsaved changes in {APP_NAME}.

Which version do you want to keep?", "EXT_DELETED_MESSAGE" : "{0} has been deleted on disk outside of {APP_NAME}, but has unsaved changes in {APP_NAME}.

Do you want to keep your changes?", + "DIRTY_FILE_ENCODING_CHANGE_WARN" : "Cannot change encoding of a dirty file", + "IGNORE_RELOAD_FROM_DISK" : "Ignore Changes and Reload from Disk", + "SAVE_FILE_ENCODING_CHANGE_WARN" : "Save the file before changing encoding", // Generic dialog/button labels "DONE" : "Done", @@ -291,6 +294,7 @@ define({ "STATUSBAR_CODE_INSPECTION_TOOLTIP" : "{0}. Click to toggle report panel.", "STATUSBAR_DEFAULT_LANG" : "(default)", "STATUSBAR_SET_DEFAULT_LANG" : "Set as Default for .{0} Files", + "STATUSBAR_ENCODING_TOOLTIP" : "Select encoding to reopen/save the file with", // CodeInspection: errors/warnings "ERRORS_PANEL_TITLE_MULTIPLE" : "{0} Problems", From 7ec5591f99e9965be2bf07909b9db6868fe5f8d5 Mon Sep 17 00:00:00 2001 From: Saurabh Kathpalia Date: Mon, 19 Jun 2017 16:26:12 +0530 Subject: [PATCH 2/4] minor change --- src/nls/root/strings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 3b8a2669f34..42bc9634320 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -294,7 +294,7 @@ define({ "STATUSBAR_CODE_INSPECTION_TOOLTIP" : "{0}. Click to toggle report panel.", "STATUSBAR_DEFAULT_LANG" : "(default)", "STATUSBAR_SET_DEFAULT_LANG" : "Set as Default for .{0} Files", - "STATUSBAR_ENCODING_TOOLTIP" : "Select encoding to reopen/save the file with", + "STATUSBAR_ENCODING_TOOLTIP" : "Select the encoding to reopen/save the file with", // CodeInspection: errors/warnings "ERRORS_PANEL_TITLE_MULTIPLE" : "{0} Problems", From 93cb83fb177c4e7506b2c2ff1eb7acd42c585dc2 Mon Sep 17 00:00:00 2001 From: Swagatam Mitra Date: Mon, 19 Jun 2017 16:55:44 +0530 Subject: [PATCH 3/4] Add navigation strings. --- src/nls/root/strings.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 42bc9634320..4a90fe58ab4 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -419,6 +419,8 @@ define({ "CMD_CSS_QUICK_EDIT_NEW_RULE" : "New Rule", "CMD_NEXT_DOC" : "Next Document", "CMD_PREV_DOC" : "Previous Document", + "CMD_NAVIGATE_BACKWARD" : "Navigate Backward", + "CMD_NAVIGATE_FORWARD" : "Navigate Forward", "CMD_NEXT_DOC_LIST_ORDER" : "Next Document in List", "CMD_PREV_DOC_LIST_ORDER" : "Previous Document in List", "CMD_SHOW_IN_TREE" : "Show in File Tree", From bc2e302c33c04d7bfb68ae494db5e65419dffeda Mon Sep 17 00:00:00 2001 From: Swagatam Mitra Date: Mon, 19 Jun 2017 17:03:38 +0530 Subject: [PATCH 4/4] Updated some strings --- src/nls/root/strings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 4a90fe58ab4..7bd6bb3fe65 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -136,7 +136,7 @@ define({ "EXT_MODIFIED_MESSAGE" : "{0} has been modified on disk outside of {APP_NAME}, but also has unsaved changes in {APP_NAME}.

Which version do you want to keep?", "EXT_DELETED_MESSAGE" : "{0} has been deleted on disk outside of {APP_NAME}, but has unsaved changes in {APP_NAME}.

Do you want to keep your changes?", "DIRTY_FILE_ENCODING_CHANGE_WARN" : "Cannot change encoding of a dirty file", - "IGNORE_RELOAD_FROM_DISK" : "Ignore Changes and Reload from Disk", + "IGNORE_RELOAD_FROM_DISK" : "Ignore changes and reload from disk", "SAVE_FILE_ENCODING_CHANGE_WARN" : "Save the file before changing encoding", // Generic dialog/button labels @@ -294,7 +294,7 @@ define({ "STATUSBAR_CODE_INSPECTION_TOOLTIP" : "{0}. Click to toggle report panel.", "STATUSBAR_DEFAULT_LANG" : "(default)", "STATUSBAR_SET_DEFAULT_LANG" : "Set as Default for .{0} Files", - "STATUSBAR_ENCODING_TOOLTIP" : "Select the encoding to reopen/save the file with", + "STATUSBAR_ENCODING_TOOLTIP" : "Select the encoding", // CodeInspection: errors/warnings "ERRORS_PANEL_TITLE_MULTIPLE" : "{0} Problems",