author | Margaret Leibovic <margaret.leibovic@gmail.com> |
Thu, 25 Apr 2013 15:27:28 -0700 | |
changeset 129937 | b9064e2ab1e2cce3194f1a34f77f7078364354bf |
parent 129936 | 60700432d0c95a7580f77da6474dc1349c7bd875 |
child 129938 | 4925cda1c972bd2caae3b1cfa66458ae7abaff8f |
push id | 27102 |
push user | mleibovic@mozilla.com |
push date | Thu, 25 Apr 2013 22:28:02 +0000 |
treeherder | mozilla-inbound@b9064e2ab1e2 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | wesj |
bugs | 786999 |
milestone | 23.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -167,25 +167,28 @@ size. --> <!ENTITY contextmenu_remove_bookmark "Remove"> <!ENTITY contextmenu_add_to_launcher "Add to Home Screen"> <!ENTITY contextmenu_share "Share"> <!ENTITY contextmenu_pasteandgo "Paste & Go"> <!ENTITY contextmenu_paste "Paste"> <!ENTITY contextmenu_copyurl "Copy Address"> <!ENTITY contextmenu_edit_bookmark "Edit"> <!ENTITY contextmenu_subscribe "Subscribe to Page"> +<!ENTITY contextmenu_site_settings "Edit Site Settings"> <!ENTITY history_removed "Page removed"> <!ENTITY bookmark_edit_title "Edit Bookmark"> <!ENTITY bookmark_edit_name "Name"> <!ENTITY bookmark_edit_location "Location"> <!ENTITY bookmark_edit_keyword "Keyword"> -<!ENTITY site_settings_title2 "Site Settingsā¦"> +<!-- Localization note (site_settings_*) : These strings are used in the "Site Settings" + dialog that appears after selecting the "Edit Site Settings" context menu item. --> +<!ENTITY site_settings_title3 "Site Settings"> <!ENTITY site_settings_cancel "Cancel"> <!ENTITY site_settings_clear "Clear"> <!ENTITY site_settings_no_settings "There are no settings to clear."> <!ENTITY reading_list "Reading List"> <!ENTITY reading_list_added "Page added to your Reading List"> <!ENTITY reading_list_removed "Page removed from your Reading List"> <!ENTITY reading_list_failed "Failed to add page to your Reading List">
--- a/mobile/android/base/resources/menu/titlebar_contextmenu.xml +++ b/mobile/android/base/resources/menu/titlebar_contextmenu.xml @@ -16,14 +16,14 @@ <item android:id="@+id/subscribe" android:title="@string/contextmenu_subscribe"/> <item android:id="@+id/copyurl" android:title="@string/contextmenu_copyurl"/> <item android:id="@+id/site_settings" - android:title="@string/site_settings_title" /> + android:title="@string/contextmenu_site_settings" /> <item android:id="@+id/add_to_launcher" android:title="@string/contextmenu_add_to_launcher"/> </menu>
--- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -146,17 +146,17 @@ <string name="char_encoding">&char_encoding;</string> <string name="new_tab">&new_tab;</string> <string name="new_private_tab">&new_private_tab;</string> <string name="close_all_tabs">&close_all_tabs;</string> <string name="tabs_normal">&tabs_normal;</string> <string name="tabs_private">&tabs_private;</string> <string name="tabs_synced">&tabs_synced;</string> - <string name="site_settings_title">&site_settings_title2;</string> + <string name="site_settings_title">&site_settings_title3;</string> <string name="site_settings_cancel">&site_settings_cancel;</string> <string name="site_settings_clear">&site_settings_clear;</string> <string name="site_settings_no_settings">&site_settings_no_settings;</string> <string name="reading_list">&reading_list;</string> <string name="reading_list_added">&reading_list_added;</string> <string name="reading_list_removed">&reading_list_removed;</string> <string name="reading_list_failed">&reading_list_failed;</string> @@ -170,16 +170,17 @@ <string name="contextmenu_remove_bookmark">&contextmenu_remove_bookmark;</string> <string name="contextmenu_add_to_launcher">&contextmenu_add_to_launcher;</string> <string name="contextmenu_share">&contextmenu_share;</string> <string name="contextmenu_pasteandgo">&contextmenu_pasteandgo;</string> <string name="contextmenu_paste">&contextmenu_paste;</string> <string name="contextmenu_copyurl">&contextmenu_copyurl;</string> <string name="contextmenu_edit_bookmark">&contextmenu_edit_bookmark;</string> <string name="contextmenu_subscribe">&contextmenu_subscribe;</string> + <string name="contextmenu_site_settings">&contextmenu_site_settings;</string> <string name="history_removed">&history_removed;</string> <string name="bookmark_edit_title">&bookmark_edit_title;</string> <string name="bookmark_edit_name">&bookmark_edit_name;</string> <string name="bookmark_edit_location">&bookmark_edit_location;</string> <string name="bookmark_edit_keyword">&bookmark_edit_keyword;</string>