Re: [PATCH 0/7] multiple PrintLayout related fixes

2014-07-24 Thread Robert C. Helling
On 25 Jul 2014, at 02:50, Lubomir I. Ivanov wrote: Hi, > please, test all print modes including the table print which is now > solved in vector. on Mac, the profile is now much much better. But the text below is still borderline blurry (at least when looking at the PDF on screen as I am at ho

[PATCH] HTML export

2014-07-24 Thread Miika Turkia
Here is a set of patches missing from master (from Gehad). miika From 5a51290e8e210dd820f20df62a0687079a2166f0 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Wed, 23 Jul 2014 05:12:25 +0200 Subject: [PATCH 11/11] HTML: Save last ordering state of sorting Saving sorting state and apply the la

Re: My progress in HTML export.

2014-07-24 Thread Miika Turkia
On Thu, Jul 24, 2014 at 10:29 PM, Gehad Elrobey wrote: > > I attached a patch with two more fixes. > Now most of the bugs list seems to be resolved. > It seems that the temperature graph is not drawn, if the temperature is constant the whole dive. The layout seems to change for me when I open a

Re: [PATCH 0/7] multiple PrintLayout related fixes

2014-07-24 Thread Gaetan Bisson
[2014-07-25 03:50:38 +0300] Lubomir I. Ivanov: > please, test all print modes including the table print which is now > solved in vector. > > do an actual printer-print, PDF print, print 2000 dives etc... This works great for me (up-to-date Arch Linux); thanks! -- Gaetan

Re: [PATCH 0/7] multiple PrintLayout related fixes

2014-07-24 Thread Dirk Hohndel
Thank you so much, Lubomir. This looks much better. For me the profile looks a touch blurry in PDF, but perfectly fine on paper. I haven't tested all combinations, I hope that our army of testers will do so :-) On Fri, Jul 25, 2014 at 03:50:38AM +0300, Lubomir I. Ivanov wrote: > please, test all p

Re: [PATCH 5/7] PrintLayout: variate the profile size based on the #dives per page

2014-07-24 Thread Lubomir I. Ivanov
On 25 July 2014 03:50, Lubomir I. Ivanov wrote: > From: "Lubomir I. Ivanov" > should have read, "PrintLayout: variate the profile font size based on the #dives per page". lubomir -- ___ subsurface mailing list subsurface@hohndel.org http://lists.hohnd

[PATCH 4/7] PrintLayout: draw the profile to a QImage only on Linux

2014-07-24 Thread Lubomir I. Ivanov
From: "Lubomir I. Ivanov" The QImage fix for the recently reported "huge-vector-lines-in-PDF-printouts" bug is only needed on Linux. For Win32 and OSx we can render to vector. Signed-off-by: Lubomir I. Ivanov --- qt-ui/printlayout.cpp | 13 + 1 file changed, 9 insertions(+), 4 del

[PATCH 6/7] PrintLayout: reduce the scope of 'pic' and 'picPainter'

2014-07-24 Thread Lubomir I. Ivanov
From: "Lubomir I. Ivanov" Signed-off-by: Lubomir I. Ivanov --- qt-ui/printlayout.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/qt-ui/printlayout.cpp b/qt-ui/printlayout.cpp index 318ba4e..d6c27b5 100644 --- a/qt-ui/printlayout.cpp +++ b/qt-ui/printlayout.cpp @@ -1

[PATCH 3/7] PrintLayout: fix the ProfilePrintModel font

2014-07-24 Thread Lubomir I. Ivanov
From: "Lubomir I. Ivanov" Fixing the font size is required, because we don't really support a dynamic row height, as the row height is set in the class constructor. 7 seems optimal for all print modes. Signed-off-by: Lubomir I. Ivanov --- qt-ui/printlayout.cpp | 2 +- 1 file changed, 1 insert

[PATCH 7/7] PrintLayout: vectorize the table print

2014-07-24 Thread Lubomir I. Ivanov
From: "Lubomir I. Ivanov" Use QPicture to do that. QPainter::drawPicture() requires offsetting the target QPoint's Y value by two times the headingRow height. This can be improved the hardcodding the offset when the 'pageIndexes' are calculated, but is a bit complicated. Signed-off-by: Lubomir

[PATCH 2/7] PrintLayout: disable the QPainter scalling

2014-07-24 Thread Lubomir I. Ivanov
From: "Lubomir I. Ivanov" This is wrong because we don't really need to scale. We already have the estimated page dimentions in pixels, so taking the quotient of the printer DPI and screen DPI and then scalling (probably up) our rendered widgets via the QPainter introduces blur (due to the oversa

[PATCH 5/7] PrintLayout: variate the profile size based on the #dives per page

2014-07-24 Thread Lubomir I. Ivanov
From: "Lubomir I. Ivanov" For the profile print, the number of dives per page is: divesPerRow * divesPerColumn If we have more 3, 0.6 seems optimal, while for less we can pretty much use the default scale of 1.0. Signed-off-by: Lubomir I. Ivanov --- qt-ui/printlayout.cpp | 2 +- 1 file change

[PATCH 1/7] PrintLayout: a whitespace fix

2014-07-24 Thread Lubomir I. Ivanov
From: "Lubomir I. Ivanov" Signed-off-by: Lubomir I. Ivanov --- qt-ui/printlayout.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt-ui/printlayout.cpp b/qt-ui/printlayout.cpp index 4b368db..c874471 100644 --- a/qt-ui/printlayout.cpp +++ b/qt-ui/printlayout.cpp @@ -45,7 +

[PATCH 0/7] multiple PrintLayout related fixes

2014-07-24 Thread Lubomir I. Ivanov
please, test all print modes including the table print which is now solved in vector. do an actual printer-print, PDF print, print 2000 dives etc... report issues, if any! thanks. lubomir -- [PATCH 1/7] PrintLayout: a whitespace fix [PATCH 2/7] PrintLayout: disable the QPainter scalling [PATCH

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Dirk Hohndel
On Fri, Jul 25, 2014 at 02:43:18AM +0300, Lubomir I. Ivanov wrote: > On 25 July 2014 02:34, Gaetan Bisson wrote: > > [2014-07-24 13:30:44 -1000] Gaetan Bisson: > >> Here is a (very) quick and dirty patch. > > > > Oops, this also includes Lubomir's patch called > > 0002-Print-increase-the-font-size

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Gaetan Bisson
[2014-07-25 02:43:18 +0300] Lubomir I. Ivanov: > On 25 July 2014 02:34, Gaetan Bisson wrote: > > [2014-07-24 13:30:44 -1000] Gaetan Bisson: > >> Here is a (very) quick and dirty patch. > > > > Oops, this also includes Lubomir's patch called > > 0002-Print-increase-the-font-size-for-smaller-number-

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Lubomir I. Ivanov
On 25 July 2014 02:34, Gaetan Bisson wrote: > [2014-07-24 13:30:44 -1000] Gaetan Bisson: >> Here is a (very) quick and dirty patch. > > Oops, this also includes Lubomir's patch called > 0002-Print-increase-the-font-size-for-smaller-number-of-d.patch > . > please hold, i'm doing a slightly differe

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Gaetan Bisson
[2014-07-24 13:30:44 -1000] Gaetan Bisson: > Here is a (very) quick and dirty patch. Oops, this also includes Lubomir's patch called 0002-Print-increase-the-font-size-for-smaller-number-of-d.patch . -- Gaetan ___ subsurface mailing list subsurface@hohn

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Gaetan Bisson
[2014-07-25 02:10:18 +0300] Lubomir I. Ivanov: > i need 10 more minutes and will supply a patch. Me too! Here is a (very) quick and dirty patch. It's definitely not the fix we want in a pure Subsurface, but it gets the job done so printing on Linux gives pretty plots (no think lines and no pixeli

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Dirk Hohndel
On Fri, Jul 25, 2014 at 02:10:18AM +0300, Lubomir I. Ivanov wrote: > On 25 July 2014 01:59, Dirk Hohndel wrote: > > On Thu, Jul 24, 2014 at 03:47:05PM -0700, Dirk Hohndel wrote: > >> On Thu, Jul 24, 2014 at 07:40:51PM -0300, Tomaz Canabrava wrote: > >> > Cant we ifdef my code just for Linux? > >>

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Lubomir I. Ivanov
On 25 July 2014 01:59, Dirk Hohndel wrote: > On Thu, Jul 24, 2014 at 03:47:05PM -0700, Dirk Hohndel wrote: >> On Thu, Jul 24, 2014 at 07:40:51PM -0300, Tomaz Canabrava wrote: >> > Cant we ifdef my code just for Linux? >> >> I'm experimenting with printing on Mac right now. >> If that works as well

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Dirk Hohndel
On Thu, Jul 24, 2014 at 03:47:05PM -0700, Dirk Hohndel wrote: > On Thu, Jul 24, 2014 at 07:40:51PM -0300, Tomaz Canabrava wrote: > > Cant we ifdef my code just for Linux? > > I'm experimenting with printing on Mac right now. > If that works as well then yes, we can limit your code to Linux for now

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Dirk Hohndel
On Thu, Jul 24, 2014 at 07:40:51PM -0300, Tomaz Canabrava wrote: > Cant we ifdef my code just for Linux? I'm experimenting with printing on Mac right now. If that works as well then yes, we can limit your code to Linux for now. Or remove it completely - because the platforms that matter to our act

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Tomaz Canabrava
Cant we ifdef my code just for Linux? Em 24/07/2014 19:38, "Lubomir I. Ivanov" escreveu: > On 25 July 2014 01:27, Dirk Hohndel wrote: > > On Fri, Jul 25, 2014 at 01:04:57AM +0300, Lubomir I. Ivanov wrote: > >> what if we use this (patch attached - 0001)? > >> based on tomaz's mod for the profil

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Lubomir I. Ivanov
On 25 July 2014 01:27, Dirk Hohndel wrote: > On Fri, Jul 25, 2014 at 01:04:57AM +0300, Lubomir I. Ivanov wrote: >> what if we use this (patch attached - 0001)? >> based on tomaz's mod for the profile table. > > The preview looks fine, but a print looks like the attached... > > And that's the probl

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Gaetan Bisson
[2014-07-25 01:04:57 +0300] Lubomir I. Ivanov: > On 25 July 2014 00:24, Dirk Hohndel wrote: > > On Fri, Jul 25, 2014 at 12:10:48AM +0300, Lubomir I. Ivanov wrote: > >> On 25 July 2014 00:04, Linus Torvalds > >> wrote: > >> > On Thu, Jul 24, 2014 at 1:44 PM, Linus Torvalds > >> > wrote: > >> >>

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Lubomir I. Ivanov
On 25 July 2014 00:24, Dirk Hohndel wrote: > On Fri, Jul 25, 2014 at 12:10:48AM +0300, Lubomir I. Ivanov wrote: >> On 25 July 2014 00:04, Linus Torvalds wrote: >> > On Thu, Jul 24, 2014 at 1:44 PM, Linus Torvalds >> > wrote: >> >> >> >> The notes work, and max depth etc. But yeah, all the profil

Beta 3

2014-07-24 Thread Dirk Hohndel
Tag is pushed, binaries are up, announcement on our website is up, G+ and FB will follow shortly. Let's fix this print thing and get 4.2 done :-) /D ___ subsurface mailing list subsurface@hohndel.org http://lists.hohndel.org/cgi-bin/mailman/listinfo/sub

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Dirk Hohndel
On Fri, Jul 25, 2014 at 12:10:48AM +0300, Lubomir I. Ivanov wrote: > On 25 July 2014 00:04, Linus Torvalds wrote: > > On Thu, Jul 24, 2014 at 1:44 PM, Linus Torvalds > > wrote: > >> > >> The notes work, and max depth etc. But yeah, all the profile text > >> (which includes pressure info, temperat

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Lubomir I. Ivanov
On 25 July 2014 00:15, Tomaz Canabrava wrote: > > Em 24/07/2014 18:10, "Lubomir I. Ivanov" escreveu: > > >> >> On 25 July 2014 00:04, Linus Torvalds >> wrote: >> > On Thu, Jul 24, 2014 at 1:44 PM, Linus Torvalds >> > wrote: >> >> >> >> The notes work, and max depth etc. But yeah, all the profil

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Tomaz Canabrava
Em 24/07/2014 18:10, "Lubomir I. Ivanov" escreveu: > > On 25 July 2014 00:04, Linus Torvalds wrote: > > On Thu, Jul 24, 2014 at 1:44 PM, Linus Torvalds > > wrote: > >> > >> The notes work, and max depth etc. But yeah, all the profile text > >> (which includes pressure info, temperature, dive com

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Lubomir I. Ivanov
On 25 July 2014 00:04, Linus Torvalds wrote: > On Thu, Jul 24, 2014 at 1:44 PM, Linus Torvalds > wrote: >> >> The notes work, and max depth etc. But yeah, all the profile text >> (which includes pressure info, temperature, dive computer name etc) is >> completely unreadable. It's just noise. > >

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Linus Torvalds
On Thu, Jul 24, 2014 at 1:44 PM, Linus Torvalds wrote: > > The notes work, and max depth etc. But yeah, all the profile text > (which includes pressure info, temperature, dive computer name etc) is > completely unreadable. It's just noise. Btw, what platform had the "thick lines" issue? Because m

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Lubomir I. Ivanov
On 24 July 2014 23:37, Tomaz Canabrava wrote: > Linus, > > What text issue? The text on the notes *should* work, as they are not being > converted to bitmap, the ones on the profile are not, unfortunately. Seems > its a bug on the qt pdf side. I lack a print here but if anyone can print > with the

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Robert Helling
On 24 Jul 2014, at 22:45, Dirk Hohndel wrote: > If you or Lubomir or Tomaz or frankly, anyone, have a better solution, by > all means send it and I'll consider adding it even after Beta 3 - but I > haven't seen any indication that someone has a solution. I totally understand that you want to mo

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Dirk Hohndel
On Thu, Jul 24, 2014 at 10:41:44PM +0200, Robert Helling wrote: > > On 24 Jul 2014, at 22:38, Dirk Hohndel wrote: > > Hi, > > > Yes, printing needs to be rethought. But for 4.2 I think this is as good > > as it gets (and good enough). > > are you sure, have a look at this > > http://euve10195

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Linus Torvalds
On Thu, Jul 24, 2014 at 1:37 PM, Tomaz Canabrava wrote: > > What text issue? The text on the notes *should* work, as they are not being > converted to bitmap, the ones on the profile are not, unfortunately The notes work, and max depth etc. But yeah, all the profile text (which includes pressure

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Lubomir I. Ivanov
On 24 July 2014 23:37, Tomaz Canabrava wrote: > Linus, > > What text issue? The text on the notes *should* work, as they are not being > converted to bitmap, the ones on the profile are not, unfortunately. Seems > its a bug on the qt pdf side. I lack a print here but if anyone can print > with the

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Robert Helling
On 24 Jul 2014, at 22:38, Dirk Hohndel wrote: Hi, > Yes, printing needs to be rethought. But for 4.2 I think this is as good > as it gets (and good enough). are you sure, have a look at this http://euve10195.vserver.de/~robert/profile.pdf Best Robert signature.asc Description: Message sign

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Tomaz Canabrava
Replan is easy. Print I dont really know. =) I'll do my best for it to be amazing. Em 24/07/2014 17:39, "Dirk Hohndel" escreveu: > On Thu, Jul 24, 2014 at 01:13:17PM -0700, Linus Torvalds wrote: > > So current git doesn't have the html issue, and generally looks fine > > to my quick testing. Jus

Re: getting ready for Beta 3

2014-07-24 Thread Dirk Hohndel
On Thu, Jul 24, 2014 at 10:19:34PM +0200, roberto forini wrote: > I'm debugging your windows binary right now. Do you want me to put what i > find here or in Bugtrack? Bugtrack, please! /D ___ subsurface mailing list subsurface@hohndel.org http://lists.

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Dirk Hohndel
On Thu, Jul 24, 2014 at 01:13:17PM -0700, Linus Torvalds wrote: > So current git doesn't have the html issue, and generally looks fine > to my quick testing. Just out of interest I tried the > one-dive-per-page printing, and it _kind_ of works (and is fine for > taking a pdf of your logbook with yo

Re: getting ready for Beta 3

2014-07-24 Thread Tomaz Canabrava
Bugtrack Em 24/07/2014 17:19, "roberto forini" escreveu: > I'm debugging your windows binary right now. Do you want me to put what i > find here or in Bugtrack? > > Roberto > > > 2014-07-24 17:04 GMT+02:00 Dirk Hohndel : > >> I pushed all the changes I plan to include, I made a new Windows build

Re: Current -git looking fine.. except for printing

2014-07-24 Thread Tomaz Canabrava
Linus, What text issue? The text on the notes *should* work, as they are not being converted to bitmap, the ones on the profile are not, unfortunately. Seems its a bug on the qt pdf side. I lack a print here but if anyone can print with the old code on a *real* printer and see if the lines are goo

Re: getting ready for Beta 3

2014-07-24 Thread roberto forini
I'm debugging your windows binary right now. Do you want me to put what i find here or in Bugtrack? Roberto 2014-07-24 17:04 GMT+02:00 Dirk Hohndel : > I pushed all the changes I plan to include, I made a new Windows build > available under "daily"... > > My plan right now is to do the Beta 3 i

Current -git looking fine.. except for printing

2014-07-24 Thread Linus Torvalds
So current git doesn't have the html issue, and generally looks fine to my quick testing. Just out of interest I tried the one-dive-per-page printing, and it _kind_ of works (and is fine for taking a pdf of your logbook with you on a phone - I tested emailing it to myself and looking at my phone -

Re: [PATCH] Various updates to user manual

2014-07-24 Thread Dirk Hohndel
On Thu, Jul 24, 2014 at 09:31:12PM +0200, Willem Ferguson wrote: > User manual: Add text as well as figures. > > This patch updates the user manual in the following respects: > 1) Add section dealing with modifying the categories of information >shown in the Dive List. (A figure added) > 2) Ad

[PATCH] Various updates to user manual

2014-07-24 Thread Willem Ferguson
User manual: Add text as well as figures. This patch updates the user manual in the following respects: 1) Add section dealing with modifying the categories of information shown in the Dive List. (A figure added) 2) Add section on filtering the Dive List for a particular dive site, using C

