Bug 571902 - Land sync and crypto components on trunk [r=mconnor]
authorPhilipp von Weitershausen <philipp@weitershausen.de>
Fri, 18 Jun 2010 17:21:08 -0700
changeset 109 4bbc3b1a226429ed7ffe0cd1fdc02c5827cacd8f
parent 108 e86a113973b50e0dc014d9d627dafbcfaea73c3a
child 110 cccb85406e1dcc228431ec4cc69732541cdea396
push id6
push usermconnor@mozilla.com
push dateMon, 27 Sep 2010 14:46:39 +0000
reviewersmconnor
bugs571902
Bug 571902 - Land sync and crypto components on trunk [r=mconnor] Harmonize locale directory structure with mozilla-central conventions.
services/errors.properties
services/sync.properties
deleted file mode 100644
--- a/services/errors.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-error.login.reason.network    = Failed to connect to the server
-error.login.reason.passphrase = Wrong secret phrase
-error.login.reason.password   = Incorrect username or password
-error.login.reason.no_password= No saved password to use
-error.login.reason.no_passphrase= No saved secret phrase to use
-error.login.reason.server     = Server incorrectly configured
-
-error.sync.failed_partial     = One or more data types could not be synced
-
-invalid-captcha = Incorrect words, try again
-weak-password   = Use a stronger password
-
-# this is the fallback, if we hit an error we didn't bother to localize
-error.reason.unknown          = Unknown error
-
-change.passphrase.ppSameAsPassphrase = The secret phrase cannot be the same as your current secret phrase
-change.passphrase.ppSameAsPassword   = The secret phrase cannot be the same as your password
-change.passphrase.ppSameAsUsername   = The secret phrase cannot be the same as your user name
-change.passphrase.mismatch           = The phrases entered do not match
-change.passphrase.tooShort           = The secret phrase entered is too short
-
-change.password.pwSameAsPassphrase   = Password can't match secret phrase
-change.password.pwSameAsPassword     = Password can't match current password
-change.password.pwSameAsUsername     = Password can't match your user name
-change.password.mismatch             = The passwords entered do not match
-change.password.tooShort             = The password entered is too short
deleted file mode 100644
--- a/services/sync.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-# %1: the user name (Ed), %2: the app name (Firefox), %3: the operating system (Android)
-client.name2 = %1$S's %2$S on %3$S
-
-# %S is the date and time at which the last sync successfully completed
-lastSync.label = Last Update: %S
-lastSyncInProgress.label = Last Update: in progress…
-
-# %S is the username logged in
-connected.label = Connected: %S
-disconnected.label = Disconnected
-connecting.label = Connecting…
-
-mobile.label = Mobile Bookmarks
-
-remote.pending.label = Remote tabs are being synced…
-remote.missing.label = Sync your other computers again to access their tabs
-remote.opened.label = All remote tabs are already open
-remote.notification.label = Recent desktop tabs will be available once they sync
-
-error.login.title = Error While Signing In
-error.login.description = Sync encountered an error while connecting: %1$S.  Please try again.
-error.login.prefs.label = Preferences…
-error.login.prefs.accesskey = P
-# should decide if we're going to show this
-error.logout.title = Error While Signing Out
-error.logout.description = Sync encountered an error while connecting.  It's probably ok, and you don't have to do anything about it.
-error.sync.title = Error While Syncing
-error.sync.description = Sync encountered an error while syncing: %1$S.  Sync will automatically retry this action.
-error.sync.no_node_found = The Sync server is a little busy right now, but you don't need to do anything about it.  We'll start syncing your data as soon as we can!
-error.sync.no_node_found.title = Sync Delay
-error.sync.needUpdate.description = You need to update Firefox Sync to continue syncing your data.
-error.sync.needUpdate.label = Update Firefox Sync
-error.sync.needUpdate.accesskey = U
-error.sync.tryAgainButton.label = Sync Now
-error.sync.tryAgainButton.accesskey = S
-
-tabs.fromOtherComputers.label = Tabs From Other Computers