diff options
author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-06 01:56:21 +0000 |
---|---|---|
committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-06 01:56:21 +0000 |
commit | 9394fa97725f4f4af43d445c29c71fbd6e555283 (patch) | |
tree | fc2edcd81a8dfe1e3475177f7ebf069c83da2772 /chrome | |
parent | 036d87726035ac500ba35ab41fdc9ef6128f0e4f (diff) | |
download | chromium_src-9394fa97725f4f4af43d445c29c71fbd6e555283.zip chromium_src-9394fa97725f4f4af43d445c29c71fbd6e555283.tar.gz chromium_src-9394fa97725f4f4af43d445c29c71fbd6e555283.tar.bz2 |
Allow the import lock dialog to be sized by locale.
Also increase the height of the Italian first run bubble.
BUG=1334381,1359145
Review URL: http://codereview.chromium.org/482
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1819 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
44 files changed, 105 insertions, 12 deletions
diff --git a/chrome/app/locales/locale_settings.h b/chrome/app/locales/locale_settings.h index 65a51c1..dd01fd0 100644 --- a/chrome/app/locales/locale_settings.h +++ b/chrome/app/locales/locale_settings.h @@ -136,25 +136,30 @@ #define IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS 1050 #define IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES 1051 +// The width and height of the "Mozilla Firefox is locked" dialog box in +// characters and lines (See above). +#define IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS 1052 +#define IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES 1053 + // The width and height of the First Run Search Information bubble in // characters and lines (See above). -#define IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS 1052 -#define IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES 1053 +#define IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS 1054 +#define IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES 1055 // The width of the font style column in the Fonts and Languages dialog box, // in character widths. -#define IDS_FONTSLANG_LABEL_WIDTH 1054 +#define IDS_FONTSLANG_LABEL_WIDTH 1056 // The URL for the the Welcome to Chrome page shown on first run. -#define IDS_WELCOME_PAGE_URL 1055 +#define IDS_WELCOME_PAGE_URL 1057 // The URL for the the Learn More page shown on incognito new tab. -#define IDS_LEARN_MORE_INCOGNITO_URL 1056 +#define IDS_LEARN_MORE_INCOGNITO_URL 1058 // The URL for the "Learn more" page for the Report user metrics and crash data // checkbox in Options. -#define IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL 1057 +#define IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL 1059 // The URL for more info on how we are affected by 3rd party licenses. -#define IDS_ABOUT_VERSION_LICENSE_URL 1058 +#define IDS_ABOUT_VERSION_LICENSE_URL 1060 diff --git a/chrome/app/resources/locale_settings_ar.rc b/chrome/app/resources/locale_settings_ar.rc index 5e282de6..9afad5f 100644 --- a/chrome/app/resources/locale_settings_ar.rc +++ b/chrome/app/resources/locale_settings_ar.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=ar" diff --git a/chrome/app/resources/locale_settings_bg.rc b/chrome/app/resources/locale_settings_bg.rc index 08c90f4..9c81366 100644 --- a/chrome/app/resources/locale_settings_bg.rc +++ b/chrome/app/resources/locale_settings_bg.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=bg" diff --git a/chrome/app/resources/locale_settings_ca.rc b/chrome/app/resources/locale_settings_ca.rc index d74b574..6e6f21a 100644 --- a/chrome/app/resources/locale_settings_ca.rc +++ b/chrome/app/resources/locale_settings_ca.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=ca" diff --git a/chrome/app/resources/locale_settings_cs.rc b/chrome/app/resources/locale_settings_cs.rc index a83fef2..1515d42 100644 --- a/chrome/app/resources/locale_settings_cs.rc +++ b/chrome/app/resources/locale_settings_cs.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=cs" diff --git a/chrome/app/resources/locale_settings_da.rc b/chrome/app/resources/locale_settings_da.rc index 22ee529..9631dcc 100644 --- a/chrome/app/resources/locale_settings_da.rc +++ b/chrome/app/resources/locale_settings_da.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=da" diff --git a/chrome/app/resources/locale_settings_de.rc b/chrome/app/resources/locale_settings_de.rc index 66e0361..ed2b819 100644 --- a/chrome/app/resources/locale_settings_de.rc +++ b/chrome/app/resources/locale_settings_de.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=de" diff --git a/chrome/app/resources/locale_settings_el.rc b/chrome/app/resources/locale_settings_el.rc index e6b8e3ef..0f1896f 100644 --- a/chrome/app/resources/locale_settings_el.rc +++ b/chrome/app/resources/locale_settings_el.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "120" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=el" diff --git a/chrome/app/resources/locale_settings_en-GB.rc b/chrome/app/resources/locale_settings_en-GB.rc index 69d344a..b89b4ac 100644 --- a/chrome/app/resources/locale_settings_en-GB.rc +++ b/chrome/app/resources/locale_settings_en-GB.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=en-GB" diff --git a/chrome/app/resources/locale_settings_en-US.rc b/chrome/app/resources/locale_settings_en-US.rc index 3f591b3..c29cf9b 100644 --- a/chrome/app/resources/locale_settings_en-US.rc +++ b/chrome/app/resources/locale_settings_en-US.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=en-US" diff --git a/chrome/app/resources/locale_settings_es-419.rc b/chrome/app/resources/locale_settings_es-419.rc index 6108fc2..67f3ef1 100644 --- a/chrome/app/resources/locale_settings_es-419.rc +++ b/chrome/app/resources/locale_settings_es-419.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "120" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=es-419" diff --git a/chrome/app/resources/locale_settings_es.rc b/chrome/app/resources/locale_settings_es.rc index 3c71c9a..963db31 100644 --- a/chrome/app/resources/locale_settings_es.rc +++ b/chrome/app/resources/locale_settings_es.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "120" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=es" diff --git a/chrome/app/resources/locale_settings_et.rc b/chrome/app/resources/locale_settings_et.rc index b1c8a5d..78312d5 100644 --- a/chrome/app/resources/locale_settings_et.rc +++ b/chrome/app/resources/locale_settings_et.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=et" diff --git a/chrome/app/resources/locale_settings_fi.rc b/chrome/app/resources/locale_settings_fi.rc index d3d1392..5bf0db7 100644 --- a/chrome/app/resources/locale_settings_fi.rc +++ b/chrome/app/resources/locale_settings_fi.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=fi" diff --git a/chrome/app/resources/locale_settings_fil.rc b/chrome/app/resources/locale_settings_fil.rc index 59a4f05..623a366 100644 --- a/chrome/app/resources/locale_settings_fil.rc +++ b/chrome/app/resources/locale_settings_fil.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "14" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=fil" diff --git a/chrome/app/resources/locale_settings_fr.rc b/chrome/app/resources/locale_settings_fr.rc index 481618d..85eb5cf 100644 --- a/chrome/app/resources/locale_settings_fr.rc +++ b/chrome/app/resources/locale_settings_fr.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "120" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=fr" diff --git a/chrome/app/resources/locale_settings_he.rc b/chrome/app/resources/locale_settings_he.rc index 2da1c5a..b87d5a6 100644 --- a/chrome/app/resources/locale_settings_he.rc +++ b/chrome/app/resources/locale_settings_he.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=he" diff --git a/chrome/app/resources/locale_settings_hi.rc b/chrome/app/resources/locale_settings_hi.rc index fdf76e6..092e61c 100644 --- a/chrome/app/resources/locale_settings_hi.rc +++ b/chrome/app/resources/locale_settings_hi.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=hi" diff --git a/chrome/app/resources/locale_settings_hr.rc b/chrome/app/resources/locale_settings_hr.rc index b87da5f..80c4483 100644 --- a/chrome/app/resources/locale_settings_hr.rc +++ b/chrome/app/resources/locale_settings_hr.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=hr" diff --git a/chrome/app/resources/locale_settings_hu.rc b/chrome/app/resources/locale_settings_hu.rc index 0bedd7cc..c63de63 100644 --- a/chrome/app/resources/locale_settings_hu.rc +++ b/chrome/app/resources/locale_settings_hu.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "115" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=hu" diff --git a/chrome/app/resources/locale_settings_id.rc b/chrome/app/resources/locale_settings_id.rc index 8c76d63..eefbeb2 100644 --- a/chrome/app/resources/locale_settings_id.rc +++ b/chrome/app/resources/locale_settings_id.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=id" diff --git a/chrome/app/resources/locale_settings_it.rc b/chrome/app/resources/locale_settings_it.rc index 844c952..f14297b 100644 --- a/chrome/app/resources/locale_settings_it.rc +++ b/chrome/app/resources/locale_settings_it.rc @@ -50,8 +50,10 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" - IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" + IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "13" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=it" IDS_BUGREPORT_POST_URL "http://web-bug.appspot.com/bugreport" IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252" diff --git a/chrome/app/resources/locale_settings_ja.rc b/chrome/app/resources/locale_settings_ja.rc index f7f41bf..9d77941 100644 --- a/chrome/app/resources/locale_settings_ja.rc +++ b/chrome/app/resources/locale_settings_ja.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=ja" diff --git a/chrome/app/resources/locale_settings_ko.rc b/chrome/app/resources/locale_settings_ko.rc index eb59112..bd0a2d6 100644 --- a/chrome/app/resources/locale_settings_ko.rc +++ b/chrome/app/resources/locale_settings_ko.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=ko" diff --git a/chrome/app/resources/locale_settings_lt.rc b/chrome/app/resources/locale_settings_lt.rc index d316032..f669c86 100644 --- a/chrome/app/resources/locale_settings_lt.rc +++ b/chrome/app/resources/locale_settings_lt.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=lt" diff --git a/chrome/app/resources/locale_settings_lv.rc b/chrome/app/resources/locale_settings_lv.rc index 6787b3d..89f3e7c 100644 --- a/chrome/app/resources/locale_settings_lv.rc +++ b/chrome/app/resources/locale_settings_lv.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "110" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=lv" diff --git a/chrome/app/resources/locale_settings_nb.rc b/chrome/app/resources/locale_settings_nb.rc index b1bae88..b068934 100644 --- a/chrome/app/resources/locale_settings_nb.rc +++ b/chrome/app/resources/locale_settings_nb.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=nb" diff --git a/chrome/app/resources/locale_settings_nl.rc b/chrome/app/resources/locale_settings_nl.rc index 8bf4d0f..dd2d17b5 100644 --- a/chrome/app/resources/locale_settings_nl.rc +++ b/chrome/app/resources/locale_settings_nl.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=nl" diff --git a/chrome/app/resources/locale_settings_pl.rc b/chrome/app/resources/locale_settings_pl.rc index caad85d..5b27e46 100644 --- a/chrome/app/resources/locale_settings_pl.rc +++ b/chrome/app/resources/locale_settings_pl.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=pl" diff --git a/chrome/app/resources/locale_settings_pt-BR.rc b/chrome/app/resources/locale_settings_pt-BR.rc index c2d39c2b..a128fa0 100644 --- a/chrome/app/resources/locale_settings_pt-BR.rc +++ b/chrome/app/resources/locale_settings_pt-BR.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "120" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=pt-BR" diff --git a/chrome/app/resources/locale_settings_pt-PT.rc b/chrome/app/resources/locale_settings_pt-PT.rc index 2a1306a..f7c64b0 100644 --- a/chrome/app/resources/locale_settings_pt-PT.rc +++ b/chrome/app/resources/locale_settings_pt-PT.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=pt-PT" diff --git a/chrome/app/resources/locale_settings_ro.rc b/chrome/app/resources/locale_settings_ro.rc index d17ae91..6eded50 100644 --- a/chrome/app/resources/locale_settings_ro.rc +++ b/chrome/app/resources/locale_settings_ro.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=ro" diff --git a/chrome/app/resources/locale_settings_ru.rc b/chrome/app/resources/locale_settings_ru.rc index 5dfabfe..1de2a68 100644 --- a/chrome/app/resources/locale_settings_ru.rc +++ b/chrome/app/resources/locale_settings_ru.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "120" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=ru" diff --git a/chrome/app/resources/locale_settings_sk.rc b/chrome/app/resources/locale_settings_sk.rc index abb5d17..a54f569 100644 --- a/chrome/app/resources/locale_settings_sk.rc +++ b/chrome/app/resources/locale_settings_sk.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "120" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=sk" diff --git a/chrome/app/resources/locale_settings_sl.rc b/chrome/app/resources/locale_settings_sl.rc index 18f96557..eae1d42 100644 --- a/chrome/app/resources/locale_settings_sl.rc +++ b/chrome/app/resources/locale_settings_sl.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=sl" diff --git a/chrome/app/resources/locale_settings_sr.rc b/chrome/app/resources/locale_settings_sr.rc index c18187a..63b96e7 100644 --- a/chrome/app/resources/locale_settings_sr.rc +++ b/chrome/app/resources/locale_settings_sr.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "110" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=sr" diff --git a/chrome/app/resources/locale_settings_sv.rc b/chrome/app/resources/locale_settings_sv.rc index 5fd0679..1e64e44 100644 --- a/chrome/app/resources/locale_settings_sv.rc +++ b/chrome/app/resources/locale_settings_sv.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=sv" diff --git a/chrome/app/resources/locale_settings_th.rc b/chrome/app/resources/locale_settings_th.rc index 662e408..d0cc320 100644 --- a/chrome/app/resources/locale_settings_th.rc +++ b/chrome/app/resources/locale_settings_th.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=th" diff --git a/chrome/app/resources/locale_settings_tr.rc b/chrome/app/resources/locale_settings_tr.rc index ec0074e..7553306 100644 --- a/chrome/app/resources/locale_settings_tr.rc +++ b/chrome/app/resources/locale_settings_tr.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=tr" diff --git a/chrome/app/resources/locale_settings_uk.rc b/chrome/app/resources/locale_settings_uk.rc index a0663ad..e88127a 100644 --- a/chrome/app/resources/locale_settings_uk.rc +++ b/chrome/app/resources/locale_settings_uk.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "120" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=uk" diff --git a/chrome/app/resources/locale_settings_vi.rc b/chrome/app/resources/locale_settings_vi.rc index 272e5f5..c3f4975 100644 --- a/chrome/app/resources/locale_settings_vi.rc +++ b/chrome/app/resources/locale_settings_vi.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=vi" diff --git a/chrome/app/resources/locale_settings_zh-CN.rc b/chrome/app/resources/locale_settings_zh-CN.rc index d1fddd3..0617841 100644 --- a/chrome/app/resources/locale_settings_zh-CN.rc +++ b/chrome/app/resources/locale_settings_zh-CN.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=zh-CN" diff --git a/chrome/app/resources/locale_settings_zh-TW.rc b/chrome/app/resources/locale_settings_zh-TW.rc index 3b4cf4c..eb7a58c 100644 --- a/chrome/app/resources/locale_settings_zh-TW.rc +++ b/chrome/app/resources/locale_settings_zh-TW.rc @@ -50,6 +50,8 @@ BEGIN IDS_COOKIES_DIALOG_HEIGHT_LINES "29" IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS "75" IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES "16" + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS "50" + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES "8" IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS "93" IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES "12" IDS_HELP_CONTENT_URL "http://www.google.com/support/chrome/?hl=zh-TW" diff --git a/chrome/browser/views/importer_lock_view.cc b/chrome/browser/views/importer_lock_view.cc index d1c5f2f..bf57ab2 100644 --- a/chrome/browser/views/importer_lock_view.cc +++ b/chrome/browser/views/importer_lock_view.cc @@ -4,10 +4,12 @@ #include "chrome/browser/views/importer_lock_view.h" +#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/importer.h" #include "chrome/browser/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/views/label.h" +#include "chrome/views/window.h" #include "chromium_strings.h" #include "generated_resources.h" @@ -33,14 +35,16 @@ ImporterLockView::~ImporterLockView() { } void ImporterLockView::GetPreferredSize(CSize *out) { - out->cx = kDefaultWindowWidth; - out->cy = kDefaultWindowHeight; + DCHECK(out); + *out = ChromeViews::Window::GetLocalizedContentsSize( + IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS, + IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES).ToSIZE(); } void ImporterLockView::Layout() { description_label_->SetBounds(kPanelHorizMargin, kPanelVertMargin, - kDefaultWindowWidth - 2 * kPanelHorizMargin, - kDefaultWindowHeight - 2 * kPanelVertMargin); + GetWidth() - 2 * kPanelHorizMargin, + GetHeight() - 2 * kPanelVertMargin); } std::wstring ImporterLockView::GetDialogButtonLabel( |