Merge branch 'master' into Sync-weave

1 files changed, 151 insertions, 151 deletions

diff --git a/application/palemoon/themes/windows/jar.mn b/application/palemoon/themes/windows/jar.mn
index 724bac689..8a00d8b70 100644
--- a/application/palemoon/themes/windows/jar.mn
+++ b/application/palemoon/themes/windows/jar.mn
@@ -4,164 +4,164 @@
 
 browser.jar:
 % skin browser classic/1.0 %skin/classic/browser/
-        skin/classic/browser/sanitizeDialog.css
-*       skin/classic/browser/aboutPrivateBrowsing.css
-*       skin/classic/browser/aboutSessionRestore.css
-        skin/classic/browser/aboutSessionRestore-window-icon.png
-        skin/classic/browser/aboutCertError.css
-        skin/classic/browser/aboutCertError_sectionCollapsed.png
-        skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png
-        skin/classic/browser/aboutCertError_sectionExpanded.png
+  skin/classic/browser/sanitizeDialog.css
+* skin/classic/browser/aboutPrivateBrowsing.css
+* skin/classic/browser/aboutSessionRestore.css
+  skin/classic/browser/aboutSessionRestore-window-icon.png
+  skin/classic/browser/aboutCertError.css
+  skin/classic/browser/aboutCertError_sectionCollapsed.png
+  skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png
+  skin/classic/browser/aboutCertError_sectionExpanded.png
 #ifdef MOZ_SERVICES_SYNC
-        skin/classic/browser/aboutSyncTabs.css
+  skin/classic/browser/aboutSyncTabs.css
 #endif
