Hi, Yes I'll fix this as soon as I can. I'm overloaded with work (day job) atm...
Regards, Albert On Mon, Mar 21, 2011 at 17:41, Muthu Subramanian K <sumu...@novell.com> wrote: > @Albert: There seems to be some conflicts with the newer code, would it > be possible for you to fix those, please? I have pushed a few files from > this patch set though. Thank you very much! > > PS: I had actually reviewed most parts of the patch, but when i tried to > commit and do a 'pull -r' i had too many conflicts to resolve. > > On 03/14/2011 11:42 PM, Muthu Subramanian K wrote: >> Since its taking some time for me to review and push...I am sending this >> mail with 'WIP' tag. >> >> On 03/14/2011 04:48 AM, Albert Thuswaldner wrote: >>> Hi, >>> Here are the additional fixes to sfx2. >>> >>> You can commit the patch under the terms of MPL 1.1 / GPLv3+ / LGPLv3+ >>> triple license. >>> /Albert >>> >>> On Fri, Mar 11, 2011 at 13:47, Muthu Subramanian K <sumu...@novell.com> >>> wrote: >>>> Hi, >>>> >>>> I have pushed all of your sfx2 changes except for sfx2-inc patch. It has >>>> merge conflict changes - it would be great if you could fix and resend >>>> it? Please do let me know if I have missed any other patch. >>>> >>>> Thank you! >>>> Muthu Subramanian >>>> >>>> On 03/11/2011 02:49 PM, Albert Thuswaldner wrote: >>>>> Hi, >>>>> >>>>> On Fri, Mar 11, 2011 at 09:45, Muthu Subramanian K <sumu...@novell.com> >>>>> wrote: >>>>>> Hi Albert, >>>>>> >>>>>> oh...Will have a look at those patches too... >>>>>> I assumed those were the ones you resent...Will get back to you in a >>>>>> while. >>>>> >>>>> If you do manage to have a look on my other patches, please for now >>>>> ignore the first concerning libs-core/editeng. >>>>> Applying the patch will lead to merge conflicts. I will resolve this >>>>> in my local repo and resend this patch. >>>>> >>>>>> Would you also want to look at some simple hacks? features? Since you >>>>>> seem to be comfortable with C++? >>>>> >>>>> Yes, that is my plan. :) >>>>> /Albert >>>>> >>>>>> >>>>>> Thanks! >>>>>> Muthu Subramanian >>>>>> >>>>>> On 03/11/2011 02:12 AM, Albert Thuswaldner wrote: >>>>>>> Hi Muthu, >>>>>>> Thanks for pushing my patches! It is always nice to see them go in. >>>>>>> >>>>>>> On Thu, Mar 10, 2011 at 18:38, Muthu Subramanian K <sumu...@novell.com> >>>>>>> wrote: >>>>>>>> Hi Albert, >>>>>>>> >>>>>>>> I have pushed after correcting a few typos - hope I have caught the >>>>>>>> important ones and most of the others. >>>>>>> >>>>>>> Sorry for the typos, I try to review my patches before sending them >>>>>>> but some things you just don't see for some reason... >>>>>>> >>>>>>>> If possible (in the future), please do compile and check the code >>>>>>>> before >>>>>>>> submitting the patch - I found some stray characters. >>>>>>> >>>>>>> Yeah, compiling the code was he plan from the beginning, haven't >>>>>>> manage to do this yet, though. >>>>>>> >>>>>>>> Thanks again for the (huge) patch...please do continue the good work. >>>>>>> >>>>>>> There are more patches of mine further up the list. If someone has the >>>>>>> time to take care of them, please do. >>>>>>> >>>>>>> [Libreoffice] [PATCH] Additional translations of German comments >>>>>>> in libs-core/editeng Albert Thuswaldner >>>>>>> [Libreoffice] [PATCH] Additional translations of German >>>>>>> comments in libs-core/editeng Albert Thuswaldner >>>>>>> [Libreoffice] [PATCH] Additional translations of German >>>>>>> comments in libs-core/sfx2/inc Albert Thuswaldner >>>>>>> [Libreoffice] [PATCH] Additional translations of German comments >>>>>>> in libs-core/sfx2/sdi Albert Thuswaldner >>>>>>> [Libreoffice] [PATCH] Additional translations of German comments in >>>>>>> libs-core/sfx2/source/appl Albert Thuswaldner >>>>>>> [Libreoffice] [PATCH] Additional translations of German comments >>>>>>> in libs-core/sfx2/source/appl Albert Thuswaldner >>>>>>> >>>>>>> I'm now a member of the mailing list. Please let me know if there are >>>>>>> problems applying my patches (merge conflicts and so on) . I can >>>>>>> always help out, fixing the patches and re-sending them. To make >>>>>>> things as smooth as possible for you poor guys/gals having to push >>>>>>> them. ;) >>>>>>> >>>>>>> Cheers >>>>>>> >>>>>>> /Albert >>>>>>> >>>>>>>> >>>>>>>> @Martin: If possible, could you please help in re-reviewing this set? - >>>>>>>> would help us a lot - since the patch is big, there is a lot of >>>>>>>> probability that I might have missed some things. Thank you! >>>>>>>> >>>>>>>> - Muthu Subramanian >>>>>>>> >>>>>>>> On 03/10/2011 05:23 PM, Muthu Subramanian K wrote: >>>>>>>>> Thank you for resending. I am reviewing them...I will push them in a >>>>>>>>> while. >>>>>>>>> >>>>>>>>> Yes, translating the debug messages, DBG_ASSERTS would also be really >>>>>>>>> helpful. >>>>>>>>> >>>>>>>>> >>>>>>>>> On 03/08/2011 05:30 AM, Martin Kepplinger wrote: >>>>>>>>>> Am 08.03.2011 00:23, schrieb Albert Thuswaldner: >>>>>>>>>>> Hi >>>>>>>>>>> Here are last ones that did not get pushed to master. >>>>>>>>>>> >>>>>>>>>>> You can commit the patch under the terms of MPL 1.1 / GPLv3+ / >>>>>>>>>>> LGPLv3+ >>>>>>>>>>> triple license. >>>>>>>>>>> >>>>>>>>>>> /Albert >>>>>>>>>>> >>>>>>>>>> >>>>>>>>>> Hi Albert, >>>>>>>>>> >>>>>>>>>> Thanks for that work! These patches don't just translate german >>>>>>>>>> comments >>>>>>>>>> though. They translate debug-messages, delete comments, translate of >>>>>>>>>> course, fix typos and coding style issues. >>>>>>>>>> >>>>>>>>>> When nobody is faster, I could maybe look at them this week. But I'd >>>>>>>>>> need just another opinion on also translating DBG_ASSERT and such in >>>>>>>>>> one >>>>>>>>>> go, before I could push them. Sorry, I'm just not experienced enough >>>>>>>>>> here. >>>>>>>>>> >>>>>>>>>> thanks! >>>>>>>>>> martin >>>>>>>>>> >>>>>>>>> >>>>>>>>> _______________________________________________ >>>>>>>>> LibreOffice mailing list >>>>>>>>> LibreOffice@lists.freedesktop.org >>>>>>>>> http://lists.freedesktop.org/mailman/listinfo/libreoffice >>>>>>>> >>>>>>>> >>>>>>> _______________________________________________ >>>>>>> LibreOffice mailing list >>>>>>> LibreOffice@lists.freedesktop.org >>>>>>> http://lists.freedesktop.org/mailman/listinfo/libreoffice >>>>>> >>>>>> >>>>> _______________________________________________ >>>>> LibreOffice mailing list >>>>> LibreOffice@lists.freedesktop.org >>>>> http://lists.freedesktop.org/mailman/listinfo/libreoffice >>>> >>>> >>>> >>>> >>>> _______________________________________________ >>>> LibreOffice mailing list >>>> LibreOffice@lists.freedesktop.org >>>> http://lists.freedesktop.org/mailman/listinfo/libreoffice >> >> _______________________________________________ >> LibreOffice mailing list >> LibreOffice@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/libreoffice > > _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice