diff --git a/patches/ui-patches/pref-naming.patch b/patches/ui-patches/pref-naming.patch index b823323..98e7909 100644 --- a/patches/ui-patches/pref-naming.patch +++ b/patches/ui-patches/pref-naming.patch @@ -1,7 +1,5 @@ -diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl -index a1e414697e71..b69052923385 100644 ---- a/browser/locales/en-US/browser/preferences/preferences.ftl -+++ b/browser/locales/en-US/browser/preferences/preferences.ftl +--- browser/locales/en-US/browser/preferences/preferences.ftl ++++ browser/locales/en-US/browser/preferences/preferences.ftl @@ -128,6 +128,8 @@ search-results-help-link = Need help? Visit { -brand-sho startup-header = Startup @@ -11,7 +9,7 @@ index a1e414697e71..b69052923385 100644 always-check-default = .label = Always check if { -brand-short-name } is your default browser .accesskey = y -@@ -469,13 +471,13 @@ play-drm-content = +@@ -472,7 +474,7 @@ play-drm-content = .label = Play DRM-controlled content .accesskey = P @@ -20,14 +18,16 @@ index a1e414697e71..b69052923385 100644 update-application-title = { -brand-short-name } Updates - update-application-description = Keep { -brand-short-name } up to date for the best performance, stability, and security. +@@ -480,7 +482,7 @@ update-application-description = Keep { -brand-short-name } up to date for the b + # Variables: + # $version (string) - Firefox version -update-application-version = Version { $version } What’s new +update-application-version = Version { $version } Visit the repositories update-history = .label = Show Update History… -@@ -634,7 +636,7 @@ home-restore-defaults = +@@ -639,7 +641,7 @@ home-restore-defaults = .accesskey = R home-mode-choice-default-fx = @@ -36,7 +36,7 @@ index a1e414697e71..b69052923385 100644 home-mode-choice-custom = .label = Custom URLs… -@@ -663,8 +665,8 @@ choose-bookmark = +@@ -668,8 +670,8 @@ choose-bookmark = ## Home Section - Firefox Home Content Customization @@ -47,15 +47,12 @@ index a1e414697e71..b69052923385 100644 home-prefs-search-header = .label = Web Search -@@ -709,7 +711,7 @@ home-prefs-recent-activity-description = A selection of recent sites and content +@@ -714,7 +716,7 @@ home-prefs-recent-activity-description = A selection of recent sites and content home-prefs-snippets-header = .label = Snippets -home-prefs-snippets-description-new = Tips and news from { -vendor-short-name } and { -brand-product-name } +home-prefs-snippets-description-new = Tips and news from { -vendor-short-name } - home-prefs-sections-rows-option = - .label = --- -2.37.3 - + # Variables: + # $num (number) - Number of rows displayed diff --git a/scripts/fix-patch.sh b/scripts/fix-patch.sh index 29d9912..8888f15 100755 --- a/scripts/fix-patch.sh +++ b/scripts/fix-patch.sh @@ -31,15 +31,18 @@ echo "$files" | xargs touch echo "$files" | xargs git add echo "-> Trying to apply patch" -patch -p1 -i "../$1" +rejects="$(patch -p1 -i "../$1" | tee /dev/stderr | sed -r --quiet 's/^.*saving rejects to file (.*\.rej)$/\1/p')" -echo "-> Done. You can now fix the patch. If you are done," -echo " press enter to update the patch with your changes" -echo " or Ctrl+C to abort." +echo "-> Done. You can now fix the patch. If you are done, press enter to" +echo " update the patch with your changes or Ctrl+C to abort." +code . & +echo "$rejects" | xargs code & read echo "-> Updating patch" -git diff >"../$1" +sed -i '/^[^#]/d' "../$1" +git diff --no-prefix | sed '/^diff --git /,+1 d' >>"../$1" +sed -i '1{/^$/d}' "../$1" echo "-> Cleaning up" cd ..