-*       skin/classic/browser/autocomplete.css
-        skin/classic/browser/actionicon-tab.png
-        skin/classic/browser/appmenu-icons.png
-        skin/classic/browser/appmenu-dropmarker.png
-*       skin/classic/browser/browser.css
-        skin/classic/browser/caption-buttons.svg
-        skin/classic/browser/click-to-play-warning-stripes.png
-*       skin/classic/browser/engineManager.css
-        skin/classic/browser/Geolocation-16.png
-        skin/classic/browser/Geolocation-64.png
-        skin/classic/browser/Info.png
-        skin/classic/browser/identity.png
-        skin/classic/browser/imagedocument.png					
-        skin/classic/browser/identity-icons-generic.png
-        skin/classic/browser/identity-icons-https.png
-        skin/classic/browser/identity-icons-https-ev.png
-        skin/classic/browser/identity-icons-https-mixed-active.png
-        skin/classic/browser/keyhole-forward-mask.svg
-        skin/classic/browser/KUI-background.png
-        skin/classic/browser/KUI-close.png
-        skin/classic/browser/livemark-folder.png
-        skin/classic/browser/menu-back.png
-        skin/classic/browser/menu-forward.png
-        skin/classic/browser/mixed-content-blocked-16.png
-        skin/classic/browser/mixed-content-blocked-64.png
-        skin/classic/browser/monitor.png
-        skin/classic/browser/monitor_16-10.png
-        skin/classic/browser/pageInfo.css
-        skin/classic/browser/pageInfo.png
-        skin/classic/browser/page-livemarks.png                      (feeds/feedIcon16.png)
-        skin/classic/browser/pointerLock-16.png
-        skin/classic/browser/pointerLock-64.png
-        skin/classic/browser/Privacy-16.png
-        skin/classic/browser/Privacy-32.png
-        skin/classic/browser/Privacy-48.png
-        skin/classic/browser/Privacy-64.png
-        skin/classic/browser/privatebrowsing-light.png
-        skin/classic/browser/privatebrowsing-dark.png
-        skin/classic/browser/reload-stop-go.png
-        skin/classic/browser/sanitize.png
-        skin/classic/browser/searchbar.css
-        skin/classic/browser/searchbar-dropdown-arrow.png
-        skin/classic/browser/Secure24.png
-        skin/classic/browser/setDesktopBackground.css
-        skin/classic/browser/slowStartup-16.png
-        skin/classic/browser/Toolbar.svg
-        skin/classic/browser/Toolbar-glass.svg
-        skin/classic/browser/Toolbar-inverted.svg
-        skin/classic/browser/toolbarbutton-dropdown-arrow.png
-        skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png
-        skin/classic/browser/urlbar-arrow.png
-        skin/classic/browser/urlbar-popup-blocked.png
-        skin/classic/browser/urlbar-history-dropmarker.png
-        skin/classic/browser/web-notifications-icon.svg
-        skin/classic/browser/web-notifications-tray.svg
-        skin/classic/browser/notification-pluginNormal.png           (../shared/plugins/notification-pluginNormal.png)
-        skin/classic/browser/notification-pluginAlert.png            (../shared/plugins/notification-pluginAlert.png)
-        skin/classic/browser/notification-pluginBlocked.png          (../shared/plugins/notification-pluginBlocked.png)
+* skin/classic/browser/autocomplete.css
+  skin/classic/browser/actionicon-tab.png
+  skin/classic/browser/appmenu-icons.png
+  skin/classic/browser/appmenu-dropmarker.png
+* skin/classic/browser/browser.css
+  skin/classic/browser/caption-buttons.svg
+  skin/classic/browser/click-to-play-warning-stripes.png
+* skin/classic/browser/engineManager.css
+  skin/classic/browser/Geolocation-16.png
+  skin/classic/browser/Geolocation-64.png
+  skin/classic/browser/Info.png
+  skin/classic/browser/identity.png
+  skin/classic/browser/imagedocument.png					
+  skin/classic/browser/identity-icons-generic.png
+  skin/classic/browser/identity-icons-https.png
+  skin/classic/browser/identity-icons-https-ev.png
+  skin/classic/browser/identity-icons-https-mixed-active.png
+  skin/classic/browser/keyhole-forward-mask.svg
+  skin/classic/browser/KUI-background.png
+  skin/classic/browser/KUI-close.png
+  skin/classic/browser/livemark-folder.png
+  skin/classic/browser/menu-back.png
+  skin/classic/browser/menu-forward.png
+  skin/classic/browser/mixed-content-blocked-16.png
+  skin/classic/browser/mixed-content-blocked-64.png
+  skin/classic/browser/monitor.png
+  skin/classic/browser/monitor_16-10.png
+  skin/classic/browser/pageInfo.css
+  skin/classic/browser/pageInfo.png
+  skin/classic/browser/page-livemarks.png                             (feeds/feedIcon16.png)
+  skin/classic/browser/pointerLock-16.png
+  skin/classic/browser/pointerLock-64.png
+  skin/classic/browser/Privacy-16.png
+  skin/classic/browser/Privacy-32.png
+  skin/classic/browser/Privacy-48.png
+  skin/classic/browser/Privacy-64.png
+  skin/classic/browser/privatebrowsing-light.png
+  skin/classic/browser/privatebrowsing-dark.png
+  skin/classic/browser/reload-stop-go.png
+  skin/classic/browser/sanitize.png
+  skin/classic/browser/searchbar.css
+  skin/classic/browser/searchbar-dropdown-arrow.png
+  skin/classic/browser/Secure24.png
+  skin/classic/browser/setDesktopBackground.css
+  skin/classic/browser/slowStartup-16.png
+  skin/classic/browser/Toolbar.svg
+  skin/classic/browser/Toolbar-glass.svg
+  skin/classic/browser/Toolbar-inverted.svg
+  skin/classic/browser/toolbarbutton-dropdown-arrow.png
+  skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png
+  skin/classic/browser/urlbar-arrow.png
+  skin/classic/browser/urlbar-popup-blocked.png
+  skin/classic/browser/urlbar-history-dropmarker.png
+  skin/classic/browser/web-notifications-icon.svg
+  skin/classic/browser/web-notifications-tray.svg
+  skin/classic/browser/notification-pluginNormal.png                  (../shared/plugins/notification-pluginNormal.png)
+  skin/classic/browser/notification-pluginAlert.png                   (../shared/plugins/notification-pluginAlert.png)
+  skin/classic/browser/notification-pluginBlocked.png                 (../shared/plugins/notification-pluginBlocked.png)
 #ifdef MOZ_WEBRTC
