From ccb0302d3f28c5908bdb3619e2cd5e10b960f549 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 14 Mar 2018 13:13:47 +0100 Subject: [PATCH] Resolved Merge issue; Added Russian; --- browser/main/Main.js | 2 + browser/main/NoteList/index.js | 2 +- browser/main/lib/ConfigManager.js | 2 + browser/main/modals/PreferencesModal/UiTab.js | 1 + locales/da.json | 3 +- locales/de.json | 5 +- locales/en.json | 5 +- locales/es.json | 3 +- locales/fr.json | 3 +- locales/ja.json | 3 +- locales/ko.json | 3 +- locales/no.json | 3 +- locales/pl.json | 3 +- locales/pt.json | 3 +- locales/ru.json | 146 ++++++++++++++++++ locales/sq.json | 3 +- locales/zh-CN.json | 3 +- locales/zh-TW.json | 3 +- 18 files changed, 182 insertions(+), 14 deletions(-) create mode 100644 locales/ru.json diff --git a/browser/main/Main.js b/browser/main/Main.js index 13294c0f..a2c8b658 100644 --- a/browser/main/Main.js +++ b/browser/main/Main.js @@ -171,6 +171,8 @@ class Main extends React.Component { i18n.setLocale('pl') } else if (config.ui.language === 'pt') { i18n.setLocale('pt') + } else if (config.ui.language === 'ru') { + i18n.setLocale('ru') } else if (config.ui.language === 'es') { i18n.setLocale('es') } else { diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js index cfde1f84..0329a9cc 100644 --- a/browser/main/NoteList/index.js +++ b/browser/main/NoteList/index.js @@ -15,7 +15,7 @@ import path from 'path' import { hashHistory } from 'react-router' import copy from 'copy-to-clipboard' import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig' -import markdown from '../../lib/markdown' +import Markdown from '../../lib/markdown' import i18n from 'browser/lib/i18n' const { remote } = require('electron') diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js index 2da2f1c2..40b89198 100644 --- a/browser/main/lib/ConfigManager.js +++ b/browser/main/lib/ConfigManager.js @@ -157,6 +157,8 @@ function set (updates) { i18n.setLocale('pl') } else if (newConfig.ui.language === 'pt') { i18n.setLocale('pt') + } else if (newConfig.ui.language === 'ru') { + i18n.setLocale('ru') } else if (newConfig.ui.language === 'es') { i18n.setLocale('es') } else { diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js index 23c302d0..deb70c06 100644 --- a/browser/main/modals/PreferencesModal/UiTab.js +++ b/browser/main/modals/PreferencesModal/UiTab.js @@ -190,6 +190,7 @@ class UiTab extends React.Component { + diff --git a/locales/da.json b/locales/da.json index 27c94e6e..60201b34 100644 --- a/locales/da.json +++ b/locales/da.json @@ -139,5 +139,6 @@ "Polish": "Polish", "Portuguese": "Portuguese", "Spanish": "Spanish", - "You have to save!": "You have to save!" + "You have to save!": "You have to save!", + "Russian": "Russian" } \ No newline at end of file diff --git a/locales/de.json b/locales/de.json index ae9c84d6..fb2b6b11 100644 --- a/locales/de.json +++ b/locales/de.json @@ -139,5 +139,8 @@ "Spanish": "Spanisch", "Chinese (zh-CN)": "Chinesisch (zh-CN)", "Chinese (zh-TW)": "Chinesisch (zh-TW)", - "Successfully applied!": "Erfolgreich angewendet!" + "Successfully applied!": "Erfolgreich angewendet!", + "UserName": "UserName", + "Password": "Password", + "Russian": "Russian" } \ No newline at end of file diff --git a/locales/en.json b/locales/en.json index 27c94e6e..91cb7f18 100644 --- a/locales/en.json +++ b/locales/en.json @@ -139,5 +139,8 @@ "Polish": "Polish", "Portuguese": "Portuguese", "Spanish": "Spanish", - "You have to save!": "You have to save!" + "You have to save!": "You have to save!", + "UserName": "UserName", + "Password": "Password", + "Russian": "Russian" } \ No newline at end of file diff --git a/locales/es.json b/locales/es.json index 27c94e6e..60201b34 100644 --- a/locales/es.json +++ b/locales/es.json @@ -139,5 +139,6 @@ "Polish": "Polish", "Portuguese": "Portuguese", "Spanish": "Spanish", - "You have to save!": "You have to save!" + "You have to save!": "You have to save!", + "Russian": "Russian" } \ No newline at end of file diff --git a/locales/fr.json b/locales/fr.json index 27c94e6e..60201b34 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -139,5 +139,6 @@ "Polish": "Polish", "Portuguese": "Portuguese", "Spanish": "Spanish", - "You have to save!": "You have to save!" + "You have to save!": "You have to save!", + "Russian": "Russian" } \ No newline at end of file diff --git a/locales/ja.json b/locales/ja.json index 27c94e6e..60201b34 100644 --- a/locales/ja.json +++ b/locales/ja.json @@ -139,5 +139,6 @@ "Polish": "Polish", "Portuguese": "Portuguese", "Spanish": "Spanish", - "You have to save!": "You have to save!" + "You have to save!": "You have to save!", + "Russian": "Russian" } \ No newline at end of file diff --git a/locales/ko.json b/locales/ko.json index 27c94e6e..60201b34 100644 --- a/locales/ko.json +++ b/locales/ko.json @@ -139,5 +139,6 @@ "Polish": "Polish", "Portuguese": "Portuguese", "Spanish": "Spanish", - "You have to save!": "You have to save!" + "You have to save!": "You have to save!", + "Russian": "Russian" } \ No newline at end of file diff --git a/locales/no.json b/locales/no.json index 27c94e6e..60201b34 100644 --- a/locales/no.json +++ b/locales/no.json @@ -139,5 +139,6 @@ "Polish": "Polish", "Portuguese": "Portuguese", "Spanish": "Spanish", - "You have to save!": "You have to save!" + "You have to save!": "You have to save!", + "Russian": "Russian" } \ No newline at end of file diff --git a/locales/pl.json b/locales/pl.json index 27c94e6e..60201b34 100644 --- a/locales/pl.json +++ b/locales/pl.json @@ -139,5 +139,6 @@ "Polish": "Polish", "Portuguese": "Portuguese", "Spanish": "Spanish", - "You have to save!": "You have to save!" + "You have to save!": "You have to save!", + "Russian": "Russian" } \ No newline at end of file diff --git a/locales/pt.json b/locales/pt.json index 27c94e6e..60201b34 100644 --- a/locales/pt.json +++ b/locales/pt.json @@ -139,5 +139,6 @@ "Polish": "Polish", "Portuguese": "Portuguese", "Spanish": "Spanish", - "You have to save!": "You have to save!" + "You have to save!": "You have to save!", + "Russian": "Russian" } \ No newline at end of file diff --git a/locales/ru.json b/locales/ru.json new file mode 100644 index 00000000..91cb7f18 --- /dev/null +++ b/locales/ru.json @@ -0,0 +1,146 @@ +{ + "Notes": "Notes", + "Tags": "Tags", + "Preferences": "Preferences", + "Make a note": "Make a note", + "Ctrl": "Ctrl", + "Ctrl(^)": "Ctrl", + "to create a new note": "to create a new note", + "Toggle Mode": "Toggle Mode", + "Trash": "Trash", + "MODIFICATION DATE": "MODIFICATION DATE", + "Words": "Words", + "Letters": "Letters", + "STORAGE": "STORAGE", + "FOLDER": "FOLDER", + "CREATION DATE": "CREATION DATE", + "NOTE LINK": "NOTE LINK", + ".md": ".md", + ".txt": ".txt", + ".html": ".html", + "Print": "Print", + "Your preferences for Boostnote": "Your preferences for Boostnote", + "Storages": "Storages", + "Add Storage Location": "Add Storage Location", + "Add Folder": "Add Folder", + "Open Storage folder": "Open Storage folder", + "Unlink": "Unlink", + "Edit": "Edit", + "Delete": "Delete", + "Interface": "Interface", + "Interface Theme": "Interface Theme", + "Default": "Delete", + "White": "White", + "Solarized Dark": "Solarized Dark", + "Dark": "Dark", + "Show a confirmation dialog when deleting notes": "Show a confirmation dialog when deleting notes", + "Editor Theme": "Editor Theme", + "Editor Font Size": "Editor Font Size", + "Editor Font Family": "Editor Font Family", + "Editor Indent Style": "Editor Indent Style", + "Spaces": "Spaces", + "Tabs": "Tabs", + "Switch to Preview": "Switch to Preview", + "When Editor Blurred": "When Editor Blurred", + "When Editor Blurred, Edit On Double Click": "When Editor Blurred, Edit On Double Click", + "On Right Click": "On Right Click", + "Editor Keymap": "Editor Keymap", + "default": "default", + "vim": "vim", + "emacs": "emacs", + "⚠️ Please restart boostnote after you change the keymap": "⚠️ Please restart boostnote after you change the keymap", + "Show line numbers in the editor": "Show line numbers in the editor", + "Allow editor to scroll past the last line": "Allow editor to scroll past the last line", + "Bring in web page title when pasting URL on editor": "Bring in web page title when pasting URL on editor", + "Preview Font Size": "Preview Font Size", + "Preview Font Family": "Preview Font Family", + "Code block Theme": "Code block Theme", + "Allow preview to scroll past the last line": "Allow preview to scroll past the last line", + "Show line numbers for preview code blocks": "Show line numbers for preview code blocks", + "LaTeX Inline Open Delimiter": "LaTeX Inline Open Delimiter", + "LaTeX Inline Close Delimiter": "LaTeX Inline Close Delimiter", + "LaTeX Block Open Delimiter": "LaTeX Block Open Delimiter", + "LaTeX Block Close Delimiter": "LaTeX Block Close Delimiter", + "Community": "Community", + "Subscribe to Newsletter": "Subscribe to Newsletter", + "GitHub": "GitHub", + "Blog": "Blog", + "Facebook Group": "Facebook Group", + "Twitter": "Twitter", + "About": "About", + "Boostnote": "Boostnote", + "An open source note-taking app made for programmers just like you.": "An open source note-taking app made for programmers just like you.", + "Website": "Website", + "Development": "Development", + " : Development configurations for Boostnote.": " : Development configurations for Boostnote.", + "Copyright (C) 2017 - 2018 BoostIO": "Copyright (C) 2017 - 2018 BoostIO", + "License: GPL v3": "License: GPL v3", + "Analytics": "Analytics", + "Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.": "Boostnote collects anonymous data for the sole purpose of improving the application, and strictly does not collect any personal information such the contents of your notes.", + "You can see how it works on ": "You can see how it works on ", + "You can choose to enable or disable this option.": "You can choose to enable or disable this option.", + "Enable analytics to help improve Boostnote": "Enable analytics to help improve Boostnote", + "Crowdfunding": "Crowdfunding", + "Dear everyone,": "Dear everyone,", + "Thank you for using Boostnote!": "Thank you for using Boostnote!", + "Boostnote is used in about 200 different countries and regions by an awesome community of developers.": "Boostnote is used in about 200 different countries and regions by an awesome community of developers.", + "To continue supporting this growth, and to satisfy community expectations,": "To continue supporting this growth, and to satisfy community expectations,", + "we would like to invest more time and resources in this project.": "we would like to invest more time and resources in this project.", + "If you like this project and see its potential, you can help by supporting us on OpenCollective!": "If you like this project and see its potential, you can help by supporting us on OpenCollective!", + "Thanks,": "Thanks,", + "Boostnote maintainers": "Boostnote maintainers", + "Support via OpenCollective": "Support via OpenCollective", + "Language": "Language", + "English": "English", + "German": "German", + "French": "French", + "Show \"Saved to Clipboard\" notification when copying": "Show \"Saved to Clipboard\" notification when copying", + "All Notes": "All Notes", + "Starred": "Starred", + "Are you sure to ": "Are you sure to ", + " delete": " delete", + "this folder?": "this folder?", + "Confirm": "Confirm", + "Cancel": "Cancel", + "Markdown Note": "Markdown Note", + "This format is for creating text documents. Checklists, code blocks and Latex blocks are available.": "This format is for creating text documents. Checklists, code blocks and Latex blocks are available.", + "Snippet Note": "Snippet Note", + "This format is for creating code snippets. Multiple snippets can be grouped into a single note.": "This format is for creating code snippets. Multiple snippets can be grouped into a single note.", + "Tab to switch format": "Tab to switch format", + "Updated": "Updated", + "Created": "Created", + "Alphabetically": "Alphabetically", + "Default View": "Default View", + "Compressed View": "Compressed View", + "Search": "Search", + "Blog Type": "Blog Type", + "Blog Address": "Blog Address", + "Save": "Save", + "Auth": "Auth", + "Authentication Method": "Authentication Method", + "JWT": "JWT", + "USER": "USER", + "Token": "Token", + "Storage": "Storage", + "Hotkeys": "Hotkeys", + "Show/Hide Boostnote": "Show/Hide Boostnote", + "Restore": "Restore", + "Permanent Delete": "Permanent Delete", + "Confirm note deletion": "Confirm note deletion", + "This will permanently remove this note.": "This will permanently remove this note.", + "Successfully applied!": "Successfully applied!", + "Albanian": "Albanian", + "Chinese (zh-CN)": "Chinese (zh-CN)", + "Chinese (zh-TW)": "Chinese (zh-TW)", + "Danish": "Danish", + "Japanese": "Japanese", + "Korean": "Korean", + "Norwegian": "Norwegian", + "Polish": "Polish", + "Portuguese": "Portuguese", + "Spanish": "Spanish", + "You have to save!": "You have to save!", + "UserName": "UserName", + "Password": "Password", + "Russian": "Russian" +} \ No newline at end of file diff --git a/locales/sq.json b/locales/sq.json index 27c94e6e..60201b34 100644 --- a/locales/sq.json +++ b/locales/sq.json @@ -139,5 +139,6 @@ "Polish": "Polish", "Portuguese": "Portuguese", "Spanish": "Spanish", - "You have to save!": "You have to save!" + "You have to save!": "You have to save!", + "Russian": "Russian" } \ No newline at end of file diff --git a/locales/zh-CN.json b/locales/zh-CN.json index 27c94e6e..60201b34 100644 --- a/locales/zh-CN.json +++ b/locales/zh-CN.json @@ -139,5 +139,6 @@ "Polish": "Polish", "Portuguese": "Portuguese", "Spanish": "Spanish", - "You have to save!": "You have to save!" + "You have to save!": "You have to save!", + "Russian": "Russian" } \ No newline at end of file diff --git a/locales/zh-TW.json b/locales/zh-TW.json index 27c94e6e..60201b34 100644 --- a/locales/zh-TW.json +++ b/locales/zh-TW.json @@ -139,5 +139,6 @@ "Polish": "Polish", "Portuguese": "Portuguese", "Spanish": "Spanish", - "You have to save!": "You have to save!" + "You have to save!": "You have to save!", + "Russian": "Russian" } \ No newline at end of file