Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuben Rodriguez <ruben@activitycentral.com>2012-09-04 15:22:11 (GMT)
committer Ruben Rodriguez <ruben@activitycentral.com>2012-09-04 15:22:11 (GMT)
commit8d00346fb4fe5600ac3389bdcaae61cbf86dc799 (patch)
treeba9be056c068a7ddc1444d9af12a3665fb6bc290
parent5ce87f70863790fc5841459c4a08d3b4a188b8c2 (diff)
Modified patches 0000 and 0134 to avoid them failing to apply
-rw-r--r--rpms/sugar/0000-langs.patch6
-rw-r--r--rpms/sugar/0134-translation-fix-closes-sdxo-2218.patch11
2 files changed, 3 insertions, 14 deletions
diff --git a/rpms/sugar/0000-langs.patch b/rpms/sugar/0000-langs.patch
index 09a6a75..01f5b19 100644
--- a/rpms/sugar/0000-langs.patch
+++ b/rpms/sugar/0000-langs.patch
@@ -1,10 +1,10 @@
---- configure.ac.orig 2012-02-08 16:36:08.000000000 -0600
-+++ configure.ac 2012-02-08 16:36:47.000000000 -0600
+--- a/configure.ac.orig 2012-02-08 16:36:08.000000000 -0600
++++ b/configure.ac 2012-02-08 16:36:47.000000000 -0600
@@ -18,7 +18,7 @@
# Setup GETTEXT
#
--ALL_LINGUAS="af am ar ay aym bg bi bn_IN bn ca cpp cs da de dz el en es fa_AF fa ff fil fr gu ha he hi ht hu id ig is it ja km ko kos mg mi mk ml mn mr ms mvo nb ne nl pa pap pis pl ps pt_BR pt qu quz ro ru rw sd si sk sl sq sv sw ta te th tpi tr tvl tzo ug ur vi wa yo zh_CN zh_TW"
+-ALL_LINGUAS="af am ar ay bg bi bn_IN bn ca cpp cs da de dz el en es fa_AF fa ff fil fr gu ha he hi ht hu id ig is it ja km ko kos mg mi mk ml mn mr ms mvo nb ne nl pa pap pis pl ps pt_BR pt qu ro ru rw sd si sk sl sq sv sw ta te th tpi tr tvl tzo ug ur vi wa yo zh_CN zh_TW"
+ALL_LINGUAS="af am ar ay aym bg bi bn_IN bn ca cpp cs da de dz el en en_GB es fa_AF fa ff fil fr gu ha he hi ht hu id ig is it ja km ko kos mg mi mk ml mn mr ms mvo nb ne nl pa pap pis pl ps pt_BR pt qu quz ro ru rw sd si sk sl sq sv sw ta te th tpi tr tvl tzo ug ur vi wa yo zh_CN zh_TW"
GETTEXT_PACKAGE=sugar
diff --git a/rpms/sugar/0134-translation-fix-closes-sdxo-2218.patch b/rpms/sugar/0134-translation-fix-closes-sdxo-2218.patch
index c5b4b5e..891dc3b 100644
--- a/rpms/sugar/0134-translation-fix-closes-sdxo-2218.patch
+++ b/rpms/sugar/0134-translation-fix-closes-sdxo-2218.patch
@@ -12,17 +12,6 @@ diff --git a/po/es.po b/po/es.po
index a1cbd6d..32e7163 100644
--- a/po/es.po
+++ b/po/es.po
-@@ -27,8 +27,8 @@ msgstr ""
- "Project-Id-Version: olpc-sugar\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2012-04-24 00:33-0400\n"
--"PO-Revision-Date: 2012-04-24 08:17+0200\n"
--"Last-Translator: Chris <cjl@laptop.org>\n"
-+"PO-Revision-Date: 2012-08-30 21:34+0200\n"
-+"Last-Translator: Rafael Ortiz <rafael@laptop.org>\n"
- "Language-Team: Fedora Spanish <fedora-trans-es@redhat.com>\n"
- "Language: es\n"
- "MIME-Version: 1.0\n"
@@ -316,8 +316,8 @@ msgid ""
"server will be able to see each other, even when they aren't on the same "
"network."