Re: My progress in HTML export.

2014-07-24 Thread Gehad Elrobey
I attached a patch with two more fixes. Now most of the bugs list seems to be resolved. what do you recommend to be added for now? and what things are missing or need to be fixed as a priority? On Mon, Jul 21, 2014 at 7:32 AM, Miika Turkia wrote: > On Mon, Jul 21, 2014 at 8:16 AM, Gehad Elrobey

Re: [PATCH] Print: add the "1 dive per page" option

2014-07-24 Thread Dirk Hohndel
On Thu, Jul 24, 2014 at 10:56:31AM -0700, Dirk Hohndel wrote: > Given the impact on manual and translations I my release plans... I'm a > bit nervous about this. > > On the flip side... heck yeah, I want this :-) > > *pondering* This is WAY too useful in the context of the planner... So I'll ad

Re: [PATCH] Print: add the "1 dive per page" option

2014-07-24 Thread Dirk Hohndel
Given the impact on manual and translations I my release plans... I'm a bit nervous about this. On the flip side... heck yeah, I want this :-) *pondering* /D On Thu, Jul 24, 2014 at 07:08:02PM +0300, Lubomir I. Ivanov wrote: > From: "Lubomir I. Ivanov" > > With this option there is an excepti

User manual on loading photos

2014-07-24 Thread Sergey Starosek
Willem, Can you please add a paragraph to the user manual stating something like: image time should be within +/- 30 min time-frame relating to dive time. Otherwise pictures won't appear on profile / Photos tab. Sergey ___ subsurface mailing list subsu

