* Don't ignore a fscanf()'s output.
* Rewrite some increment/roll-overs to avoid, e.g.
src/im.c:1193:18: warning: operation on ‘cm.section’ may be undefined [-Wsequence-point]
cm.section = (++cm.section % SEC_TOTAL); /* Change section */
- Replace any C++ style comments (// ...) with C style (/* ... */).
- Improve calls to fgets() to avoid "ignoring return value
of ‘fscanf’, declared with attribute warn_unused_result
[-Wunused-result]" errors (WIP).
- Removed some unused, commented-out code.
The big one we've all been waiting for -- ran indent on tuxpaint.c
(which itself is ~25K lines long, and really needs to be split up).
Hopefully the code will look less atrocious now :-)
A number of assignments of grid_dims structs were of the form of
(ignoring some carriage returns, which undoubtedly added to the
confusion):
gd_controls = (grid_dims) { 3, 2 };
which confused `indent`, causing it to think certain if/else blocks
were being ended early.
Turning these into assignments, like so, to avoid this:
gd_controls.rows = 3;
gd_controls.cols = 2;
Coming up with some reasonable config options for `indent`
(so one will eventually be able to run `indent *.c *.h` to
get consistent formatting).
I expect this'll change as I experiment with it, against various
source files. (Old code is olllllllld)
Name (UTF-8 encoding) in the credits.
Added ":" and ";" in the common punctuation.
Added "[]>" in the uncommon punctuation. Did not add, as unique symbols, "<=" and ">=" (more/less than or equal).
Did not add missing digits (I'm not sure why there is only 017 there).
Changed "Excelente!" ("Great!") para "Ótimo!", por pensar que esta outra é mais comum no Brasil, acrescentando mais familiaridade para os usuários.
Corrected "Octágono" ("Octagon") which is *wrong* to "Octógono".
Correted "An octagon has eight equal sides." -> "Um octógono tem oito lados iguais.", had the same octagon error.
Changed "A star with N points." -> "Uma estrela DE 3 pontas" to use more common use words for these shapes.
Changed "Paint" -> "Pintar" to "Pincel". I translated the word "paint" as a noun, and not a verb. In Portuguese these two words are different, and the verb translation was being used; also changed "Stamp" -> "Carimbar" to "Carimbo" (also was verb, noun is put).
Changed "Save" -> "Guardar" para "Salvar", which is a much more common word and technical jargon in Brasil to "Save" (a program which saves files).
Changed "Pick a color and a brush shape to draw with." to "Escolha uma cor e um pincel para usar." to simplify sentence with a shorter and more common one. I dropped the translated word for "shape" ("forma"); a different form may be better depending on the TuxPaint interface, as a whole.
Changed translation to tools.h:124 to something that ommits the word "mouse", so it can be reused in more different platforms without a slightly wrong detail. Simplified the sentences a bit (with care to choose what is right, of course).
Changed "Open…" -> "Abrir..." to "Abrir…" (to use an ellipsis sign instead of three dots); same change for "Printing..."; also for tools.h:173.
Changed /tools.h:154 "Your image has been saved!" -> "Seu desenho foi guardado!" to "Seu desenho foi salvo!" (use more common word for save, and keep consistence with another change); same change in #: ../tuxpaint.c:2063
Changed #: ../tools.h:164 "Let go of the button to complete the line." to simplify a bit, keeping the tool's idea.
Changed #: ../tools.h:170 to use "pointer" instead of "mouse". This is a better sentence, and a bit simpler. "Mova o ponteiro para girar a figura. Clique para desenhá-la."
Changed #: ../tools.h:173 to a more natural Portuguese sentence.
Changed #: ../tuxpaint.c:2056 to more common words (unnecessary word removed, as we usually do).
Changed #: ../tuxpaint.c:2059 ../tuxpaint.c:2086 to something that gives the idea for us, although a different literal translation: "Não, quero desenhar mais!" is "No, [I] want to draw more!"
Changed #: ../tuxpaint.c:2064 ../tuxpaint.c:2069 to shorter sentence.
Changed #: ../tuxpaint.c:2065 ../tuxpaint.c:2070 "No, don’t bother saving!" -> "Não, pode deixar pra lá!" to include the word for "saving", so the interface keeps consistence with some important words for actions.
Changed #: ../tuxpaint.c:2068 to more colloquial sentence, important word kept.
Corrected #: ../tuxpaint.c:2073 "Can’t open that picture!" to "Não consigo abrir este desenho!", use the correct word for "this", in this context.
Changed #: ../tuxpaint.c:2080 "There are no saved files!" to "Não tem nenhum desenho salvo!", to use the word for "save".
Changed #: ../tuxpaint.c:2085 "Yes, print it!" to "Sim, imprima ele!", more colloquial; also for #: ../tuxpaint.c:2101 "Yes, erase it!"; also for #: ../tuxpaint.c:2102
Corrected #: ../tuxpaint.c:2100 "Erase this picture?" to "Quer apagar este desenho?"
Changed #: ../tuxpaint.c:3071 "Please wait…" to use ellipsis symbol.
Changed #: ../tuxpaint.c:7652 "Play" -> "Começar" to use more common word.
Corrected and changed #: ../tuxpaint.c:12792 "Replace the picture with your changes?" to "Trocar o desenho antigo por este?", shorter and more common sentence, correct pronoun.
Changed #: ../tuxpaint.c:12796 "Yes, replace the old one!" -> "Sim, troque o antigo!" to keep consistence ith previous changed, also gives the same benefits.
Changed #: ../tuxpaint.c:12800 "No, save a new file!" -> "Não, salve como um novo arquivo!", changed word for "save".
Changed #.../tuxpaint.c:14045 "Choose the picture you want, then click “Open”." -> "Escolha um desenho e clique em “Abrir“." to make it shorter and clearer.
Changed #: ../../magic/src/blocks_chalk_drip.c:153 to simplify.
Changed #: ../../magic/src/blur.c:80 "Blur" -> "Borrão" (noun, filter name, and not the action it does).
Corrected some quotes where interface names are shown in messages (the "unquotes" were wrong).
Changed #: ../../magic/src/blur.c:84 "Click to blur the entire image." -> "Clique para borrar toda a figura."
Changed #: ../../magic/src/calligraphy.c:134 "Click and move the mouse around to draw in calligraphy." -> "Clique e arraste para desenhar com caligrafia.", changed pronoun.
Changed several "click and drag the mouse" to "clique e arraste", simpler and correct.
Changed #: ../../magic/src/distortion.c:150 to "Clique e arraste para fazer uma distorção na sua figura."
Maybe corrected #: ../../magic/src/fold.c:107 "Choose a background color and click to turn the corner of the page over." --> What will be clicked? The color or the page corner to be turned?
"Selecione uma cor de fundo e clique para dobrar a beirada da página."
Changed #: ../../magic/src/fretwork.c:180 "Click and drag to draw repetitive patterns. " ->
"Clique e arraste para desenhar repetidamente. " ->
Changed #: ../../magic/src/fretwork.c:176 "Fretwork" -> "Moldura". An apropriate word, common.
Changed #: ../../magic/src/fretwork.c:182 "Click to surround your picture with repetitive patterns." -> "Clique pra contornar sua figura com um padrão."
Changed #: ../../magic/src/grass.c:118
"Click and drag to draw grass. Don’t forget the dirt!"
"Clique e mova para desenhar grama. Não se esqueça da terra!", much more common word for "dirt".
Simplified #: ../../magic/src/halftone.c:38 "Click and drag to turn your drawing into a newspaper." "Clique e arraste para transformar seu desenho em um jornal."
Changed #: ../../magic/src/kalidescope.c:142
Changed #: ../../magic/src/perspective.c:146 "Zoom" -> "Ampliar"
Changed #: ../../magic/src/perspective.c:151 "Click on the corners and drag where you want to stretch the picture." -> "Clique nos cantos e arraste onde você quiser esticar a figura."
Corrected #: ../../magic/src/realrainbow.c:112 "ROYGBIV Rainbow" -> "Arco-íris VLAVAIV"
Changed #: ../../magic/src/realrainbow.c:117 "Click where you want your rainbow to start, drag to where you want it to end, and then let go to draw a rainbow." -> "Clique onde será o começo do arco-íris e arraste até onde ele termina."
Corrected #: ../../magic/src/tint.c:78 "Click to turn your entire picture into white and a color you choose." "Clique para mudar a figura inteira para branco e outra cor que você escolher."
Changed #: ../../magic/src/waves.c:104 "Wavelets" -> "Tremidos" to be more clear and colloquial
