Changeset View
Changeset View
Standalone View
Standalone View
head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
| --- chrome/app/google_chrome_strings.grd.orig 2019-12-16 21:51:22 UTC | --- chrome/app/google_chrome_strings.grd.orig 2020-03-03 18:53:48 UTC | ||||
| +++ chrome/app/google_chrome_strings.grd | +++ chrome/app/google_chrome_strings.grd | ||||
| @@ -614,7 +614,7 @@ Google Chrome is unable to recover your settings. | @@ -635,7 +635,7 @@ Google Chrome is unable to recover your settings. | ||||
| </if> | </if> | ||||
| <!-- about:browser-switch strings --> | <!-- about:browser-switch strings --> | ||||
| - <if expr="is_win or is_macosx or (is_linux and not is_chromeos)"> | - <if expr="is_win or is_macosx or (is_linux and not is_chromeos)"> | ||||
| + <if expr="is_win or is_macosx or (is_posix and not is_chromeos)"> | + <if expr="is_win or is_macosx or (is_posix and not is_chromeos)"> | ||||
| <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> | <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> | ||||
| Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. | Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. | ||||
| </message> | </message> | ||||
| @@ -725,7 +725,7 @@ Google Chrome is unable to recover your settings. | @@ -739,7 +739,7 @@ Google Chrome is unable to recover your settings. | ||||
| </message> | </message> | ||||
| <!-- ProcessSingleton --> | <!-- ProcessSingleton --> | ||||
| - <if expr="is_linux or is_macosx"> | - <if expr="is_linux or is_macosx"> | ||||
| + <if expr="is_linux or is_macosx or is_posix"> | + <if expr="is_linux or is_macosx or is_posix"> | ||||
| <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> | <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> | ||||
| The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome. | The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome. | ||||
| </message> | </message> | ||||
| @@ -965,7 +965,7 @@ Google Chrome is unable to recover your settings. | @@ -979,7 +979,7 @@ Google Chrome is unable to recover your settings. | ||||
| </message> | </message> | ||||
| <!-- Plugin Placeholders --> | <!-- Plugin Placeholders --> | ||||
| - <if expr="is_linux"> | - <if expr="is_linux"> | ||||
| + <if expr="is_posix"> | + <if expr="is_posix"> | ||||
| <message name="IDS_PLUGIN_RESTART_REQUIRED" desc="The placeholder text for a plugin that can't be loaded until the browser is restarted."> | <message name="IDS_PLUGIN_RESTART_REQUIRED" desc="The placeholder text for a plugin that can't be loaded until the browser is restarted."> | ||||
| Restart Chrome to enable <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> | Restart Chrome to enable <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> | ||||
| </message> | </message> | ||||