Merge pull request obsidianmd#21 from obsidianmd/master

Updating

README.md

@@ -51,25 +51,30 @@ Here is a table of language code to language name, in alphabetical order. These
 | --- | --- | --- | :---: |
 | `en` (default) | English | English | ✅ |
 | `ar` | Arabic | العربية | 🚧 |
+| `eu` | Basque | Euskara | 🚧 |
+| `bg` | Bulgarian | български език | 🚧 |
 | `cz` | Czech | čeština | ✅ |
 | `da` | Danish | Dansk | ✅ |
 | `de` | German | Deutsch | ✅ |
 | `el` | Greek | Ελληνικά | 🚧 |
 | `es` | Spanish | Español | ✅ |
+| `fa` | Persian | فارسی | 🚧 |
 | `fr` | French | français | ✅ |
 | `hi` | Hindi | हिन्दी | 🚧 |
 | `id` | Indonesian | Bahasa Indonesia | ✅ |
 | `it` | Italian | Italiano | ✅ |
 | `ja` | Japanese | 日本語 | ✅ |
 | `ko` | Korean | 한국어 | ✅ |
 | `ml` | Malayalam | മലയാളം | 🚧 |
+| `ms` | Malay | Bahasa Melayu | 🚧 |
 | `nl` | Dutch | Nederlands | 🚧 |
 | `no` | Norwegian | Norsk | ✅ |
 | `pl` | Polish | język polski | ✅ |
 | `pt` | Portuguese | Português | ✅ |
 | `pt-BR` | Brazilian Portuguese | Portugues do Brasil | ✅ |
 | `ro` | Romanian | Română | ✅ |
 | `ru` | Russian | русский | ✅ |
+| `sr` | Serbian | српски језик | 🚧 |
 | `se` | Swedish | Svenska | 🚧 |
 | `sk` | Slovak | Slovenčina | 🚧 |
 | `tam` | Tamil | தமிழ் | 🚧 |

el.json

@@ -28,10 +28,10 @@
 			"option-fold-heading-description": "Let you fold everything under a heading.",
 			"option-fold-indent": "Fold indent",
 			"option-fold-indent-description": "Let you fold a portion of the same indentation, such as lists.",
-			"option-default-view-mode": "Default view mode",
-			"option-default-view-mode-description": "The default mode a file gets opened in.",
-			"option-default-view-mode-source": "Editor",
-			"option-default-view-mode-preview": "Preview",
+			"option-default-new-pane-mode": "Default new pane mode",
+			"option-default-new-pane-mode-description": "The default mode a new pane gets opened in.",
+			"option-default-new-pane-mode-source": "Editor",
+			"option-default-new-pane-mode-preview": "Preview",
 			"option-show-line-number": "Show line number",
 			"option-show-line-number-description": "Show line number in the gutter.",
 			"option-use-tabs": "Use tabs",
@@ -43,7 +43,18 @@
 			"option-auto-convert-html": "Auto convert HTML",
 			"option-auto-convert-html-description": "Automatically convert HTML to Markdown when pasting and drag-and-drop from webpages. Use Ctrl/Cmd+Shift+V to paste without conversion.",
 			"option-vim-key-bindings": "Vim key bindings",
