diff --git a/locales/en-US/notes.properties b/locales/en-US/notes.properties
index fa83165cd..96fe51735 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 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}
+
+# 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