mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
gecko-dev/mobile/android/services/strings.xml.in

87 строки
6.4 KiB
XML
Исходник Обычный вид История

Bug 716478 - update licence to MPL 2.
2012-05-21 15:12:37 +04:00
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
Bug 1243821 - Remove unused Old Sync strings. r=nalexander MozReview-Commit-ID: 48Nm8SxZEbG --HG-- extra : histedit_source : fb43607451033e9019c05f39e324597a84fc6a90
2016-02-02 23:32:25 +03:00
<!-- Configure Engines -->
<string name="sync_configure_engines_title_passwords">&sync.configure.engines.title.passwords2;</string>
<string name="sync_configure_engines_title_history">&sync.configure.engines.title.history;</string>
<string name="sync_configure_engines_title_tabs">&sync.configure.engines.title.tabs;</string>
<!-- Bookmark folder strings -->
<string name="bookmarks_folder_menu">&bookmarks.folder.menu.label;</string>
<string name="bookmarks_folder_places">&bookmarks.folder.places.label;</string>
<string name="bookmarks_folder_tags">&bookmarks.folder.tags.label;</string>
<string name="bookmarks_folder_toolbar">&bookmarks.folder.toolbar.label;</string>
Bug 1257599 - Rename 'Unsorted Bookmarks' into 'Other Bookmarks'. r=jaws a=kwierso MozReview-Commit-ID: 7iMM0vg9rUo
2016-04-01 02:17:30 +03:00
<string name="bookmarks_folder_unfiled">&bookmarks.folder.other.label;</string>
Bug 1243821 - Remove unused Old Sync strings. r=nalexander MozReview-Commit-ID: 48Nm8SxZEbG --HG-- extra : histedit_source : fb43607451033e9019c05f39e324597a84fc6a90
2016-02-02 23:32:25 +03:00
<string name="bookmarks_folder_desktop">&bookmarks.folder.desktop.label;</string>
<string name="bookmarks_folder_mobile">&bookmarks.folder.mobile.label;</string>
<string name="bookmarks_folder_pinned">&bookmarks.folder.pinned.label;</string>
<!-- Send tab to device. -->
<string name="sync_default_client_name">&sync.default.client.name;</string>
Bug 808813 - Part 2: Implement Firefox Account Android account type. r=rnewman
2013-09-14 01:52:27 +04:00
Bug 974133 - Replace "Firefox account" with "Firefox Account". r=rnewman
2014-03-14 09:31:54 +04:00
<!-- Firefox Account links. -->
Bug 965867 - Update final URLs for Android Firefox Accounts landing. r=rnewman
2014-01-31 05:59:30 +04:00
<string name="fxaccount_link_tos">https://accounts.firefox.com/legal/terms</string>
<string name="fxaccount_link_pn">https://accounts.firefox.com/legal/privacy</string>
Bug 965376 - Update final copy for Android Firefox Accounts. r=me --HG-- extra : amend_source : a5dc69864bc0e9ba4e834184f7f2d8525f75995a
2014-01-30 01:02:44 +04:00
<string name="fxaccount_getting_started_welcome_to_sync">&fxaccount_getting_started_welcome_to_sync;</string>
Bug 1136477 - Unify terminology of Passwords/Logins for about:logins (nee about:passwords).2/2.r=liuche
2015-06-26 22:54:35 +03:00
<string name="fxaccount_getting_started_description">&fxaccount_getting_started_description2;</string>
Bug 965376 - Update final copy for Android Firefox Accounts. r=me --HG-- extra : amend_source : a5dc69864bc0e9ba4e834184f7f2d8525f75995a
2014-01-30 01:02:44 +04:00
<string name="fxaccount_getting_started_get_started">&fxaccount_getting_started_get_started;</string>
Bug 977336 - Support action bar 'up' for FxAccountStatusActivity. r=rnewman
2014-03-04 03:20:19 +04:00
<string name="fxaccount_status_activity_label">&syncBrand.shortName.label;</string>
Bug 977358 - Replace status activity header with 'Signed in as'. r=rnewman
2014-03-04 03:20:20 +04:00
<string name="fxaccount_status_signed_in_as">&fxaccount_status_signed_in_as;</string>
Bug 1205418 - Add "Manage account" link to Status Activity. r=vivek This just directs to about:accounts?action=manage, which determines the relevant URL and displays the web content. Nota bene: about:accounts hasn't landed yet. --HG-- extra : commitid : LCGuHdfDl9B extra : rebase_source : 4a1ae71b6de0eec792a4a8eb499abf03d95d2c51 extra : histedit_source : 1fc484124924836a60c77cde487f5f039ad80d55
2015-09-11 02:36:29 +03:00
<string name="fxaccount_status_manage_account">&fxaccount_status_manage_account;</string>
Bug 1022749 - Show custom server URLs in setup activities. r=rnewman ======== https://github.com/mozilla-services/android-sync/commit/cf613656fe5c17518ff4c463f4ccdbc0f428c28d Author: Nick Alexander <nalexander@mozilla.com> Bug 1022749 - Part 2: Show custom server URLs in status activity. ======== https://github.com/mozilla-services/android-sync/commit/91268a261f131af13209e8d906e5ed74713a0fcf Author: Nick Alexander <nalexander@mozilla.com> Bug 1022749 - Part 1: Show custom server URLs in setup activities.
2014-06-10 04:31:58 +04:00
<string name="fxaccount_status_auth_server">&fxaccount_status_auth_server;</string>
Bug 966103 - Add a 'Sync now' button to the main FxA status screen. r=nalexander,rnewman
2014-11-14 02:34:45 +03:00
<string name="fxaccount_status_sync_now">&fxaccount_status_sync_now;</string>
Bug 966103 - Follow-up: Replace three dots with ellipsis. r=flod
2014-11-14 21:00:14 +03:00
<string name="fxaccount_status_syncing">&fxaccount_status_syncing2;</string>
Bug 966103 - Add a 'Sync now' button to the main FxA status screen. r=nalexander,rnewman
2014-11-14 02:34:45 +03:00
<string name="fxaccount_status_last_synced">&remote_tabs_last_synced;</string>
Bug 1124193 - Follow-up: Reland part of first synced date is wrong on first sync. r=nalexander I didn't backport this to android-sync correctly, so it got trampled. --HG-- extra : rebase_source : 8f06e8b1c67b72aea7e6c38a438bf2f83ce390c5 extra : source : da5bf8c21c13c738c02419e35e12ab3581af390b
2015-02-18 16:18:00 +03:00
<string name="fxaccount_status_never_synced">&remote_tabs_never_synced;</string>
Bug 788688 - Allow setting client's device name in FxAccountStatusActivity. r=rnewman ======== https://github.com/mozilla-services/android-sync/commit/8c7b2531420892398d6b86eef52b0b472908e53e Author: Nick Alexander <nalexander@mozilla.com> Date: Tue Jun 3 15:48:40 2014 -0700 Bug 788688 - Review comment: Include timestamp in setClientName. ======== https://github.com/mozilla-services/android-sync/commit/b53b9092c20a317b0ebb4eef0d3618c12d4c6407 Author: Nick Alexander <nalexander@mozilla.com> Date: Thu May 29 16:05:25 2014 -0700 Bug 788688 - Post: PII client data to ease debugging. ======== https://github.com/mozilla-services/android-sync/commit/fd59f3c984b4a6c480cf045ca810e298ced826d5 Author: Nick Alexander <nalexander@mozilla.com> Date: Wed Jun 4 15:01:12 2014 -0700 Bug 788688 - Part 4: Work around Android DialogPreference caching bug. ======== https://github.com/mozilla-services/android-sync/commit/87d10bc16aaf59d463e187bb5879728152367cfc Author: Nick Alexander <nalexander@mozilla.com> Date: Thu May 29 14:44:24 2014 -0700 Bug 788688 - Part 3: Add "Device name" pref to Status activity. In the edge case where what the user has entered (empty text) and what is persisted (default client name) differ, Android does not update the contents of the dialog's EditText correctly. Removing and re-creating all preferences is the only way I found to work around this; that's in the next commit. ======== https://github.com/mozilla-services/android-sync/commit/7af72f6c2ff9099b957cc562cc3f71ee3cb1f49b Author: Nick Alexander <nalexander@mozilla.com> Date: Thu May 29 16:05:59 2014 -0700 Bug 788688 - Part 2: Upload clients and tabs records when client name changes. ======== https://github.com/mozilla-services/android-sync/commit/0e99eae1b5fe5e79dd3a8030bfca4aef64e22703 Author: Nick Alexander <nalexander@mozilla.com> Date: Thu May 29 15:28:36 2014 -0700 Bug 788688 - Part 1: Add setClientName with timestamp to ClientsDataDelegate. ======== https://github.com/mozilla-services/android-sync/commit/1999e263dbee7340c1f2ad312813561520805700 Author: Nick Alexander <nalexander@mozilla.com> Date: Thu May 29 14:10:40 2014 -0700 Bug 788688 - Pre: Clean some imports.
2014-06-05 03:37:25 +04:00
<string name="fxaccount_status_device_name">&fxaccount_status_device_name;</string>
Bug 1022749 - Show custom server URLs in setup activities. r=rnewman ======== https://github.com/mozilla-services/android-sync/commit/cf613656fe5c17518ff4c463f4ccdbc0f428c28d Author: Nick Alexander <nalexander@mozilla.com> Bug 1022749 - Part 2: Show custom server URLs in status activity. ======== https://github.com/mozilla-services/android-sync/commit/91268a261f131af13209e8d906e5ed74713a0fcf Author: Nick Alexander <nalexander@mozilla.com> Bug 1022749 - Part 1: Show custom server URLs in setup activities.
2014-06-10 04:31:58 +04:00
<string name="fxaccount_status_sync_server">&fxaccount_status_sync_server;</string>
Bug 965376 - Update final copy for Android Firefox Accounts. r=me --HG-- extra : amend_source : a5dc69864bc0e9ba4e834184f7f2d8525f75995a
2014-01-30 01:02:44 +04:00
<string name="fxaccount_status_sync">&fxaccount_status_sync;</string>
<string name="fxaccount_status_sync_enabled">&fxaccount_status_sync_enabled;</string>
Bug 966386 - Final tweaks from Android Firefox Accounts UX sign off. r=rnewman
2014-02-01 03:57:41 +04:00
<string name="fxaccount_status_needs_verification">&fxaccount_status_needs_verification2;</string>
Bug 965376 - Update final copy for Android Firefox Accounts. r=me --HG-- extra : amend_source : a5dc69864bc0e9ba4e834184f7f2d8525f75995a
2014-01-30 01:02:44 +04:00
<string name="fxaccount_status_needs_credentials">&fxaccount_status_needs_credentials;</string>
<string name="fxaccount_status_needs_upgrade">&fxaccount_status_needs_upgrade;</string>
Bug 983856 - Message when syncing is disabled by Android. r=rnewman
2014-03-27 09:11:05 +04:00
<string name="fxaccount_status_needs_master_sync_automatically_enabled">&fxaccount_status_needs_master_sync_automatically_enabled;</string>
Bug 1113415 - Make master sync instructions depend on Android version. r=nalexander ======== https://github.com/mozilla-services/android-sync/commit/7d643a54cb5fb06be62bf48950e76a83cdfc17bb Author: Prabhjyot Singh Sodhi <prabhjyotsingh95@gmail.com> Bug 1113415 - Make master sync instructions depend on Android version. --HG-- extra : rebase_source : 9d7c1479784add321e8d3ee9c59b3d1f99f5c2e4
2015-01-08 22:05:18 +03:00
<string name="fxaccount_status_needs_master_sync_automatically_enabled_v21">&fxaccount_status_needs_master_sync_automatically_enabled_v21;</string>
Bug 1098667 - Part 1: Import from android-sync. r=rnewman --HG-- extra : rebase_source : afa367b0bb0002a6cfda4a1531bc7c47a5f0effa extra : source : 705b1be87804d5e3427eb433f6445ef055857a89
2014-11-26 03:18:53 +03:00
<string name="fxaccount_status_needs_finish_migrating">&fxaccount_status_needs_finish_migrating;</string>
Bug 965376 - Update final copy for Android Firefox Accounts. r=me --HG-- extra : amend_source : a5dc69864bc0e9ba4e834184f7f2d8525f75995a
2014-01-30 01:02:44 +04:00
<string name="fxaccount_status_bookmarks">&fxaccount_status_bookmarks;</string>
<string name="fxaccount_status_history">&fxaccount_status_history;</string>
Bug 1136477 - Unify terminology of Passwords/Logins for about:logins (nee about:passwords).2/2.r=liuche
2015-06-26 22:54:35 +03:00
<string name="fxaccount_status_passwords">&fxaccount_status_passwords2;</string>
Bug 965376 - Update final copy for Android Firefox Accounts. r=me --HG-- extra : amend_source : a5dc69864bc0e9ba4e834184f7f2d8525f75995a
2014-01-30 01:02:44 +04:00
<string name="fxaccount_status_tabs">&fxaccount_status_tabs;</string>
<string name="fxaccount_status_legal">&fxaccount_status_legal;</string>
Bug 1255204 - Use sentence casing in Settings prefs. r=margaret - Clear Private Data > Clear private data Sync ----- - Terms of Service > Terms of service - Privacy Notice > Privacy notice Privacy ----- - Tracking protection > Tracking Protection --HG-- extra : histedit_source : 0dba954af1df974035430fb589570501b88a8272
2016-03-20 08:54:00 +03:00
<string name="fxaccount_status_linktos">&fxaccount_status_linktos2;</string>
<string name="fxaccount_status_linkprivacy">&fxaccount_status_linkprivacy2;</string>
Bug 984503 - Add "Remove Firefox Account" menu option to FxAccount status activity. r=nalexander,rnewman The menu is exposed as "More..." on devices that do not have a hardware menu button. ======== https://github.com/mozilla-services/android-sync/commit/8adeb1be5750f32201688462239a9cbcbb3731b2 Author: Nick Alexander <nalexander@mozilla.com> Bug 984503 - Part 4: Show a toast after removing Firefox Account. ======== https://github.com/mozilla-services/android-sync/commit/aeffca77dc3bca2a126e084e8b55576f1b702b54 Author: Nick Alexander <nalexander@mozilla.com> Bug 984503 - Part 3: Hide "More..." option if device has a hardware menu button. The reason for this dance is to keep the "Remove Account" button out of view if at all possible. I don't want to make it too easy to delete your account. ======== https://github.com/mozilla-services/android-sync/commit/4efe597308508722dd199bd5e0ad1e5293e0af3e Author: Nick Alexander <nalexander@mozilla.com> Date: Thu Aug 28 15:04:38 2014 -0700 Bug 984503 - Part 2: Add "More..." to Firefox Account status list. ======== https://github.com/mozilla-services/android-sync/commit/ad6a55dc33cf062724fd780dc766f97ac74dd91d Author: vivek <vivekb.balakrishnan@gmail.com> Date: Thu Aug 21 00:25:30 2014 +0300 Bug 984503 - Part 1: Add menu option to remove Firefox Account.
2014-08-29 02:05:11 +04:00
<string name="fxaccount_status_more">&fxaccount_status_more;</string>
Bug 1205817 - Move "Remove Account" out of menu. r=vivek
2015-10-07 14:29:00 +03:00
<string name="fxaccount_remove_account">&fxaccount_remove_account;</string>
Bug 965376 - Update final copy for Android Firefox Accounts. r=me --HG-- extra : amend_source : a5dc69864bc0e9ba4e834184f7f2d8525f75995a
2014-01-30 01:02:44 +04:00
Bug 966386 - Final tweaks from Android Firefox Accounts UX sign off. r=rnewman
2014-02-01 03:57:41 +04:00
<string name="fxaccount_label">&fxaccount_account_type_label;</string>
Bug 965376 - Update final copy for Android Firefox Accounts. r=me --HG-- extra : amend_source : a5dc69864bc0e9ba4e834184f7f2d8525f75995a
2014-01-30 01:02:44 +04:00
<string name="fxaccount_options_title">&fxaccount_options_title;</string>
<string name="fxaccount_options_configure_title">&fxaccount_options_configure_title;</string>
<string name="fxaccount_remote_error_UPGRADE_REQUIRED">&fxaccount_remote_error_UPGRADE_REQUIRED;</string>
Bug 966106 - Detect existing accounts during account creation, and offer to sign in. r=nalexander
2014-02-01 02:23:20 +04:00
<string name="fxaccount_remote_error_ATTEMPT_TO_CREATE_AN_ACCOUNT_THAT_ALREADY_EXISTS">&fxaccount_remote_error_ATTEMPT_TO_CREATE_AN_ACCOUNT_THAT_ALREADY_EXISTS_2;</string>
Bug 965376 - Update final copy for Android Firefox Accounts. r=me --HG-- extra : amend_source : a5dc69864bc0e9ba4e834184f7f2d8525f75995a
2014-01-30 01:02:44 +04:00
<string name="fxaccount_remote_error_ATTEMPT_TO_ACCESS_AN_ACCOUNT_THAT_DOES_NOT_EXIST">&fxaccount_remote_error_ATTEMPT_TO_ACCESS_AN_ACCOUNT_THAT_DOES_NOT_EXIST;</string>
<string name="fxaccount_remote_error_INCORRECT_PASSWORD">&fxaccount_remote_error_INCORRECT_PASSWORD;</string>
<string name="fxaccount_remote_error_ATTEMPT_TO_OPERATE_ON_AN_UNVERIFIED_ACCOUNT">&fxaccount_remote_error_ATTEMPT_TO_OPERATE_ON_AN_UNVERIFIED_ACCOUNT;</string>
<string name="fxaccount_remote_error_CLIENT_HAS_SENT_TOO_MANY_REQUESTS">&fxaccount_remote_error_CLIENT_HAS_SENT_TOO_MANY_REQUESTS;</string>
<string name="fxaccount_remote_error_SERVICE_TEMPORARILY_UNAVAILABLE_TO_DUE_HIGH_LOAD">&fxaccount_remote_error_SERVICE_TEMPORARILY_UNAVAILABLE_TO_DUE_HIGH_LOAD;</string>
<string name="fxaccount_remote_error_UNKNOWN_ERROR">&fxaccount_remote_error_UNKNOWN_ERROR;</string>
Bug 1080242 - Surface 'Account locked' status. r=rnewman --HG-- extra : rebase_source : 56a7d340960673d6244ae796755935d89885e986
2014-11-26 04:43:04 +03:00
<string name="fxaccount_remote_error_ACCOUNT_LOCKED">&fxaccount_remote_error_ACCOUNT_LOCKED;</string>
Bug 965376 - Update final copy for Android Firefox Accounts. r=me --HG-- extra : amend_source : a5dc69864bc0e9ba4e834184f7f2d8525f75995a
2014-01-30 01:02:44 +04:00
Bug 966386 - Final tweaks from Android Firefox Accounts UX sign off. r=rnewman
2014-02-01 03:57:41 +04:00
<string name="fxaccount_sync_sign_in_error_notification_title">&fxaccount_sync_sign_in_error_notification_title2;</string>
<string name="fxaccount_sync_sign_in_error_notification_text">&fxaccount_sync_sign_in_error_notification_text2;</string>
Bug 984503 - Add "Remove Firefox Account" menu option to FxAccount status activity. r=nalexander,rnewman The menu is exposed as "More..." on devices that do not have a hardware menu button. ======== https://github.com/mozilla-services/android-sync/commit/8adeb1be5750f32201688462239a9cbcbb3731b2 Author: Nick Alexander <nalexander@mozilla.com> Bug 984503 - Part 4: Show a toast after removing Firefox Account. ======== https://github.com/mozilla-services/android-sync/commit/aeffca77dc3bca2a126e084e8b55576f1b702b54 Author: Nick Alexander <nalexander@mozilla.com> Bug 984503 - Part 3: Hide "More..." option if device has a hardware menu button. The reason for this dance is to keep the "Remove Account" button out of view if at all possible. I don't want to make it too easy to delete your account. ======== https://github.com/mozilla-services/android-sync/commit/4efe597308508722dd199bd5e0ad1e5293e0af3e Author: Nick Alexander <nalexander@mozilla.com> Date: Thu Aug 28 15:04:38 2014 -0700 Bug 984503 - Part 2: Add "More..." to Firefox Account status list. ======== https://github.com/mozilla-services/android-sync/commit/ad6a55dc33cf062724fd780dc766f97ac74dd91d Author: vivek <vivekb.balakrishnan@gmail.com> Date: Thu Aug 21 00:25:30 2014 +0300 Bug 984503 - Part 1: Add menu option to remove Firefox Account.
2014-08-29 02:05:11 +04:00
<!-- Remove Account -->
<string name="fxaccount_remove_account_dialog_title">&fxaccount_remove_account_dialog_title;</string>
<string name="fxaccount_remove_account_dialog_message">&fxaccount_remove_account_dialog_message;</string>
<string name="fxaccount_remove_account_toast">&fxaccount_remove_account_toast;</string>
Bug 1098667 - Part 1: Import from android-sync. r=rnewman --HG-- extra : rebase_source : afa367b0bb0002a6cfda4a1531bc7c47a5f0effa extra : source : 705b1be87804d5e3427eb433f6445ef055857a89
2014-11-26 03:18:53 +03:00
<string name="fxaccount_sync_finish_migrating_notification_title">&fxaccount_sync_finish_migrating_notification_title;</string>
<string name="fxaccount_sync_finish_migrating_notification_text">&fxaccount_sync_finish_migrating_notification_text;</string>
Bug 1178378 - Debug personal information exposed as Menu item r=nalexander --HG-- extra : commitid : IQ3uFEOoKYE extra : rebase_source : 5ab5944e7d9101faafa677265b499c752f34f959 extra : histedit_source : f422e6be27c8780314b89b38e1e9f62356bb1bcd
2015-07-02 22:26:35 +03:00
<!-- Log Personal information -->
Bug 1205418 - Add "Manage account" link to Status Activity. r=vivek This just directs to about:accounts?action=manage, which determines the relevant URL and displays the web content. Nota bene: about:accounts hasn't landed yet. --HG-- extra : commitid : LCGuHdfDl9B extra : rebase_source : 4a1ae71b6de0eec792a4a8eb499abf03d95d2c51 extra : histedit_source : 1fc484124924836a60c77cde487f5f039ad80d55
2015-09-11 02:36:29 +03:00
<string name="fxaccount_enable_debug_mode">&fxaccount_enable_debug_mode;</string>