wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1136477 - Unify terminology of Passwords/Logins for about:logins (nee about:passwords).2/2.r=liuche

Browse Source
This commit is contained in:
Allison Naaktgeboren 2015-06-26 12:54:35 -07:00
parent 80c46b674d
commit 65f8d0ae5e
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mobile/android/base/locales/en-US/android_strings.dtd
View File

@ -136,7 +136,7 @@
<!ENTITY pref_category_display "Display">
<!ENTITY pref_category_display_summary "Text, title bar, full-screen browsing">
<!ENTITY pref_category_privacy_short "Privacy">
<!ENTITY pref_category_privacy_summary "Control passwords, cookies, tracking, data">
<!ENTITY pref_category_privacy_summary2 "Control logins, cookies, tracking, data">
<!ENTITY pref_category_vendor "&vendorShortName;">
<!ENTITY pref_category_vendor_summary "About &brandShortName;, FAQs, data choices">
<!ENTITY pref_category_datareporting "Data choices">
@ -155,7 +155,7 @@
<!ENTITY pref_category_devtools "Developer tools">
<!ENTITY pref_developer_remotedebugging "Remote debugging">
<!ENTITY pref_category_logins "Logins">
<!ENTITY pref_remember_signons "Remember passwords">
<!ENTITY pref_remember_signons2 "Remember logins">
<!ENTITY pref_open_external_urls_privately_title "Open links in Private browsing">
<!ENTITY pref_open_external_urls_privately_summary "For all external links opened in &brandShortName;">
<!ENTITY pref_manage_logins "Manage logins">
@ -253,7 +253,7 @@ size. -->
<!ENTITY pref_use_master_password "Use master password">
<!ENTITY pref_sync "Sync">
<!ENTITY pref_sync_summary "Sync your tabs, bookmarks, passwords, history">
<!ENTITY pref_sync_summary2 "Sync your tabs, bookmarks, logins, history">
<!ENTITY pref_search_suggestions "Show search suggestions">
<!ENTITY pref_import_android "Import from Android">
<!ENTITY pref_import_android_summary "Import bookmarks and history from the native browser">
@ -261,7 +261,7 @@ size. -->
<!ENTITY pref_private_data_searchHistory "Search history">
<!ENTITY pref_private_data_formdata2 "Form history">
<!ENTITY pref_private_data_cookies2 "Cookies &amp; active logins">
<!ENTITY pref_private_data_passwords "Saved passwords">
<!ENTITY pref_private_data_passwords2 "Saved logins">
<!ENTITY pref_private_data_cache "Cache">
<!ENTITY pref_private_data_offlineApps "Offline website data">
<!ENTITY pref_private_data_siteSettings2 "Site settings">
@ -610,7 +610,7 @@ just addresses the organization to follow, e.g. "This site is run by " -->
<!ENTITY guest_session_dialog_continue "Continue">
<!ENTITY guest_session_dialog_cancel "Cancel">
<!ENTITY new_guest_session_title "&brandShortName; will now restart">
<!ENTITY new_guest_session_text "The person using it will not be able to see any of your personal browsing data (like saved passwords, history or bookmarks).\n\nWhen your guest is done, their browsing data will be deleted and your session will be restored.">
<!ENTITY new_guest_session_text2 "The person using it will not be able to see any of your personal browsing data (like saved logins, history or bookmarks).\n\nWhen your guest is done, their browsing data will be deleted and your session will be restored.">
<!ENTITY guest_browsing_notification_title "Guest browsing is enabled">
<!ENTITY guest_browsing_notification_text "Tap to exit">

6
mobile/android/base/locales/en-US/sync_strings.dtd
View File

