diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /browser/components/migration/content/extra-migration-strings.properties | |
parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
download | UXP-2018.07.18.tar UXP-2018.07.18.tar.gz UXP-2018.07.18.tar.lz UXP-2018.07.18.tar.xz UXP-2018.07.18.zip |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'browser/components/migration/content/extra-migration-strings.properties')
-rw-r--r-- | browser/components/migration/content/extra-migration-strings.properties | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/browser/components/migration/content/extra-migration-strings.properties b/browser/components/migration/content/extra-migration-strings.properties deleted file mode 100644 index 208906b31..000000000 --- a/browser/components/migration/content/extra-migration-strings.properties +++ /dev/null @@ -1,14 +0,0 @@ -# Automigration undo notification. -# %1$S will be replaced with the name of the browser we imported from, %2$S will be replaced with brandShortName -automigration.undo.message.all = Pick up where you left off. We’ve imported these sites and your bookmarks, history and passwords from %1$S into %2$S. -automigration.undo.message.bookmarks = Pick up where you left off. We’ve imported these sites and your bookmarks from %1$S into %2$S. -automigration.undo.message.bookmarks.logins = Pick up where you left off. We’ve imported these sites and your bookmarks and passwords from %1$S into %2$S. -automigration.undo.message.bookmarks.visits = Pick up where you left off. We’ve imported these sites and your bookmarks and history from %1$S into %2$S. -automigration.undo.message.logins = Pick up where you left off. We’ve imported your passwords from %1$S into %2$S. -automigration.undo.message.logins.visits = Pick up where you left off. We’ve imported these sites and your history and passwords from %1$S into %2$S. -automigration.undo.message.visits = Pick up where you left off. We’ve imported these sites and your history from %1$S into %2$S. -automigration.undo.keep2.label = OK, Got it -automigration.undo.keep2.accesskey = O -automigration.undo.dontkeep2.label = No Thanks -automigration.undo.dontkeep2.accesskey = N -automigration.undo.unknownbrowser = Unknown Browser |