From b1015891b48eefa93223b41992f8159240687078 Mon Sep 17 00:00:00 2001
From: vladikoff <vlad.filippov@gmail.com>
Date: Thu, 30 Nov 2017 17:07:57 -0500
Subject: [PATCH 1/2] Update Sync strings and add better L10N descriptions

---
 locales/en-US/notes.properties | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/locales/en-US/notes.properties b/locales/en-US/notes.properties
index fa83165cd..d6eb21dce 100644
--- a/locales/en-US/notes.properties
+++ b/locales/en-US/notes.properties
@@ -28,15 +28,18 @@ syncProgress=Syncing changes…
 # LOCALIZATION NOTE (disableSync): Sync is intended as a generic
 # synchronization, not Firefox Sync.
 disableSync=Disable Sync
-# 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=Synced {date}
-syncCompleteAt=Synced at {date}
-# LOCALIZATION NOTE (savedComplete): {date} is the time of saving. If this
-# structure doesn't work for your locale, you can translate this as "Saved (
-# {date})".
-savedComplete=Saved at {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=Saved at {time}
+
+# LOCALIZATION NOTE (syncComplete2): {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 "Synced ({time})".
+syncComplete2=Synced at {time}
+
+# 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=**** On this computer: ****
 
 # Tooltips for toolbar buttons
 fontSizeTitle=Font Size

From f2aee0bd0f298d1cb668913fbb99aa1c0fb96cbf Mon Sep 17 00:00:00 2001
From: vladikoff <vlad.filippov@gmail.com>
Date: Fri, 1 Dec 2017 10:03:59 -0500
Subject: [PATCH 2/2] Fix typo in description for sync

---
 locales/en-US/notes.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/en-US/notes.properties b/locales/en-US/notes.properties
index d6eb21dce..96fe51735 100644
--- a/locales/en-US/notes.properties
+++ b/locales/en-US/notes.properties
@@ -33,7 +33,7 @@ disableSync=Disable Sync
 # structure doesn't work for your locale, you can translate this as "Saved ({time})".
 savedComplete2=Saved at {time}
 
-# LOCALIZATION NOTE (syncComplete2): {time} is the time of saving. Such as 5:33pm or 17:33. If this
+# 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=Synced at {time}