summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/app/resources/locale_settings_bg.xtb2
-rw-r--r--chrome/app/resources/locale_settings_bn.xtb2
-rw-r--r--chrome/app/resources/locale_settings_ca.xtb2
-rw-r--r--chrome/app/resources/locale_settings_cs.xtb2
-rw-r--r--chrome/app/resources/locale_settings_da.xtb2
-rw-r--r--chrome/app/resources/locale_settings_de.xtb2
-rw-r--r--chrome/app/resources/locale_settings_el.xtb4
-rw-r--r--chrome/app/resources/locale_settings_es-419.xtb2
-rw-r--r--chrome/app/resources/locale_settings_es.xtb2
-rw-r--r--chrome/app/resources/locale_settings_fil.xtb2
-rw-r--r--chrome/app/resources/locale_settings_fr.xtb2
-rw-r--r--chrome/app/resources/locale_settings_gu.xtb2
-rw-r--r--chrome/app/resources/locale_settings_hr.xtb2
-rw-r--r--chrome/app/resources/locale_settings_hu.xtb2
-rw-r--r--chrome/app/resources/locale_settings_id.xtb2
-rw-r--r--chrome/app/resources/locale_settings_it.xtb2
-rw-r--r--chrome/app/resources/locale_settings_ja.xtb2
-rw-r--r--chrome/app/resources/locale_settings_kn.xtb2
-rw-r--r--chrome/app/resources/locale_settings_ko.xtb2
-rw-r--r--chrome/app/resources/locale_settings_lt.xtb2
-rw-r--r--chrome/app/resources/locale_settings_lv.xtb2
-rw-r--r--chrome/app/resources/locale_settings_ml.xtb2
-rw-r--r--chrome/app/resources/locale_settings_nl.xtb2
-rw-r--r--chrome/app/resources/locale_settings_pl.xtb2
-rw-r--r--chrome/app/resources/locale_settings_pt-BR.xtb2
-rw-r--r--chrome/app/resources/locale_settings_pt-PT.xtb2
-rw-r--r--chrome/app/resources/locale_settings_ro.xtb2
-rw-r--r--chrome/app/resources/locale_settings_ru.xtb2
-rw-r--r--chrome/app/resources/locale_settings_sk.xtb2
-rw-r--r--chrome/app/resources/locale_settings_sr.xtb2
-rw-r--r--chrome/app/resources/locale_settings_sv.xtb2
-rw-r--r--chrome/app/resources/locale_settings_ta.xtb2
-rw-r--r--chrome/app/resources/locale_settings_te.xtb2
-rw-r--r--chrome/app/resources/locale_settings_tr.xtb2
-rw-r--r--chrome/app/resources/locale_settings_uk.xtb2
-rw-r--r--chrome/app/resources/locale_settings_vi.xtb2
-rw-r--r--chrome/app/resources/locale_settings_zh-CN.xtb2
-rwxr-xr-xchrome/browser/sync/resources/gaia_login.html10
-rw-r--r--chrome/browser/sync/resources/merge_and_sync.html2
39 files changed, 44 insertions, 44 deletions
diff --git a/chrome/app/resources/locale_settings_bg.xtb b/chrome/app/resources/locale_settings_bg.xtb
index 6194d32..020992b 100644
--- a/chrome/app/resources/locale_settings_bg.xtb
+++ b/chrome/app/resources/locale_settings_bg.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_bn.xtb b/chrome/app/resources/locale_settings_bn.xtb
index f2362c0..bdc1c5d 100644
--- a/chrome/app/resources/locale_settings_bn.xtb
+++ b/chrome/app/resources/locale_settings_bn.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">12</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_ca.xtb b/chrome/app/resources/locale_settings_ca.xtb
index c9b62d9..f12eddf 100644
--- a/chrome/app/resources/locale_settings_ca.xtb
+++ b/chrome/app/resources/locale_settings_ca.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">17</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_cs.xtb b/chrome/app/resources/locale_settings_cs.xtb
index cd8ccf4..4183643 100644
--- a/chrome/app/resources/locale_settings_cs.xtb
+++ b/chrome/app/resources/locale_settings_cs.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_da.xtb b/chrome/app/resources/locale_settings_da.xtb
index 55d4996..2392003 100644
--- a/chrome/app/resources/locale_settings_da.xtb
+++ b/chrome/app/resources/locale_settings_da.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_de.xtb b/chrome/app/resources/locale_settings_de.xtb
index 445ae51..5ba40b5 100644
--- a/chrome/app/resources/locale_settings_de.xtb
+++ b/chrome/app/resources/locale_settings_de.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">17</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_el.xtb b/chrome/app/resources/locale_settings_el.xtb
index 0f579ff..25ff7dd 100644
--- a/chrome/app/resources/locale_settings_el.xtb
+++ b/chrome/app/resources/locale_settings_el.xtb
@@ -79,8 +79,8 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">50</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_es-419.xtb b/chrome/app/resources/locale_settings_es-419.xtb
index 5e30ed8..8e4c53e 100644
--- a/chrome/app/resources/locale_settings_es-419.xtb
+++ b/chrome/app/resources/locale_settings_es-419.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_es.xtb b/chrome/app/resources/locale_settings_es.xtb
index 01c270a..4a2e1d9 100644
--- a/chrome/app/resources/locale_settings_es.xtb
+++ b/chrome/app/resources/locale_settings_es.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_fil.xtb b/chrome/app/resources/locale_settings_fil.xtb
index e5347b4..99f7201 100644
--- a/chrome/app/resources/locale_settings_fil.xtb
+++ b/chrome/app/resources/locale_settings_fil.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_fr.xtb b/chrome/app/resources/locale_settings_fr.xtb
index b0a47e4..a260719 100644
--- a/chrome/app/resources/locale_settings_fr.xtb
+++ b/chrome/app/resources/locale_settings_fr.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_gu.xtb b/chrome/app/resources/locale_settings_gu.xtb
index cc60bef..08b9200 100644
--- a/chrome/app/resources/locale_settings_gu.xtb
+++ b/chrome/app/resources/locale_settings_gu.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_hr.xtb b/chrome/app/resources/locale_settings_hr.xtb
index 0d46ace..ec4ac52 100644
--- a/chrome/app/resources/locale_settings_hr.xtb
+++ b/chrome/app/resources/locale_settings_hr.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_hu.xtb b/chrome/app/resources/locale_settings_hu.xtb
index 535912e..7348b8e 100644
--- a/chrome/app/resources/locale_settings_hu.xtb
+++ b/chrome/app/resources/locale_settings_hu.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_id.xtb b/chrome/app/resources/locale_settings_id.xtb
index 8e08780..6adc845 100644
--- a/chrome/app/resources/locale_settings_id.xtb
+++ b/chrome/app/resources/locale_settings_id.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_it.xtb b/chrome/app/resources/locale_settings_it.xtb
index 1422ea8..7710f31 100644
--- a/chrome/app/resources/locale_settings_it.xtb
+++ b/chrome/app/resources/locale_settings_it.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_ja.xtb b/chrome/app/resources/locale_settings_ja.xtb
index 172ff0e..9ee552d 100644
--- a/chrome/app/resources/locale_settings_ja.xtb
+++ b/chrome/app/resources/locale_settings_ja.xtb
@@ -84,7 +84,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">17</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_kn.xtb b/chrome/app/resources/locale_settings_kn.xtb
index ab43c61..ce3ae0e 100644
--- a/chrome/app/resources/locale_settings_kn.xtb
+++ b/chrome/app/resources/locale_settings_kn.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_ko.xtb b/chrome/app/resources/locale_settings_ko.xtb
index 98accfb..c0ae2e1 100644
--- a/chrome/app/resources/locale_settings_ko.xtb
+++ b/chrome/app/resources/locale_settings_ko.xtb
@@ -84,7 +84,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">17</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_lt.xtb b/chrome/app/resources/locale_settings_lt.xtb
index 8708c07..ba61aea 100644
--- a/chrome/app/resources/locale_settings_lt.xtb
+++ b/chrome/app/resources/locale_settings_lt.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_lv.xtb b/chrome/app/resources/locale_settings_lv.xtb
index 6c823a1..f6eb5e9 100644
--- a/chrome/app/resources/locale_settings_lv.xtb
+++ b/chrome/app/resources/locale_settings_lv.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_ml.xtb b/chrome/app/resources/locale_settings_ml.xtb
index 1a109a6..3a631d3 100644
--- a/chrome/app/resources/locale_settings_ml.xtb
+++ b/chrome/app/resources/locale_settings_ml.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">18</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_nl.xtb b/chrome/app/resources/locale_settings_nl.xtb
index bbdfb5d..aa30710 100644
--- a/chrome/app/resources/locale_settings_nl.xtb
+++ b/chrome/app/resources/locale_settings_nl.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_pl.xtb b/chrome/app/resources/locale_settings_pl.xtb
index bae139b..e4dc0f6 100644
--- a/chrome/app/resources/locale_settings_pl.xtb
+++ b/chrome/app/resources/locale_settings_pl.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_pt-BR.xtb b/chrome/app/resources/locale_settings_pt-BR.xtb
index 4f545e3..cbbc47e 100644
--- a/chrome/app/resources/locale_settings_pt-BR.xtb
+++ b/chrome/app/resources/locale_settings_pt-BR.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_pt-PT.xtb b/chrome/app/resources/locale_settings_pt-PT.xtb
index 3c43203..ce1abd9 100644
--- a/chrome/app/resources/locale_settings_pt-PT.xtb
+++ b/chrome/app/resources/locale_settings_pt-PT.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_ro.xtb b/chrome/app/resources/locale_settings_ro.xtb
index 6050676..e066b6a 100644
--- a/chrome/app/resources/locale_settings_ro.xtb
+++ b/chrome/app/resources/locale_settings_ro.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_ru.xtb b/chrome/app/resources/locale_settings_ru.xtb
index cca5f66..a8ed5b2 100644
--- a/chrome/app/resources/locale_settings_ru.xtb
+++ b/chrome/app/resources/locale_settings_ru.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_sk.xtb b/chrome/app/resources/locale_settings_sk.xtb
index 2507544..fbd7d65 100644
--- a/chrome/app/resources/locale_settings_sk.xtb
+++ b/chrome/app/resources/locale_settings_sk.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_sr.xtb b/chrome/app/resources/locale_settings_sr.xtb
index 9055e0e..af54790 100644
--- a/chrome/app/resources/locale_settings_sr.xtb
+++ b/chrome/app/resources/locale_settings_sr.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_sv.xtb b/chrome/app/resources/locale_settings_sv.xtb
index 48009b4..57126d6 100644
--- a/chrome/app/resources/locale_settings_sv.xtb
+++ b/chrome/app/resources/locale_settings_sv.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_ta.xtb b/chrome/app/resources/locale_settings_ta.xtb
index 9357665..1564a75 100644
--- a/chrome/app/resources/locale_settings_ta.xtb
+++ b/chrome/app/resources/locale_settings_ta.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">17</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_te.xtb b/chrome/app/resources/locale_settings_te.xtb
index d4dff4c..f320b2f 100644
--- a/chrome/app/resources/locale_settings_te.xtb
+++ b/chrome/app/resources/locale_settings_te.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_tr.xtb b/chrome/app/resources/locale_settings_tr.xtb
index b4219dc..c8e8cea 100644
--- a/chrome/app/resources/locale_settings_tr.xtb
+++ b/chrome/app/resources/locale_settings_tr.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_uk.xtb b/chrome/app/resources/locale_settings_uk.xtb
index c3c08f2..e5a2428 100644
--- a/chrome/app/resources/locale_settings_uk.xtb
+++ b/chrome/app/resources/locale_settings_uk.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_vi.xtb b/chrome/app/resources/locale_settings_vi.xtb
index c2753b1..ae2affd 100644
--- a/chrome/app/resources/locale_settings_vi.xtb
+++ b/chrome/app/resources/locale_settings_vi.xtb
@@ -80,7 +80,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">16</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/app/resources/locale_settings_zh-CN.xtb b/chrome/app/resources/locale_settings_zh-CN.xtb
index 6c99853..07c3f31 100644
--- a/chrome/app/resources/locale_settings_zh-CN.xtb
+++ b/chrome/app/resources/locale_settings_zh-CN.xtb
@@ -84,7 +84,7 @@
<translation id="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">5</translation>
<translation id="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">60</translation>
<translation id="IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS">46</translation>
-<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">15</translation>
+<translation id="IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES">17</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_WIDTH_CHARS">50</translation>
<translation id="IDS_CONFIRM_MESSAGE_BOX_DEFAULT_HEIGHT_LINES">5</translation>
<translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS">60</translation>
diff --git a/chrome/browser/sync/resources/gaia_login.html b/chrome/browser/sync/resources/gaia_login.html
index 5732519..2b555ec 100755
--- a/chrome/browser/sync/resources/gaia_login.html
+++ b/chrome/browser/sync/resources/gaia_login.html
@@ -426,17 +426,17 @@
<table align="center" cellpadding="0" cellspacing="0">
<tr>
<td>
- <div id="throbber_container" style="display:none">
- <div id="throb" style="background-image:url(throbber.png);
- width:16px; height:16px; background-position:0px;">
+ <div id="throbber_container" style="display:none;">
+ <div id="throb" style="background-image:url(throbber.png);
+ width:16px; height:16px; background-position:0px;
+ margin:0px 10px 0px 10px">
</div>
</div>
</td>
<td class="noverticalpadding">
<input id="signIn" type="button" class="gaia le button"
name="signIn" i18n-values="value:signin"
- onclick="sendCredentialsAndClose();"
- style="width:85" />
+ onclick="sendCredentialsAndClose();" />
</td>
</tr>
</table>
diff --git a/chrome/browser/sync/resources/merge_and_sync.html b/chrome/browser/sync/resources/merge_and_sync.html
index d902d10..38dd2cd 100644
--- a/chrome/browser/sync/resources/merge_and_sync.html
+++ b/chrome/browser/sync/resources/merge_and_sync.html
@@ -87,7 +87,7 @@ html[dir='rtl'] .textaligned {
i18n-values="value:mergeandsynclabel"
onclick="acceptMergeAndSync();" />
<input id="close" type="button" i18n-values="value:abortlabel"
- onclick="Close();" style="width:85"/>
+ onclick="Close();"/>
</td>
</tr>
</table>