Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

Merge branch 'master' into beta

Abdullah Attaf01b88083f82
diff --cc packages/intl/locale/en.po
index 87de5c852,8b48047b9..85cf3d006
--- a/packages/intl/locale/en.po
+++ b/packages/intl/locale/en.po
@@@ -7501,7 -7471,11 +7501,11 @@@ msgstr "Your free trial has started
msgid "Your free trial is ending soon"
msgstr "Your free trial is ending soon"
-#: src/strings.ts:2614
++#: src/strings.ts:2622
+ msgid "Your free trial is on-going. Your subscription will start on {trialExpiryDate}"
+ msgstr "Your free trial is on-going. Your subscription will start on {trialExpiryDate}"
+
-#: src/strings.ts:1777
+#: src/strings.ts:1778
msgid "Your full name"
msgstr "Your full name"
diff --cc packages/intl/locale/pseudo-LOCALE.po
index afc3aa41b,a55f1f0c3..6f484938f
--- a/packages/intl/locale/pseudo-LOCALE.po
+++ b/packages/intl/locale/pseudo-LOCALE.po
@@@ -7442,11 -7413,15 +7442,15 @@@ msgstr "
msgid "Your free trial has started"
msgstr ""
-#: src/strings.ts:1402
+#: src/strings.ts:1403
msgid "Your free trial is ending soon"
-msgstr ""
++msgstr "<<<<<<< HEAD"
+
-#: src/strings.ts:2614
++#: src/strings.ts:2622
+ msgid "Your free trial is on-going. Your subscription will start on {trialExpiryDate}"
msgstr ""
-#: src/strings.ts:1777
+#: src/strings.ts:1778
msgid "Your full name"
msgstr ""
diff --cc packages/intl/src/strings.ts
index 11d913c27,a69227fed..0826f27ee
--- a/packages/intl/src/strings.ts
+++ b/packages/intl/src/strings.ts
@@@ -2611,11 -2610,6 +2611,13 @@@ Use this if changes from other devices
clickToUpdate: () => t`Click to update`,
noPassword: () => t`No password`,
publishToTheWeb: () => t`Publish to the web`,
+ addToHome: () => t`Add to home`,
+ clickToSave: () => t`Click to save`,
+ lineHeight: () => t`Line height`,
+ lineHeightDesc: () => t`Adjust the line height of the editor`,
+ enterTitle: () => t`Enter title`,
+ dayFormat: () => t`Day format`,
- dayFormatDesc: () => t`Choose how day is displayed in the app`
++ dayFormatDesc: () => t`Choose how day is displayed in the app`,
+ trialOnGoing: (trialExpiryDate: string) =>
+ t`Your free trial is on-going. Your subscription will start on ${trialExpiryDate}`
};