-        skin/classic/browser/webRTC-shareDevice-16.png
-        skin/classic/browser/webRTC-shareDevice-64.png
-        skin/classic/browser/webRTC-sharingDevice-16.png
+  skin/classic/browser/webRTC-shareDevice-16.png
+  skin/classic/browser/webRTC-shareDevice-64.png
+  skin/classic/browser/webRTC-sharingDevice-16.png
 #endif
-        skin/classic/browser/downloads/buttons.png                   (downloads/buttons.png)
-        skin/classic/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png)
-        skin/classic/browser/downloads/download-notification-start.png (downloads/download-notification-start.png)
-        skin/classic/browser/downloads/download-summary.png          (downloads/download-summary.png)
-        skin/classic/browser/downloads/downloads.css                 (downloads/downloads.css)
-        skin/classic/browser/downloads/allDownloadsViewOverlay.css   (downloads/allDownloadsViewOverlay.css)
-        skin/classic/browser/downloads/contentAreaDownloadsView.css  (downloads/contentAreaDownloadsView.css)
-        skin/classic/browser/feeds/feedIcon.png                      (feeds/feedIcon.png)
-        skin/classic/browser/feeds/feedIcon16.png                    (feeds/feedIcon16.png)
-        skin/classic/browser/feeds/videoFeedIcon.png                 (feeds/feedIcon.png)
-        skin/classic/browser/feeds/videoFeedIcon16.png               (feeds/feedIcon16.png)
-        skin/classic/browser/feeds/audioFeedIcon.png                 (feeds/feedIcon.png)
-        skin/classic/browser/feeds/audioFeedIcon16.png               (feeds/feedIcon16.png)
-        skin/classic/browser/feeds/feed-icons-16.png                 (feeds/feed-icons-16.png)
-        skin/classic/browser/feeds/subscribe.css                     (feeds/subscribe.css)
-        skin/classic/browser/feeds/subscribe-ui.css                  (feeds/subscribe-ui.css)
-*       skin/classic/browser/newtab/newTab.css                       (newtab/newTab.css)
-        skin/classic/browser/newtab/controls.png                     (../shared/newtab/controls.png)
-        skin/classic/browser/newtab/noise.png                        (../shared/newtab/noise.png)
-        skin/classic/browser/newtab/pinned.png                       (../shared/newtab/pinned.png)
-        skin/classic/browser/places/places.css                       (places/places.css)
-*       skin/classic/browser/places/organizer.css                    (places/organizer.css)
-        skin/classic/browser/places/editBookmark.png                 (places/editBookmark.png)
-        skin/classic/browser/places/bookmark.png                     (places/bookmark.png)
-        skin/classic/browser/places/query.png                        (places/query.png)
-        skin/classic/browser/places/bookmarksMenu.png                (places/bookmarksMenu.png)
-        skin/classic/browser/places/bookmarksToolbar.png             (places/bookmarksToolbar.png)
-        skin/classic/browser/places/calendar.png                     (places/calendar.png)
-        skin/classic/browser/places/toolbarDropMarker.png            (places/toolbarDropMarker.png)
-        skin/classic/browser/places/editBookmarkOverlay.css          (places/editBookmarkOverlay.css)
-        skin/classic/browser/places/libraryToolbar.png               (places/libraryToolbar.png)
-        skin/classic/browser/places/starred48.png                    (places/starred48.png)
-        skin/classic/browser/places/unstarred48.png                  (places/unstarred48.png)
-        skin/classic/browser/places/tag.png                          (places/tag.png)
-        skin/classic/browser/places/history.png                      (places/history.png)
-        skin/classic/browser/places/allBookmarks.png                 (places/allBookmarks.png)
-        skin/classic/browser/places/unsortedBookmarks.png            (places/unsortedBookmarks.png)
-        skin/classic/browser/places/downloads.png                    (places/downloads.png)
-        skin/classic/browser/places/livemark-item.png                (places/livemark-item.png)
-        skin/classic/browser/permissions/aboutPermissions.css        (permissions/aboutPermissions.css)
-        skin/classic/browser/preferences/alwaysAsk.png               (preferences/alwaysAsk.png)
-        skin/classic/browser/preferences/application.png             (preferences/application.png)
-        skin/classic/browser/preferences/mail.png                    (preferences/mail.png)
-        skin/classic/browser/preferences/Options.png                 (preferences/Options.png)
+  skin/classic/browser/downloads/buttons.png                          (downloads/buttons.png)
+  skin/classic/browser/downloads/download-notification-finish.png     (downloads/download-notification-finish.png)
+  skin/classic/browser/downloads/download-notification-start.png      (downloads/download-notification-start.png)
+  skin/classic/browser/downloads/download-summary.png                 (downloads/download-summary.png)
+  skin/classic/browser/downloads/downloads.css                        (downloads/downloads.css)
+  skin/classic/browser/downloads/allDownloadsViewOverlay.css          (downloads/allDownloadsViewOverlay.css)
+  skin/classic/browser/downloads/contentAreaDownloadsView.css         (downloads/contentAreaDownloadsView.css)
+  skin/classic/browser/feeds/feedIcon.png                             (feeds/feedIcon.png)
+  skin/classic/browser/feeds/feedIcon16.png                           (feeds/feedIcon16.png)
+  skin/classic/browser/feeds/videoFeedIcon.png                        (feeds/feedIcon.png)
+  skin/classic/browser/feeds/videoFeedIcon16.png                      (feeds/feedIcon16.png)
+  skin/classic/browser/feeds/audioFeedIcon.png                        (feeds/feedIcon.png)
+  skin/classic/browser/feeds/audioFeedIcon16.png                      (feeds/feedIcon16.png)
+  skin/classic/browser/feeds/feed-icons-16.png                        (feeds/feed-icons-16.png)
+  skin/classic/browser/feeds/subscribe.css                            (feeds/subscribe.css)
+  skin/classic/browser/feeds/subscribe-ui.css                         (feeds/subscribe-ui.css)
+* skin/classic/browser/newtab/newTab.css                              (newtab/newTab.css)
+  skin/classic/browser/newtab/controls.png                            (../shared/newtab/controls.png)
+  skin/classic/browser/newtab/noise.png                               (../shared/newtab/noise.png)
+  skin/classic/browser/newtab/pinned.png                              (../shared/newtab/pinned.png)
+  skin/classic/browser/places/places.css                              (places/places.css)
+* skin/classic/browser/places/organizer.css                           (places/organizer.css)
+  skin/classic/browser/places/editBookmark.png                        (places/editBookmark.png)
+  skin/classic/browser/places/bookmark.png                            (places/bookmark.png)
+  skin/classic/browser/places/query.png                               (places/query.png)
+  skin/classic/browser/places/bookmarksMenu.png                       (places/bookmarksMenu.png)
+  skin/classic/browser/places/bookmarksToolbar.png                    (places/bookmarksToolbar.png)
+  skin/classic/browser/places/calendar.png                            (places/calendar.png)
+  skin/classic/browser/places/toolbarDropMarker.png                   (places/toolbarDropMarker.png)
+  skin/classic/browser/places/editBookmarkOverlay.css                 (places/editBookmarkOverlay.css)
+  skin/classic/browser/places/libraryToolbar.png                      (places/libraryToolbar.png)
+  skin/classic/browser/places/starred48.png                           (places/starred48.png)
+  skin/classic/browser/places/unstarred48.png                         (places/unstarred48.png)
+  skin/classic/browser/places/tag.png                                 (places/tag.png)
+  skin/classic/browser/places/history.png                             (places/history.png)
+  skin/classic/browser/places/allBookmarks.png                        (places/allBookmarks.png)
+  skin/classic/browser/places/unsortedBookmarks.png                   (places/unsortedBookmarks.png)
+  skin/classic/browser/places/downloads.png                           (places/downloads.png)
+  skin/classic/browser/places/livemark-item.png                       (places/livemark-item.png)
+  skin/classic/browser/permissions/aboutPermissions.css               (permissions/aboutPermissions.css)
+  skin/classic/browser/preferences/alwaysAsk.png                      (preferences/alwaysAsk.png)
+  skin/classic/browser/preferences/application.png                    (preferences/application.png)
+  skin/classic/browser/preferences/mail.png                           (preferences/mail.png)
+  skin/classic/browser/preferences/Options.png                        (preferences/Options.png)
 #ifdef MOZ_SERVICES_SYNC
