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 710703 - Use "plugins" instead of "flash" in strings. r=mfinkle

Browse Source
This commit is contained in:
Margaret Leibovic 2011-12-19 11:43:39 -08:00
parent 6c364b00ad
commit c793a7040f
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,10 +62,10 @@
<!ENTITY pref_clear_history_confirm "Browsing history will be deleted">
<!ENTITY pref_clear_private_data "Clear private data">
<!ENTITY pref_clear_private_data_confirm "Browsing settings, including passwords and cookies, will be deleted">
<!ENTITY pref_enable_flash "Enable Flash">
<!ENTITY pref_enable_flash_yes "Yes">
<!ENTITY pref_enable_flash_tap_to_play "Tap To Play">
<!ENTITY pref_enable_flash_no "No">
<!ENTITY pref_enable_plugins "Enable Plugins">
<!ENTITY pref_enable_plugins_yes "Yes">
<!ENTITY pref_enable_plugins_tap_to_play "Tap To Play">
<!ENTITY pref_enable_plugins_no "No">
<!ENTITY pref_font_size "Font size">
<!ENTITY pref_font_size_small "Small">
<!ENTITY pref_font_size_medium "Medium">

10
mobile/android/base/resources/values/arrays.xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="pref_enable_flash_entries">
<item>@string/pref_enable_flash_yes</item>
<item>@string/pref_enable_flash_tap_to_play</item>
<item>@string/pref_enable_flash_no</item>
<string-array name="pref_enable_plugins_entries">
<item>@string/pref_enable_plugins_yes</item>
<item>@string/pref_enable_plugins_tap_to_play</item>
<item>@string/pref_enable_plugins_no</item>
</string-array>
<string-array name="pref_enable_flash_values">
<string-array name="pref_enable_plugins_values">
<item>1</item>
<item>2</item>
<item>0</item>

6
mobile/android/base/resources/xml/preferences.xml
View File

@ -20,9 +20,9 @@
android:persistent="false" />
<ListPreference android:key="plugin.enable"
android:title="@string/pref_enable_flash"
android:entries="@array/pref_enable_flash_entries"
android:entryValues="@array/pref_enable_flash_values"
android:title="@string/pref_enable_plugins"
android:entries="@array/pref_enable_plugins_entries"
android:entryValues="@array/pref_enable_plugins_values"
android:persistent="false" />
<ListPreference android:key="font.size.inflation.minTwips"

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

@ -68,10 +68,10 @@
<string name="pref_clear_history_confirm">&pref_clear_history_confirm;</string>
<string name="pref_clear_private_data">&pref_clear_private_data;</string>
<string name="pref_clear_private_data_confirm">&pref_clear_private_data_confirm;</string>
<string name="pref_enable_flash">&pref_enable_flash;</string>
<string name="pref_enable_flash_yes">&pref_enable_flash_yes;</string>
<string name="pref_enable_flash_tap_to_play">&pref_enable_flash_tap_to_play;</string>
<string name="pref_enable_flash_no">&pref_enable_flash_no;</string>
<string name="pref_enable_plugins">&pref_enable_plugins;</string>
<string name="pref_enable_plugins_yes">&pref_enable_plugins_yes;</string>
<string name="pref_enable_plugins_tap_to_play">&pref_enable_plugins_tap_to_play;</string>
<string name="pref_enable_plugins_no">&pref_enable_plugins_no;</string>
<string name="pref_font_size">&pref_font_size;</string>
<string name="pref_font_size_small">&pref_font_size_small;</string>
<string name="pref_font_size_medium">&pref_font_size_medium;</string>

6
mobile/android/chrome/content/browser.js
View File

@ -3207,16 +3207,16 @@ var ClipboardHelper = {
var PluginHelper = {
showDoorHanger: function(aTab) {
let message = Strings.browser.GetStringFromName("clickToPlayFlash.message");
let message = Strings.browser.GetStringFromName("clickToPlayPlugins.message");
let buttons = [
{
label: Strings.browser.GetStringFromName("clickToPlayFlash.yes"),
label: Strings.browser.GetStringFromName("clickToPlayPlugins.yes"),
callback: function() {
PluginHelper.playAllPlugins(aTab);
}
},
{
label: Strings.browser.GetStringFromName("clickToPlayFlash.no"),
label: Strings.browser.GetStringFromName("clickToPlayPlugins.no"),
callback: function() {
// Do nothing
}

6
mobile/android/locales/en-US/chrome/browser.properties
View File

@ -301,9 +301,9 @@ timer.start=%S: timer started
timer.end=%1$S: %2$Sms
# Click to play plugins
clickToPlayFlash.message=This page contains flash content. Would you like to play it?
clickToPlayFlash.yes=Yes
clickToPlayFlash.no=No
clickToPlayPlugins.message=This page contains plugin content. Would you like to play it?
clickToPlayPlugins.yes=Yes
clickToPlayPlugins.no=No
# Site settings dialog
# LOCALIZATION NOTE (siteSettings.labelToValue): This string will be used to