Web editor: improve edit file and diff preview

1 files changed, 13 insertions, 15 deletions

diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 9dbb71f183..9bf756bebc 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -440,36 +440,34 @@ edit_this_file = Edit this file
 edit_file = Edit file
 delete_confirm_message = Are you sure you want to delete this file?
 delete_commit_message = Write a note about this delete (optional)
-file_editing_no_longer_exists = The file you are editing no longer exists in the repository
-file_already_exists = A file by that name already exists
 unable_to_update_file = Unable to update this file, error occurred
-add = Add
-update = Update
-filename_cannot_be_empty = Filename cannot be empty
-directory_is_a_file = One of the directories in the path is already a file in this repository
-filename_is_a_directory = The filename given is an existing directory in the repository
 must_be_on_branch = You must be on a branch to make or propose changes to this file
 must_be_writer = You must have write access to make or propose changes to this file
 cannot_edit_binary_files = Cannot edit binary files
 filename_help = To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
 fork_before_edit = You must fork this before editing
-branch_already_exists = Branch already exists
-create_new_branch = Create a %s for this commit and start a pull request.
 new_branch = new branch
-commit_directly_to_this_branch = Commit directly to the %s branch.
+editor.commit_directly_to_this_branch = Commit directly to the <strong class="branch-name">%s</strong> branch.
+editor.create_new_branch = Create a <strong>new branch</strong> for this commit and start a pull request.
+editor.filename_cannot_be_empty = Filename cannot be empty.
+editor.branch_already_exists = Branch '%s' already exists in this repository.
+editor.directory_is_a_file = Entry '%s' in the parent path is a file not a directory in this repository.
+editor.filename_is_a_directory = The filename '%s' is an existing directory in this repository.
+editor.file_editing_no_longer_exists = The file '%s' you are editing no longer exists in the repository.
+editor.file_changed_while_editing = File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
+editor.file_already_exists = A file with name '%s' already exists in this repository.
+editor.add = Add '%s'
+editor.update = Update '%s'
+editor.failed_to_upload_files = An error occurred while updating file: %v
+editor.no_changes_to_show = There are no changes to show.
 create_branch = Create branch
 from = from
 upload_file = Upload file
 add_files_to_dir = Add files to %s
-unable_to_upload_files = Unable to upload files, an error occurred.
 add_subdir = Add subdirectory...
 name_your_file = Name your file...
-user_has_committed_since_you_started_editing = %s has committed since you started editing.
-see_what_changed = See what changed.
-pressing_commit_again_will_overwrite_those_changes = Pressing '%s' again will overwrite those changes.
 copy_file_path_to_clipboard = Copy file path to clipboard
 preview_changes = Preview Changes
-no_changes_to_show = There are no changes to show.
 
 commits.commits = Commits
 commits.search = Search commits