Merge lp:~kroq-gar78/ubuntu/precise/freedict/fix-568333 into lp:ubuntu/precise/freedict

[kroq-gar78]

I have fixed the incorrect translation in dictionary 'fra-eng' which incorrectly stated some translations as "summery" instead of "summary". There was some un/compressing involved and I'm not sure if I used the correct settings in 'tar' and 'dictzip'. I just used the default ones. Also, the original tar 'fra-eng-20030508.tar.gz' had a timestamp in the filename. I thought that if I changed the name, I could mess up things (not sure what, but something maybe), so I decided to keep the name the same.

[Daniel Holbach (dholbach)]

Thanks a lot for your work on this.

Do you think you could forward your change to http://sourceforge.net/tracker/?group_id=1419&atid=301419 (you should be able to login with Launchpad OpenID).

This might make it easier for us to get the change into Debian and Ubuntu as well, without having to modify binary files, etc.

[Daniel Holbach (dholbach)]

I'll reject this merge proposal. This does not mean that your work is rejected, but it will be easier for us to let the change trickle down from upstream. If you need any help with forwarding, please let me know.

Unmerged revisions

8. By kroq-gar78 on 2012-03-23

fra-eng-20030508.tar.gz: fixed incorrect translation to "summery" (LP: #568333)

=== modified file 'debian/changelog'
--- debian/changelog	2008-05-21 23:24:52 +0000
+++ debian/changelog	2012-03-23 03:40:23 +0000
@@ -1,3 +1,9 @@
+freedict (1.3-4ubuntu2) precise; urgency=low
+
+  * fra-eng-20030508.tar.gz: fixed incorrect translation to "summery" (LP: #568333)
+
+ -- Aditya Vaidya <[e-mail]>  Thu, 22 Mar 2012 22:29:25 -0500
+
 freedict (1.3-4ubuntu1) intrepid; urgency=low
 
   * Merge from debian unstable (LP: #175106) (LP: #234193).

=== modified file 'fra-eng-20030508.tar.gz'
Binary files fra-eng-20030508.tar.gz	2005-08-14 02:42:23 +0000 and fra-eng-20030508.tar.gz	2012-03-23 03:40:23 +0000 differ