Re: getting ready for Beta 3

2014-07-24 Thread Tomaz Canabrava
What problems? Ugh. I'll step on that and try to understand whats happening. Em 24/07/2014 13:06, "Dirk Hohndel" escreveu: > On Thu, Jul 24, 2014 at 12:35:42PM -0300, Tomaz Canabrava wrote: > > let's wait for Qt 5.4 to start focusing on Qt 5. > > Except that we build the Mac binaries with Qt5 to

[PATCH] Print: add the "1 dive per page" option

2014-07-24 Thread Lubomir I. Ivanov
From: "Lubomir I. Ivanov" With this option there is an exception, which makes the notes section of the profile table occupy half the page. Signed-off-by: Lubomir I. Ivanov --- http://trac.hohndel.org/ticket/636#comment:4 --- display.h | 3 ++- qt-ui/printlayout.cpp | 14 +++

Re: getting ready for Beta 3

2014-07-24 Thread Dirk Hohndel
On Thu, Jul 24, 2014 at 12:35:42PM -0300, Tomaz Canabrava wrote: > let's wait for Qt 5.4 to start focusing on Qt 5. Except that we build the Mac binaries with Qt5 to work around other problems we had there :-( /D > On Thu, Jul 24, 2014 at 12:32 PM, Dirk Hohndel wrote: > > On Thu, Jul 24, 2014 a

