notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://git.code.sf.net:/p/tuxpaint/tuxpaint

Browse source
This commit is contained in:
Mark K. Kim 2018-04-01 15:43:55 -04:00
commit f396438155
4 changed files with 44 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

7
docs/AUTHORS.txt
View file

@ -2,12 +2,12 @@ AUTHORS.txt for Tux Paint
Tux Paint - A simple drawing program for children. Tux Paint - A simple drawing program for children.
Copyright (c) 2002-2017 by Bill Kendrick and others Copyright (c) 2002-2018 by Bill Kendrick and others
bill@newbreedsoftware.com bill@newbreedsoftware.com
http://www.tuxpaint.org/ http://www.tuxpaint.org/
June 17, 2002 - December 18, 2017 June 17, 2002 - February 24, 2018
$Id$ $Id$
@ -524,7 +524,8 @@ $Id$
* Basque * Basque
Juan Irigoien <juanirigoien@yahoo.es> Juan Irigoien <juanirigoien@yahoo.es>
Ander Elortondo <ander.elor@gmail.com> Ander Elortondo <ander.elor@gmail.com> [retired]
Alexander Gabillondo <alexgabilondo@gmail.com>
* Belarusian * Belarusian
Eugene Zelenko <greendeath@mail.ru> Eugene Zelenko <greendeath@mail.ru>

6
docs/CHANGES.txt
View file

@ -8,7 +8,7 @@ http://www.tuxpaint.org/
$Id$ $Id$
2017.xxx.x (0.9.23) 2018.xxx.x (0.9.23)
* New tools * New tools
--------- ---------
* Color selector * Color selector
@ -59,6 +59,10 @@ $Id$
* Aragnoes translation * Aragnoes translation
Juan Pablo Martinez Cortes <jpmart@unizar.es> Juan Pablo Martinez Cortes <jpmart@unizar.es>
* Basque translation
Ander Elortondo <ander.elor@gmail.com>
Alexander Gabillondo <alexgabilondo@gmail.com>
* British English translation * British English translation
Caroline Ford <caroline.ford.work@googlemail.com> Caroline Ford <caroline.ford.work@googlemail.com>

10
src/po/ca.po
View file

@ -3,7 +3,7 @@
# Copyright (C) 2002-2009 # Copyright (C) 2002-2009
# This file is distributed under the same license as the Tuxpaint package. # This file is distributed under the same license as the Tuxpaint package.
# Pere Pujal i Carabantes <pere@fornol.no-ip.org>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2015. # Pere Pujal i Carabantes <pere@fornol.no-ip.org>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2015.
# Robert Buj Gelonch <rbuj@fedoraproject.org> 2017. # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017-2018.
# Aquest fitxer és distribueix amb la mateixa llicència que el Tuxpaint. # Aquest fitxer és distribueix amb la mateixa llicència que el Tuxpaint.
# #
# #
@ -18,14 +18,14 @@ msgstr ""
"Project-Id-Version: Tuxpaint cvs 2009-06-21\n" "Project-Id-Version: Tuxpaint cvs 2009-06-21\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-29 15:48+0200\n" "POT-Creation-Date: 2017-07-29 15:48+0200\n"
"PO-Revision-Date: 2017-12-03 09:13+0100\n" "PO-Revision-Date: 2018-02-25 12:57+0100\n"
"Last-Translator: Robert Buj Gelonch <rbuj@fedoraproject.org>\n" "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
"Language-Team: Català <linux-ca@chanae.alphanet.ch>\n" "Language-Team: Català <linux-ca@chanae.alphanet.ch>\n"
"Language: ca\n" "Language: ca\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.4\n" "X-Generator: Poedit 2.0.6\n"
#. Response to Black (0, 0, 0) color selected #. Response to Black (0, 0, 0) color selected
#: ../colors.h:86 #: ../colors.h:86
@ -763,7 +763,7 @@ msgstr "Trieu el dibuix que voleu, llavors feu clic en Obre."
#. Instructions for Slideshow file dialog (FIXME: Make a #define) #. Instructions for Slideshow file dialog (FIXME: Make a #define)
#: ../tuxpaint.c:15079 ../tuxpaint.c:15407 #: ../tuxpaint.c:15079 ../tuxpaint.c:15407
msgid "Choose the pictures you want, then click “Play”." msgid "Choose the pictures you want, then click “Play”."
msgstr "Trieu els dibuixos que voleu, llavors feu clic en «Reproduïr»." msgstr "Trieu els dibuixos que voleu, llavors feu clic a «Reproduir»."
#: ../tuxpaint.c:22873 #: ../tuxpaint.c:22873
msgid "Select a color from your drawing." msgid "Select a color from your drawing."

