| OLD | NEW |
| 1 <div id="import-data-overlay" class="page" hidden> | 1 <div id="import-data-overlay" class="page" hidden> |
| 2 <div class="close-button"></div> | 2 <div class="close-button"></div> |
| 3 <h1 i18n-content="importDataOverlay"></h1> | 3 <h1 i18n-content="importDataOverlay"></h1> |
| 4 <div class="content-area"> | 4 <div class="content-area"> |
| 5 <div class="import-data-configure"> | 5 <div class="import-data-configure"> |
| 6 <div id="import-from-div"> | 6 <div id="import-from-div"> |
| 7 <span i18n-content="importFromLabel"></span> | 7 <span i18n-content="importFromLabel"></span> |
| 8 <select id="import-browsers"> | 8 <select id="import-browsers"> |
| 9 <option i18n-content="importLoading"></option> | 9 <option i18n-content="importLoading"></option> |
| 10 </select> | 10 </select> |
| 11 </div> | 11 </div> |
| 12 <div id="import-checkboxes"> | 12 <div id="import-checkboxes"> |
| 13 <div i18n-content="importDescription"></div> | 13 <div i18n-content="importDescription"></div> |
| 14 <div class="checkbox"><label> | 14 <div class="checkbox"> |
| 15 <input id="import-history" type="checkbox" pref="import_history"> | 15 <span class="controlled-setting-with-label"> |
| 16 <span for="import-history" i18n-content="importHistory"></span> | 16 <input id="import-history" type="checkbox" pref="import_history"> |
| 17 </label></div> | 17 <span> |
| 18 <div class="checkbox"><label> | 18 <label for="import-history" i18n-content="importHistory"></label> |
| 19 <input id="import-favorites" type="checkbox" pref="import_bookmarks"> | 19 <span class="controlled-setting-indicator" pref="import_history"> |
| 20 <span for="import-favorites" i18n-content="importFavorites"></span> | 20 </span> |
| 21 </label></div> | 21 </span> |
| 22 <div class="checkbox"><label> | 22 </span> |
| 23 <input id="import-passwords" type="checkbox" | 23 </div> |
| 24 pref="import_saved_passwords"> | 24 <div class="checkbox"> |
| 25 <span i18n-content="importPasswords"></span> | 25 <span class="controlled-setting-with-label"> |
| 26 </label></div> | 26 <input id="import-favorites" type="checkbox" |
| 27 <div class="checkbox"><label> | 27 pref="import_bookmarks"> |
| 28 <input id="import-search" type="checkbox" pref="import_search_engine"> | 28 <span> |
| 29 <span i18n-content="importSearch"></span> | 29 <label for="import-favorites" i18n-content="importFavorites"> |
| 30 </label></div> | 30 </label> |
| 31 <span class="controlled-setting-indicator" |
| 32 pref="import_bookmarks"> |
| 33 </span> |
| 34 </span> |
| 35 </span> |
| 36 </div> |
| 37 <div class="checkbox"> |
| 38 <span class="controlled-setting-with-label"> |
| 39 <input id="import-passwords" type="checkbox" |
| 40 pref="import_saved_passwords"> |
| 41 <span> |
| 42 <label for="import-passwords" i18n-content="importPasswords"> |
| 43 </label> |
| 44 <span class="controlled-setting-indicator" |
| 45 pref="import_saved_passwords"> |
| 46 </span> |
| 47 </span> |
| 48 </span> |
| 49 </div> |
| 50 <div class="checkbox"> |
| 51 <span class="controlled-setting-with-label"> |
| 52 <input id="import-search" type="checkbox" |
| 53 pref="import_search_engine"> |
| 54 <span> |
| 55 <label for="import-search" i18n-content="importSearch"></label> |
| 56 <span class="controlled-setting-indicator" |
| 57 pref="import_search_engine"> |
| 58 </span> |
| 59 </span> |
| 60 </span> |
| 61 </div> |
| 31 </div> | 62 </div> |
| 32 </div> | 63 </div> |
| 33 <div class="import-data-success" hidden> | 64 <div class="import-data-success" hidden> |
| 34 <div id="import-success-header"> | 65 <div id="import-success-header"> |
| 35 <strong i18n-content="importSucceeded"></strong> | 66 <strong i18n-content="importSucceeded"></strong> |
| 36 </div> | 67 </div> |
| 37 <div id="import-success-image"> | 68 <div id="import-success-image"> |
| 38 <img src="../shared/images/success.png"> | 69 <img src="../shared/images/success.png"> |
| 39 </div> | 70 </div> |
| 40 <div id="import-find-your-bookmarks"> | 71 <div id="import-find-your-bookmarks"> |
| 41 <span i18n-content="findYourImportedBookmarks"></span> | 72 <span i18n-content="findYourImportedBookmarks"></span> |
| 42 <div class="checkbox"> | 73 <div class="checkbox"> |
| 43 <label> | 74 <span class="controlled-setting-with-label"> |
| 44 <input id="import-data-show-bookmarks-bar" | 75 <input id="import-data-show-bookmarks-bar" |
| 45 pref="bookmark_bar.show_on_all_tabs" | 76 pref="bookmark_bar.show_on_all_tabs" |
| 46 metric="Options_ShowBookmarksBar" type="checkbox"> | 77 metric="Options_ShowBookmarksBar" type="checkbox"> |
| 47 <span i18n-content="toolbarShowBookmarksBar"></span> | 78 <span> |
| 48 </label> | 79 <label for="import-data-show-bookmarks-bar" |
| 80 i18n-content="toolbarShowBookmarksBar"> |
| 81 </label> |
| 82 <span class="controlled-setting-indicator" |
| 83 pref="bookmark_bar.show_on_all_tabs"> |
| 84 </span> |
| 85 </span> |
| 86 </span> |
| 49 </div> | 87 </div> |
| 50 </div> | 88 </div> |
| 51 </div> | 89 </div> |
| 52 </div> | 90 </div> |
| 53 <div class="action-area"> | 91 <div class="action-area"> |
| 54 <div class="import-data-configure"> | 92 <div class="import-data-configure"> |
| 55 <div class="action-area-right"> | 93 <div class="action-area-right"> |
| 56 <div id="import-throbber" class="throbber"></div> | 94 <div id="import-throbber" class="throbber"></div> |
| 57 <div class="button-strip"> | 95 <div class="button-strip"> |
| 58 <button id="import-data-cancel" i18n-content="cancel"></button> | 96 <button id="import-data-cancel" i18n-content="cancel"></button> |
| 59 <button id="import-data-commit" i18n-content="importCommit"></button> | 97 <button id="import-data-commit" i18n-content="importCommit"></button> |
| 60 </div> | 98 </div> |
| 61 </div> | 99 </div> |
| 62 </div> | 100 </div> |
| 63 <div class="import-data-success" hidden> | 101 <div class="import-data-success" hidden> |
| 64 <div class="action-area-right"> | 102 <div class="action-area-right"> |
| 65 <div class="button-strip"> | 103 <div class="button-strip"> |
| 66 <button id="import-data-confirm" i18n-content="ok"></button> | 104 <button id="import-data-confirm" i18n-content="ok"></button> |
| 67 </div> | 105 </div> |
| 68 </div> | 106 </div> |
| 69 </div> | 107 </div> |
| 70 </div> | 108 </div> |
| 71 </div> | 109 </div> |
| OLD | NEW |