Re: getting ready for Beta 3

2014-07-24 Thread Tomaz Canabrava
let's wait for Qt 5.4 to start focusing on Qt 5. On Thu, Jul 24, 2014 at 12:32 PM, Dirk Hohndel wrote: > On Thu, Jul 24, 2014 at 12:07:46PM -0300, Tomaz Canabrava wrote: >> I'll finish the translations today. >> Any bug that's a blogker on the Qt side, say to me and I'll fix. >> other than that,

Re: getting ready for Beta 3

2014-07-24 Thread Dirk Hohndel
On Thu, Jul 24, 2014 at 12:07:46PM -0300, Tomaz Canabrava wrote: > I'll finish the translations today. > Any bug that's a blogker on the Qt side, say to me and I'll fix. > other than that, I'm pretty busy on real work :( The only one that still bothers me is the shortcuts not working in some Qt5 s

Re: getting ready for Beta 3

2014-07-24 Thread Tomaz Canabrava
I'll finish the translations today. Any bug that's a blogker on the Qt side, say to me and I'll fix. other than that, I'm pretty busy on real work :( On Thu, Jul 24, 2014 at 12:04 PM, Dirk Hohndel wrote: > I pushed all the changes I plan to include, I made a new Windows build > available under "

getting ready for Beta 3

2014-07-24 Thread Dirk Hohndel
I pushed all the changes I plan to include, I made a new Windows build available under "daily"... My plan right now is to do the Beta 3 in a few hours (I'll pull translations one more time before then) and assuming nothing else that is critical shows up, do the 4.2 release early next week. Please

[PATCH] Update spanish translation of user manual to english 3e66948

2014-07-24 Thread Salvador Cuñat
Signed-off-by: Salvador Cuñat --- Documentation/user-manual_es.txt | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Documentation/user-manual_es.txt b/Documentation/user-manual_es.txt index 1ba9fa7..ccc910a 100644 --- a/Documentation/user-manual_es.txt +++ b/Do