79
src/po/eu.po
View file

@ -11,15 +11,15 @@ msgstr ""
"Project-Id-Version: eu\n" "Project-Id-Version: eu\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-29 15:48+0200\n" "POT-Creation-Date: 2017-07-29 15:48+0200\n"
"PO-Revision-Date: 2014-08-07 15:22+0200\n" "PO-Revision-Date: 2018-01-20 18:19+0100\n"
"Last-Translator: etxondoko <ander.elor@gmail.com>\n" "Last-Translator: Alexander Gabilondo <alexgabi@irakasle.net>\n"
"Language-Team: librezale@librezale.org\n" "Language-Team: librezale@librezale.org\n"
"Language: eu\n" "Language: eu\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Virtaal 0.7.0\n" "X-Generator: Poedit 2.0.4\n"
#. Response to Black (0, 0, 0) color selected #. Response to Black (0, 0, 0) color selected
#: ../colors.h:86 #: ../colors.h:86
@ -282,7 +282,7 @@ msgstr "Oktogonoa"
#: ../shapes.h:266 ../shapes.h:269 ../shapes.h:272 ../shapes.h:275 #: ../shapes.h:266 ../shapes.h:269 ../shapes.h:272 ../shapes.h:275
#: ../shapes.h:278 ../shapes.h:281 #: ../shapes.h:278 ../shapes.h:281
msgid "Star" msgid "Star"
msgstr "" msgstr "Izarra"
#. Description of a square #. Description of a square
#: ../shapes.h:290 ../shapes.h:291 #: ../shapes.h:290 ../shapes.h:291
@ -326,15 +326,15 @@ msgstr "Oktogonoak zortzi alde berdin ditu."
#: ../shapes.h:327 ../shapes.h:328 #: ../shapes.h:327 ../shapes.h:328
msgid "A star with 3 points." msgid "A star with 3 points."
msgstr "" msgstr "3 puntako izarra."
#: ../shapes.h:329 ../shapes.h:330 #: ../shapes.h:329 ../shapes.h:330
msgid "A star with 4 points." msgid "A star with 4 points."
msgstr "" msgstr "4 puntako izarra."
#: ../shapes.h:331 ../shapes.h:332 #: ../shapes.h:331 ../shapes.h:332
msgid "A star with 5 points." msgid "A star with 5 points."
msgstr "" msgstr "5 puntako izarra."
#. Title of tool selector (buttons down the left) #. Title of tool selector (buttons down the left)
#: ../titles.h:56 #: ../titles.h:56
@ -467,7 +467,7 @@ msgid ""
"size you want. Move around to rotate it, and click to draw it." "size you want. Move around to rotate it, and click to draw it."
msgstr "" msgstr ""
"Aukeratu irudia. Egin klik erdia markatzeko, arrastatu, eta, nahi duzun " "Aukeratu irudia. Egin klik erdia markatzeko, arrastatu, eta, nahi duzun "
"tamainua duenean, askatu. Mugitu biratzeko eta klikatu marrazteko." "tamaina duenean, askatu. Mugitu biratzeko eta klikatu marrazteko."
#. Text tool instructions #. Text tool instructions
#: ../tools.h:127 #: ../tools.h:127
@ -480,20 +480,14 @@ msgstr ""
#. Label tool instructions #. Label tool instructions
#: ../tools.h:130 #: ../tools.h:130
#, fuzzy
#| msgid ""
#| "Choose a style of text. Click on your drawing and you can start typing. "
#| "Press [Enter] or [Tab] to complete the text. By using the selector button "
#| "and clicking an exist label, you can move it, edit it and change its text "
#| "style."
msgid "" msgid ""
"Choose a style of text. Click on your drawing and you can start typing. " "Choose a style of text. Click on your drawing and you can start typing. "
"Press [Enter] or [Tab] to complete the text. By using the selector button " "Press [Enter] or [Tab] to complete the text. By using the selector button "
"and clicking an existing label, you can move it, edit it and change its text " "and clicking an existing label, you can move it, edit it and change its text "
"style." "style."
msgstr "" msgstr ""
"Aukera ezazu testu estiloa. Egin klik zure irudian eta has zaitez idazten.\n" "Aukera ezazu testu estiloa. Egin klik zure irudian eta has zaitez idazten. "
"Sakatu [enter] edo [tab] testua amaitzeko. Aukeratze botoiaz badagoen " "Sakatu [Intro] edo [Tab] testua amaitzeko. Aukeratze botoiaz badagoen "
"etiketa baten klik eginez mugitzeko, aldatzeko eta testu estiloa aldatzeko " "etiketa baten klik eginez mugitzeko, aldatzeko eta testu estiloa aldatzeko "
"aukera duzu." "aukera duzu."
@ -550,7 +544,7 @@ msgstr "Aska ezazu botoia marra amaitzeko."
#. Instruction while using Shape tool (after first click, before release) #. Instruction while using Shape tool (after first click, before release)
#: ../tools.h:167 #: ../tools.h:167
msgid "Hold the button to stretch the shape." msgid "Hold the button to stretch the shape."
msgstr "Euki botoia sakatuta irudia luzatzeko." msgstr "Eutsi botoia sakatuta irudia luzatzeko."
#. Instruction while finishing Shape tool (after release, during rotation step before second click) #. Instruction while finishing Shape tool (after release, during rotation step before second click)
#: ../tools.h:170 #: ../tools.h:170
@ -676,7 +670,7 @@ msgstr "Ezabatu"
#. Open dialog: 'Slides' button, to switch to slide show mode #. Open dialog: 'Slides' button, to switch to slide show mode
#: ../tuxpaint.c:7646 #: ../tuxpaint.c:7646
msgid "Slides" msgid "Slides"
msgstr "Filminak" msgstr "Diapositibak"
#. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture #. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture
#: ../tuxpaint.c:7649 #: ../tuxpaint.c:7649
@ -738,7 +732,7 @@ msgstr "Aukera ezazu ireki nahi duzun irudia. Ondoren klik egin ‘Hasi’ botoi
#: ../tuxpaint.c:22873 #: ../tuxpaint.c:22873
msgid "Select a color from your drawing." msgid "Select a color from your drawing."
msgstr "" msgstr "Hautatu zure marrazkiaren kolore bat"
#: ../tuxpaint.c:22885 #: ../tuxpaint.c:22885
msgid "Pick a color." msgid "Pick a color."
@ -761,12 +755,9 @@ msgid "Color Shift"
msgstr "Kolore aldaketa" msgstr "Kolore aldaketa"
#: ../../magic/src/alien.c:67 #: ../../magic/src/alien.c:67
#, fuzzy
#| msgid ""
#| "Click and move the mouse to change the colors in parts of your picture."
msgid "Click and drag the mouse to change the colors in parts of your picture." msgid "Click and drag the mouse to change the colors in parts of your picture."
msgstr "" msgstr ""
"Klik egin eta mugi ezazu sagua irudiaren parte batzuetako koloreak aldatzeko" "Klik egin eta mugi ezazu sagua irudiaren parte batzuetako koloreak aldatzeko."
#: ../../magic/src/alien.c:68 #: ../../magic/src/alien.c:68
msgid "Click to change the colors in your entire picture." msgid "Click to change the colors in your entire picture."
@ -813,10 +804,8 @@ msgstr ""
"marrazteko." "marrazteko."
#: ../../magic/src/blocks_chalk_drip.c:156 #: ../../magic/src/blocks_chalk_drip.c:156
#, fuzzy
#| msgid "Click and move the mouse around to make the picture drip."
msgid "Click and drag the mouse around to make the picture drip." msgid "Click and drag the mouse around to make the picture drip."
msgstr "Klik egin eta mugi ezazu sagua irudiari busti itxura emateko!" msgstr "Klik egin eta mugi ezazu sagua irudiari busti itxura emateko."
#: ../../magic/src/blur.c:80 #: ../../magic/src/blur.c:80
msgid "Blur" msgid "Blur"
@ -902,20 +891,16 @@ msgid "Darken"
msgstr "Ilundu" msgstr "Ilundu"
#: ../../magic/src/fade_darken.c:134 #: ../../magic/src/fade_darken.c:134
#, fuzzy
#| msgid "Click and move the mouse to lighten parts of your picture."
msgid "Click and drag the mouse to lighten parts of your picture." msgid "Click and drag the mouse to lighten parts of your picture."
msgstr "Klik egin eta mugi ezazu sagua irudiaren parte batzuk argitzeko" msgstr "Klik egin eta mugi ezazu sagua irudiaren parte batzuk argitzeko."
#: ../../magic/src/fade_darken.c:136 #: ../../magic/src/fade_darken.c:136
msgid "Click to lighten your entire picture." msgid "Click to lighten your entire picture."
msgstr "Klik egin irudi osoa argitzeko" msgstr "Klik egin irudi osoa argitzeko"
#: ../../magic/src/fade_darken.c:141 #: ../../magic/src/fade_darken.c:141
#, fuzzy
#| msgid "Click and move the mouse to darken parts of your picture."
msgid "Click and drag the mouse to darken parts of your picture." msgid "Click and drag the mouse to darken parts of your picture."
msgstr "Klik egin eta mugitu sagua irudiaren parte batzuk iluntzeko" msgstr "Klik egin eta mugitu sagua irudiaren parte batzuk iluntzeko."
#: ../../magic/src/fade_darken.c:143 #: ../../magic/src/fade_darken.c:143
msgid "Click to darken your entire picture." msgid "Click to darken your entire picture."
@ -950,12 +935,12 @@ msgstr ""
#: ../../magic/src/foam.c:121 #: ../../magic/src/foam.c:121
msgid "Foam" msgid "Foam"
msgstr "Bitza" msgstr "Aparra"
#: ../../magic/src/foam.c:127 #: ../../magic/src/foam.c:127
msgid "Click and drag the mouse to cover an area with foamy bubbles." msgid "Click and drag the mouse to cover an area with foamy bubbles."
msgstr "" msgstr ""
"Klik egin eta mugi ezazu sagua irudiaren eremu bat bitz burbuilez estaltzeko." "Klik egin eta mugi ezazu sagua irudiaren eremu bat apar burbuilez estaltzeko."
#: ../../magic/src/fold.c:105 #: ../../magic/src/fold.c:105
msgid "Fold" msgid "Fold"
@ -977,7 +962,7 @@ msgstr "Klik egin eta arrastatu sare artistiko korapilatsua marrazteko."
#: ../../magic/src/fretwork.c:182 #: ../../magic/src/fretwork.c:182
msgid "Click to surround your picture with repetitive patterns." msgid "Click to surround your picture with repetitive patterns."
msgstr "Egizu klik zure irudia diseinu korapilatsuaz inguratzeko." msgstr "Egizu klik zure irudia diseinua errepikatzeko."
#: ../../magic/src/glasstile.c:107 #: ../../magic/src/glasstile.c:107
msgid "Glass Tile" msgid "Glass Tile"
@ -1013,7 +998,7 @@ msgstr "Egin klik eta arrastatu egunkari paperera pasatzeko irudia."
#: ../../magic/src/kalidescope.c:120 #: ../../magic/src/kalidescope.c:120
msgid "Symmetric Left/Right" msgid "Symmetric Left/Right"
msgstr "Simetrikoa ezker/eskuma" msgstr "Simetrikoa ezker/eskuin"
#: ../../magic/src/kalidescope.c:122 #: ../../magic/src/kalidescope.c:122
msgid "Symmetric Up/Down" msgid "Symmetric Up/Down"
@ -1025,7 +1010,7 @@ msgstr "Diseinua"
#: ../../magic/src/kalidescope.c:126 #: ../../magic/src/kalidescope.c:126
msgid "Tiles" msgid "Tiles"
msgstr "" msgstr "Lauza"
#. KAL_BOTH #. KAL_BOTH
#: ../../magic/src/kalidescope.c:128 #: ../../magic/src/kalidescope.c:128
@ -1037,16 +1022,16 @@ msgid ""
"Click and drag the mouse to draw with two brushes that are symmetric across " "Click and drag the mouse to draw with two brushes that are symmetric across "
"the left and right of your picture." "the left and right of your picture."
msgstr "" msgstr ""
"Klikatu eta arrastatu sagua irudiaren ezker eskuman simetrikoak diren bi " "Klikatu eta arrastatu sagua irudiaren ezker eskuin simetrikoak diren bi "
"pintzelekin marrazteko." "pintzelez marrazteko."
#: ../../magic/src/kalidescope.c:138 #: ../../magic/src/kalidescope.c:138
msgid "" msgid ""
"Click and drag the mouse to draw with two brushes that are symmetric across " "Click and drag the mouse to draw with two brushes that are symmetric across "
"the top and bottom of your picture." "the top and bottom of your picture."
msgstr "" msgstr ""
"Klikatu eta arrastatu sagua irudiaren goi azpian simetrikoak diren bi " "Klikatu eta arrastatu sagua irudiaren goian behean simetrikoak diren bi "
"pintzelekin marrazteko." "pintzelez marrazteko."
#: ../../magic/src/kalidescope.c:140 #: ../../magic/src/kalidescope.c:140
msgid "Click and drag the mouse to draw a pattern across the picture." msgid "Click and drag the mouse to draw a pattern across the picture."
@ -1429,13 +1414,9 @@ msgid "Color & White"
msgstr "Kolorea & Zuria" msgstr "Kolorea & Zuria"
#: ../../magic/src/tint.c:75 #: ../../magic/src/tint.c:75
#, fuzzy
#| msgid ""
#| "Click and move the mouse around to change the color of parts of your "
#| "picture."
msgid "" msgid ""
"Click and drag the mouse around to change the color of parts of your picture." "Click and drag the mouse around to change the color of parts of your picture."
msgstr "Klik egin eta mugitu sagua irudiaren unadetako kolorea aldatzeko" msgstr "Klik egin eta mugitu sagua irudiaren zonetako kolorea aldatzeko."
#: ../../magic/src/tint.c:76 #: ../../magic/src/tint.c:76
msgid "Click to change the color of your entire picture." msgid "Click to change the color of your entire picture."
@ -1475,7 +1456,7 @@ msgstr "Klik egin eta arrastatu zure irudian tornado tunela marrazteko."
#: ../../magic/src/tv.c:100 #: ../../magic/src/tv.c:100
msgid "TV" msgid "TV"
msgstr "TV" msgstr "TB"
#: ../../magic/src/tv.c:105 #: ../../magic/src/tv.c:105
msgid "" msgid ""
@ -1495,7 +1476,7 @@ msgstr "Uhinak"
#: ../../magic/src/waves.c:104 #: ../../magic/src/waves.c:104
msgid "Wavelets" msgid "Wavelets"
msgstr "Olatutxoak" msgstr "Uhintxoak"
#: ../../magic/src/waves.c:111 #: ../../magic/src/waves.c:111
msgid "" msgid ""
@ -1519,7 +1500,7 @@ msgstr ""
#: ../../magic/src/xor.c:95 #: ../../magic/src/xor.c:95
msgid "Xor Colors" msgid "Xor Colors"
msgstr "Xor Koloreak" msgstr "Xor koloreak"
#: ../../magic/src/xor.c:101 #: ../../magic/src/xor.c:101
msgid "Click and drag to draw a XOR effect" msgid "Click and drag to draw a XOR effect"