--- a/firefox-kde.patch Sun Jan 25 11:12:18 2015 +0100
+++ b/firefox-kde.patch Wed Jan 28 13:45:46 2015 +0100
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent 6697591ddc0a1b18171c31a7bf18d99be9825aab
+# Parent ae5fa7b97ee57df54434bebc6dbda400b7525340
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
new file mode 100644
@@ -257,13 +257,13 @@
+ noautohide="true"
+ orient="vertical"
+ align="stretch">
-+ <label class="SearchHighlightTitle">One-Click Searches</label>
-+ <description class="SearchHighlightText" flex="1">Search any of these sites instantly, without changing your default.</description>
++ <label class="SearchHighlightTitle">&SearchHighlight1.title;</label>
++ <description class="SearchHighlightText" flex="1">&SearchHighlight1.text;</description>
+ <hbox class="SearchHighlightFooter" align="center">
+ <spacer class="dot filled"/>
+ <spacer class="dot"/>
+ <spacer flex="1"/>
-+ <button label="Next"/>
++ <button label="&SearchHighlightNext;"/>
+ </hbox>
+ </panel>
+ <panel id="SearchHighlight2"
@@ -274,20 +274,21 @@
+ noautohide="true"
+ orient="vertical"
+ align="stretch">
-+ <label class="SearchHighlightTitle">Smart Suggestions</label>
-+ <description class="SearchHighlightText" flex="1">Suggestions from your default search engine appear as you type.</description>
++ <label class="SearchHighlightTitle">&SearchHighlight2.title;</label>
++ <description class="SearchHighlightText" flex="1">&SearchHighlight2.text;</description>
+ <hbox class="SearchHighlightFooter" align="center">
+ <spacer class="dot"/>
+ <spacer class="dot filled"/>
+ <spacer flex="1"/>
-+ <button label="Thanks!"/>
++ <button label="&SearchHighlightClose;"/>
+ </hbox>
+ </panel>
+
-+ <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true">
++ <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true"
++ onclick="this.hidePopup()">
+ <hbox id="abouthome-search-panel-manage"
+ onclick="openPreferences('paneSearch')">
-+ <label>&cmd_engineManager.label;</label>
++ <label>&changeSearchSettings.button;</label>
+ </hbox>
+ </panel>
+
@@ -732,9 +733,9 @@
+ fullscreentoolbar="true" mode="icons" customizable="true"
+ iconsize="small"
+#ifdef MOZ_DEV_EDITION
-+ defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button"
++ defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button,loop-button"
+#else
-+ defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button"
++ defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,loop-button"
+#endif
+ customizationtarget="nav-bar-customization-target"
+ overflowable="true"
@@ -773,7 +774,6 @@
+ enablehistory="true"
+ maxrows="6"
+ newlines="stripsurroundingwhitespace"
-+ oninput="gBrowser.userTypedValue = this.value;"
+ ontextentered="this.handleCommand(param);"
+ ontextreverted="return this.handleRevert();"
+ pageproxystate="invalid"
@@ -1336,11 +1336,11 @@
* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml)
* content/browser/chatWindow.xul (content/chatWindow.xul)
content/browser/content.js (content/content.js)
+ content/browser/content-UITour.js (content/content-UITour.js)
content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg)
content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg)
content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg)
content/browser/defaultthemes/1.preview.jpg (content/defaultthemes/1.preview.jpg)
- content/browser/defaultthemes/2.footer.jpg (content/defaultthemes/2.footer.jpg)
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
@@ -1895,25 +1895,25 @@
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
-@@ -698,19 +698,21 @@
- @BINPATH@/defaults/autoconfig/prefcalls.js
- @BINPATH@/browser/defaults/profile/prefs.js
+@@ -689,19 +689,21 @@
+ @RESPATH@/defaults/autoconfig/prefcalls.js
+ @RESPATH@/browser/defaults/profile/prefs.js
#ifndef LIBXUL_SDK
; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
; Technically this is an app pref file, but we are keeping it in the original
; gre location for now.
- @BINPATH@/defaults/pref/channel-prefs.js
+ @RESPATH@/defaults/pref/channel-prefs.js
+@BINPATH@/defaults/pref/kde.js
#else
; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588)
- @BINPATH@/@PREF_DIR@/channel-prefs.js
+ @RESPATH@/@PREF_DIR@/channel-prefs.js
+@BINPATH@/@PREF_DIR@/kde.js
#endif
; Services (gre) prefs
#ifdef MOZ_SERVICES_NOTIFICATIONS
- @BINPATH@/defaults/pref/services-notifications.js
+ @RESPATH@/defaults/pref/services-notifications.js
#endif
#ifdef MOZ_SERVICES_SYNC
- @BINPATH@/defaults/pref/services-sync.js
+ @RESPATH@/defaults/pref/services-sync.js