Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Making External changes Dialog Box clearer #10831

Merged
merged 9 commits into from
Apr 8, 2015
Merged

Making External changes Dialog Box clearer #10831

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
26ac109
Making External changes Dialog Box clearer
rroshan1 Apr 6, 2015
448d27f
Making External changes Dialog Box clearer
rroshan1 Apr 7, 2015
7e221dc
Making External changes Dialog Box clearer
rroshan1 Apr 7, 2015
17dbabb
Use cm.findWordAt() in selectWordAt()
Sep 6, 2014
fba588e
update tern and acorn
redmunds Jan 9, 2015
9d78f50
Merge branch 'branch_message' of https://github.com/rroshan1/brackets…
rroshan1 Apr 7, 2015
c74b63c
Merge branch 'master' into branch_message
rroshan1 Apr 7, 2015
6b96469
Making External changes Dialog Box clearer
rroshan1 Apr 7, 2015
70162f9
Merge branch 'master' into branch_message
rroshan1 Apr 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/nls/root/strings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,9 @@ define({
"CONFIRM_FOLDER_DELETE_TITLE" : "Confirm Delete",
"CONFIRM_FOLDER_DELETE" : "Are you sure you want to delete the folder <span class='dialog-filename'>{0}</span>?",
"FILE_DELETED_TITLE" : "File Deleted",
"EXT_MODIFIED_WARNING" : "<span class='dialog-filename'>{0}</span> has been modified on disk.<br /><br />Do you want to save the file and overwrite those changes?",
"EXT_MODIFIED_MESSAGE" : "<span class='dialog-filename'>{0}</span> has been modified on disk, but also has unsaved changes in {APP_NAME}.<br /><br />Which version do you want to keep?",
"EXT_DELETED_MESSAGE" : "<span class='dialog-filename'>{0}</span> has been deleted on disk, but has unsaved changes in {APP_NAME}.<br /><br />Do you want to keep your changes?",
"EXT_MODIFIED_WARNING" : "<span class='dialog-filename'>{0}</span> has been modified on disk outside of {APP_NAME}.<br /><br />Do you want to save the file and overwrite those changes?",
"EXT_MODIFIED_MESSAGE" : "<span class='dialog-filename'>{0}</span> has been modified on disk outside of {APP_NAME}, but also has unsaved changes in {APP_NAME}.<br /><br />Which version do you want to keep?",
"EXT_DELETED_MESSAGE" : "<span class='dialog-filename'>{0}</span> has been deleted on disk outside of {APP_NAME}, but has unsaved changes in {APP_NAME}.<br /><br />Do you want to keep your changes?",

// Generic dialog/button labels
"DONE" : "Done",
Expand Down