-			"option-vim-key-bindings-description": "Let you use Vim key bindings in the source editor."
+			"option-vim-key-bindings-description": "Let you use Vim key bindings in the source editor.",
+			"option-emacsy-keys": "Legacy Emacs-style key bindings for macOS",
+			"option-emacsy-keys-description": "Allows you to use the additional Emacs-style navigation keys, which are standard on macOS, but may interfere with some key operations.",
+			"label-confirm-enable-vim": "Confirm entering Vim mode",
+			"label-vim-warning": "Vim mode is for efficient text editing but can be quite counter-intuitive. If you're not familiar with Vim, this option might make it look like Obsidian has stopped working.",
+			"label-vim-test": "To verify that you know your way around Vim, please enter the command to quit Vim without saving below:",
+			"label-vim-your-answer": "Your answer",
+			"placeholder-enter-command": "Enter command...",
+			"button-confirm-enable-vim": "Let me enable Vim",
+			"msg-vim-mode-enabled": "Command is correct. Vim mode now enabled.",
+			"msg-vim-mode-not-enabled": "Command is incorrect. Vim mode remains disabled to protect you.",
+			"msg-vim-mode-please-enter-command": "Please enter the command to enable Vim mode"
 		},
 		"file": {
 			"name": "File",
@@ -147,6 +158,9 @@
 			"option-language-description": "Change the display language.",
 			"option-insider-build": "Receive insider builds",
 			"option-insider-build-description": "Auto-update to insider builds to try out new features. Note that these builds are bleeding edge and might be less stable.",
+			"option-hw-acceleration": "Hardware Acceleration",
+			"option-hw-acceleration-description": "Turns on Hardware Acceleration, which uses your GPU to make Obsidian smoother.",
+			"option-hw-acceleration-warning": "If you turn this off, app performance will be severely degraded.",
 			"label-license": "License",
 			"label-your-commercial-license": "Your commercial license key is ",
 			"label-commercial-license-info": "Registered to \"{{company}}\" for {{seats}} users. Valid until {{expiry}}.",
@@ -240,6 +254,39 @@
 			"label-sort-alphabetical": "Plugin name (A to Z)",
 			"label-sort-alphabetical-reverse": "Plugin name (Z to A)",
 			"label-search-summary": "Showing {{pluginCount}}:"
+		},
+		"mobile-toolbar": {
+			"name": "Mobile toolbar",
+			"option-internal-link": "Add internal link",
+			"option-internal-embed": "Add embed",
+			"option-tag": "Add tag",
+			"option-heading": "Toggle heading",
+			"option-bold": "Toggle bold",
+			"option-italics": "Toggle italics",
+			"option-strikethrough": "Toggle strikethrough",
+			"option-highlight": "Toggle highlight",
+			"option-code": "Toggle code",
+			"option-blockquote": "Toggle blockquote",
+			"option-comment": "Toggle comment",
+			"option-markdown-link": "Add Markdown link",
+			"option-bullet-list": "Toggle bullet list",
+			"option-numbered-list": "Toggle numbered list",
+			"option-checklist": "Toggle checklist",
+			"option-indent-list": "Indent list item",
+			"option-unindent-list": "Unindent list item",
+			"option-undo": "Undo",
+			"option-redo": "Redo",
+			"option-move-caret-up": "Move caret up",
+			"option-move-caret-down": "Move caret down",
+			"option-move-caret-left": "Move caret left",
+			"option-move-caret-right": "Move caret right",
+			"option-first-line": "Go to first line",
+			"option-last-line": "Go to last line",
+			"option-toggle-keyboard": "Toggle keyboard",
+			"option-configure-toolbar": "Configure mobile toolbar",
+			"option-added-options": "Added options",
+			"option-more-options": "More options",
+			"option-attach": "Insert attachment"
 		}
 	},
 	"editor": {
@@ -293,6 +340,7 @@
 		"sidebar-collapse": "Collapse",
 		"msg-fail-to-save-file": "Failed to save file \"{{filepath}}\". {{message}}.",
 		"no-file": "No file",
+		"msg-file-changed": "\"{{file}}\" has been modified externally, merging changes automatically.",
 		"switch-vault": "Open another vault",
 		"help": "Help",
 		"settings": "Settings",
@@ -306,6 +354,7 @@
 		"url": "Url",
 		"msg-open-file-through-uri": "Opened file \"{{path}}\"",
 		"msg-file-not-found-through-uri": "File \"{{name}}\" not found.",
+		"delete-action-short-name": "Delete",
 		"empty-state": {
 			"no-file-open": "No file is open",
 			"create-new-file": "Create new file",
@@ -327,7 +376,8 @@
 			"link-pane": "Link with pane...",
 			"delete-file": "Delete file",
 			"open-in-new-pane": "Open in new pane",
-			"copy-url": "Copy url"
+			"copy-url": "Copy url",
+			"close-current-pane": "Close current pane"
 		},
 		"tooltip": {
 			"click-to-expand": "Click to expand",
@@ -400,7 +450,7 @@
 		"close-other-panes": "Close all other panes",
 		"toggle-left-sidebar": "Toggle left sidebar",
 		"toggle-right-sidebar": "Toggle right sidebar",
-		"toggle-default-view-mode": "Toggle default view mode",
+		"toggle-default-new-pane-mode": "Toggle default new pane mode",
 		"toggle-fold": "Toggle fold on the current line",
 		"fold-all": "Fold all headings and lists",
 		"unfold-all": "Unfold all headings and lists",
@@ -484,7 +534,8 @@
 			"msg-empty-file-name": "File name cannot be empty.",
 			"tooltip-modified-time": "Last modified at {{time}}",
 			"tooltip-created-time": "Created at {{time}}",
-			"tooltip-folders-files-count": "{{fileCount}}, {{folderCount}}"
+			"tooltip-folders-files-count": "{{fileCount}}, {{folderCount}}",
+			"action-move-file-short-name": "Move"
 		},
 		"search": {
 			"name": "Search",
@@ -605,6 +656,7 @@
 			"label-linked-mentions": "Linked mentions",
 			"label-no-backlinks": "No backlinks found.",
 			"label-unlinked-mentions": "Unlinked mentions",
+			"label-show-search": "Show search filter",
 			"label-link-button-text": "Link",
 			"tab-title": "Backlinks for {{displayText}}",
 			"label-no-unlinked-mentions": "No unlinked mentions found.",
@@ -826,7 +878,7 @@
 			"option-site-components": "Components",
 			"option-site-appearance": "Appearance",
 			"option-site-reading-experience": "Reading experience",
-			"option-site-security": "Security",
+			"option-site-misc": "Other site settings",
 			"option-site-name": "Site name",
 			"option-site-name-description": "Name of your published site. It will show up in the page title of your site.",
 			"option-site-name-placeholder": "Name of your site",
@@ -853,6 +905,8 @@
 			"option-readable-line-length-description": "Limit maximum line length. Fits less content on the screen, but makes long paragraphs more readable.",
 			"option-site-password": "Passwords",
 			"option-site-password-description": "Restrict access to your site with passwords.",
+			"option-google-analytics": "Google Analytics tracking code",
+			"option-google-analytics-description": "Configure Google Analytics for your site. Only available for visitors from your custom domain URL. Please check with your local laws and regulations first.",
 			"button-manage-passwords": "Manage",
 			"button-save-site-settings": "Save site settings",
 			"msg-updated-options": "Updated options for your site.",
@@ -912,6 +966,8 @@
 			"option-custom-url-name": "Custom URL",
 			"option-custom-url-desc": "The URL that your site will be located at.",
 			"option-custom-url-placeholder": "www.yourdomain.com",
+			"option-custom-url-redirect": "Redirect to your custom domain",
+			"option-custom-url-redirect-desc": "Redirect visitors on publish.obsidian.md/id to your custom domain.",
 			"button-update-custom-domain": "Update domain setting",
 			"label-custom-domain-instructions": "Please refer to our {{link}} on our help site for more information.",
 			"label-custom-domain-link-name": "custom domain setup guide",
@@ -923,6 +979,7 @@
 			"desc": "Save and load workspace layout.",
 			"action-load": "Load workspace",
 			"action-manage-workspaces": "Manage workspaces",
+			"action-save-and-load": "Save and load another workspace",
 			"placeholder-save-current-workspace-as": "Save current workspace as...",
 			"button-save": "Save",
 			"button-load": "Load",
@@ -1030,6 +1087,26 @@
 			"label-setup-connection": "Setup connection",
 			"label-now-connected-to-vault": "You're now connected to \"{{name}}\".",
 			"button-start-syncing": "Start syncing"
+		},
+		"file-recovery": {
+			"name": "File recovery",
+			"desc": "Let you restore recent snapshots to recover from accidental data loss. Snapshots are only saved for Markdown files.",
+			"action-open": "Open saved snapshots",
+			"option-interval": "Snapshot interval",
+			"option-interval-description": "Minimal interval in minutes between two snapshots.",
+			"option-keep": "History length",
+			"option-keep-description": "Length in days snapshots is kept for.",
+			"option-open-history": "Snapshots",
+			"option-open-history-description": "View and restore saved snapshots.",
+			"button-view-snapshots": "View",
+			"option-clear": "Clear history",
+			"option-clear-description": "Wipe all snapshots.",
+			"button-clear-history": "Clear",
+			"label-clear-warning": "Are you sure you want to delete all snapshots? Note that only snapshots will be removed. All files inside your vault will not be affected.",
+			"msg-clear-complete": "Snapshots cleared.",
+			"label-no-history-found": "No snapshots found.",
+			"placeholder-choose-file": "Choose a file...",
+			"label-select-file": "Please select a file on the left to view snapshots."
 		}
 	},
 	"nouns": {