summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMárcio Alexandre Silva Delgado <coadde@adinet.com.uy>2012-06-15 15:50:54 -0300
committerMárcio Alexandre Silva Delgado <coadde@adinet.com.uy>2012-06-15 15:50:54 -0300
commitb36b8f0dc0b90c4f50cff2e4e5c2a2387cc79def (patch)
tree198ef53e47fbc09d1aa082d67011e9620e9ac3e6
parent886ff36176b0c3d2bd81880599553e464f836e65 (diff)
parentca82307bc329389f3ae1a82ecea3a16d740ef4f4 (diff)
Merge ssh://parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--libre/iceweasel-libre/libre.patch10
1 files changed, 7 insertions, 3 deletions
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 3e29c2730..e726a58e9 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -276,13 +276,17 @@ diff -urN iceweasel-13.0.orig/toolkit/locales/en-US/chrome/global-region/region.
diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-13.0/browser/locales/generic/profile/bookmarks.html.in
--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2012-06-01 09:03:48.000000000 -0300
-+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2012-06-13 18:28:05.269430988 -0300
-@@ -11,13 +11,12 @@
++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2012-06-15 15:11:46.364192476 -0300
+@@ -10,14 +10,16 @@
+ <DL><p>
<DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
<DD>@bookmarks_toolbarfolder_description@
++ <DT><H3 ID="rdf:#$ZvPhC3">Parabola GNU/Linux-libre</H3>
<DL><p>
- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
+ <DT><A HREF="https://parabolagnulinux.org/">Parabola GNU/Linux-libre</A>
++ <DT><A HREF="https://wiki.parabolagnulinux.org/">Parabola GNU/Linux-libre Wiki</A>
++ <DT><A HREF="https://labs.parabola.nu/">Parabola GNU/Linux-libre Bugs</A>
</DL><p>
- <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
+ <DT><H3 ID="rdf:#$ZvPhC3">Free Software Fundation</H3>
@@ -293,7 +297,7 @@ diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in
- <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
+ <DT><A HREF="http://www.fsf.org/">Free Software Foundation</A>
+ <DT><A HREF="http://libreplanet.org/">LibrePlanet</A>
-+ <DT><a href="http://www.gnu.org/software/gnuzilla/addons.html">Free addons</A>
++ <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html">Free addons</A>
</DL><p>
</DL><p>
diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js