-        skin/classic/browser/preferences/Options-sync.png            (preferences/Options-sync.png)
+  skin/classic/browser/preferences/Options-sync.png                   (preferences/Options-sync.png)
 #endif
-        skin/classic/browser/preferences/saveFile.png                (preferences/saveFile.png)
-*       skin/classic/browser/preferences/preferences.css             (preferences/preferences.css)
-        skin/classic/browser/preferences/applications.css            (preferences/applications.css)
+  skin/classic/browser/preferences/saveFile.png                       (preferences/saveFile.png)
+* skin/classic/browser/preferences/preferences.css                    (preferences/preferences.css)
+  skin/classic/browser/preferences/applications.css                   (preferences/applications.css)
 #ifdef MOZ_BROWSER_STATUSBAR
-        skin/classic/browser/statusbar/dynamic.css                   (../shared/statusbar/dynamic.css)
-*       skin/classic/browser/statusbar/overlay.css                   (statusbar/overlay.css)
-*       skin/classic/browser/statusbar/prefs.css                     (statusbar/prefs.css)
-        skin/classic/browser/statusbar/pulse.png                     (../shared/statusbar/pulse.png)
-        skin/classic/browser/statusbar/pms16.png                     (../shared/statusbar/pms16.png)
-        skin/classic/browser/statusbar/pms24.png                     (../shared/statusbar/pms24.png)
-        skin/classic/browser/statusbar/throbber-idle.png             (../shared/statusbar/throbber-idle.png)
-        skin/classic/browser/statusbar/throbberStatic.png            (../shared/statusbar/throbberStatic.png)
+  skin/classic/browser/statusbar/dynamic.css                          (../shared/statusbar/dynamic.css)
+* skin/classic/browser/statusbar/overlay.css                          (statusbar/overlay.css)
+* skin/classic/browser/statusbar/prefs.css                            (statusbar/prefs.css)
+  skin/classic/browser/statusbar/pulse.png                            (../shared/statusbar/pulse.png)
+  skin/classic/browser/statusbar/pms16.png                            (../shared/statusbar/pms16.png)
+  skin/classic/browser/statusbar/pms24.png                            (../shared/statusbar/pms24.png)
+  skin/classic/browser/statusbar/throbber-idle.png                    (../shared/statusbar/throbber-idle.png)
+  skin/classic/browser/statusbar/throbberStatic.png                   (../shared/statusbar/throbberStatic.png)
 #endif
