fix prefixes

patches/ui-patches/pref-naming.patch

@@ -1,5 +1,5 @@
---- browser/locales/en-US/browser/preferences/preferences.ftl
-+++ browser/locales/en-US/browser/preferences/preferences.ftl
+--- a/browser/locales/en-US/browser/preferences/preferences.ftl
++++ b/browser/locales/en-US/browser/preferences/preferences.ftl
 @@ -128,6 +128,8 @@ search-results-help-link = Need help? Visit <a data-l10n-name="url">{ -brand-sho
  
  startup-header = Startup

patches/ui-patches/privacy-preferences.patch

@@ -1,5 +1,5 @@
---- browser/components/preferences/privacy.inc.xhtml
-+++ browser/components/preferences/privacy.inc.xhtml
+--- a/browser/components/preferences/privacy.inc.xhtml
++++ b/browser/components/preferences/privacy.inc.xhtml
 @@ -53,7 +53,7 @@
          </description>
        </vbox>
@@ -50,8 +50,8 @@
      <checkbox id="blockDownloads"
                data-l10n-id="security-block-downloads"/>
      <checkbox id="blockUncommonUnwanted"
---- browser/locales/en-US/browser/preferences/preferences.ftl
-+++ browser/locales/en-US/browser/preferences/preferences.ftl
+--- a/browser/locales/en-US/browser/preferences/preferences.ftl
++++ b/browser/locales/en-US/browser/preferences/preferences.ftl
 @@ -1190,7 +1190,7 @@ addressbar-quickactions-learn-more = Learn more
  
  content-blocking-enhanced-tracking-protection = Enhanced Tracking Protection

patches/ui-patches/remove-cfrprefs.patch

@@ -1,5 +1,5 @@
---- browser/components/preferences/main.inc.xhtml
-+++ browser/components/preferences/main.inc.xhtml
+--- a/browser/components/preferences/main.inc.xhtml
++++ b/browser/components/preferences/main.inc.xhtml
 @@ -742,7 +742,7 @@
            support-page="media-keyboard-control"
      />

scripts/fix-patch.sh

@@ -40,7 +40,7 @@ read
 
 echo "-> Updating patch"
 sed -i '/^[^#]/d' "../$1"
-git diff --no-prefix | sed '/^diff --git /,+1 d' >>"../$1"
+git diff | sed '/^diff --git /,+1 d' >>"../$1"
 sed -i '1{/^$/d}' "../$1"
 
 echo "-> Cleaning up"