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

Merge 0.9.26 for sdl2.0

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2021-06-29 07:21:40 +02:00
commit da20be7a79
26 changed files with 162 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Makefile
View file

@ -4,12 +4,12 @@
# Various contributors (see AUTHORS.txt) # Various contributors (see AUTHORS.txt)
# http://www.tuxpaint.org/ # http://www.tuxpaint.org/
# June 14, 2002 - June 13, 2021 # June 14, 2002 - June 28, 2021
# The version number, for release: # The version number, for release:
VER_VERSION:=0.9.26-rc1 VER_VERSION:=0.9.26
ifdef SOURCE_DATE_EPOCH ifdef SOURCE_DATE_EPOCH
VER_DATE=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u "+%Y-%m-%d") VER_DATE=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u "+%Y-%m-%d")
else else
@ -1347,9 +1347,16 @@ obj:
###### ######
MAGIC_SDL_CPPFLAGS:=$(shell $(PKG_CONFIG) $(SDL_PCNAME) --cflags) MAGIC_SDL_CPPFLAGS:=$(shell $(PKG_CONFIG) $(SDL_PCNAME) --cflags)
MAGIC_SDL_LIBS:=$(LIBMINGW) $(shell $(PKG_CONFIG) $(SDL_PCNAME) --libs) -lSDL2_image -lSDL2_ttf $(SDL_MIXER_LIB)
windows_MAGIC_ARCH_LINKS:=-lintl $(PNG) windows_MAGIC_SDL_LIBS:=-L/usr/local/lib $(LIBMINGW) $(shell $(PKG_CONFIG) $(SDL_PCNAME) --libs) -lSDL_image -lSDL_ttf $(SDL_MIXER_LIB)
macos_MAGIC_ARCH_LINKS:=-lintl $(PNG) macos_MAGIC_SDL_LIBS:=-L/usr/local/lib $(shell $(PKG_CONFIG) $(SDL_PCNAME) --libs) -lSDL_image -lSDL_ttf $(SDL_MIXER_LIB)
ios_MAGIC_SDL_LIBS:=$(shell $(PKG_CONFIG) $(SDL_PCNAME) --libs) -lSDL_image -lSDL_ttf $(SDL_MIXER_LIB)
beos_MAGIC_SDL_LIBS:=-L/usr/local/lib $(shell $(PKG_CONFIG) $(SDL_PCNAME) --libs) -lSDL_image -lSDL_ttf $(SDL_MIXER_LIB)
linux_MAGIC_SDL_LIBS:=-L/usr/local/lib $(shell $(PKG_CONFIG) $(SDL_PCNAME) --libs) -lSDL_image -lSDL_ttf $(SDL_MIXER_LIB)
MAGIC_SDL_LIBS:=$($(OS)_MAGIC_SDL_LIBS)
windows_MAGIC_ARCH_LINKS=-lintl $(PNG)
macos_MAGIC_ARCH_LINKS=-lintl $(PNG)
ios_MAGIC_ARCH_LINKS=-lintl -ljpeg $(PNG) $(shell $(PKG_CONFIG) --libs libtiff-4 libwebp libmpg123 ogg vorbisenc vorbisidec) ios_MAGIC_ARCH_LINKS=-lintl -ljpeg $(PNG) $(shell $(PKG_CONFIG) --libs libtiff-4 libwebp libmpg123 ogg vorbisenc vorbisidec)
beos_MAGIC_ARCH_LINKS:=-lintl $(PNG) beos_MAGIC_ARCH_LINKS:=-lintl $(PNG)
linux_MAGIC_ARCH_LINKS:=-lintl $(PNG) linux_MAGIC_ARCH_LINKS:=-lintl $(PNG)

6
docs/CHANGES.txt
View file

@ -8,7 +8,7 @@ http://www.tuxpaint.org/
$Id$ $Id$
2021.June.10 (0.9.26) 2021.June.28 (0.9.26)
* New Features * New Features
------------ ------------
* Larger UI buttons * Larger UI buttons
@ -70,6 +70,10 @@ $Id$
* Documented how to build Tux Paint using old macOS * Documented how to build Tux Paint using old macOS
Mark K. Kim <markuskimius@gmail.com> Mark K. Kim <markuskimius@gmail.com>
* Added more credits to manpage. Avoiding word-wrapping
URLs and email addresses. Saved out as UTF-8, rather than
Latin-1 encoding.
* Other Improvements * Other Improvements
------------------ ------------------
* Fill tools do a better job at filling around * Fill tools do a better job at filling around

2
docs/en/OPTIONS.txt
View file