-        skin/classic/browser/tabbrowser/alltabs.png                  (tabbrowser/alltabs.png)
-        skin/classic/browser/tabbrowser/alltabs-inverted.png         (tabbrowser/alltabs-inverted.png)
-        skin/classic/browser/tabbrowser/newtab.png                   (tabbrowser/newtab.png)
-        skin/classic/browser/tabbrowser/newtab-glass.png             (tabbrowser/newtab-glass.png)
-        skin/classic/browser/tabbrowser/newtab-inverted.png          (tabbrowser/newtab-inverted.png)
-        skin/classic/browser/tabbrowser/connecting.png               (tabbrowser/connecting.png)
-        skin/classic/browser/tabbrowser/loading.png                  (tabbrowser/loading.png)
-        skin/classic/browser/tabbrowser/tab-arrow-left.png           (tabbrowser/tab-arrow-left.png)
-        skin/classic/browser/tabbrowser/tab-arrow-left-glass.png     (tabbrowser/tab-arrow-left-glass.png)
-        skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png  (tabbrowser/tab-arrow-left-inverted.png)
-        skin/classic/browser/tabbrowser/tab-overflow-border.png      (tabbrowser/tab-overflow-border.png)
-        skin/classic/browser/tabbrowser/tabDragIndicator.png         (tabbrowser/tabDragIndicator.png)
-        skin/classic/browser/tabbrowser/tab-audio.svg                (../shared/tabbrowser/tab-audio.svg)
-        skin/classic/browser/tabbrowser/tab-audio-small.svg          (../shared/tabbrowser/tab-audio-small.svg)
+  skin/classic/browser/tabbrowser/alltabs.png                         (tabbrowser/alltabs.png)
+  skin/classic/browser/tabbrowser/alltabs-inverted.png                (tabbrowser/alltabs-inverted.png)
+  skin/classic/browser/tabbrowser/newtab.png                          (tabbrowser/newtab.png)
+  skin/classic/browser/tabbrowser/newtab-glass.png                    (tabbrowser/newtab-glass.png)
+  skin/classic/browser/tabbrowser/newtab-inverted.png                 (tabbrowser/newtab-inverted.png)
+  skin/classic/browser/tabbrowser/connecting.png                      (tabbrowser/connecting.png)
+  skin/classic/browser/tabbrowser/loading.png                         (tabbrowser/loading.png)
+  skin/classic/browser/tabbrowser/tab-arrow-left.png                  (tabbrowser/tab-arrow-left.png)
+  skin/classic/browser/tabbrowser/tab-arrow-left-glass.png            (tabbrowser/tab-arrow-left-glass.png)
+  skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png         (tabbrowser/tab-arrow-left-inverted.png)
+  skin/classic/browser/tabbrowser/tab-overflow-border.png             (tabbrowser/tab-overflow-border.png)
+  skin/classic/browser/tabbrowser/tabDragIndicator.png                (tabbrowser/tabDragIndicator.png)
+  skin/classic/browser/tabbrowser/tab-audio.svg                       (../shared/tabbrowser/tab-audio.svg)
+  skin/classic/browser/tabbrowser/tab-audio-small.svg                 (../shared/tabbrowser/tab-audio-small.svg)
 #ifdef MOZ_SERVICES_SYNC
-        skin/classic/browser/sync-throbber.png
-        skin/classic/browser/sync-16.png
-        skin/classic/browser/sync-32.png
-        skin/classic/browser/sync-128.png
-        skin/classic/browser/sync-bg.png
-        skin/classic/browser/sync-desktopIcon.png
-        skin/classic/browser/sync-mobileIcon.png
-        skin/classic/browser/syncSetup.css
-        skin/classic/browser/syncCommon.css
-        skin/classic/browser/syncQuota.css
-        skin/classic/browser/syncProgress.css
+  skin/classic/browser/sync-throbber.png
+  skin/classic/browser/sync-16.png
+  skin/classic/browser/sync-32.png
+  skin/classic/browser/sync-128.png
+  skin/classic/browser/sync-bg.png
+  skin/classic/browser/sync-desktopIcon.png
+  skin/classic/browser/sync-mobileIcon.png
+  skin/classic/browser/syncSetup.css
+  skin/classic/browser/syncCommon.css
+  skin/classic/browser/syncQuota.css
+  skin/classic/browser/syncProgress.css
 #endif