@ -62,7 +62,7 @@
<!ENTITY sync.configure.engines.title.label 'What to sync'>
<!ENTITY sync.configure.engines.sync.my.title.label 'Sync your…'>
<!ENTITY sync.configure.engines.title.bookmarks 'Bookmarks'>
<!ENTITY sync.configure.engines.title.passwords 'Passwords'>
<!ENTITY sync.configure.engines.title.passwords2 'Logins'>
<!ENTITY sync.configure.engines.title.history 'History'>
<!ENTITY sync.configure.engines.title.tabs 'Tabs'>
@ -141,7 +141,7 @@
<!ENTITY fxaccount_policy_linkprivacy 'Privacy Notice'>
<!ENTITY fxaccount_getting_started_welcome_to_sync 'Welcome to &syncBrand.shortName.label;'>
<!ENTITY fxaccount_getting_started_description 'Sign in to sync your tabs, bookmarks, passwords &amp; more.'>
<!ENTITY fxaccount_getting_started_description2 'Sign in to sync your tabs, bookmarks, logins &amp; more.'>
<!ENTITY fxaccount_getting_started_get_started 'Get started'>
<!ENTITY fxaccount_getting_started_old_firefox 'Using an older version of &syncBrand.shortName.label;?'>
@ -212,7 +212,7 @@
<!ENTITY fxaccount_status_needs_finish_migrating 'Tap to sign in to your new Firefox Account.'>
<!ENTITY fxaccount_status_bookmarks 'Bookmarks'>
<!ENTITY fxaccount_status_history 'History'>
<!ENTITY fxaccount_status_passwords 'Passwords'>
<!ENTITY fxaccount_status_passwords2 'Logins'>
<!ENTITY fxaccount_status_tabs 'Open tabs'>
<!ENTITY fxaccount_status_legal 'Legal' >
<!-- Localization note: when tapped, the following two strings link to

10
mobile/android/base/strings.xml.in
View File

@ -134,7 +134,7 @@
<string name="pref_category_display">&pref_category_display;</string>
<string name="pref_category_display_summary">&pref_category_display_summary;</string>
<string name="pref_category_privacy_short">&pref_category_privacy_short;</string>
<string name="pref_category_privacy_summary">&pref_category_privacy_summary;</string>
<string name="pref_category_privacy_summary">&pref_category_privacy_summary2;</string>
<string name="pref_category_vendor">&pref_category_vendor;</string>
<string name="pref_category_vendor_summary">&pref_category_vendor_summary;</string>
<string name="pref_category_datareporting">&pref_category_datareporting;</string>
@ -176,7 +176,7 @@
<string name="pref_learn_more">&pref_learn_more;</string>
<string name="pref_category_logins">&pref_category_logins;</string>
<string name="pref_remember_signons">&pref_remember_signons;</string>
<string name="pref_remember_signons">&pref_remember_signons2;</string>
<string name="pref_open_external_urls_privately_title">&pref_open_external_urls_privately_title;</string>
<string name="pref_open_external_urls_privately_summary">&pref_open_external_urls_privately_summary;</string>
@ -223,13 +223,13 @@
<string name="pref_restore_always">&pref_restore_always;</string>
<string name="pref_restore_quit">&pref_restore_quit;</string>
<string name="pref_sync">&pref_sync;</string>
<string name="pref_sync_summary">&pref_sync_summary;</string>
<string name="pref_sync_summary">&pref_sync_summary2;</string>
<string name="pref_search_suggestions">&pref_search_suggestions;</string>
<string name="pref_private_data_history2">&pref_private_data_history2;</string>
<string name="pref_private_data_searchHistory">&pref_private_data_searchHistory;</string>
<string name="pref_private_data_formdata2">&pref_private_data_formdata2;</string>
<string name="pref_private_data_cookies2">&pref_private_data_cookies2;</string>
<string name="pref_private_data_passwords">&pref_private_data_passwords;</string>
<string name="pref_private_data_passwords">&pref_private_data_passwords2;</string>
<string name="pref_private_data_cache">&pref_private_data_cache;</string>
<string name="pref_private_data_offlineApps">&pref_private_data_offlineApps;</string>
<string name="pref_private_data_siteSettings">&pref_private_data_siteSettings2;</string>
@ -513,7 +513,7 @@
<string name="guest_session_dialog_continue">&guest_session_dialog_continue;</string>
<string name="guest_session_dialog_cancel">&guest_session_dialog_cancel;</string>
<string name="new_guest_session_title">&new_guest_session_title;</string>
<string name="new_guest_session_text">&new_guest_session_text;</string>
<string name="new_guest_session_text">&new_guest_session_text2;</string>
<string name="guest_browsing_notification_title">&guest_browsing_notification_title;</string>
<string name="guest_browsing_notification_text">&guest_browsing_notification_text;</string>

6
mobile/android/services/strings.xml.in
View File