@ -6,7 +6,7 @@ Options Documentation
Copyright © 2002-2021 by various contributors; see AUTHORS. Copyright © 2002-2021 by various contributors; see AUTHORS.
http://www.tuxpaint.org/ http://www.tuxpaint.org/
April 19, 2021 June 28, 2021
---------------------------------------------------------------------- ----------------------------------------------------------------------

2
docs/en/README.txt
View file

@ -6,7 +6,7 @@
Copyright © 2002-2021 by various contributors; see AUTHORS. Copyright © 2002-2021 by various contributors; see AUTHORS.
http://www.tuxpaint.org/ http://www.tuxpaint.org/
March 9, 2021 June 28, 2021
---------------------------------------------------------------------- ----------------------------------------------------------------------

2
docs/en/html/OPTIONS.html
View file

@ -25,7 +25,7 @@
</p> </p>
<p> <p>
April 19, 2021 </p> June 28, 2021 </p>
</center> </center>
<hr size="2" <hr size="2"

2
docs/en/html/README.html
View file

@ -28,7 +28,7 @@
</p> </p>
<p> <p>
March 9, 2021 </p> June 28, 2021 </p>
</center> </center>
<hr size="2" <hr size="2"

2
docs/es_ES.UTF-8/OPTIONS.txt
View file

@ -6,7 +6,7 @@ Options Documentation
Copyright © 2002-2021 by various contributors; see AUTHORS. Copyright © 2002-2021 by various contributors; see AUTHORS.
http://www.tuxpaint.org/ http://www.tuxpaint.org/
abril 19, 2021 junio 28, 2021
---------------------------------------------------------------------- ----------------------------------------------------------------------

2
docs/es_ES.UTF-8/README.txt
View file

@ -6,7 +6,7 @@
Copyright © 2002-2021 by various contributors; see AUTHORS. Copyright © 2002-2021 by various contributors; see AUTHORS.
http://www.tuxpaint.org/ http://www.tuxpaint.org/
marzo 9, 2021 junio 28, 2021
---------------------------------------------------------------------- ----------------------------------------------------------------------

2
docs/es_ES.UTF-8/html/OPTIONS.html
View file

@ -25,7 +25,7 @@
</p> </p>
<p> <p>
abril 19, 2021 </p> junio 28, 2021 </p>
</center> </center>
<hr size="2" <hr size="2"

2
docs/es_ES.UTF-8/html/README.html
View file

@ -28,7 +28,7 @@
</p> </p>
<p> <p>
marzo 9, 2021 </p> junio 28, 2021 </p>
</center> </center>
<hr size="2" <hr size="2"

2
docs/fr_FR.UTF-8/OPTIONS.txt
View file

@ -6,7 +6,7 @@ Documentation sur les options
Copyright &copie; 2002-2021 par divers contributeurs; voir AUTHORS. Copyright &copie; 2002-2021 par divers contributeurs; voir AUTHORS.
http://www.tuxpaint.org/ http://www.tuxpaint.org/
avril 19, 2021 juin 28, 2021
---------------------------------------------------------------------- ----------------------------------------------------------------------

2
docs/fr_FR.UTF-8/README.txt
View file

@ -6,7 +6,7 @@
Copyright &copie; 2002-2021 par divers contributeurs; voir AUTHORS. Copyright &copie; 2002-2021 par divers contributeurs; voir AUTHORS.
http://www.tuxpaint.org/ http://www.tuxpaint.org/
mars 9, 2021 juin 28, 2021
---------------------------------------------------------------------- ----------------------------------------------------------------------

2
docs/fr_FR.UTF-8/html/OPTIONS.html
View file

@ -25,7 +25,7 @@
</p> </p>
<p> <p>
avril 19, 2021 </p> juin 28, 2021 </p>
</center> </center>
<hr size="2" <hr size="2"

2
docs/fr_FR.UTF-8/html/README.html
View file

@ -28,7 +28,7 @@
</p> </p>
<p> <p>
mars 9, 2021 </p> juin 28, 2021 </p>
</center> </center>
<hr size="2" <hr size="2"

2
docs/gl_ES.UTF-8/OPTIONS.txt
View file

@ -6,7 +6,7 @@ Documentación de opcións
Copyright © 2002-2021 por varios colaboradores; vexa AUTHORS (AUTORES). Copyright © 2002-2021 por varios colaboradores; vexa AUTHORS (AUTORES).
http://www.tuxpaint.org/ http://www.tuxpaint.org/
19 de Abril de 2021 28 de Xuño de 2021
---------------------------------------------------------------------- ----------------------------------------------------------------------

2
docs/gl_ES.UTF-8/README.txt
View file

@ -6,7 +6,7 @@
Copyright © 2002-2021 por varios colaboradores; vexa AUTHORS (AUTORES). Copyright © 2002-2021 por varios colaboradores; vexa AUTHORS (AUTORES).
http://www.tuxpaint.org/ http://www.tuxpaint.org/
9 de Marzo de 2021 28 de Xuño de 2021
---------------------------------------------------------------------- ----------------------------------------------------------------------

