A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
Merge branch 'master' into beta
Abdullah Atta6489dda4c856
diff --cc packages/intl/locale/pseudo-LOCALE.poindex 71807e773,952c53ea5..a487a2c87--- a/packages/intl/locale/pseudo-LOCALE.po+++ b/packages/intl/locale/pseudo-LOCALE.po@@@ -640,11 -624,11 +640,11 @@@ msgstr "msgid "2FA code is required()"msgstr ""-#: src/strings.ts:1008+#: src/strings.ts:1010msgid "2FA code sent via {method}"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2585+#: src/strings.ts:2587msgid "5 year plan (One time purchase)"msgstr ""@@@ -752,15 -732,15 +752,15 @@@ msgstr "msgid "Add tags"msgstr ""-#: src/strings.ts:934+#: src/strings.ts:936msgid "Add tags to multiple notes at once"- msgstr "<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2245+#: src/strings.ts:2247msgid "Add to dictionary"-msgstr ""+msgstr "<<<<<<< HEAD<<<<<<< HEAD"-#: src/strings.ts:2618+#: src/strings.ts:2620msgid "Add to home"msgstr ""@@@ -772,11 -752,11 +772,11 @@@ msgstr "msgid "Add your first note"msgstr ""-#: src/strings.ts:975+#: src/strings.ts:977msgid "Add your first notebook"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2621+#: src/strings.ts:2623msgid "Adjust the line height of the editor"msgstr ""@@@ -866,9 -846,9 +866,9 @@@ msgstr "#: src/strings.ts:250msgid "An error occurred while migrating your data. You can logout of your account and try to relogin. However this is not recommended as it may result in some data loss if your data was not synced."- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2579+#: src/strings.ts:2581msgid "and"msgstr ""@@@ -884,32 -864,12 +884,32 @@@ msgstr "<<<<<<< HEADmsgid "and much more."msgstr ""-#: src/strings.ts:1397+#: src/strings.ts:1399msgid "and we will manually confirm your account."- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2596+#: src/strings.ts:2598msgid "ANNOUNCEMENT"- msgstr "<<<<<<< HEAD"++msgstr ">>>>>>> master"++#: src/strings.ts:2687+msgid "API key copied to clipboard"+msgstr ""++#: src/strings.ts:2665+msgid "API key created successfully"+msgstr ""++#: src/strings.ts:2692+msgid "API key revoked"+msgstr ""++#: src/strings.ts:2658+msgid "API Keys"+msgstr ""++#: src/strings.ts:2679+msgid "API Keys Limit Reached"msgstr ""#: src/strings.ts:252@@@ -1158,11 -1106,11 +1158,11 @@@ msgstr "msgid "Available on iOS"msgstr ""-#: src/strings.ts:2155+#: src/strings.ts:2157msgid "Available on iOS & Android"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2644+#: src/strings.ts:2710msgid "Back"msgstr ""@@@ -1250,15 -1198,15 +1250,15 @@@ msgstr "msgid "Behavior"msgstr ""-#: src/strings.ts:2136+#: src/strings.ts:2138msgid "Behaviour"- msgstr "<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2472+#: src/strings.ts:2474msgid "Believer plan"-msgstr ""+msgstr "<<<<<<< HEAD<<<<<<< HEAD"-#: src/strings.ts:2582+#: src/strings.ts:2584msgid "Best value"msgstr ""@@@ -1320,9 -1268,9 +1320,9 @@@ msgstr "#: src/strings.ts:405msgid "By"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2577+#: src/strings.ts:2579msgid "By joining you agree to our"msgstr ""@@@ -1340,9 -1288,9 +1340,9 @@@ msgstr "#: src/strings.ts:549msgid "Cancel"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2575+#: src/strings.ts:2577msgid "Cancel anytime, subscription auto-renews."msgstr ""@@@ -1433,9 -1377,9 +1433,9 @@@ msgstr "#: src/strings.ts:434msgid "Change password"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2589+#: src/strings.ts:2591msgid "Change plan"msgstr ""@@@ -1547,11 -1487,11 +1547,11 @@@ msgstr "msgid "Choose from pre-built themes or create your own"msgstr ""-#: src/strings.ts:1133+#: src/strings.ts:1135msgid "Choose how dates are displayed in the app"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2624+#: src/strings.ts:2626msgid "Choose how day is displayed in the app"msgstr ""@@@ -1565,9 -1505,9 +1565,9 @@@ msgstr "#: src/strings.ts:402msgid "Choose how you want to secure your notes locally."- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2629+#: src/strings.ts:2631msgid "Choose what day to display as the first day of the week"msgstr ""@@@ -1648,13 -1588,13 +1648,13 @@@ msgid ""---\n""\n""**Only use this for troubleshooting purposes. If you are having persistent issues, it is recommended that you reach out to us via [email protected] so we can help you resolve it permanently.**"- msgstr "<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2229+#: src/strings.ts:2231msgid "Clearing trash will permanently delete all the items in your trash. This action is IRREVERSIBLE."-msgstr ""+msgstr "<<<<<<< HEAD"-#: src/strings.ts:2611+#: src/strings.ts:2613msgid "Click here to directly claim the promotion."msgstr ""@@@ -1666,15 -1606,15 +1666,15 @@@ msgstr "msgid "Click to preview"msgstr ""-#: src/strings.ts:1772+#: src/strings.ts:1774msgid "Click to remove"- msgstr "<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2393+#: src/strings.ts:2395msgid "Click to reset {title}"-msgstr ""+msgstr "<<<<<<< HEAD<<<<<<< HEAD"-#: src/strings.ts:2619+#: src/strings.ts:2621msgid "Click to save"msgstr ""@@@ -1819,11 -1759,11 +1819,11 @@@ msgstr "msgid "Confirm password"msgstr ""-#: src/strings.ts:1487+#: src/strings.ts:1489msgid "Confirm pin"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2643+#: src/strings.ts:2645msgid "Confirmation email sent"msgstr ""@@@ -2130,11 -2046,11 +2130,11 @@@ msgstr "msgid "Date uploaded"msgstr ""-#: src/strings.ts:1841+#: src/strings.ts:1843msgid "Day"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2623+#: src/strings.ts:2625msgid "Day format"msgstr ""@@@ -2211,15 -2127,15 +2211,15 @@@ msgstr "msgid "Delete account"msgstr ""-#: src/strings.ts:1319+#: src/strings.ts:1321msgid "Delete collapsed section"- msgstr "<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2293+#: src/strings.ts:2295msgid "Delete column"-msgstr ""+msgstr "<<<<<<< HEAD<<<<<<< HEAD"-#: src/strings.ts:2640+#: src/strings.ts:2642msgid "Delete data"msgstr ""@@@ -2484,11 -2388,11 +2484,11 @@@ msgstr "<<<<<<< HEADmsgid "Easy access"msgstr ""-#: src/strings.ts:1777+#: src/strings.ts:1779msgid "Edit"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2630+#: src/strings.ts:2632msgid "Edit creation date"msgstr ""@@@ -2513,12 -2417,12 +2513,12 @@@ msgstr "msgid "Edit your full name"msgstr ""-#: src/strings.ts:1142-#: src/strings.ts:1526+#: src/strings.ts:1144+#: src/strings.ts:1528msgid "Editor"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2586+#: src/strings.ts:2588msgid "Education plan"msgstr ""@@@ -2712,9 -2608,9 +2712,9 @@@ msgstr "#: src/strings.ts:120msgid "Enter the recovery code to continue logging in"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2622+#: src/strings.ts:2624msgid "Enter title"msgstr ""@@@ -2806,23 -2702,11 +2806,23 @@@ msgstr "msgid "Expand sidebar"msgstr ""-#: src/strings.ts:2072+#: src/strings.ts:2074msgid "Experience the next level of private note taking\""- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2636+#: src/strings.ts:2698+msgid "Expired"+msgstr ""++#: src/strings.ts:2663+msgid "Expires in"+msgstr ""++#: src/strings.ts:2699+msgid "Expires on"+msgstr ""++#: src/strings.ts:2638msgid "Expiry date"msgstr ""@@@ -2847,11 -2731,11 +2847,11 @@@ msgid "Export all notes as pdf, markdowmsgstr ""#. placeholder {0}: format ? " " + format : ""-#: src/strings.ts:2035+#: src/strings.ts:2037msgid "Export as{0}"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2637+#: src/strings.ts:2639msgid "Export CSV"msgstr ""@@@ -2871,15 -2755,15 +2871,15 @@@ msgstr "msgid "EXTREMELY DANGEROUS! This action is irreversible. All your data including notes, notebooks, attachments & settings will be deleted. This is a full account reset. Proceed with caution."msgstr ""-#: src/strings.ts:1259+#: src/strings.ts:1261msgid "Faced an issue or have a suggestion? Click here to create a bug report"- msgstr "<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2404+#: src/strings.ts:2406msgid "Failed"-msgstr ""+msgstr "<<<<<<< HEAD<<<<<<< HEAD"-#: src/strings.ts:2641+#: src/strings.ts:2643msgid "Failed to attach file"msgstr ""@@@ -3029,11 -2896,11 +3029,11 @@@ msgstr "msgid "Filter attachments by filename, type or hash"msgstr ""-#: src/strings.ts:1833+#: src/strings.ts:1835msgid "Filter languages"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2608+#: src/strings.ts:2610msgid "Finish your purchase in the browser."msgstr ""@@@ -3212,11 -3079,11 +3212,11 @@@ msgstr "msgid "Getting recovery codes"msgstr ""-#: src/strings.ts:2162+#: src/strings.ts:2164msgid "GNU GENERAL PUBLIC LICENSE Version 3"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2609+#: src/strings.ts:2611msgid "Go back"msgstr ""@@@ -3252,13 -3119,13 +3252,13 @@@ msgstr "msgid "Go to previous page"msgstr ""-#: src/strings.ts:1304+#: src/strings.ts:1306msgid "Go to web app"- msgstr "<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2539+#: src/strings.ts:2541msgid "Google will remind you 2 days before your trial ends."-msgstr ""+msgstr "<<<<<<< HEAD>>>>>>> master"#: src/strings.ts:586msgid "Got it"@@@ -3474,11 -3337,11 +3474,11 @@@ msgstr "msgid "Import & export"msgstr ""-#: src/strings.ts:1751+#: src/strings.ts:1753msgid "Import completed"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2638+#: src/strings.ts:2640msgid "Import CSV"msgstr ""@@@ -3574,19 -3425,11 +3574,19 @@@ msgstr "msgid "Invalid CORS proxy url"msgstr ""-#: src/strings.ts:1482+#: src/strings.ts:1484msgid "Invalid email"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2646+#: src/strings.ts:2686+msgid "Invalid password"+msgstr ""++#: src/strings.ts:2705+msgid "Invalid PGP key pair. Please check your keys and try again."+msgstr ""++#: src/strings.ts:2712msgid "Invalid recovery key. Make sure to input your account recovery key, not a 2FA recovery code."msgstr ""@@@ -3738,13 -3573,13 +3738,13 @@@ msgstr "#: src/strings.ts:725msgid "Light"- msgstr "<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2357+#: src/strings.ts:2359msgid "Line {line}, Column {column}"-msgstr ""+msgstr "<<<<<<< HEAD<<<<<<< HEAD"-#: src/strings.ts:2620+#: src/strings.ts:2622msgid "Line height"msgstr ""@@@ -3921,11 -3748,11 +3921,11 @@@ msgstr "msgid "Login successful"msgstr ""-#: src/strings.ts:1362+#: src/strings.ts:1364msgid "Login to encrypt and sync notes"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2613+#: src/strings.ts:2615msgid "Login to upload attachments. [Read more](https://help.notesnook.com/faqs/login-to-upload-attachments)"msgstr ""@@@ -4329,9 -4148,9 +4329,9 @@@ msgstr "#: src/strings.ts:202msgid "No one can view this {type} except you."- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2616+#: src/strings.ts:2618msgid "No password"msgstr ""@@@ -4460,15 -4279,15 +4460,15 @@@ msgstr "msgid "Notes exported as {path} successfully"msgstr ""-#: src/strings.ts:1750+#: src/strings.ts:1752msgid "notes imported"- msgstr "<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2543+#: src/strings.ts:2545msgid "Notesnook"-msgstr ""+msgstr "<<<<<<< HEAD<<<<<<< HEAD"-#: src/strings.ts:2601+#: src/strings.ts:2603msgid "Notesnook Circle"msgstr ""@@@ -4765,9 -4580,9 +4765,9 @@@ msgstr "#: src/strings.ts:523msgid "Pinned"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2583+#: src/strings.ts:2585msgid "Plan limits"msgstr ""@@@ -5035,11 -4842,11 +5035,11 @@@ msgstr "msgid "Privacy for everyone"msgstr ""-#: src/strings.ts:1180+#: src/strings.ts:1182msgid "Privacy mode"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2578+#: src/strings.ts:2580msgid "privacy policy"msgstr ""@@@ -5117,9 -4916,9 +5117,9 @@@ msgstr "#: src/strings.ts:487msgid "Publish note"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2617+#: src/strings.ts:2619msgid "Publish to the web"msgstr ""@@@ -5141,9 -4940,9 +5141,9 @@@ msgstr "#: src/strings.ts:271msgid "Published note link will be automatically deleted once it is viewed by someone."- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2571+#: src/strings.ts:2573msgid "Purchase"msgstr ""@@@ -5275,15 -5074,15 +5275,15 @@@ msgstr "msgid "Recovery key text file saved"msgstr ""-#: src/strings.ts:1916+#: src/strings.ts:1918msgid "Recovery successful!"- msgstr "<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2436+#: src/strings.ts:2438msgid "Redeem"-msgstr ""+msgstr "<<<<<<< HEAD<<<<<<< HEAD"-#: src/strings.ts:2600+#: src/strings.ts:2602msgid "Redeem code"msgstr ""@@@ -6063,11 -5854,11 +6063,11 @@@ msgstr "msgid "Set as light theme"msgstr ""-#: src/strings.ts:1333+#: src/strings.ts:1335msgid "Set automatic trash cleanup interval from Settings > Behaviour > Clean trash interval."- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2634+#: src/strings.ts:2636msgid "Set expiry"msgstr ""@@@ -6253,15 -6040,15 +6253,15 @@@ msgstr "msgid "Sort by"msgstr ""-#: src/strings.ts:2149+#: src/strings.ts:2151msgid "Source code"- msgstr "<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2355+#: src/strings.ts:2357msgid "Spaces"-msgstr ""+msgstr "<<<<<<< HEAD<<<<<<< HEAD"-#: src/strings.ts:2593+#: src/strings.ts:2595msgid "Special Offer"msgstr ""@@@ -6339,9 -6126,9 +6339,9 @@@ msgstr "#: src/strings.ts:580msgid "Submit"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2572+#: src/strings.ts:2574msgid "Subscribe"msgstr ""@@@ -6595,9 -6382,9 +6595,9 @@@ msgstr "#: src/strings.ts:102msgid "Terms of Service "- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2580+#: src/strings.ts:2582msgid "terms of use."msgstr ""@@@ -6621,15 -6408,15 +6621,15 @@@ msgstr "msgid "Thank you for choosing end-to-end encrypted note taking. Now you can sync your notes to unlimited devices."msgstr ""-#: src/strings.ts:2050+#: src/strings.ts:2052msgid "Thank you for reporting!"- msgstr "<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2551+#: src/strings.ts:2553msgid "Thank you for subscribing"-msgstr ""+msgstr "<<<<<<< HEAD<<<<<<< HEAD"-#: src/strings.ts:2588+#: src/strings.ts:2590msgid "Thank you for the purchase"msgstr ""@@@ -6641,19 -6428,19 +6641,19 @@@ msgstr "msgid "Thank you. You are the proof that privacy always comes first."msgstr ""-#: src/strings.ts:1643+#: src/strings.ts:1645msgid "The {title} at {url} is not compatible with this client."- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2633+#: src/strings.ts:2635msgid "The incoming note could not be unlocked with the provided password. Enter the correct password for the incoming note"msgstr ""#: src/strings.ts:231msgid "The information above will be publically available at"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2607+#: src/strings.ts:2609msgid "The Notesnook Circle is exclusive to subscribers. Please consider subscribing to gain access to Notesnook Circle and enjoy additional benefits."msgstr ""@@@ -6729,11 -6516,11 +6729,11 @@@ msgstr "<<<<<<< HEAD<<<<<<< HEADmsgid "This feature is not available on this plan."msgstr ""-#: src/strings.ts:1934+#: src/strings.ts:1936msgid "This image cannot be previewed"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2574+#: src/strings.ts:2576msgid "This is a one time purchase, no subscription."msgstr ""@@@ -6741,12 -6528,12 +6741,12 @@@msgid "This may take a while"msgstr ""-#: src/strings.ts:1101-#: src/strings.ts:1110+#: src/strings.ts:1103+#: src/strings.ts:1112msgid "This must only be used for troubleshooting. Using it regularly for sync is not recommended and will lead to unexpected data loss and other issues. If you are having persistent issues with sync, please report them to us at [email protected]."- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2639+#: src/strings.ts:2641msgid "This note is empty"msgstr ""@@@ -6938,9 -6725,9 +6938,9 @@@ msgstr "#: src/strings.ts:854msgid "Unfavorite"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2584+#: src/strings.ts:2586msgid "Unlimited"msgstr ""@@@ -6954,9 -6741,9 +6954,9 @@@ msgstr "#: src/strings.ts:157msgid "Unlock"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2631+#: src/strings.ts:2633msgid "Unlock incoming note"msgstr ""@@@ -6971,9 -6758,9 +6971,9 @@@ msgstr "#: src/strings.ts:888msgid "Unlock note to delete it"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2642+#: src/strings.ts:2644msgid "Unlock note to merge conflicts"msgstr ""@@@ -7021,11 -6808,11 +7021,11 @@@ msgstr "msgid "Unpublish notes to delete them"msgstr ""-#: src/strings.ts:2086+#: src/strings.ts:2088msgid "Unregister"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2635+#: src/strings.ts:2637msgid "Unset expiry"msgstr ""@@@ -7072,9 -6859,9 +7072,9 @@@ msgstr "#: src/strings.ts:749msgid "Upgrade to Pro"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2599+#: src/strings.ts:2601msgid "Upgrade to redeem"msgstr ""@@@ -7309,11 -7088,11 +7309,11 @@@ msgstr "msgid "View source code"msgstr ""-#: src/strings.ts:1062+#: src/strings.ts:1064msgid "View your recovery codes to recover your account in case you lose access to your two-factor authentication methods."- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2614+#: src/strings.ts:2616msgid "Views"msgstr ""@@@ -7379,9 -7158,9 +7379,9 @@@ msgstr "#: src/strings.ts:664msgid "Week"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2627+#: src/strings.ts:2629msgid "Week format"msgstr ""@@@ -7394,11 -7173,11 +7394,11 @@@ msgstr "msgid "Welcome back, {email}"msgstr ""-#: src/strings.ts:1888+#: src/strings.ts:1890msgid "Welcome back!"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2587+#: src/strings.ts:2589msgid "Welcome to Notesnook {plan}"msgstr ""@@@ -7473,9 -7252,9 +7473,9 @@@ msgstr "#: src/strings.ts:106msgid "You also agree to recieve marketing emails from us which you can opt-out of from app settings."- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2592+#: src/strings.ts:2594msgid "You are already subscribed to this plan."msgstr ""@@@ -7503,11 -7282,11 +7503,11 @@@ msgstr "msgid "You can also link a note to multiple Notebooks. Tap and hold any notebook to enable multi-select."msgstr ""-#: src/strings.ts:2064+#: src/strings.ts:2066msgid "You can change the theme at any time from Settings or the side menu."- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2595+#: src/strings.ts:2597msgid "You can change your subscription plan from the web app"msgstr ""@@@ -7568,11 -7347,11 +7568,11 @@@ msgstr "msgid "You have been logged out from all other devices."msgstr ""-#: src/strings.ts:2192+#: src/strings.ts:2194msgid "You have been logged out."- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2591+#: src/strings.ts:2593msgid "You have made a one time purchase. To change your plan please contact support."msgstr ""@@@ -7689,11 -7468,11 +7689,11 @@@ msgstr "msgid "Your changes have been saved and will be reflected after the app has refreshed."msgstr ""-#: src/strings.ts:2099+#: src/strings.ts:2101msgid "Your current 2FA method is {method}"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2598+#: src/strings.ts:2600msgid "Your current subscription does not allow changing plans"msgstr ""@@@ -7737,11 -7516,11 +7737,11 @@@ msgstr "msgid "Your free trial has started"msgstr ""-#: src/strings.ts:1403+#: src/strings.ts:1405msgid "Your free trial is ending soon"- msgstr "<<<<<<< HEAD<<<<<<< HEAD"+ msgstr ""-#: src/strings.ts:2626+#: src/strings.ts:2628msgid "Your free trial is on-going. Your subscription will start on {trialExpiryDate}"msgstr ""