mozilla · Natim · Feb 9, 2018 · Jan 22, 2018 · Jan 22, 2018 · Jan 22, 2018
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -8,6 +8,7 @@ parserOptions:
 
 extends:
   - eslint:recommended
+  - plugin:mozilla/recommended
 
 globals:
   BrowserStorageCredentials: false
@@ -28,13 +29,19 @@ globals:
   loadFromKinto: false
   localizeEditorButtons: false
   migrationCheck: false
+  migrationNote: false
+  migrationBody: false
   retrieveNote: false
   saveToKinto: false
   setAnimation: false
 
+plugins:
+  - mozilla
+
 root: true
 
 rules:
+  consistent-return: warn
   eqeqeq: error
   linebreak-style: [error, unix]
   no-console: warn

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
 # Changelog
+
+## 2.2.0 (2018-02-12)
+
+* Add the full heading names (#528)
+* Fix first edition not detected in new windows (#582)
+
+
 ## 2.1.1 (2018-01-22)
 
 * Add a toolbar icon

diff --git a/docs/issue_template.md b/docs/issue_template.md
@@ -0,0 +1,21 @@
+### [Description]:
+
+
+### [Affected versions]:
+
+
+### [Prerequisites]:
+
+
+### [Steps to reproduce]:
+
+
+### [Expected result]:
+
+
+### [Actual result]:
+
+
+### [Additional Notes]:
+
+
diff --git a/docs/metrics.md b/docs/metrics.md
@@ -34,6 +34,7 @@ Data will be collected with Google Analytics and follow [Test Pilot standards](h
 - `cd6` - whether the user has, anywhere in their notepad, a list. One of `true` or `false`.
 - `cd7` - the UI element used to open or close the notepad. Possible values TBD, but may include `closeButton`, `sidebarButton`, and `sidebarSwitcher`.
 - `cd8` - the reason an editing session ended. One of `timeout` or `closed`.
+- `cd9` - whether the user was able to load the note panel or not. One of `true` or `false`.
 
 ### Events
 
@@ -42,12 +43,15 @@ An event fired when the user actively navigates to the Notes sidebar. Includes:
 
 - `ec` - `notes`
 - `ea` - `open`
+- `cd9`
 
 #### `close`
 An event fired when the user actively navigates away from the Notes sidebar. Includes:
 
 - `ec` - `notes`
 - `ea` - `close`
+- `cd7`
+- `cd8`
 
 #### `changed`
 An event fired when the user completes a change of the content of the notepad. It prospectively begins when a user focuses on the notepad's editable area, and ends when the user either 1) closes the sidebar, or 2) does not make any changes in 20 seconds. Includes:
@@ -63,8 +67,6 @@ An event fired when the user completes a change of the content of the notepad. I
 - `cd4`
 - `cd5`
 - `cd6`
-- `cd7`
-- `cd8`
 
 #### `drag-n-drop`
 
@@ -81,8 +83,6 @@ An event fired when the user tries to drag or drop a content into the notepad.
 - `cd4`
 - `cd5`
 - `cd6`
-- `cd7`
-- `cd8`
 
 #### `sync-started`
 An event fired whenever the user attempts to login to sync. Includes:
@@ -98,62 +98,71 @@ An event fired whenever the user attempts to login to sync. Includes:
 - `cd5`
 - `cd6`
 
-#### `sync-enabled`
-An event fired whenever the user enables sync. Includes:
+#### `login-success`
+An event fired whenever the user enables sync successfully. Includes:
 
 - `ec` - `notes`
-- `ea` - `sync-enabled`
-- `cm1`
-- `cm2`
-- `cd1`
-- `cd2`
-- `cd3`
-- `cd4`
-- `cd5`
-- `cd6`
+- `ea` - `login-success`
 
-#### `sync-disabled`
-An event fired whenever the user disables sync. Includes:
+#### `login-failed`
+An event fired whenever the user enables sync but the FxA login fails. Includes:
 
 - `ec` - `notes`
-- `ea` - `sync-disabled`
-- `cm1`
-- `cm2`
-- `cd1`
-- `cd2`
-- `cd3`
-- `cd4`
-- `cd5`
-- `cd6`
+- `ea` - `login-failed`
 
 #### `theme-changed`
 An event fired whenever the user changes the theme. Includes:
 
 - `ec` - `notes`
 - `ea` - `theme-changed`
-- `cm1`
-- `cm2`
-- `cd1`
-- `cd2`
-- `cd3`
-- `cd4`
-- `cd5`
-- `cd6`
-
-#### `login-success`
-An event fired when FxA login succeeds
-
-#### `login-failed`
-An event fired when FxA login fails
 
 #### `webext-button-authenticate`
 An event fired when user presses the sync button
 
+- `ec` - `notes`
+- `ea` - `webext-button-authenticate`
+
 #### `webext-button-disconnect`
 An event fired when user logs out of sync
 
+- `ec` - `notes`
+- `ea` - `webext-button-disconnect`
+
 #### `handle-conflict`
 An event fired when sync resolved a sync conflict
 
+- `ec` - `notes`
+- `ea` - `handle-conflict`
+
 #### `reconnect-sync`
-An event fired when user loses sync due to a password reset or change
+An event fired when user closes sync due to a password reset or change
+
+- `ec` - `notes`
+- `ea` - `reconnect-sync`
+
+#### `metrics-migrated`
+An event fired when the user migrate from Quill.JS to CKEditor
+
+- `ec` - `notes`
+- `ea` - `metrics-migrated`
+
+#### `metrics-migrated-before`
+An event fired when the migration from Quill.JS to CKEditor already happened
+
+- `ec` - `notes`
+- `ea` - `metrics-migrated-before`
+
+#### `limit-reached`
+
+An event fired when user goes over the pad limit (15000 character)
+
+- `ec` - `notes`
+- `ea` - `limit-reached`
+- `cm1`
+- `cm2`
+- `cd1`
+- `cd2`
+- `cd3`
+- `cd4`
+- `cd5`
+- `cd6`
diff --git a/locales/ar/notes.properties b/locales/ar/notes.properties
@@ -1,26 +1,98 @@
-welcomeTitle2=مرحبا!
-welcomeText2=أهلا في دفتر الملاحظات من صفحة واحدة المدمج في فَيَرفُكس. دوّن الملاحظات. بهذه البساطة.
+welcomeTitle3=أهلا في ملاحظات فَيرفُكس
+welcomeSubtitle=أداة بسيطة لتدوين الملاحظات أثناء تصفحك.
+welcomeOpenNotes=لفتح الملاحظات:
+# LOCALIZATION NOTE (welcomeWindowsLinuxShortcut): {shortcut} is the
+# key combination to open the sidebar
+welcomeWindowsLinuxShortcut=على وندوز و لنكس: {shortcut}
+# LOCALIZATION NOTE (welcomeMacShortcut): {shortcut} is the
+# key combination to open the sidebar
+welcomeMacShortcut=على ماك: {shortcut}
+welcomeAccessNotes=للوصول إلى ملاحظاتك من أي حاسوب:
+# LOCALIZATION NOTE (welcomeSyncInfo): {sync} is the label on the sync button
+welcomeSyncInfo=اختر {sync} للولوج إلى حساب فَيَرفُكس.
+welcomeFormatText=<strong>لتنسيق النص</strong>، استخدم أحد الأوامر التالية:
+# LOCALIZATION NOTE (welcomeHeading): #, ##, and ### are the markdown
+# syntax to use. Keep the backticks (`) to explain to the user how to use
+# the syntax.
+welcomeHeading=رؤوس العناوين: ابدأ السطر بعلامة `#` أو `##` أو `###` ثم مسافة، لتنسيق عنوان رئيسي ١، أو عنوان رئيسي ٢، أو عنوان رئيسي ٣
+# LOCALIZATION NOTE (welcomeBold): **text**, and __text__ are the
+# markdown syntax example. "text" can be translated. Keep the backticks (`)
+# to explain to the user how to use the syntax.
+welcomeBold=عريض: `**نص**` أو `__نص__`
+# LOCALIZATION NOTE (welcomeItalics): *text*, and _text_ are the
+# markdown syntax example. "text" can be translated. Keep the backticks (`)
+# to explain to the user how to use the syntax.
+welcomeItalics=مائل: `*نص*` أو `_نص_`
+# LOCALIZATION NOTE (welcomeBulleted): * and - are the markdown
+# syntax example. Keep the backticks (`) to explain to the user how to use
+# the syntax.
+welcomeBulleted=قائمة منقوطة: ابدأ السطر بعلامة `*`  أو  `–`  ثم مسافة
+# LOCALIZATION NOTE (welcomeNumbered): 1. and 1) are the markdown
+# syntax example. Keep the backticks (`) to explain to the user how to use
+# the syntax.
+welcomeNumbered=قائمة مرقّمة: ابدأ السطر بعلامة `1.` أو `1)` ثم مسافة
+# LOCALIZATION NOTE (welcomeCode): `text` is the markdown syntax
+# example. "text" can be translated. Please keep the backticks (`) to
+# explain to the user how to use the syntax.
+welcomeCode=كود: ``نص``
+welcomeSuggestion=ألديك اقتراح لتحسين الملاحظات؟
+# LOCALIZATION NOTE (welcomeGiveFeedback): {feedback} contains the
+# label of the Give Feedback button.
+welcomeGiveFeedback=اختر {feedback} من قائمة الملاحظات.
+welcomeThatsIt=<strong>هذا كل شيء</strong>—يمكنك تدوين الملاحظات الآن!
+
+migratedEditor=استبدلنا محرر نصوص الملاحظات للحصول على المزيد من الخصائص و السرعة، لكن اضطررنا لإزالة تنسيق ملاحظاتك السابقة. نعتذر عن هذا و نقدّر مشاركتك.
 
 emptyPlaceHolder=خذ ملاحظة…
 
 giveFeedback=انقر هنا لإطلاعنا على مقترحاتك
+feedback=أعط رأيك
+cancelLogin=ألغِ الولوج
+removeAccount=أزِل الحساب
 
 openingLogin=يفتح الولوج…
+pleaseLogin=أكّد حسابك…
 forgetEmail=انسَ هذا البريد
+disableSync=عطّل المزامنة
+reconnectSync=أعِد الاتصال بالتزامن
+syncError=عطل في المزامنة
 
 savingChanges=يحفظ التغييرات…
 changesSaved=حُفظت كل التغييرات
-
+maximumPadSizeExceeded=خاصية الملاحظات المتعددة ستأتي قريبًا. حاليًا وصلت ملاحظة للحد الأقصى، فرجاء مسح جزء منها قبل إضافة المزيد.
 syncNotReady2=للأسف مزامنة الملاحظات ليست جاهزة بعد، لكن ستعتبر نقرتك تصويتًا ليُسرع.
+syncReady=أخبار جيدة – المزامنة جاهزة. فعلها أدناه للوصول إلى ملاحظاتك أينما احتجتهم.
+
 syncNotes=زامن ملاحظاتك
 syncProgress=يُزامن التغييرات…
 # LOCALIZATION NOTE (disableSync): Sync is intended as a generic
 # synchronization, not Firefox Sync.
 disableSync=عطّل المزامنة
-# LOCALIZATION NOTE (syncComplete): {date} is the date of last sync. If this
-# structure doesn't work for your locale, you can translate this as "Last sync:
-# {date}".
-syncComplete=آخر مزامنة: {date}
+
+# LOCALIZATION NOTE (savedComplete2): {time} is the time of saving. Such as 5:33pm or 17:33. If this
+# structure doesn't work for your locale, you can translate this as "Saved ({time})".
+savedComplete2=آخر حفظ في {time}
+
+# LOCALIZATION NOTE (syncComplete2): {time} is the time of syncing. Such as 5:33pm or 17:33. If this
+# structure doesn't work for your locale, you can translate this as "Synced ({time})".
+syncComplete2=آخر مزامنة في {time}
+
+# LOCALIZATION NOTE (syncComplete3): {time} is the time of syncing. Such as 5:33pm or 17:33.
+syncComplete3=آخر مزامنة {time}
+
+# LOCALIZATION NOTE (syncToMail): {mail} is the email address of the Firefox account in use
+syncToMail=زامِن مع {mail}
+
+# LOCALIZATION NOTE (mergeWarning): This string is displayed in case of a merge conflict during a note sync.
+# It is displayed below the 'synced' notes and above the 'local' notes. It is a visual separator.
+mergeWarning=**** على هذا الحاسوب: ****
+
+# Font size
+title1=عنوان رئيسي ١
+title2=عنوان رئيسي ٢
+title3=عنوان رئيسي ٣
+paragraph=متن
+bodyText=متن النص
 
 # Tooltips for toolbar buttons
 fontSizeTitle=حجم الخط