2
docs/gl_ES.UTF-8/html/OPTIONS.html
View file

@ -25,7 +25,7 @@
</p> </p>
<p> <p>
19 de Abril de 2021 </p> 28 de Xuño de 2021 </p>
</center> </center>
<hr size="2" <hr size="2"

2
docs/gl_ES.UTF-8/html/README.html
View file

@ -28,7 +28,7 @@
</p> </p>
<p> <p>
9 de Marzo de 2021 </p> 28 de Xuño de 2021 </p>
</center> </center>
<hr size="2" <hr size="2"

2
docs/ja_JP.UTF-8/OPTIONS.txt
View file

@ -6,7 +6,7 @@
Copyright © 2002-2021 by various contributors; "AUTHORS" 参照. Copyright © 2002-2021 by various contributors; "AUTHORS" 参照.
http://www.tuxpaint.org/ http://www.tuxpaint.org/
2021年4月19日 2021年6月28日
---------------------------------------------------------------------- ----------------------------------------------------------------------

2
docs/ja_JP.UTF-8/README.txt
View file

@ -6,7 +6,7 @@
Copyright © 2002-2021 by various contributors; "AUTHORS" 参照. Copyright © 2002-2021 by various contributors; "AUTHORS" 参照.
http://www.tuxpaint.org/ http://www.tuxpaint.org/
2021年3月 9日 2021年6月28日
---------------------------------------------------------------------- ----------------------------------------------------------------------

2
docs/ja_JP.UTF-8/html/OPTIONS.html
View file

@ -25,7 +25,7 @@
</p> </p>
<p> <p>
2021年4月19日 </p> 2021年6月28日 </p>
</center> </center>
<hr size="2" <hr size="2"

2
docs/ja_JP.UTF-8/html/README.html
View file

@ -28,7 +28,7 @@
</p> </p>
<p> <p>
2021年3月 9日 </p> 2021年6月28日 </p>
</center> </center>
<hr size="2" <hr size="2"

100
src/manpage/tuxpaint.1
View file

