--- a/firefox-kde.patch Tue Oct 09 13:43:09 2012 +0200
+++ b/firefox-kde.patch Mon Oct 15 16:08:40 2012 +0200
@@ -2,7 +2,7 @@
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1264 @@
+@@ -0,0 +1,1261 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -221,7 +221,7 @@
+ </hbox>
+ </panel>
+
-+ <panel id="editSharePopup"
++ <panel id="unsharePopup"
+ type="arrow"
+ orient="vertical"
+ ignorekeys="true"
@@ -229,54 +229,54 @@
+ onpopupshown="SocialShareButton.panelShown(event);"
+ consumeoutsideclicks="true"
+ level="top">
-+ <row id="editSharePopupHeader" align="center">
++ <!-- Note that 'label', 'accesskey', 'value' and 'aria-label' attributes
++ for many of these elements are supplied by the provider and filled
++ in at runtime
++ -->
++ <row id="unsharePopupHeader" align="center">
+ <vbox align="center">
-+ <image id="socialUserPortrait" onclick="SocialUI.showProfile();"
-+ aria-label="&social.sharePopup.portrait.arialabel;"/>
++ <image id="socialUserPortrait" onclick="SocialUI.showProfile();"/>
+ </vbox>
-+ <vbox id="editSharePopupText">
-+ <button id="socialUserDisplayName"
++ <vbox id="unsharePopupText">
++ <button id="socialUserDisplayName" pack="start"
+ oncommand="SocialUI.showProfile();"/>
+ <spacer flex="1"/>
-+ <label id="socialUserRecommendedText"
-+ value="&social.sharePopup.shared.label;"/>
++ <label id="socialUserRecommendedText"/>
+ </vbox>
+ </row>
-+ <hbox id="editSharePopupBottomButtons" pack="end">
++ <hbox id="unsharePopupBottomButtons" pack="end">
+#ifdef XP_UNIX
-+ <button id="editSharePopupUndoButton"
-+ class="editSharePopupBottomButton"
-+ label="&social.sharePopup.undo.label;"
-+ accesskey="&social.sharePopup.undo.accesskey;"
++ <button id="unsharePopupStopSharingButton"
++ class="unsharePopupBottomButton"
+ command="Social:UnsharePage"/>
-+ <button id="editSharePopupOkButton"
-+ class="editSharePopupBottomButton"
++ <button id="unsharePopupContinueSharingButton"
++ class="unsharePopupBottomButton"
+ default="true"
+ autofocus="autofocus"
-+ label="&social.ok.label;"
-+ accesskey="&social.ok.accesskey;"
-+ oncommand="SocialShareButton.dismissSharePopup();"/>
++ oncommand="SocialShareButton.dismissUnsharePopup();"/>
+#else
-+ <button id="editSharePopupOkButton"
-+ class="editSharePopupBottomButton"
++ <button id="unsharePopupContinueSharingButton"
++ class="unsharePopupBottomButton"
+ default="true"
+ autofocus="autofocus"
-+ label="&social.ok.label;"
-+ accesskey="&social.ok.accesskey;"
-+ oncommand="SocialShareButton.dismissSharePopup();"/>
-+ <button id="editSharePopupUndoButton"
-+ class="editSharePopupBottomButton"
-+ label="&social.sharePopup.undo.label;"
-+ accesskey="&social.sharePopup.undo.accesskey;"
++ oncommand="SocialShareButton.dismissUnsharePopup();"/>
++ <button id="unsharePopupStopSharingButton"
++ class="unsharePopupBottomButton"
+ command="Social:UnsharePage"/>
+#endif
+ </hbox>
+ </panel>
+
-+ <panel id="social-notification-panel" type="arrow" hidden="true" noautofocus="true">
++ <panel id="social-notification-panel"
++ class="social-panel"
++ type="arrow"
++ hidden="true"
++ consumeoutsideclicks="true"
++ noautofocus="true">
+ <box id="social-notification-box" flex="1"></box>
+ </panel>
+ <panel id="social-flyout-panel"
++ class="social-panel"
+ onpopupshown="SocialFlyout.onShown()"
+ onpopuphidden="SocialFlyout.onHidden()"
+ side="right"
@@ -669,35 +669,32 @@
+ onclick="BrowserGoHome(event);"
+ aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
+
-+ <toolbaritem id="social-toolbar-button"
-+ class="toolbarbutton-1 chromeclass-toolbar-additional"
++ <toolbaritem id="social-toolbar-item"
++ class="chromeclass-toolbar-additional"
+ removable="false"
-+ pack="center"
+ title="&socialToolbar.title;"
+ hidden="true">
-+ <hbox id="social-toolbar-button-box" class="social-statusarea-container">
-+ <button id="social-provider-image" type="menu">
-+ <menupopup id="social-statusarea-popup">
-+ <hbox id="social-statusarea-user" pack="left" align="center">
-+ <image id="social-statusarea-user-portrait"/>
-+ <vbox>
-+ <label id="social-statusarea-notloggedin"
-+ value="&social.notLoggedIn.label;"/>
-+ <button id="social-statusarea-username"
-+ oncommand="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();"/>
-+ </vbox>
-+ </hbox>
-+ <menuitem id="social-toggle-sidebar-menuitem"
-+ type="checkbox"
-+ autocheck="false"
-+ command="Social:ToggleSidebar"
-+ label="&social.toggleSidebar.label;"
-+ accesskey="&social.toggleSidebar.accesskey;"/>
-+ </menupopup>
-+ </button>
-+ <hbox id="social-status-iconbox" flex="1">
-+ </hbox>
-+ </hbox>
++ <toolbarbutton id="social-provider-button"
++ class="toolbarbutton-1"
++ type="menu">
++ <menupopup id="social-statusarea-popup">
++ <hbox id="social-statusarea-user" pack="start" align="center"
++ onclick="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();">
++ <image id="social-statusarea-user-portrait"/>
++ <vbox>
++ <button id="social-statusarea-notloggedin"
++ class="link" label="&social.notLoggedIn.label;"/>
++ <button id="social-statusarea-username" class="link"/>
++ </vbox>
++ </hbox>
++ <menuitem id="social-toggle-sidebar-menuitem"
++ type="checkbox"
++ autocheck="false"
++ command="Social:ToggleSidebar"
++ label="&social.toggleSidebar.label;"
++ accesskey="&social.toggleSidebar.accesskey;"/>
++ </menupopup>
++ </toolbarbutton>
+ </toolbaritem>
+
+ <toolbaritem id="bookmarks-menu-button-container"
@@ -1270,12 +1267,12 @@
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
-@@ -35,16 +35,18 @@ browser.jar:
- content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png)
+@@ -36,16 +36,18 @@ browser.jar:
content/browser/abouthome/mozilla.png (content/abouthome/mozilla.png)
content/browser/abouthome/noise.png (content/abouthome/noise.png)
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
+ content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml)
* content/browser/browser.css (content/browser.css)
* content/browser/browser.js (content/browser.js)
* content/browser/browser.xul (content/browser.xul)