diff --git a/src/extensions/default/DefaultExtensions.json b/src/extensions/default/DefaultExtensions.json index f88f65741..cddad7761 100644 --- a/src/extensions/default/DefaultExtensions.json +++ b/src/extensions/default/DefaultExtensions.json @@ -33,4 +33,4 @@ "bib-locked-live-preview", "brackets-display-shortcuts", "changing-tags", "brackets-indent-guides" ] } -} \ No newline at end of file +} diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 813176191..c7bbda3a2 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -1276,7 +1276,7 @@ define({ "AUTHOR": "Author", "AUTHORS_OF": "Authors of", "SYSTEM_CONFIGURATION": "System configuration", - "BRACKETS_GIT_ERROR": "Git encountered an error", + "BRACKETS_GIT_ERROR": "Git encountered an error\u2026", "BRANCH_NAME": "Branch name", "BUTTON_CANCEL": "Cancel", "CHECKOUT_COMMIT": "Checkout", @@ -1285,7 +1285,7 @@ define({ "BUTTON_CLOSE": "Close", "BUTTON_COMMIT": "Commit", "BUTTON_DEFAULTS": "Restore defaults", - "BUTTON_FIND_CONFLICTS": "Find conflicts", + "BUTTON_FIND_CONFLICTS": "Find conflicts\u2026", "GIT_INIT": "Init", "BUTTON_MERGE_ABORT": "Abort merge", "BUTTON_OK": "OK", @@ -1300,40 +1300,40 @@ define({ "RESET_MIXED_TITLE": "Confirm Mixed Reset", "RESET_SOFT_TITLE": "Confirm Soft Reset", "RESET_DETAIL": "Commits after the following will be discarded:
Commit Message: {0}
Git Command: {1}", - "RESET_HARD_MESSAGE": "This action will discard all changes and commits after the selected commit. This operation cannot be undone easily. Are you sure you want to proceed?

ÔÜá´©Å Warning: This rewrites history and should not be used on commits that have been pushed to a shared branch.", - "RESET_MIXED_MESSAGE": "This action will discard all commits after the selected commit but keep all changes unstaged. This operation cannot be undone easily. Are you sure you want to proceed?

ÔÜá´©Å Warning: This rewrites history and should not be used on commits that have been pushed to a shared branch.", - "RESET_SOFT_MESSAGE": "This action will discard all commits after the selected commit but keep all changes staged for a new commit. This operation cannot be undone easily. Are you sure you want to proceed?

ÔÜá´©Å Warning: This rewrites history and should not be used on commits that have been pushed to a shared branch.", + "RESET_HARD_MESSAGE": "This action will discard all changes and commits after the selected commit. This operation cannot be undone easily. Are you sure you want to proceed?

⚠️ Warning: This rewrites history and should not be used on commits that have been pushed to a shared branch.", + "RESET_MIXED_MESSAGE": "This action will discard all commits after the selected commit but keep all changes unstaged. This operation cannot be undone easily. Are you sure you want to proceed?

⚠️ Warning: This rewrites history and should not be used on commits that have been pushed to a shared branch.", + "RESET_SOFT_MESSAGE": "This action will discard all commits after the selected commit but keep all changes staged for a new commit. This operation cannot be undone easily. Are you sure you want to proceed?

⚠️ Warning: This rewrites history and should not be used on commits that have been pushed to a shared branch.", "BUTTON_SAVE": "Save", "RESET": "Reset", "CHANGE_USER_EMAIL_TITLE": "Change git email", - "CHANGE_USER_EMAIL": "Change git emailÔǪ", - "CHANGE_USER_EMAIL_MENU": "Change git email ({0})ÔǪ", + "CHANGE_USER_EMAIL": "Change git email\u2026", + "CHANGE_USER_EMAIL_MENU": "Change git email ({0})\u2026", "CHANGE_USER_NAME_TITLE": "Change git username", - "CHANGE_USER_NAME": "Change git usernameÔǪ", - "CHANGE_USER_NAME_MENU": "Change git username ({0})ÔǪ", + "CHANGE_USER_NAME": "Change git username\u2026", + "CHANGE_USER_NAME_MENU": "Change git username ({0})\u2026", "REQUIRES_APP_RESTART_SETTING": "Changing this setting requires an app restart to take effect", "CLEAN_FILE_END": "File cleaned", "CLEAN_FILE_START": "Cleaning file", - "CLEANING_WHITESPACE_PROGRESS": "Cleaning whitespace from filesÔǪ", + "CLEANING_WHITESPACE_PROGRESS": "Cleaning whitespace from files\u2026", "CLEAR_WHITESPACE_ON_FILE_SAVE": "Clear whitespace on file save", "CLONE_REPOSITORY": "Clone repository", "CODE_INSPECTION_PROBLEMS": "Code inspection problems", - "CODE_INSPECTION_IN_PROGRESS": "Code inspection in progressÔǪ", + "CODE_INSPECTION_IN_PROGRESS": "Code inspection in progress\u2026", "CODE_INSPECTION_PROBLEMS_NONE": "No problems detected", - "CODE_INSPECTION_DONE_FILES": "{0} of {1} files doneÔǪ", - "PLEASE_WAIT": "Please waitÔǪ", + "CODE_INSPECTION_DONE_FILES": "{0} of {1} files done\u2026", + "PLEASE_WAIT": "Please wait\u2026", "COMMIT": "Commit", - "COMMIT_ALL_SHORTCUT": "Commit all filesÔǪ", - "COMMIT_CURRENT_SHORTCUT": "Commit current fileÔǪ", - "COMMIT_MESSAGE_PLACEHOLDER": "Enter commit message hereÔǪ", - "CREATE_NEW_BRANCH": "Create new branchÔǪ", + "COMMIT_ALL_SHORTCUT": "Commit all files\u2026", + "COMMIT_CURRENT_SHORTCUT": "Commit current file\u2026", + "COMMIT_MESSAGE_PLACEHOLDER": "Enter commit message here\u2026", + "CREATE_NEW_BRANCH": "Create new branch\u2026", "CREATE_NEW_BRANCH_TITLE": "Create new branch", - "CREATE_NEW_GITFTP_SCOPE": "Create new Git-FTP remoteÔǪ", - "CREATE_NEW_REMOTE": "Create new remoteÔǪ", + "CREATE_NEW_GITFTP_SCOPE": "Create new Git-FTP remote\u2026", + "CREATE_NEW_REMOTE": "Create new remote\u2026", "CURRENT_TRACKING_BRANCH": "Current tracking branch", "_CURRENT_TRACKING_BRANCH": "current tracking branch", "DEFAULT_GIT_TIMEOUT": "Default Git operation timeout (in seconds)", - "DELETE_FILE_BTN": "Delete fileÔǪ", + "DELETE_FILE_BTN": "Delete file\u2026", "DELETE_LOCAL_BRANCH": "Delete local branch", "DELETE_LOCAL_BRANCH_NAME": "Do you really wish to delete local branch \"{0}\"?", "DELETE_REMOTE": "Delete remote", @@ -1360,14 +1360,14 @@ define({ "ERROR_SAVE_FIRST": "Save the document first!", "ERROR_TERMINAL_NOT_FOUND": "Terminal was not found for your OS, you can define a custom Terminal command in the settings", "EXTENDED_COMMIT_MESSAGE": "EXTENDED", - "GETTING_STAGED_DIFF_PROGRESS": "Getting diff of staged filesÔǪ", - "GIT_COMMIT": "Git commitÔǪ", + "GETTING_STAGED_DIFF_PROGRESS": "Getting diff of staged files\u2026", + "GIT_COMMIT": "Git commit\u2026", "GIT_COMMIT_IN_PROGRESS": "Git Commit in Progress", "GIT_DIFF": "Git diff —", "GIT_PULL_RESPONSE": "Git Pull response", "GIT_PUSH_RESPONSE": "Git Push response", "GIT_REMOTES": "Git remotes", - "GIT_SETTINGS": "Git SettingsÔǪ", + "GIT_SETTINGS": "Git Settings\u2026", "GIT_SETTINGS_TITLE": "Git Settings", "GOTO_NEXT_GIT_CHANGE": "Go to next Git change", "GOTO_PREVIOUS_GIT_CHANGE": "Go to previous Git change", @@ -1383,7 +1383,7 @@ define({ "MERGE_RESULT": "Merge result", "NORMALIZE_LINE_ENDINGS": "Normalize line endings (to \\n)", "NOTHING_TO_COMMIT": "Nothing to commit, working directory clean.", - "OPERATION_IN_PROGRESS_TITLE": "Git operation in progressÔǪ", + "OPERATION_IN_PROGRESS_TITLE": "Git operation in progress\u2026", "ORIGIN_BRANCH": "Origin branch", "ON_BRANCH": "'{0}' - Current Git branch", "PANEL_COMMAND": "Show Git panel", @@ -1396,16 +1396,16 @@ define({ "PULL_MERGE_NOCOMMIT": "Merge without commit", "PULL_REBASE": "Use rebase", "PULL_RESET": "Use soft reset", - "PULL_SHORTCUT": "Pull from remoteÔǪ", - "PULL_SHORTCUT_BEHIND": "Pull from remote ({0} behind)ÔǪ", + "PULL_SHORTCUT": "Pull from remote\u2026", + "PULL_SHORTCUT_BEHIND": "Pull from remote ({0} behind)\u2026", "PULL_BEHAVIOR": "Pull Behavior", "FETCH_SHORTCUT": "Fetch from remote", "PUSH_DEFAULT": "Default push", "PUSH_DELETE_BRANCH": "Delete remote branch", "PUSH_SEND_TAGS": "Send tags", "PUSH_FORCED": "Forced push", - "PUSH_SHORTCUT": "Push to remoteÔǪ", - "PUSH_SHORTCUT_AHEAD": "Push to remote ({0} ahead)ÔǪ", + "PUSH_SHORTCUT": "Push to remote\u2026", + "PUSH_SHORTCUT_AHEAD": "Push to remote ({0} ahead)\u2026", "PUSH_TO": "Push to", "PUSH_BEHAVIOR": "Push Behavior", "Q_UNDO_CHANGES": "Reset changes to file {0}?", @@ -1413,7 +1413,7 @@ define({ "REFRESH_GIT": "Refresh Git", "REMOVE_BOM": "Remove BOM from files", "REMOVE_FROM_GITIGNORE": "Remove from .gitignore", - "RESET_LOCAL_REPO": "Discard all changes since last commitÔǪ", + "RESET_LOCAL_REPO": "Discard all changes since last commit\u2026", "DISCARD_CHANGES": "Discard Changes", "RESET_LOCAL_REPO_CONFIRM": "Do you wish to discard all changes done since last commit? This action can't be reverted.", "UNDO_LOCAL_COMMIT_CONFIRM": "Are you sure you want to undo the last non-pushed commit?", @@ -1443,8 +1443,8 @@ define({ "TOOLTIP_SHOW_FILE_HISTORY": "Show file history", "TOOLTIP_SHOW_HISTORY": "Show history", "UNDO_CHANGES": "Discard changes", - "UNDO_CHANGES_BTN": "Discard changesÔǪ", - "UNDO_LAST_LOCAL_COMMIT": "Undo last local (not pushed) commitÔǪ", + "UNDO_CHANGES_BTN": "Discard changes\u2026", + "UNDO_LAST_LOCAL_COMMIT": "Undo last local (not pushed) commit\u2026", "UNDO_COMMIT": "Undo Commit", "URL": "URL", "USERNAME": "Username", @@ -1454,10 +1454,10 @@ define({ "USE_REBASE": "Use REBASE", "USE_VERBOSE_DIFF": "Show verbose output in diffs", "USE_DIFFTOOL": "Use difftool for diffs", - "VIEW_AUTHORS_FILE": "View authors of fileÔǪ", - "VIEW_AUTHORS_SELECTION": "View authors of selectionÔǪ", + "VIEW_AUTHORS_FILE": "View authors of file\u2026", + "VIEW_AUTHORS_SELECTION": "View authors of selection\u2026", "VIEW_THIS_FILE": "View this file", - "TAG_NAME_PLACEHOLDER": "Enter tag name hereÔǪ", + "TAG_NAME_PLACEHOLDER": "Enter tag name here\u2026", "TAG_NAME": "Tag", "CMD_CLOSE_UNMODIFIED": "Close Unmodified Files", "FILE_ADDED": "New file",