@ -1,5 +1,5 @@
.\" tuxpaint.1 - 2021.06.13 .\" tuxpaint.1 - 2021.06.28
.TH TUXPAINT 1 "13 June 2021" "0.9.26" "Tux Paint" .TH TUXPAINT 1 "28 June 2021" "0.9.26" "Tux Paint"
.SH NAME .SH NAME
tuxpaint -- "Tux Paint", a drawing program for young children. tuxpaint -- "Tux Paint", a drawing program for young children.
@ -1058,14 +1058,22 @@ the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
.SH OTHER INFO .SH OTHER INFO
See the documentation that comes with \fITux Paint\fP for further instructions on
using the program's features.
The canonical place to find \fITux Paint\fP information is at The canonical place to find \fITux Paint\fP information is at
.nh
http://www.tuxpaint.org/. http://www.tuxpaint.org/.
.hy
.SH AUTHORS .SH AUTHORS
Bill Kendrick. <bill@newbreedsoftware.com> Lead developer & project manager: Bill Kendrick
.nh
<bill@newbreedsoftware.com>.
.hy
With patches, fixes, extensions, translation, documentation and more from With patches, fixes, extensions, porting, translations, documentation, and more from
lots of people, including, but not limited to: lots of people, including, but probably not limited to (see AUTHORS.txt and CHANGES.txt):
Aki, Aki,
Ashish Arora, Ashish Arora,
@ -1077,18 +1085,25 @@ Adorilson Bezerra de Araujo,
Xandru Armesto, Xandru Armesto,
Ben Armstrong, Ben Armstrong,
Ravishankar Ayyakkannu, Ravishankar Ayyakkannu,
Dwayne Bailey, Dwayne Bailey,
Matías Bellone,
Martin Benjamin, Martin Benjamin,
Besnik Bleta,
Denis Bodor, Denis Bodor,
Rahul Borade,
Yacine Bouklif, Yacine Bouklif,
René Brandenburger, Miguel Bouzada,
René Brandenburger,
Herman Bruyninckx, Herman Bruyninckx,
Lucie Burianova, Lucie Burianova,
Laurentiu Buzdugan, Laurentiu Buzdugan,
Albert Cahalan, Albert Cahalan,
Pere Pujal Carabantes, Pere Pujal i Carabantes,
Felipe Castro,
Ouychai Chaita, Ouychai Chaita,
Zden¿k Chalupský, Zdenek Chalupský,
Wei-Lun Chao, Wei-Lun Chao,
Jacques Chion, Jacques Chion,
Ankit Choudary, Ankit Choudary,
@ -1097,63 +1112,87 @@ Urska Colner,
Adam 'akanewbie' Corcoran, Adam 'akanewbie' Corcoran,
Helder Correia, Helder Correia,
Ricardo Cruz, Ricardo Cruz,
Magnus Dahl,
Laurent Dhima, Laurent Dhima,
Chandrakant Dhutadmal, Chandrakant Dhutadmal,
Yavor Doganov, Yavor Doganov,
Joe Dalton, Joe Dalton,
Tim Dickson,
Dawa Dolma, Dawa Dolma,
Kevin Donnelly, Kevin Donnelly,
Ander Elortondo,
Alberto Escudero-Pascual,
Jamil Farzana,
Doruk Fisek,
Dovix, Dovix,
Korvigellou An Drouizig (Philippe), Korvigellou An Drouizig (Philippe),
Serhij Dubyk,
Ander Elortondo,
Alberto Escudero-Pascual,
T. Surya Fajri,
Jamil Farzana,
Sveinn í Felli,
Doruk Fisek,
Flavia Floris,
Fòram na Gàidhlig,
Fabian Franz, Fabian Franz,
Derrick Frimpong, Derrick Frimpong,
Martin Fuhrer, Martin Fuhrer,
Fula Localization Project, Fula Localization Project,
Alexander Gabillondo,
Gabriel Gazzan, Gabriel Gazzan,
Robert Buj Gelonch,
Alexander Geroimenko, Alexander Geroimenko,
Torsten Giebl, Torsten Giebl,
Harvey Ginter,
Solomon Gizaw, Solomon Gizaw,
Robert Glowczynski, Robert Glowczynski,
Chris Goerner, Chris Goerner,
Mikel González, Mikel González,
Volker Grabsch, Volker Grabsch,
The Greek Linux i18n Team, The Greek Linux i18n Team,
Edmund GRIMLEY EVANS, Edmund GRIMLEY EVANS,
Frederico Goncalves Guimaraes, Frederico Goncalves Guimaraes,
Joe Hanson, Joe Hanson,
Sam "Criswell" Hart, Sam "Criswell" Hart,
Guy Hed, Guy Hed,
Farinaz Hedayat, Farinaz Hedayat,
Prasanta Hembram,
Willem Heppe,
Tedi Heriyanto, Tedi Heriyanto,
Pjetur G. Hjaltason, Pjetur G. Hjaltason,
Knut Erik Hollund, Knut Erik Hollund,
Henrik Holst,
Khaled Hosny, Khaled Hosny,
Henry House, Henry House,
Mohomodou Houssouba, Mohomodou Houssouba,
Song Huang, Song Huang,
Karl Ove Hufthammer, Karl Ove Hufthammer,
Roland Illig, Roland Illig,
Daniel Illingworth,
Indigenas Sin Fronteras, Indigenas Sin Fronteras,
Juan Irigoien, Juan Irigoien,
Students of Vocational Higher Secondary School Irimpanam, Students of Vocational Higher Secondary School Irimpanam,
Ivana Rakic, Ivana Rakic,
Dmitriy Ivanov, Dmitriy Ivanov,
Mogens Jaeger, Mogens Jaeger,
Lis Gøthe í Jákupsstovu, Lis Gøthe í Jákupsstovu,
Nedjeljko Jedvaj, Nedjeljko Jedvaj,
Aleksandar Jelenak, Aleksandar Jelenak,
Rasmus Erik Voel Jensen, Rasmus Erik Voel Jensen,
Lauri Jesmin,
Wang Jian, Wang Jian,
Amed Ç. Jiyan, Amed Ç. Jiyan,
Petri Jooste, Petri Jooste,
Richard June, Richard June,
Andrej Kacian, Andrej Kacian,
Thomas Kalka, Thomas Kalka,
Jorma Karvonen, Jorma Karvonen,
Yannis Kaskamanidis,
Kazuhiko, Kazuhiko,
Gabor Kelemen, Gabor Kelemen,
Mark Kim, Mark Kim,
@ -1166,6 +1205,7 @@ Freek de Kruijf,
Andrzej M. Krzysztofowicz, Andrzej M. Krzysztofowicz,
Piotr Kwilinski, Piotr Kwilinski,
Serafeim Kyriaki, Serafeim Kyriaki,
Matthew Lange, Matthew Lange,
Fabio Lazarin, Fabio Lazarin,
Niko Lewman, Niko Lewman,
@ -1173,6 +1213,8 @@ Arkadiusz Lipiec,
Ricky Lontoc, Ricky Lontoc,
Dag H. Loras, Dag H. Loras,
Burkhard Luck, Burkhard Luck,
Nuno Magalhães,
Vincent Mahlangu, Vincent Mahlangu,
Ankit Malik, Ankit Malik,
Neskie Manuel, Neskie Manuel,
@ -1184,18 +1226,26 @@ Sergio Marques,
Pheledi Mathibela, Pheledi Mathibela,
Scott McCreary, Scott McCreary,
Marco Milanesi, Marco Milanesi,
Never Min,
Kartik Mistry, Kartik Mistry,
Mugunth, Mugunth,
Benson Muite,
Steve Murphy, Steve Murphy,
Samuel Murray (Groenkloof), Samuel Murray (Groenkloof),
Shumani Mercy Nehulaudzi, Shumani Mercy Nehulaudzi,
Mikkel Kirkgaard Nielsen, Mikkel Kirkgaard Nielsen,
Alesis Novik, Alesis Novik,
Nudjaree,
Daniel Nylander, Daniel Nylander,
Olli, Olli,
Sven Ollino,
James Olweny, James Olweny,
Teresa Orive, Teresa Orive,
Gareth Owen, Gareth Owen,
Quentin PAGÈS,
Sorin Paliga, Sorin Paliga,
Yannis Papatzikos, Yannis Papatzikos,
Nikolay Parukhin, Nikolay Parukhin,
@ -1209,32 +1259,42 @@ Henrik Pihl,
Auk Piseth, Auk Piseth,
Pablo Pita, Pablo Pita,
Milan Plzik, Milan Plzik,
Eric Poncet,
Sergei Popov, Sergei Popov,
John Popplewell, John Popplewell,
Adam 'foo-script' Rakowski, Adam 'foo-script' Rakowski,
Rodrigo Perez Ramirez and Indigenas Sin Fronteras, Rodrigo Perez Ramirez and Indigenas Sin Fronteras,
Sebastian Rasmussen,
Robert Readman, Robert Readman,
Leandro Regueiro, Leandro Regueiro,
Samir Ribić,
Simona Riva, Simona Riva,
Robin Rosenberg, Robin Rosenberg,
Ilir Rugova, Ilir Rugova,
Jaroslav Rynik, Jaroslav Rynik,
Bert Saal, Bert Saal,
Ibraahiima SAAR, Ibraahiima SAAR,
Saikumar, Saikumar,
Samuel Sarpong, Samuel Sarpong,
Kevin Patrick Scannell, Kevin Patrick Scannell,
Stephanie Schilling, Stephanie Schilling,
Luc 'Begasus' Schrijvers,
Kiriaki SERAFEIM, Kiriaki SERAFEIM,
Pavithran Shakamuri, Pavithran Shakamuri,
Gia Shervashidze, Gia Shervashidze,
Clytie Siddall, Clytie Siddall,
Kliment Simoncev, Kliment Simoncev,
Tomas Skäre,
Sokratis Sofianopoulos, Sokratis Sofianopoulos,
Khoem Sokhem, Khoem Sokhem,
Geert Stams, Geert Stams,
Peter Sterba, Peter Sterba,
Raivis Strogonovs, Raivis Strogonovs,
Luis C. Suárez,
Sugar Labs i18n team,
Tomasz 'karave' Tarach, Tomasz 'karave' Tarach,
Michal Terbert, Michal Terbert,
Ignacia Tike, Ignacia Tike,
@ -1242,19 +1302,25 @@ Tilo,
Tarmo Toikkanen, Tarmo Toikkanen,
TOYAMA Shin-ichi, TOYAMA Shin-ichi,
Niall Tracey, Niall Tracey,
Gerasim Troeglazov,
tropikhajma, tropikhajma,
Florence Tushabe, Florence Tushabe,
Matej Urban,
Matej Urbančič,
Rita Verbauskaite, Rita Verbauskaite,
Daniel Jose Viana, Daniel Jose Viana,
Charles Vidal, Charles Vidal,
Darrell Walisser, Darrell Walisser,
Frank Weng, Frank Weng,
Damian Yerrick, Damian Yerrick,
yurchor,
Muhammad Najmi Ahmad Zabidi, Muhammad Najmi Ahmad Zabidi,
Eugene Zelenko, Eugene Zelenko,
Martin Zhekov, Martin Zhekov,
Flavia Floris,
and and
Huang Zuzhen. Huang Zuzhen.

