Differential D18757 Diff 55427 www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_chromium__strings.grd
Changeset View
Changeset View
Standalone View
Standalone View
www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_chromium__strings.grd
| --- src/3rdparty/chromium/chrome/app/chromium_strings.grd.orig 2017-01-26 00:49:07 UTC | --- src/3rdparty/chromium/chrome/app/chromium_strings.grd.orig 2018-11-13 18:25:11 UTC | ||||
| +++ src/3rdparty/chromium/chrome/app/chromium_strings.grd | +++ src/3rdparty/chromium/chrome/app/chromium_strings.grd | ||||
| @@ -939,7 +939,7 @@ Signing in anyway will merge Chromium in | @@ -814,7 +814,7 @@ Signing in anyway will merge Chromium information like | ||||
| </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_bsd"> | + <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 Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium 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 Chromium. | The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium 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 Chromium. | ||||
| </message> | </message> | ||||