From ae7f7846ea0d236b69e612bbf9abcedb23b2bf31 Mon Sep 17 00:00:00 2001 From: "alexeypa@google.com" Date: Tue, 30 Jul 2013 18:43:25 +0000 Subject: Revert 214379 "Localized Chromoting Host on Mac and Linux." The CL broke "Google Chrome Win" in a strange way: http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Win/builds/19799/steps/compile/logs/stdio 671> Traceback (most recent call last): 671> File "webapp/build-webapp.py", line 331, in 671> sys.exit(main()) 671> File "webapp/build-webapp.py", line 327, in main 671> sys.argv[5], sys.argv[6], files, locales, patches) 671> File "webapp/build-webapp.py", line 141, in buildWebApp 671> shutil.copy2(current_locale, destination_file) 671> File "c:\b\build\slave\google-chrome-rel-win\build\src\third_party\python_26\lib\shutil.py", line 99, in copy2 671> copyfile(src, dst) 671> File "c:\b\build\slave\google-chrome-rel-win\build\src\third_party\python_26\lib\shutil.py", line 52, in copyfile 671> fsrc = open(src, 'rb') 671> IOError: [Errno 2] No such file or directory: 'c:/b/build/slave/google-chrome-rel-win/build/src/build/Release/\\remoting_ocales\\nl.pak' 671>C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\Microsoft.CppCommon.targets(151,5): error MSB6006: "cmd.exe" exited with code 1. > Localized Chromoting Host on Mac and Linux. > > Re-landing r213997. TBR because this is a trivial, mechanical fix. > > This CL implements generation of localizable strings from remoting_strings.grd file. Depending on the platform the localized resources are placed to: > - Mac: localized .string and .pak resources are added to each application bundle under 'Resources/.lproj' > - Linux: localized .pak files are placed under 'remoting_locales' directory next to the binary locading them. > - Windows: .rc resources are generated from .jinja2 templates and embedded into a relevant binary. > > Chrome l10n and i18n APIs are used to retrieve the current locale and RTL flag (Mac & Linux). The it2me plugin sets the locale to match the locale of the browser. > > Collateral changes: > - UiString is not used any more. > - Increased width of disconnect window message on Mac. > - The host plugin version is correctly reported on Mac. > - Dialogs use RTL templates in case of RTL languages. No more updating the templates dynamically (Windows). > - remoting_unittests.ResourcesTest now runs on Mac, LInux and Windows. > - '@' is used for variable substitutions by remoting_localize.py. > - HOST_PLUGIN_MIME_TYPE is defined in one place now. > - Deleted unused commong_resources.grd. > > Mac installer and preference panel are not localized yet. > > TBR=garykac@chromium.org > BUG=155204 > > Review URL: https://codereview.chromium.org/20985002 TBR=alexeypa@chromium.org Review URL: https://codereview.chromium.org/21090006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214401 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/branding_Chromium | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'remoting/branding_Chromium') diff --git a/remoting/branding_Chromium b/remoting/branding_Chromium index 1a6a94a..22f3621 100644 --- a/remoting/branding_Chromium +++ b/remoting/branding_Chromium @@ -1,4 +1,6 @@ +COPYRIGHT=Copyright 2013 The Chromium Authors. All Rights Reserved. HOST_PLUGIN_FILE_NAME=Chromoting Host +HOST_PLUGIN_DESCRIPTION=Allow another user to access your computer securely over the Internet. DAEMON_FILE_NAME=Chromoting Host Service MAC_BUNDLE_ID=org.chromium.Chromium MAC_CREATOR=Cr24 @@ -6,4 +8,7 @@ MAC_HOST_BUNDLE_ID=org.chromium.chromoting.remoting_me2me_host MAC_UNINSTALLER_NAME=Chromoting Host Uninstaller MAC_UNINSTALLER_BUNDLE_PREFIX=org.chromium.pkg MAC_UNINSTALLER_BUNDLE_ID=org.chromium.remoting.host_uninstaller +MAC_UNINSTALLER_BUNDLE_NAME=Chromoting Host Uninstaller MAC_PREFPANE_BUNDLE_ID=org.chromium.remoting.preferences +MAC_PREFPANE_BUNDLE_NAME=Chromoting Host Preferences +MAC_PREFPANE_ICON_LABEL=Chromoting Host -- cgit v1.1