39
src/po/nb.po
View file

@ -2,21 +2,21 @@
# Oversettelse av Tux Paint til bokmål. # Oversettelse av Tux Paint til bokmål.
# Dag H. Lorås <dag.loraas@operamail.com>, 2003. # Dag H. Lorås <dag.loraas@operamail.com>, 2003.
# Knut Erik Hollund <khollund@responze.net>, 2003. # Knut Erik Hollund <khollund@responze.net>, 2003.
# Karl Ove Hufthammer <karl@huftis.org>, 2003, 2005, 2006, 2007, 2009, 2014, 2015, 2017, 2020. # Karl Ove Hufthammer <karl@huftis.org>, 2003, 2005, 2006, 2007, 2009, 2014, 2015, 2017, 2020, 2021.
# Klaus Ade Johnstad <klaus@skolelinux.no>, 2004. # Klaus Ade Johnstad <klaus@skolelinux.no>, 2004.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: nb\n" "Project-Id-Version: nb\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-06-13 21:06-0700\n" "POT-Creation-Date: 2021-06-13 21:06-0700\n"
"PO-Revision-Date: 2020-12-12 15:25+0100\n" "PO-Revision-Date: 2021-06-28 19:40+0200\n"
"Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n" "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
"Language-Team: Norwegian Bokmål <l10n-no@lister.huftis.org>\n" "Language-Team: Norwegian Bokmål <l10n-no@lister.huftis.org>\n"
"Language: nb\n" "Language: nb\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: Lokalize 21.03.70\n" "X-Generator: Lokalize 21.04.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. Response to Black (0, 0, 0) color selected #. Response to Black (0, 0, 0) color selected
@ -184,35 +184,37 @@ msgstr "<9>spare-9b"
#: ../fill_tools.h:49 #: ../fill_tools.h:49
msgid "Solid" msgid "Solid"
msgstr "" msgstr "Ensfarget"
#: ../fill_tools.h:50 #: ../fill_tools.h:50
#, fuzzy
#| msgid "Lines" #| msgid "Lines"
msgid "Linear" msgid "Linear"
msgstr "Linjer" msgstr "Lineær"
#: ../fill_tools.h:51 #: ../fill_tools.h:51
msgid "Radial" msgid "Radial"
msgstr "" msgstr "Radiell"
#: ../fill_tools.h:55 #: ../fill_tools.h:55
#, fuzzy
#| msgid "Click in the picture to fill that area with color." #| msgid "Click in the picture to fill that area with color."
msgid "Click to fill an area with a solid color." msgid "Click to fill an area with a solid color."
msgstr "Trykk på tegningen for å fylle området med fargen fra malingbøtta." msgstr "Trykk for å fylle hele området med fargen fra malingbøtta."
#: ../fill_tools.h:56 #: ../fill_tools.h:56
msgid "" msgid ""
"Click and drag to fill an area with a linear gradient (from the chosen color " "Click and drag to fill an area with a linear gradient (from the chosen color "
"to transparent)." "to transparent)."
msgstr "" msgstr ""
"Trykk for å fylle området med en lineær fargeovergang (fra den valgte fargen"
" til gjennomsiktig)."
#: ../fill_tools.h:57 #: ../fill_tools.h:57
msgid "" msgid ""
"Click to fill an area with a radial gradient (from the chosen color to " "Click to fill an area with a radial gradient (from the chosen color to "
"transparent)." "transparent)."
msgstr "" msgstr ""
"Trykk for å fylle området med en radiell fargeovergang (fra den valgte fargen"
" til gjennomsiktig)."
#. Congratulations #1 #. Congratulations #1
#: ../great.h:37 #: ../great.h:37
@ -417,7 +419,6 @@ msgstr "Magi"
#. Title of fill selector (buttons down the right for fill tool) #. Title of fill selector (buttons down the right for fill tool)
#: ../titles.h:81 #: ../titles.h:81
#, fuzzy
#| msgid "Fill" #| msgid "Fill"
msgid "Fills" msgid "Fills"
msgstr "Bøtte" msgstr "Bøtte"
@ -818,7 +819,7 @@ msgstr ""
#: ../tuxpaint.c:24135 #: ../tuxpaint.c:24135
msgid "Select a color from your drawing." msgid "Select a color from your drawing."
msgstr "Vel ein farge frå teikninga." msgstr "Velg en farge fra tegningen."
#: ../tuxpaint.c:24147 #: ../tuxpaint.c:24147
msgid "Pick a color." msgid "Pick a color."
@ -932,23 +933,24 @@ msgstr ""
#: ../../magic/src/checkerboard.c:99 #: ../../magic/src/checkerboard.c:99
msgid "Checkerboard" msgid "Checkerboard"
msgstr "" msgstr "Sjakkbrett"
#: ../../magic/src/checkerboard.c:106 #: ../../magic/src/checkerboard.c:106
#, fuzzy
#| msgid "Click and drag to draw repetitive patterns. " #| msgid "Click and drag to draw repetitive patterns. "
msgid "Click and drag to fill the canvas with a checkerboard pattern." msgid "Click and drag to fill the canvas with a checkerboard pattern."
msgstr "Hold inne knappen og flytt rundt for å tegne mønster." msgstr "Hold inne knappen og flytt rundt for å tegne et sjakkbrett­mønster."
#: ../../magic/src/clone.c:132 #: ../../magic/src/clone.c:132
msgid "Clone" msgid "Clone"
msgstr "" msgstr "Klon"
#: ../../magic/src/clone.c:138 #: ../../magic/src/clone.c:138
msgid "" msgid ""
"Click once to pick a spot to begin cloning. Click again and drag to clone " "Click once to pick a spot to begin cloning. Click again and drag to clone "
"that part of the picture." "that part of the picture."
msgstr "" msgstr ""
"Trykk først for å velge hvor du vil klone fra. Trykk så en annen plass og dra"
" for å klone tegningen."
#: ../../magic/src/confetti.c:83 #: ../../magic/src/confetti.c:83
msgid "Confetti" msgid "Confetti"
@ -1067,7 +1069,7 @@ msgstr "Gress"
#: ../../magic/src/grass.c:113 #: ../../magic/src/grass.c:113
msgid "Click and drag to draw grass. Don’t forget the dirt!" msgid "Click and drag to draw grass. Don’t forget the dirt!"
msgstr "ŭHold inne knappen og flytt rundt for å tegne gress. Ikke glem jorden!" msgstr "Hold inne knappen og flytt rundt for å tegne gress. Ikke glem jorden!"
#: ../../magic/src/halftone.c:35 #: ../../magic/src/halftone.c:35
msgid "Halftone" msgid "Halftone"
@ -1272,13 +1274,12 @@ msgstr ""
#. Both are named "Pixels", at the moment: #. Both are named "Pixels", at the moment:
#: ../../magic/src/pixels.c:108 #: ../../magic/src/pixels.c:108
msgid "Pixels" msgid "Pixels"
msgstr "" msgstr "Piksler"
#: ../../magic/src/pixels.c:114 #: ../../magic/src/pixels.c:114
#, fuzzy
#| msgid "Click and drag to draw large bricks." #| msgid "Click and drag to draw large bricks."
msgid "Click and drag to draw large pixels." msgid "Click and drag to draw large pixels."
msgstr "Hold inne knappen og flytt rundt for å tegne store mursteiner." msgstr "Hold inne knappen og flytt rundt for å tegne store piksler."
#: ../../magic/src/puzzle.c:103 #: ../../magic/src/puzzle.c:103
msgid "Puzzle" msgid "Puzzle"