@ -55,7 +55,7 @@
<string name="sync_configure_engines_title">&sync.configure.engines.title.label;</string>
<string name="sync_configure_engines_sync_my_title">&sync.configure.engines.sync.my.title.label;</string>
<string name="sync_configure_engines_title_bookmarks">&sync.configure.engines.title.bookmarks;</string>
<string name="sync_configure_engines_title_passwords">&sync.configure.engines.title.passwords;</string>
<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>
@ -132,7 +132,7 @@
<string name="fxaccount_policy_linkprivacy">&fxaccount_policy_linkprivacy;</string>
<string name="fxaccount_getting_started_welcome_to_sync">&fxaccount_getting_started_welcome_to_sync;</string>
<string name="fxaccount_getting_started_description">&fxaccount_getting_started_description;</string>
<string name="fxaccount_getting_started_description">&fxaccount_getting_started_description2;</string>
<string name="fxaccount_getting_started_get_started">&fxaccount_getting_started_get_started;</string>
<string name="fxaccount_getting_started_old_firefox">&fxaccount_getting_started_old_firefox;</string>
@ -203,7 +203,7 @@
<string name="fxaccount_status_needs_finish_migrating">&fxaccount_status_needs_finish_migrating;</string>
<string name="fxaccount_status_bookmarks">&fxaccount_status_bookmarks;</string>
<string name="fxaccount_status_history">&fxaccount_status_history;</string>
<string name="fxaccount_status_passwords">&fxaccount_status_passwords;</string>
<string name="fxaccount_status_passwords">&fxaccount_status_passwords2;</string>
<string name="fxaccount_status_tabs">&fxaccount_status_tabs;</string>
<string name="fxaccount_status_reading_list">&reading_list_title;</string>
<string name="fxaccount_status_legal">&fxaccount_status_legal;</string>

4
mobile/android/tests/browser/robocop/StringHelper.java
View File

@ -145,7 +145,7 @@ public class StringHelper {
public final String TRACKING_PROTECTION_LABEL;
public final String DNT_LABEL;
public final String COOKIES_LABEL;
public final String REMEMBER_PASSWORDS_LABEL;
public final String REMEMBER_LOGINS_LABEL;
public final String MANAGE_LOGINS_LABEL;
public final String MASTER_PASSWORD_LABEL;
public final String CLEAR_PRIVATE_DATA_LABEL;
@ -326,7 +326,7 @@ public class StringHelper {
TRACKING_PROTECTION_LABEL = res.getString(R.string.pref_tracking_protection_title);
DNT_LABEL = res.getString(R.string.pref_donottrack_title);
COOKIES_LABEL = res.getString(R.string.pref_cookies_menu);
REMEMBER_PASSWORDS_LABEL = res.getString(R.string.pref_remember_signons);
REMEMBER_LOGINS_LABEL = res.getString(R.string.pref_remember_signons);
MANAGE_LOGINS_LABEL = res.getString(R.string.pref_manage_logins);
MASTER_PASSWORD_LABEL = res.getString(R.string.pref_use_master_password);
CLEAR_PRIVATE_DATA_LABEL = res.getString(R.string.pref_clear_private_data);

2
mobile/android/tests/browser/robocop/testAboutLogins.js
View File

@ -43,7 +43,7 @@ function add_login(login) {
add_test(function password_setup() {
add_login(LOGIN_FIELDS);
// Load about:passwords.
// Load about:logins.
BrowserApp = Services.wm.getMostRecentWindow("navigator:browser").BrowserApp;
browser = BrowserApp.addTab("about:logins", { selected: true, parentId: BrowserApp.selectedTab.id }).browser;

4
mobile/android/tests/browser/robocop/testSettingsMenuItems.java
View File

@ -99,10 +99,10 @@ public class testSettingsMenuItems extends PixelTest {
TRACKING_PROTECTION_LABEL_ARR,
{ mStringHelper.DNT_LABEL },
{ mStringHelper.COOKIES_LABEL, "Enabled", "Enabled, excluding 3rd party", "Disabled" },
{ mStringHelper.REMEMBER_PASSWORDS_LABEL },
{ mStringHelper.REMEMBER_LOGINS_LABEL },
MANAGE_LOGINS_ARR,
{ mStringHelper.MASTER_PASSWORD_LABEL },
{ mStringHelper.CLEAR_PRIVATE_DATA_LABEL, "", "Browsing history", "Search history", "Downloads", "Form history", "Cookies & active logins", "Saved passwords", "Cache", "Offline website data", "Site settings", "Clear data" },
{ mStringHelper.CLEAR_PRIVATE_DATA_LABEL, "", "Browsing history", "Search history", "Downloads", "Form history", "Cookies & active logins", mStringHelper.CLEAR_PRIVATE_DATA_LABEL, "Cache", "Offline website data", "Site settings", "Clear data" },
};
PATH_MOZILLA = new String[] { mStringHelper.MOZILLA_SECTION_LABEL };