35
src/po/nn.po
View file

@ -1,19 +1,19 @@
# Translation of Tux Paint to Norwegian Nynorsk # Translation of Tux Paint to Norwegian Nynorsk
# #
# Karl Ove Hufthammer <karl@huftis.org>, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2014, 2015, 2017, 2020. # Karl Ove Hufthammer <karl@huftis.org>, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2014, 2015, 2017, 2020, 2021.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: nn\n" "Project-Id-Version: nn\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-06-13 21:06-0700\n" "POT-Creation-Date: 2021-06-13 21:06-0700\n"
"PO-Revision-Date: 2020-12-12 15:23+0100\n" "PO-Revision-Date: 2021-06-28 19:38+0200\n"
"Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n" "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
"Language-Team: Norwegian Nynorsk <l10n-no@lister.huftis.org>\n" "Language-Team: Norwegian Nynorsk <l10n-no@lister.huftis.org>\n"
"Language: nn\n" "Language: nn\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: Lokalize 21.03.70\n" "X-Generator: Lokalize 21.04.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. Response to Black (0, 0, 0) color selected #. Response to Black (0, 0, 0) color selected
@ -181,35 +181,37 @@ msgstr "<9>spare-9b"
#: ../fill_tools.h:49 #: ../fill_tools.h:49
msgid "Solid" msgid "Solid"
msgstr "" msgstr "Einsfarga"
#: ../fill_tools.h:50 #: ../fill_tools.h:50
#, fuzzy
#| msgid "Lines" #| msgid "Lines"
msgid "Linear" msgid "Linear"
msgstr "Linjer" msgstr "Lineær"
#: ../fill_tools.h:51 #: ../fill_tools.h:51
msgid "Radial" msgid "Radial"
msgstr "" msgstr "Radiell"
#: ../fill_tools.h:55 #: ../fill_tools.h:55
#, fuzzy
#| msgid "Click in the picture to fill that area with color." #| msgid "Click in the picture to fill that area with color."
msgid "Click to fill an area with a solid color." msgid "Click to fill an area with a solid color."
msgstr "Trykk på teikninga for å fylla området med fargen frå målingbøtta." msgstr "Trykk for å fylla heile området med fargen frå målingbøtta."
#: ../fill_tools.h:56 #: ../fill_tools.h:56
msgid "" msgid ""
"Click and drag to fill an area with a linear gradient (from the chosen color " "Click and drag to fill an area with a linear gradient (from the chosen color "
"to transparent)." "to transparent)."
msgstr "" msgstr ""
"Trykk for å fylla området med ein lineær fargeovergang (frå den valde fargen"
" til gjennomsiktig)."
#: ../fill_tools.h:57 #: ../fill_tools.h:57
msgid "" msgid ""
"Click to fill an area with a radial gradient (from the chosen color to " "Click to fill an area with a radial gradient (from the chosen color to "
"transparent)." "transparent)."
msgstr "" msgstr ""
"Trykk for å fylla området med ein radiell fargeovergang (frå den valde fargen"
" til gjennomsiktig)."
#. Congratulations #1 #. Congratulations #1
#: ../great.h:37 #: ../great.h:37
@ -414,7 +416,6 @@ msgstr "Magi"
#. Title of fill selector (buttons down the right for fill tool) #. Title of fill selector (buttons down the right for fill tool)
#: ../titles.h:81 #: ../titles.h:81
#, fuzzy
#| msgid "Fill" #| msgid "Fill"
msgid "Fills" msgid "Fills"
msgstr "Bøtte" msgstr "Bøtte"
@ -931,23 +932,24 @@ msgstr ""
#: ../../magic/src/checkerboard.c:99 #: ../../magic/src/checkerboard.c:99
msgid "Checkerboard" msgid "Checkerboard"
msgstr "" msgstr "Sjakkbrett"
#: ../../magic/src/checkerboard.c:106 #: ../../magic/src/checkerboard.c:106
#, fuzzy
#| msgid "Click and drag to draw repetitive patterns. " #| msgid "Click and drag to draw repetitive patterns. "
msgid "Click and drag to fill the canvas with a checkerboard pattern." msgid "Click and drag to fill the canvas with a checkerboard pattern."
msgstr "Hald inne knappen og flytt rundt for å teikna mønster. " msgstr "Hald inne knappen og flytt rundt for å teikna eit sjakkbrett­mønster."
#: ../../magic/src/clone.c:132 #: ../../magic/src/clone.c:132
msgid "Clone" msgid "Clone"
msgstr "" msgstr "Klon"
#: ../../magic/src/clone.c:138 #: ../../magic/src/clone.c:138
msgid "" msgid ""
"Click once to pick a spot to begin cloning. Click again and drag to clone " "Click once to pick a spot to begin cloning. Click again and drag to clone "
"that part of the picture." "that part of the picture."
msgstr "" msgstr ""
"Trykk først for å velja kor du vil klona frå. Trykk så ein annan plass og dra"
" for å klona teikninga."
#: ../../magic/src/confetti.c:83 #: ../../magic/src/confetti.c:83
msgid "Confetti" msgid "Confetti"
@ -1272,13 +1274,12 @@ msgstr ""
#. Both are named "Pixels", at the moment: #. Both are named "Pixels", at the moment:
#: ../../magic/src/pixels.c:108 #: ../../magic/src/pixels.c:108
msgid "Pixels" msgid "Pixels"
msgstr "" msgstr "Pikslar"
#: ../../magic/src/pixels.c:114 #: ../../magic/src/pixels.c:114
#, fuzzy
#| msgid "Click and drag to draw large bricks." #| msgid "Click and drag to draw large bricks."
msgid "Click and drag to draw large pixels." msgid "Click and drag to draw large pixels."
msgstr "Hald inne knappen og flytt rundt for å teikna store mursteinar." msgstr "Hald inne knappen og flytt rundt for å teikna store pikslar."
#: ../../magic/src/puzzle.c:103 #: ../../magic/src/puzzle.c:103
msgid "Puzzle" msgid "Puzzle"

8
win32/tuxpaint.iss
View file

@ -626,19 +626,19 @@ begin
lang := Lang2Gettext(false); lang := Lang2Gettext(false);
if lang = 'es' then if lang = 'es' then
readme := 'es\html\LEEME.html' readme := 'es_ES.UTF-8\html\README.html'
else else
if lang = 'fr' then if lang = 'fr' then
readme := 'fr\html\README.html' readme := 'fr_FR.UTF8\html\README.html'
else else
if lang = 'gl' then if lang = 'gl' then
readme := 'gl\html\README.html' readme := 'gl_GL.UTF-8\html\README.html'
else else
if lang = 'it' then if lang = 'it' then
readme := 'it\html\README.html' readme := 'it\html\README.html'
else else
if lang = 'ja' then if lang = 'ja' then
readme := 'ja\html\README.html' readme := 'ja_JP.UTF-8\html\README.html'
else else
if lang = 'nl' then if lang = 'nl' then
readme := 'nl\html\README.html' readme := 'nl\html\README.html'