Merge branch 'master' into sdl2.0
This commit is contained in:
Pere Pujal i Carabantes 2020-12-28 21:55:49 +01:00
commit dc332fc161
16 changed files with 2609 additions and 2428 deletions

View file

@ -36,7 +36,7 @@ else
MINGW_DIR:=/mingw64
else
ifeq ($(SYSNAME),Darwin)
OS:=osx
OS:=macos
GPERF:=/usr/bin/gperf
else
ifeq ($(SYSNAME),BeOS)
@ -84,7 +84,7 @@ beos_MIMESET_CMD:=mimeset -f tuxpaint
MIMESET_CMD:=$($(OS)_MIMESET_CMD)
windows_SO_TYPE:=dll
osx_SO_TYPE:=dylib
macos_SO_TYPE:=dylib
beos_SO_TYPE:=so
linux_SO_TYPE:=so
SO_TYPE:=$($(OS)_SO_TYPE)
@ -96,25 +96,25 @@ windows_EXE_EXT:=.exe
EXE_EXT:=$($(OS)_EXE_EXT)
windows_BUNDLE:=
osx_BUNDLE=./TuxPaint.app
macos_BUNDLE=./TuxPaint.app
beos_BUNDLE:=
linux_BUNDLE:=
BUNDLE:=$($(OS)_BUNDLE)
windows_ARCH_LIBS:=obj/win32_print.o obj/resource.o
osx_ARCH_LIBS:=src/macos_print.m obj/macos.o
macos_ARCH_LIBS:=src/macos_print.m obj/macos.o
beos_ARCH_LIBS:=obj/BeOS_print.o
linux_ARCH_LIBS:=obj/postscript_print.o
ARCH_LIBS:=$($(OS)_ARCH_LIBS)
windows_ARCH_CFLAGS:=
osx_ARCH_CFLAGS:=-mmacosx-version-min=10.8 -isystem /opt/local/include -DHAVE_STRCASESTR -w -headerpad_max_install_names
macos_ARCH_CFLAGS:=-mmacosx-version-min=10.8 -isystem /opt/local/include -DHAVE_STRCASESTR -w -headerpad_max_install_names
beos_ARCH_CFLAGS:=
linux_ARCH_CFLAGS:=
ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
windows_ARCH_LDFLAGS:=
osx_ARCH_LDFLAGS:=-L/opt/local/lib
macos_ARCH_LDFLAGS:=-L/opt/local/lib
beos_ARCH_LDFLAGS:=
linux_ARCH_LDFLAGS:=
ARCH_LDFLAGS:=$($(OS)_ARCH_LDFLAGS)
@ -128,13 +128,13 @@ FRIBIDI_LIB:=$(shell $(PKG_CONFIG) --libs fribidi)
FRIBIDI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags fribidi)
windows_ARCH_LINKS:=-lgdi32 -lcomdlg32 $(PNG) -lz -lwinspool -lshlwapi $(FRIBIDI_LIB) -liconv -limagequant
osx_ARCH_LINKS:=$(FRIBIDI_LIB) -limagequant
macos_ARCH_LINKS:=$(FRIBIDI_LIB) -limagequant
beos_ARCH_LINKS:=-lintl $(PNG) -lz -lbe -lnetwork -liconv $(FRIBIDI_LIB) $(PAPER_LIB) $(STDC_LIB) -limagequant
linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB) -limagequant
ARCH_LINKS:=$($(OS)_ARCH_LINKS)
windows_ARCH_HEADERS:=src/win32_print.h
osx_ARCH_HEADERS:=src/macos.h
macos_ARCH_HEADERS:=src/macos.h
beos_ARCH_HEADERS:=src/BeOS_print.h
linux_ARCH_HEADERS:=
ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
@ -142,7 +142,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
# Where things will go when ultimately installed:
# For macOS, the prefix is relative to DESTDIR.
windows_PREFIX:=/usr/local
osx_PREFIX:=Resources
macos_PREFIX:=Resources
linux_PREFIX:=/usr/local
PREFIX:=$($(OS)_PREFIX)
@ -150,7 +150,7 @@ PREFIX:=$($(OS)_PREFIX)
# PKG_ROOT is the old name for this, and should be undefined.
# macOS is set up as a bundle, with all files under 'Contents'.
# "TuxPaint-1" is the OLPC XO name. Installing to ./ is bad!
ifeq ($(OS),osx)
ifeq ($(OS),macos)
DESTDIR:=$(BUNDLE)/Contents/
else ifeq ($(PREFIX),./)
DESTDIR:=TuxPaint-1
@ -474,7 +474,7 @@ trans:
######
windows_ARCH_INSTALL:=
osx_ARCH_INSTALL:=install-macbundle TuxPaint.dmg
macos_ARCH_INSTALL:=install-macbundle TuxPaint.dmg
linux_ARCH_INSTALL:=install-xdg
ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
@ -495,7 +495,7 @@ install: install-bin install-data install-man install-doc \
@echo
@echo "--------------------------------------------------------------"
@echo
@if [ "x$(OS)" = "xosx" ]; then \
@if [ "x$(OS)" = "xmacos" ]; then \
echo "All done! Now you can double click $(BUNDLE) to run the"; \
echo "program!!! TuxPaint.dmg has also been created for"; \
echo "distribution."; \
@ -715,7 +715,7 @@ STARTER_BACK_NAME=$(or $(wildcard $(subst starters/.thumbs,starters,$(@:-t.png=-
# FIXME: Need to be able to update a thumbnail if the source image is modified -bjk 2019.09.14
$(THUMB_STARTERS):
@echo -n "."
@printf "."
@mkdir -p starters/.thumbs
@if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \
then \
@ -776,7 +776,7 @@ TEMPLATE_NAME=$(or $(wildcard $(subst templates/.thumbs,templates,$(@:-t.png=.sv
# FIXME: Need to be able to update a thumbnail if the source image is modified -bjk 2019.09.14
$(THUMB_TEMPLATES):
@echo -n "."
@printf "."
@mkdir -p templates/.thumbs
@convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
@ -1255,7 +1255,7 @@ MAGIC_SDL_LIBS:=-L/usr/local/lib $(LIBMINGW) $(shell $(PKG_CONFIG) $(SDL_PCNAME)
MAGIC_ARCH_LINKS:=-lintl $(PNG)
windows_PLUGIN_LIBS:=$(MAGIC_SDL_LIBS) $(MAGIC_ARCH_LINKS)
osx_PLUGIN_LIBS:=$(MAGIC_SDL_LIBS) $(MAGIC_ARCH_LINKS)
macos_PLUGIN_LIBS:=$(MAGIC_SDL_LIBS) $(MAGIC_ARCH_LINKS)
beos_PLUGIN_LIBS:="$(MAGIC_SDL_LIBS) $(MAGIC_ARCH_LINKS) $(MAGIC_SDL_CPPFLAGS)"
linux_PLUGIN_LIBS:=
PLUGIN_LIBS:=$($(OS)_PLUGIN_LIBS)

View file

@ -8,7 +8,7 @@ http://www.tuxpaint.org/
$Id$
2020.November.21 (0.9.25)
2020.December.27 (0.9.25)
* New Features
------------
* Export drawings:
@ -122,7 +122,6 @@ $Id$
* New Translations:
-----------------
* Sardinian translation
Flavia Floris <flavia.efloris@gmail.com>
@ -134,6 +133,9 @@ $Id$
* Catalan translation
Pere Pujal i Carabantes <pere@fornol.no-ip.org>
* French translation
Chion Jacques <jacques.chion@orange.fr>
* Galician translation
Miguel Bouzada <mbouzada@gmail.com>
@ -143,6 +145,12 @@ $Id$
* Japanese translation & Japanese README documentation
TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
* Norwegian Bokmål translation
Karl Ove Hufthammer <karl@huftis.org>
* Norwegian Nynorsk translation
Karl Ove Hufthammer <karl@huftis.org>
* Santali translation (Ol-Chiki)
Prasanta Hembram <prasantahembram720@gmail.com>

View file

@ -5,7 +5,7 @@
Copyright (c) 2002-2020 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/
June 14, 2002 - August 29, 2020
June 14, 2002 - December 27, 2020
----------------------------------------------------------------------

View file

@ -5,20 +5,19 @@
Copyright (c) 2002-2020 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/
September 14, 2002 - October 30, 2020
September 14, 2002 - December 27, 2020
----------------------------------------------------------------------
Drawing-related
Fonts I added to Tux Paint only show squares
Fonts I added to Tux Paint only show squares
The TrueType Font you're using might have the wrong encoding. If
it's 'custom' encoded, for example, you can try running it through
FontForge (http://fontforge.sourceforge.net/) to convert it to an
ISO-8859 format. (Email us if you need help with special fonts.)
The Rubber Stamp tool is greyed out!
The Rubber Stamp tool is greyed out!
This means that Tux Paint either couldn't find any stamp images,
or was asked not to load them.
@ -44,7 +43,7 @@ Drawing-related
override it with "--stamps" on the command line or "nostamps=no"
or "stamps=yes" in a configuration file.
The Magic "Fill" Tool Looks Bad
The Magic "Fill" Tool Looks Bad
Tux Paint is probably comparing exact pixel colors when filling.
This is faster, but looks worse. Run the command
@ -58,7 +57,7 @@ Drawing-related
in the "tuxpaint.c" file in the "src" directory.
Stamp outlines are always rectangles
Stamp outlines are always rectangles
Tux Paint was built with low-quality (but faster) stamp outlines.
@ -73,7 +72,7 @@ Drawing-related
Interface Problems
Stamp thumbnails in the Stamp Selector look bad
Stamp thumbnails in the Stamp Selector look bad
Tux Paint was probably compiled with the faster, lower quality
thumbnail code enabled. Run the command: "tuxpaint --version" from
@ -87,12 +86,11 @@ Interface Problems
in the "tuxpaint.c" file in the "src" directory.
Pictures in the 'Open' dialog look bad
Pictures in the 'Open' dialog look bad
"Low Quality Thumbnails" is probably enabled. See: "Stamp
thumbnails in the Stamp Selector look bad", above.
The color picker buttons are ugly squares, not pretty buttons!
The color picker buttons are ugly squares, not pretty buttons!
Tux Paint was probably compiled with the nice looking color
selector buttons disabled. Run the command: "tuxpaint --version"
@ -107,7 +105,7 @@ Interface Problems
in the "tuxpaint.c" file in the "src" directory.
All of the text is in uppercase!
All of the text is in uppercase!
The "uppercase" option is on.
@ -130,13 +128,11 @@ Interface Problems
Or use Tux Paint Config. and make sure "Show Uppercase Text Only"
(under "Languages") is not checked.
Tux Paint is in a different language!
Tux Paint is in a different language!
Make sure your locale setting is correct. See "Tux Paint won't
switch to my language", below.
Tux Paint won't switch to my language
Tux Paint won't switch to my language
* Linux and Unix users: Make sure the locale is available
Make sure the locale you want is available. Check your
@ -180,7 +176,7 @@ Interface Problems
Printing
Tux Paint won't print, gives an error, or prints garbage (Unix/Linux)
Tux Paint won't print, gives an error, or prints garbage (Unix/Linux)
Tux Paint prints by creating a PostScript rendition of the picture
and sending it to an external command. By default, this command is
@ -200,7 +196,7 @@ Printing
0.9.15, you will need to go back and alter it to accept
PostScript.
I get the message "You can't print yet!" when I go to print!
I get the message "You can't print yet!" when I go to print!
The "print delay" option is on. You can only print once every
X seconds.
@ -229,7 +225,7 @@ Printing
Or use Tux Paint Config. and make sure "Print Delay" (under
"Printing") is set to "0 seconds."
I simply can't print! The button is greyed out!
I simply can't print! The button is greyed out!
The "no print" option is on.
@ -255,7 +251,7 @@ Printing
Saving
Where does Tux Paint save my drawings?
Where does Tux Paint save my drawings?
Unless you asked Tux Paint to save into a specific location (using
the 'savedir' option), Tux Paint saves into a standard location on
@ -285,7 +281,7 @@ Saving
should be able to load (image editors, word processors, web
browsers, etc.)
Tux Paint always saves over my old picture!
Tux Paint always saves over my old picture!
The "save over" option is enabled. (This disables the prompt that
would appear when you click 'Save.')
@ -310,7 +306,7 @@ Saving
Also, see "Tux Paint always saves a new picture!", below.
Tux Paint always saves a new picture!
Tux Paint always saves a new picture!
The "never save over" option is enabled. (This disables the prompt
that would appear when you click 'Save.')
@ -339,8 +335,7 @@ Saving
Audio Problems
There's no sound!
There's no sound!
* First, check the obvious:
* Are your speakers connected and turned on?
* Is the volume turned up on your speakers?
@ -403,7 +398,7 @@ Audio Problems
the SDL_mixer library and its development headers are
available!
Tux Paint makes too much noise! Can I turn them off?
Tux Paint makes too much noise! Can I turn them off?
Yes, there are a number of ways to disable sounds in Tux Paint:
@ -419,8 +414,8 @@ Audio Problems
* Recompile Tux Paint with sound support disabled. (See
above and INSTALL.txt.)
The stereo panning of sound effects is bothersome; can sound effects be
monophonic?
The stereo panning of sound effects is bothersome; can sound effects be
monophonic?
Run Tux Paint with the "no stereo" option:
@ -431,7 +426,7 @@ Audio Problems
* Run "tuxpaint --nostereo" from the command line or shortcut
or desktop icon.
The sound effects sound strange
The sound effects sound strange
This could have to do with how SDL and SDL_mixer were initialized.
(The buffer size chosen.)
@ -445,11 +440,10 @@ Audio Problems
Fullscreen Mode Problems
When I run Tux Paint full-screen and ALT-TAB out, the window turns black!
When I run Tux Paint full-screen and ALT-TAB out, the window turns black!
This is apparently a bug in the SDL library. Sorry.
When I run Tux Paint full-screen, it has large borders around it
When I run Tux Paint full-screen, it has large borders around it
Linux users - Your X-Window server is probably not set with the
ability to switch to the desired resolution: 800×600. (or whatever
@ -477,7 +471,7 @@ Fullscreen Mode Problems
changes for you. Debian users can run the command
"dpkg-reconfigure xserver-xfree86" as root, for example.
Tux Paint keeps running in Full Screen mode - I want it windowed!
Tux Paint keeps running in Full Screen mode - I want it windowed!
The "fullscreen" option is set.
@ -504,7 +498,7 @@ Fullscreen Mode Problems
Other Probelms
Tux Paint won't run
Tux Paint won't run
If Tux Paint aborts with the message: "You're already running a
copy of Tux Paint!", this means it has been launched in the last
@ -530,7 +524,7 @@ Other Probelms
To disable the lockfile, add the "--nolockfile" argument to
Tux Paint's command-line.
I can't quit Tux Paint
I can't quit Tux Paint
The "noquit" option is set. This disables the "Quit" button in
Tux Paint's toolbar (greying it out), and prevents Tux Paint from
@ -547,7 +541,7 @@ Other Probelms
(Note: with or without "noquit" set, you can always use the [Alt]
+ [F4] combination on your keyboard to quit Tux Paint.)
I don't want "noquit" mode enabled!
I don't want "noquit" mode enabled!
If you're running Tux Paint from a command-line, make sure you're
not giving it a "--noquit" option.
@ -567,7 +561,7 @@ Other Probelms
Or use Tux Paint Config. and make sure "Disable Quit Button and
[Escape] Key" (under "Simplification") is not checked.
Tux Paint keeps writing weird messages to the screen / to a text file
Tux Paint keeps writing weird messages to the screen / to a text file
A few messages are normal, but if Tux Paint is being extremely
verbose (like listing the name of every rubber-stamp image it
@ -581,7 +575,7 @@ Other Probelms
in the "tuxpaint.c" file in the "src" directory.
Tux Paint is using options I didn't specify!
Tux Paint is using options I didn't specify!
By default, Tux Paint first looks at configuration files for
options.

View file

@ -6,7 +6,7 @@ Options Documentation
Copyright (c) 2002-2020 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/
August 14, 2020
December 27, 2020
----------------------------------------------------------------------

View file

@ -6,7 +6,7 @@
Copyright 2002-2020 by various contributors; see AUTHORS.txt
http://www.tuxpaint.org/
June 14, 2002 - November 21, 2020
June 14, 2002 - December 27, 2020
----------------------------------------------------------------------

File diff suppressed because it is too large Load diff

View file

@ -32,7 +32,7 @@
</p>
<p>
September 14, 2002 - October 30, 2020
September 14, 2002 - December 27, 2020
</p>
</center>
@ -43,17 +43,23 @@
</h2>
<dl>
<dt><h3>Fonts I added to Tux&nbsp;Paint only show squares</h3></dt>
<dt>
Fonts I added to Tux&nbsp;Paint only show squares
</dt>
<dd>
The TrueType Font you're using might have the wrong
encoding. If it's 'custom' encoded, for example, you can
try running it through FontForge (<a href=
"http://fontforge.sourceforge.net/">http://fontforge.sourceforge.net/</a>)
to convert it to an ISO-8859 format. (Email us if you
need help with special fonts.)
to convert it to an ISO-8859 format. (Email us if you need
help with special fonts.)
</dd>
<dt><h3>The Rubber Stamp tool is greyed out!<h3></dt>
<dt>
The Rubber Stamp tool is greyed out!
</dt>
<dd>
<p>
This means that Tux&nbsp;Paint either couldn't find any
@ -94,7 +100,10 @@
</p>
</dd>
<dt><h3>The Magic "Fill" Tool Looks Bad</h3></dt>
<dt>
The Magic "Fill" Tool Looks Bad
</dt>
<dd>
<p>
Tux&nbsp;Paint is probably comparing exact pixel colors
@ -121,7 +130,10 @@
</p>
</dd>
<dt><h3>Stamp outlines are always rectangles</h3></dt>
<dt>
Stamp outlines are always rectangles
</dt>
<dd>
<p>
Tux&nbsp;Paint was built with low-quality (but faster)
@ -152,7 +164,10 @@
</h2>
<dl>
<dt><h3>Stamp thumbnails in the Stamp Selector look bad</h3></dt>
<dt>
Stamp thumbnails in the Stamp Selector look bad
</dt>
<dd>
<p>
Tux&nbsp;Paint was probably compiled with the faster,
@ -179,13 +194,20 @@
</p>
</dd>
<dt><h3>Pictures in the 'Open' dialog look bad</h3></dt>
<dt>
Pictures in the 'Open' dialog look bad
</dt>
<dd>
"Low Quality Thumbnails" is probably enabled. See: "Stamp
thumbnails in the Stamp Selector look bad", above.
</dd>
<dt><h3>The color picker buttons are ugly squares, not pretty buttons!</h3></dt>
<dt>
The color picker buttons are ugly squares, not pretty
buttons!
</dt>
<dd>
<p>
Tux&nbsp;Paint was probably compiled with the nice
@ -212,7 +234,10 @@
</p>
</dd>
<dt><h3>All of the text is in uppercase!</h3></dt>
<dt>
All of the text is in uppercase!
</dt>
<dd>
<p>
The "uppercase" option is on.
@ -252,13 +277,19 @@
</p>
</dd>
<dt><h3>Tux&nbsp;Paint is in a different language!</h3></dt>
<dt>
Tux&nbsp;Paint is in a different language!
</dt>
<dd>
Make sure your locale setting is correct. See
"Tux&nbsp;Paint won't switch to my language", below.
</dd>
<dt><h3>Tux&nbsp;Paint won't switch to my language</h3></dt>
<dt>
Tux&nbsp;Paint won't switch to my language
</dt>
<dd>
<ul>
<li>
@ -273,45 +304,45 @@
</p>
<p>
Note: Debian and derivative (e.g., Ubuntu) users can simply run
"<code>dpkg-reconfigure locales</code>" if the
locales are managed by "dpkg."
Note: Debian and derivative (e.g., Ubuntu) users can
simply run "<code>dpkg-reconfigure locales</code>" if
the locales are managed by "dpkg."
</p>
</li>
<li>If you're using the "<code>--lang</code>"
command-line option
<p>
Try using the "<code>--locale</code>"
command-line option, or your operating system's
locale settings (e.g., the "<code>$LANG</code>"
environment variable), and please e-mail us
regarding your trouble.
Try using the "<code>--locale</code>" command-line
option, or your operating system's locale settings
(e.g., the "<code>$LANG</code>" environment
variable), and please e-mail us regarding your
trouble.
</p>
</li>
<li>If you're using the "<code>--locale</code>"
command-line option
<p>
If this doesn't work, please e-mail us regarding
your trouble.
If this doesn't work, please e-mail us regarding your
trouble.
</p>
</li>
<li>If you're trying to use your Operating System's
locale
<p>
If this doesn't work, please e-mail us regarding
your trouble.
If this doesn't work, please e-mail us regarding your
trouble.
</p>
</li>
<li>Make sure you have the necessary font
<p>
Some translations require their own font. Chinese
and Korean, for example, need Chinese and Korean
TrueType Fonts installed and placed in the proper
location, respectively.
Some translations require their own font. Chinese and
Korean, for example, need Chinese and Korean TrueType
Fonts installed and placed in the proper location,
respectively.
</p>
<p>
@ -337,8 +368,11 @@
</h2>
<dl>
<dt><h3>Tux&nbsp;Paint won't print, gives an error, or prints
garbage (Unix/Linux)</h3></dt>
<dt>
Tux&nbsp;Paint won't print, gives an error, or prints
garbage (Unix/Linux)
</dt>
<dd>
<p>
Tux&nbsp;Paint prints by creating a PostScript rendition
@ -369,8 +403,11 @@
</p>
</dd>
<dt><h3>I get the message "You can't print yet!" when I go to
print!</h3></dt>
<dt>
I get the message "You can't print yet!" when I go to
print!
</dt>
<dd>
<p>
The "print delay" option is on. You can only print once
@ -418,7 +455,10 @@
</p>
</dd>
<dt><h3>I simply can't print! The button is greyed out!</h3></dt>
<dt>
I simply can't print! The button is greyed out!
</dt>
<dd>
<p>
The "no print" option is on.
@ -464,7 +504,10 @@
</h2>
<dl>
<dt><h3>Where does Tux Paint save my drawings?</h3><dt>
<dt>
Where does Tux Paint save my drawings?
</dt>
<dd>
<p>
Unless you asked Tux&nbsp;Paint to save into a specific
@ -523,7 +566,10 @@
</p>
</dd>
<dt><h3>Tux&nbsp;Paint always saves over my old picture!</h3></dt>
<dt>
Tux&nbsp;Paint always saves over my old picture!
</dt>
<dd>
<p>
The "save over" option is enabled. (This disables the
@ -568,7 +614,10 @@
</p>
</dd>
<dt><h3>Tux&nbsp;Paint always saves a new picture!</h3></dt>
<dt>
Tux&nbsp;Paint always saves a new picture!
</dt>
<dd>
<p>
The "never save over" option is enabled. (This disables
@ -621,7 +670,10 @@
</h2>
<dl>
<dt><h3>There's no sound!</h3></dt>
<dt>
There's no sound!
</dt>
<dd>
<ul>
<li>
@ -738,7 +790,10 @@
</ul>
</dd>
<dt><h3>Tux Paint makes too much noise! Can I turn them off?</h3></dt>
<dt>
Tux Paint makes too much noise! Can I turn them off?
</dt>
<dd>
<p>
Yes, there are a number of ways to disable sounds in Tux
@ -776,28 +831,36 @@
</ul>
</dd>
<dt><h3>The stereo panning of sound effects is bothersome; can sound effects be monophonic?</h3></dt>
<dt>
The stereo panning of sound effects is bothersome; can
sound effects be monophonic?
</dt>
<dd>
<p>
Run Tux&nbsp;Paint with the "no&nbsp;stereo" option:
</p>
<ul>
<li>Use Tux&nbsp;Paint&nbsp;Config to uncheck the
"Enable Stereo Sound" option (under "Video &amp; Sound").
<li>Use Tux&nbsp;Paint&nbsp;Config to uncheck the "Enable
Stereo Sound" option (under "Video &amp; Sound").
</li>
<li>Edit Tux&nbsp;Paint's configuration file (see
<a href="OPTIONS.html">OPTIONS</a> for details) and
add a line containing "<code>nostereo=yes</code>".
<a href="OPTIONS.html">OPTIONS</a> for details) and add
a line containing "<code>nostereo=yes</code>".
</li>
<li>Run "<code>tuxpaint&nbsp;--nostereo</code>" from
the command line or shortcut or desktop icon.
<li>Run "<code>tuxpaint&nbsp;--nostereo</code>" from the
command line or shortcut or desktop icon.
</li>
</ul>
</dd>
<dt><h3>The sound effects sound strange</h3><dt>
<dt>
The sound effects sound strange
</dt>
<dd>
<p>
This could have to do with how SDL and SDL_mixer were
@ -821,14 +884,20 @@
</h2>
<dl>
<dt><h3>When I run Tux&nbsp;Paint full-screen and ALT-TAB out,
the window turns black!</h3></dt>
<dt>
When I run Tux&nbsp;Paint full-screen and ALT-TAB out, the
window turns black!
</dt>
<dd>
This is apparently a bug in the SDL library. Sorry.
</dd>
<dt><h3>When I run Tux&nbsp;Paint full-screen, it has large
borders around it</h3></dt>
<dt>
When I run Tux&nbsp;Paint full-screen, it has large borders
around it
</dt>
<dd>
<p>
Linux users - Your X-Window server is probably not set
@ -876,8 +945,11 @@
</p>
</dd>
<dt><h3>Tux&nbsp;Paint keeps running in Full Screen mode - I
want it windowed!</h3></dt>
<dt>
Tux&nbsp;Paint keeps running in Full Screen mode - I want
it windowed!
</dt>
<dd>
<p>
The "fullscreen" option is set.
@ -923,7 +995,10 @@
</h2>
<dl>
<dt><h3>Tux&nbsp;Paint won't run</h3></dt>
<dt>
Tux&nbsp;Paint won't run
</dt>
<dd>
<p>
If Tux&nbsp;Paint aborts with the message: "You're
@ -965,7 +1040,10 @@
</p>
</dd>
<dt><h3>I can't quit Tux&nbsp;Paint</h3></dt>
<dt>
I can't quit Tux&nbsp;Paint
</dt>
<dd>
<p>
The "noquit" option is set. This disables the "Quit"
@ -993,7 +1071,10 @@
</p>
</dd>
<dt><h3>I don't want "noquit" mode enabled!</h3></dt>
<dt>
I don't want "noquit" mode enabled!
</dt>
<dd>
<p>
If you're running Tux&nbsp;Paint from a command-line,
@ -1028,8 +1109,11 @@
</p>
</dd>
<dt><h3>Tux&nbsp;Paint keeps writing weird messages to the
screen / to a text file</h3></dt>
<dt>
Tux&nbsp;Paint keeps writing weird messages to the screen /
to a text file
</dt>
<dd>
<p>
A few messages are normal, but if Tux&nbsp;Paint is being
@ -1054,7 +1138,10 @@
</p>
</dd>
<dt><h3>Tux&nbsp;Paint is using options I didn't specify!</h3></dt>
<dt>
Tux&nbsp;Paint is using options I didn't specify!
</dt>
<dd>
<p>
By default, Tux&nbsp;Paint first looks at configuration
@ -1178,8 +1265,8 @@
</h2>
<p>
Any questions you don't see answered? Please let us know!
You can subscribe and post to our "tuxpaint-users" mailing list:
Any questions you don't see answered? Please let us know! You
can subscribe and post to our "tuxpaint-users" mailing list:
</p>
<blockquote>

View file

@ -32,7 +32,7 @@
</p>
<p>
August 14, 2020
December 27, 2020
</p>
</center>
@ -747,10 +747,10 @@
</dt>
<dd>
Disable the control buttons shown when using the <b>Shapes</b>
tool that allow changing how shapes are drawn &mdash;
centered around the initial mouse click, or with a corner
at the initial mouse click.
Disable the control buttons shown when using the
<b>Shapes</b> tool that allow changing how shapes are
drawn — centered around the initial mouse click, or with
a corner at the initial mouse click.
</dd>
<dt>
@ -1459,7 +1459,7 @@
<p>
As an example, you can see the default colors currently
used in Tux&nbsp;Paint in: "<a href=
"../default_colors.txt"><code>default_colors.txt</code></a>".
"../../default_colors.txt"><code>default_colors.txt</code></a>".
</p>
<p>

View file

@ -35,7 +35,7 @@
</p>
<p>
June 14, 2002 - November 21, 2020
June 14, 2002 - December 27, 2020
</p>
</center>
@ -708,27 +708,29 @@
</p>
<p>
Use the options at the bottom right to choose
the shape tool's behavior:
Use the options at the bottom right to choose the
shape tool's behavior:
</p>
<dl>
<dt>
Shapes from center
</dt>
<dd>
The shape will expand from where you initially
clicked, and will be centered around that position.
(This was Tux&nbsp;Paint's only behavior through
version 0.9.24.)
clicked, and will be centered around that
position. (This was Tux&nbsp;Paint's only
behavior through version 0.9.24.)
</dd>
<dt>
Shapes from corner
</dt>
<dd>
The shape will extend with one corner starting
from where you initially clicked. This is the
from where you initially clicked. This is the
default method of most other traditional drawing
software. (This option was added starting with
Tux&nbsp;Paint version 0.9.25.)
@ -736,10 +738,10 @@
</dl>
<p>
Note: If shape controls are disabled (e.g., with the
"<code>--noshapecontrols</code>" option), the controls
will not be presented, and the "shapes from center"
method will be used.
Note: If shape controls are disabled (e.g., with
the "<code>--noshapecontrols</code>" option), the
controls will not be presented, and the "shapes
from center" method will be used.
</p>
<p>
@ -1124,31 +1126,35 @@
<blockquote>
<p>
'Starters' can behave like a page from a coloring
book &mdash; a black-and-white outline of a picture,
which you can then color in, and the black outline
remains intact &mdash; or like a 3D photograph,
where you draw in between a foreground and background
layer.
book a black-and-white outline of a picture,
which you can then color in, and the black
outline remains intact — or like a 3D photograph,
where you draw in between a foreground and
background layer.
</p>
<p>
'Templates' are similar, but simply provide a
background drawing to work off of. Unlike 'Starters',
there is no layer that remains in the foreground of
anything you draw in the picture.
background drawing to work off of. Unlike
'Starters', there is no layer that remains in the
foreground of anything you draw in the picture.
</p>
<p>
When using the 'Eraser' tool, the original image
from the 'Starter' or 'Template' will reappear.
The 'Flip' and 'Mirror' Magic tools affect the
orientation of the 'Starter' or 'Template', as well.
<p>
When you load a 'Starter' or 'Template', draw on it,
and then click 'Save,' it creates a new picture file
&mdash; it doesn't overwrite the original, so you
can use it again later (by accessing it from the 'New'
dialoge)..
orientation of the 'Starter' or 'Template', as
well.
</p>
<p>
When you load a 'Starter' or 'Template', draw on
it, and then click 'Save,' it creates a new
picture file — it doesn't overwrite the original,
so you can use it again later (by accessing it
from the 'New' dialoge)..
</p>
</blockquote>
<br clear="all">

View file

@ -23,6 +23,6 @@
<key>CFBundleSignature</key>
<string>TXPT</string>
<key>CFBundleVersion</key>
<string>2020-06-22</string>
<string>2020-12-27</string>
</dict>
</plist>

View file

@ -1,5 +1,5 @@
.\" tuxpaint.1 - 2020.08.15
.TH TUXPAINT 1 "15 August 2020" "0.9.25" "Tux Paint"
.\" tuxpaint.1 - 2020.12.27
.TH TUXPAINT 1 "27 December 2020" "0.9.25" "Tux Paint"
.SH NAME
tuxpaint -- "Tux Paint", a drawing program for young children.

View file

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-08-15 16:42-0700\n"
"PO-Revision-Date: 2017-12-03 07:56+0100\n"
"PO-Revision-Date: 2020-12-08 10:39+0100\n"
"Last-Translator: Chion Jacques <jacques.chion@orange.fr>\n"
"Language-Team: <fr@li.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.4\n"
"X-Generator: Poedit 2.4.1\n"
#. Response to Black (0, 0, 0) color selected
#: ../colors.h:86
@ -323,23 +323,23 @@ msgstr "Un octogone a huit côtés égaux."
#: ../shapes.h:320 ../shapes.h:321
msgid "A star with 3 points."
msgstr "Étoile à 3 branches"
msgstr "Étoile à 3 branches."
#: ../shapes.h:322 ../shapes.h:323
msgid "A star with 4 points."
msgstr "Étoile à 4 branches"
msgstr "Étoile à 4 branches."
#: ../shapes.h:324 ../shapes.h:325
msgid "A star with 5 points."
msgstr "Étoile à 5 branches"
msgstr "Étoile à 5 branches."
#: ../shapes.h:372
msgid "Draw shapes from the center."
msgstr ""
msgstr "Dessine des objets depuis le centre."
#: ../shapes.h:373
msgid "Draw shapes from a corner."
msgstr ""
msgstr "Dessine des objets depuis un coin."
#. Title of tool selector (buttons down the left)
#: ../titles.h:56
@ -472,16 +472,13 @@ msgstr ""
"Clique pour commencer à dessiner une ligne. Puis continue pour la compléter."
#: ../tools.h:125
#, fuzzy
#| msgid ""
#| "Pick a shape. Click to pick the center, drag, then let go when it is the "
#| "size you want. Move around to rotate it, and click to draw it."
msgid ""
"Pick a shape. Click to start drawing, drag, and let go when it is the size "
"you want. Move around to rotate it, and click to draw it."
msgstr ""
"Choisis une forme. Clique en son centre, choisis sa place et sa taille tout "
"en appuyant, fais-la tourner, et clique enfin pour la dessiner."
"Choisis une forme. Clique pour démarrer le dessin, fais glisser, et continue "
"jusqu'à la taille désirée. Déplace-toi pour la faire tourner, et clique pour "
"dessiner."
#: ../tools.h:129
msgid ""
@ -537,7 +534,7 @@ msgstr ""
#. Response to 'open' action (while file dialog is being constructed)
#: ../tools.h:154
msgid "Open…"
msgstr "Ouvrir.."
msgstr "Ouvrir ..."
#. Response to 'save' action
#: ../tools.h:157
@ -547,7 +544,7 @@ msgstr "Ton image a été sauvegardée !"
#. Response to 'print' action (while printing, or print dialog is being used)
#: ../tools.h:160
msgid "Printing…"
msgstr "Impression.."
msgstr "Impression ..."
#. Response to 'quit' (exit) action
#: ../tools.h:163
@ -667,34 +664,26 @@ msgstr "N'oublie pas d'utiliser le bouton gauche de la souris !"
#. Confirmation of successful (we hope) image export
#: ../tuxpaint.c:2190
#, fuzzy
#| msgid "Your picture has been printed!"
msgid "Your picture has been exported!"
msgstr "Ton image a été imprimée !"
msgstr "Ton image a été exportée !"
#: ../tuxpaint.c:2191
#, fuzzy
#| msgid "Your picture has been printed!"
msgid "Your slideshow GIF has been exported!"
msgstr "Ton image a été imprimée !"
msgstr "Ton image GIF a été exportée !"
#. We got an error exporting
#: ../tuxpaint.c:2195
#, fuzzy
#| msgid "Sorry! Your picture could not be printed!"
msgid "Sorry! Your picture could not be exported!"
msgstr "Désolé, ton image n'a pas pu être imprimée !"
msgstr "Désolé, ton image n'a pas pu être exportée !"
#: ../tuxpaint.c:2196
#, fuzzy
#| msgid "Sorry! Your picture could not be printed!"
msgid "Sorry! Your slideshow GIF could not be exported!"
msgstr "Désolé, ton image n'a pas pu être imprimée !"
msgstr "Désolé, ton image GIF n'a pas pu être exportée !"
#. Slideshow instructions
#: ../tuxpaint.c:2200
msgid "Choose the pictures you want, then click “Play”."
msgstr "Choisis les images que tu veux, puis clique sur “Départ”"
msgstr "Choisis les images que tu veux, puis clique sur “Départ”."
#. Sound has been muted (silenced) via keyboard shortcut
#: ../tuxpaint.c:2407
@ -709,7 +698,7 @@ msgstr "Son activé."
#. Wait while Text tool finishes loading fonts
#: ../tuxpaint.c:3167
msgid "Please wait…"
msgstr "Attends s'il te plaît .."
msgstr "Attends s'il te plaît ..."
#. Open dialog: 'Erase' button, to erase/deleted the selected picture
#: ../tuxpaint.c:7923
@ -724,7 +713,7 @@ msgstr "Diapos"
#. Open dialog: 'Export' button, to copy an image to an easily-accessible location
#: ../tuxpaint.c:7929
msgid "Export"
msgstr ""
msgstr "Exporter"
#. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture
#: ../tuxpaint.c:7932
@ -739,7 +728,7 @@ msgstr "Départ"
#. Slideshow: 'GIF Export' button, to create an animated GIF
#: ../tuxpaint.c:7938
msgid "GIF Export"
msgstr ""
msgstr "Exporter en GIF"
#. Slideshow: 'Next' button, to load next slide (image)
#: ../tuxpaint.c:7941
@ -782,14 +771,14 @@ msgstr "Non, c'est une nouvelle image !"
#. Instructions for 'Open' file dialog
#: ../tuxpaint.c:14454
msgid "Choose the picture you want, then click “Open”."
msgstr "Choisis une image, et clique ensuite sur “Ouvrir”"
msgstr "Choisis une image, et clique ensuite sur “Ouvrir”."
#. None selected? Too dangerous to automatically select all (like we do for slideshow playback).
#. Only 1 selected? No point in saving as GIF.
#.
#: ../tuxpaint.c:15880
msgid "Select 2 or more drawings to turn into an animated GIF."
msgstr ""
msgstr "Sélectionner 2 ou plusieurs dessins pour créer une image animée GIF."
#: ../tuxpaint.c:23539
msgid "Select a color from your drawing."
@ -1259,7 +1248,7 @@ msgstr ""
#: ../../magic/src/puzzle.c:103
msgid "Puzzle"
msgstr "Puzzle "
msgstr "Puzzle"
#: ../../magic/src/puzzle.c:110
msgid "Click the part of your picture where would you like a puzzle."
@ -1573,7 +1562,7 @@ msgstr "Clique et promène la souris pour dessiner un effet Xor"
#
#: ../../magic/src/xor.c:101
msgid "Click to draw a XOR effect on the whole picture"
msgstr "Clique pour avoir un effet Xor sur l'ensemble de l'image."
msgstr "Clique pour avoir un effet Xor sur l'ensemble de l'image"
#~ msgid "Black & White"
#~ msgstr "Gris"

File diff suppressed because it is too large Load diff

View file

@ -2,21 +2,21 @@
# Oversettelse av Tux Paint til bokmål.
# Dag H. Lorås <dag.loraas@operamail.com>, 2003.
# Knut Erik Hollund <khollund@responze.net>, 2003.
# Karl Ove Hufthammer <karl@huftis.org>, 2003, 2005, 2006, 2007, 2009, 2014, 2015, 2017.
# Karl Ove Hufthammer <karl@huftis.org>, 2003, 2005, 2006, 2007, 2009, 2014, 2015, 2017, 2020.
# Klaus Ade Johnstad <klaus@skolelinux.no>, 2004.
msgid ""
msgstr ""
"Project-Id-Version: nb\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-08-15 16:42-0700\n"
"PO-Revision-Date: 2017-07-29 15:50+0100\n"
"POT-Creation-Date: 2020-12-12 15:27+0100\n"
"PO-Revision-Date: 2020-12-12 15:25+0100\n"
"Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
"Language-Team: Norwegian Bokmål <l10n-no@lister.huftis.org>\n"
"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 2.0\n"
"X-Generator: Lokalize 21.03.70\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. Response to Black (0, 0, 0) color selected
@ -335,11 +335,11 @@ msgstr "En stjerne med fem tagger."
#: ../shapes.h:372
msgid "Draw shapes from the center."
msgstr ""
msgstr "Tegn figurer fra midten."
#: ../shapes.h:373
msgid "Draw shapes from a corner."
msgstr ""
msgstr "Tegn figurer frå et hjørne."
#. Title of tool selector (buttons down the left)
#: ../titles.h:56
@ -436,7 +436,7 @@ msgstr "Ny"
#. Open a saved picture
#. buttons for the file open dialog
#. Open dialog: 'Open' button, to load the selected picture
#: ../tools.h:98 ../tuxpaint.c:7920
#: ../tools.h:98 ../tuxpaint.c:7949
msgid "Open"
msgstr "Åpne"
@ -471,16 +471,12 @@ msgid "Click to start drawing a line. Let go to complete it."
msgstr "Trykk for å starta på en linje. Slipp for å fullføre den."
#: ../tools.h:125
#, fuzzy
#| msgid ""
#| "Pick a shape. Click to pick the center, drag, then let go when it is the "
#| "size you want. Move around to rotate it, and click to draw it."
msgid ""
"Pick a shape. Click to start drawing, drag, and let go when it is the size "
"you want. Move around to rotate it, and click to draw it."
msgstr ""
"Velg en figur. Trykk og dra så for å velge midten og størrelsen på figuren. "
"Flytt rundt for å rotere den, og trykk til slutt for å tegne den."
"Velg en figur, og trykk og dra for å velge dens størrelse. Flytt rundt for å "
"rotere den, og trykk til slutt for å tegne den."
#: ../tools.h:129
msgid ""
@ -572,227 +568,220 @@ msgid "OK then… Lets keep drawing this one!"
msgstr "Greit! Da fortsetter vi med denne tegningen."
#. Prompt to confirm user wishes to quit
#: ../tuxpaint.c:2134
#: ../tuxpaint.c:2141
msgid "Do you really want to quit?"
msgstr "Er du sikker på at du vil avslutte?"
#. Quit prompt positive response (quit)
#: ../tuxpaint.c:2137
#: ../tuxpaint.c:2144
msgid "Yes, Im done!"
msgstr "Ja, jeg er ferdig!"
#. Quit prompt negative response (don't quit)
#: ../tuxpaint.c:2140 ../tuxpaint.c:2167
#: ../tuxpaint.c:2147 ../tuxpaint.c:2174
msgid "No, take me back!"
msgstr "Nei, jeg vil tegne mer!"
#. Current picture is not saved; user is quitting
#: ../tuxpaint.c:2144
#: ../tuxpaint.c:2151
msgid "If you quit, youll lose your picture! Save it?"
msgstr "Du mister tegningen hvis du avslutter. Vil du lagre den først?"
#: ../tuxpaint.c:2145 ../tuxpaint.c:2150
#: ../tuxpaint.c:2152 ../tuxpaint.c:2157
msgid "Yes, save it!"
msgstr "Ja, lagra den!"
#: ../tuxpaint.c:2146 ../tuxpaint.c:2151
#: ../tuxpaint.c:2153 ../tuxpaint.c:2158
msgid "No, dont bother saving!"
msgstr "Nei, ikke lagre den!"
#. Current picture is not saved; user is opening another picture
#: ../tuxpaint.c:2149
#: ../tuxpaint.c:2156
msgid "Save your picture first?"
msgstr "Vil du lagre tegningen først?"
#. Error opening picture
#: ../tuxpaint.c:2154
#: ../tuxpaint.c:2161
msgid "Cant open that picture!"
msgstr "Klarte ikke åpne tegningen."
#. Generic dialog dismissal
#: ../tuxpaint.c:2157 ../tuxpaint.c:2162 ../tuxpaint.c:2171 ../tuxpaint.c:2178
#: ../tuxpaint.c:2187 ../tuxpaint.c:2192
#: ../tuxpaint.c:2164 ../tuxpaint.c:2169 ../tuxpaint.c:2178 ../tuxpaint.c:2185
#: ../tuxpaint.c:2194 ../tuxpaint.c:2199
msgid "OK"
msgstr "OK"
#. Notification that 'Open' dialog has nothing to show
#: ../tuxpaint.c:2161
#: ../tuxpaint.c:2168
msgid "There are no saved files!"
msgstr "Det finnes ingen lagrede tegninger."
#. Verification of print action
#: ../tuxpaint.c:2165
#: ../tuxpaint.c:2172
msgid "Print your picture now?"
msgstr "Er du sikker på at du vil skrive ut tegningen?"
#: ../tuxpaint.c:2166
#: ../tuxpaint.c:2173
msgid "Yes, print it!"
msgstr "Ja, skriv den ut!"
#. Confirmation of successful (we hope) printing
#: ../tuxpaint.c:2170
#: ../tuxpaint.c:2177
msgid "Your picture has been printed!"
msgstr "Tegningen er skrevet ut."
#. We got an error printing
#: ../tuxpaint.c:2174
#: ../tuxpaint.c:2181
msgid "Sorry! Your picture could not be printed!"
msgstr "Klarte ikke skrive ut tegningen."
#. Notification that it's too soon to print again (--printdelay option is in effect)
#: ../tuxpaint.c:2177
#: ../tuxpaint.c:2184
msgid "You cant print yet!"
msgstr "Du kan ikke skrive ut enda!"
#. Prompt to confirm erasing a picture in the Open dialog
#: ../tuxpaint.c:2181
#: ../tuxpaint.c:2188
msgid "Erase this picture?"
msgstr "Vil du virkelig slette tegningen?"
#: ../tuxpaint.c:2182
#: ../tuxpaint.c:2189
msgid "Yes, erase it!"
msgstr "Ja, slett den!"
#: ../tuxpaint.c:2183
#: ../tuxpaint.c:2190
msgid "No, dont erase it!"
msgstr "Nei, ikke slett den!"
#. Reminder that Mouse Button 1 is the button to use in Tux Paint
#: ../tuxpaint.c:2186
#: ../tuxpaint.c:2193
msgid "Remember to use the left mouse button!"
msgstr "Husk å bruke venstre museknapp!"
#. Confirmation of successful (we hope) image export
#: ../tuxpaint.c:2190
#, fuzzy
#| msgid "Your picture has been printed!"
#: ../tuxpaint.c:2197
msgid "Your picture has been exported!"
msgstr "Tegningen er skrevet ut."
msgstr "Tegningen er nå eksportert."
#: ../tuxpaint.c:2191
#, fuzzy
#| msgid "Your picture has been printed!"
#: ../tuxpaint.c:2198
msgid "Your slideshow GIF has been exported!"
msgstr "Tegningen er skrevet ut."
msgstr "GIF-animasjonen er nå eksportert."
#. We got an error exporting
#: ../tuxpaint.c:2195
#, fuzzy
#| msgid "Sorry! Your picture could not be printed!"
#: ../tuxpaint.c:2202
msgid "Sorry! Your picture could not be exported!"
msgstr "Klarte ikke skrive ut tegningen."
msgstr "Klarte ikke eksportere tegningen."
#: ../tuxpaint.c:2196
#, fuzzy
#| msgid "Sorry! Your picture could not be printed!"
#: ../tuxpaint.c:2203
msgid "Sorry! Your slideshow GIF could not be exported!"
msgstr "Klarte ikke skrive ut tegningen."
msgstr "Klarte ikke eksportere GIF-animasjonen."
#. Slideshow instructions
#: ../tuxpaint.c:2200
#: ../tuxpaint.c:2207
msgid "Choose the pictures you want, then click “Play”."
msgstr "Vel tegningene du vil ha, og trykk sjå på «Kjør»."
#. Sound has been muted (silenced) via keyboard shortcut
#: ../tuxpaint.c:2407
#: ../tuxpaint.c:2416
msgid "Sound muted."
msgstr "Lyd slått av."
#. Sound has been unmuted (unsilenced) via keyboard shortcut
#: ../tuxpaint.c:2412
#: ../tuxpaint.c:2421
msgid "Sound unmuted."
msgstr "Lyd slått på."
#. Wait while Text tool finishes loading fonts
#: ../tuxpaint.c:3167
#: ../tuxpaint.c:3190
msgid "Please wait…"
msgstr "Vent litt …"
#. Open dialog: 'Erase' button, to erase/deleted the selected picture
#: ../tuxpaint.c:7923
#: ../tuxpaint.c:7952
msgid "Erase"
msgstr "Slett"
#. Open dialog: 'Slides' button, to switch to slide show mode
#: ../tuxpaint.c:7926
#: ../tuxpaint.c:7955
msgid "Slides"
msgstr "Lysbilder"
#. Open dialog: 'Export' button, to copy an image to an easily-accessible location
#: ../tuxpaint.c:7929
#: ../tuxpaint.c:7958
msgid "Export"
msgstr ""
msgstr "Eksporter"
#. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture
#: ../tuxpaint.c:7932
#: ../tuxpaint.c:7961
msgid "Back"
msgstr "Tilbake"
#. Slideshow: 'Play' button, to begin a slideshow sequence
#: ../tuxpaint.c:7935
#: ../tuxpaint.c:7964
msgid "Play"
msgstr "Kjør"
#. Slideshow: 'GIF Export' button, to create an animated GIF
#: ../tuxpaint.c:7938
#: ../tuxpaint.c:7967
msgid "GIF Export"
msgstr ""
msgstr "GIF-eksport"
#. Slideshow: 'Next' button, to load next slide (image)
#: ../tuxpaint.c:7941
#: ../tuxpaint.c:7970
msgid "Next"
msgstr "Neste"
#. Label for 'Letters' buttons (font selector, down the right when the Text tool is being used); used to show the difference between font faces
#: ../tuxpaint.c:8656
#: ../tuxpaint.c:8685
msgid "Aa"
msgstr "Aa"
#. Admittedly stupid way of determining which keys can be used for
#. positive and negative responses in dialogs (e.g., [Y] (for 'yes') in English)
#: ../tuxpaint.c:12069
#: ../tuxpaint.c:12179
msgid "Yes"
msgstr "Ja!"
#: ../tuxpaint.c:12073
#: ../tuxpaint.c:12183
msgid "No"
msgstr "Nei!"
#. Prompt to ask whether user wishes to save over old version of their file
#: ../tuxpaint.c:13190
#: ../tuxpaint.c:13309
msgid "Replace the picture with your changes?"
msgstr "Vil du bytte ut den gamle tegningen med den nye?"
#. Positive response to saving over old version
#. (like a 'File:Save' action in other applications)
#: ../tuxpaint.c:13194
#: ../tuxpaint.c:13313
msgid "Yes, replace the old one!"
msgstr "Ja, bytt ut den gamle!"
#. Negative response to saving over old version (saves a new image)
#. (like a 'File:Save As...' action in other applications)
#: ../tuxpaint.c:13198
#: ../tuxpaint.c:13317
msgid "No, save a new file!"
msgstr "Nei, lagre som en ny tegning!"
#. Let user choose an image:
#. Instructions for 'Open' file dialog
#: ../tuxpaint.c:14454
#: ../tuxpaint.c:14573
msgid "Choose the picture you want, then click “Open”."
msgstr "Velg en tegning og trykk «Åpne»."
#. None selected? Too dangerous to automatically select all (like we do for slideshow playback).
#. Only 1 selected? No point in saving as GIF.
#.
#: ../tuxpaint.c:15880
#: ../tuxpaint.c:15999
msgid "Select 2 or more drawings to turn into an animated GIF."
msgstr ""
"Velg to eller flere tegninger for å gjøre de om til en animert GIF-bildefil."
#: ../tuxpaint.c:23539
#: ../tuxpaint.c:23670
msgid "Select a color from your drawing."
msgstr "Vel ein farge frå teikninga."
#: ../tuxpaint.c:23551
#: ../tuxpaint.c:23682
msgid "Pick a color."
msgstr "Velg en farge."

View file

@ -5,15 +5,15 @@ msgid ""
msgstr ""
"Project-Id-Version: nn\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-08-15 16:42-0700\n"
"PO-Revision-Date: 2020-03-30 19:12+0200\n"
"POT-Creation-Date: 2020-12-12 15:27+0100\n"
"PO-Revision-Date: 2020-12-12 15:23+0100\n"
"Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
"Language-Team: Norwegian Nynorsk <l10n-no@lister.huftis.org>\n"
"Language: nn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 19.12.3\n"
"X-Generator: Lokalize 21.03.70\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. Response to Black (0, 0, 0) color selected
@ -332,11 +332,11 @@ msgstr "Ei stjerne med fem taggar."
#: ../shapes.h:372
msgid "Draw shapes from the center."
msgstr ""
msgstr "Teikn figurar frå midten."
#: ../shapes.h:373
msgid "Draw shapes from a corner."
msgstr ""
msgstr "Teikn figurar frå eit hjørne."
#. Title of tool selector (buttons down the left)
#: ../titles.h:56
@ -433,7 +433,7 @@ msgstr "Ny"
#. Open a saved picture
#. buttons for the file open dialog
#. Open dialog: 'Open' button, to load the selected picture
#: ../tools.h:98 ../tuxpaint.c:7920
#: ../tools.h:98 ../tuxpaint.c:7949
msgid "Open"
msgstr "Opna"
@ -468,16 +468,12 @@ msgid "Click to start drawing a line. Let go to complete it."
msgstr "Trykk for å starta på ei linje, og slepp for å fullføra ho."
#: ../tools.h:125
#, fuzzy
#| msgid ""
#| "Pick a shape. Click to pick the center, drag, then let go when it is the "
#| "size you want. Move around to rotate it, and click to draw it."
msgid ""
"Pick a shape. Click to start drawing, drag, and let go when it is the size "
"you want. Move around to rotate it, and click to draw it."
msgstr ""
"Vel ein figur. Trykk og dra så for å velja midten og storleiken på figuren. "
"Flytt rundt for å dreia han, og trykk til slutt for å teikna han."
"Vel ein figur, og trykk og dra for å velja storleiken på han. Flytt rundt "
"for å dreia han, og trykk til slutt for å teikna han."
#: ../tools.h:129
msgid ""
@ -569,227 +565,221 @@ msgid "OK then… Lets keep drawing this one!"
msgstr "Greitt! Då held me heller fram med denne teikninga."
#. Prompt to confirm user wishes to quit
#: ../tuxpaint.c:2134
#: ../tuxpaint.c:2141
msgid "Do you really want to quit?"
msgstr "Er du sikker på at du vil avslutta?"
#. Quit prompt positive response (quit)
#: ../tuxpaint.c:2137
#: ../tuxpaint.c:2144
msgid "Yes, Im done!"
msgstr "Ja, eg er ferdig!"
#. Quit prompt negative response (don't quit)
#: ../tuxpaint.c:2140 ../tuxpaint.c:2167
#: ../tuxpaint.c:2147 ../tuxpaint.c:2174
msgid "No, take me back!"
msgstr "Nei, eg vil teikna meir!"
#. Current picture is not saved; user is quitting
#: ../tuxpaint.c:2144
#: ../tuxpaint.c:2151
msgid "If you quit, youll lose your picture! Save it?"
msgstr "Du mistar teikninga viss du avsluttar. Vil du lagra ho først?"
#: ../tuxpaint.c:2145 ../tuxpaint.c:2150
#: ../tuxpaint.c:2152 ../tuxpaint.c:2157
msgid "Yes, save it!"
msgstr "Ja, lagra ho!"
#: ../tuxpaint.c:2146 ../tuxpaint.c:2151
#: ../tuxpaint.c:2153 ../tuxpaint.c:2158
msgid "No, dont bother saving!"
msgstr "Nei, ikkje lagra ho!"
#. Current picture is not saved; user is opening another picture
#: ../tuxpaint.c:2149
#: ../tuxpaint.c:2156
msgid "Save your picture first?"
msgstr "Vil du lagra teikninga først?"
#. Error opening picture
#: ../tuxpaint.c:2154
#: ../tuxpaint.c:2161
msgid "Cant open that picture!"
msgstr "Klarte ikkje opna teikninga."
#. Generic dialog dismissal
#: ../tuxpaint.c:2157 ../tuxpaint.c:2162 ../tuxpaint.c:2171 ../tuxpaint.c:2178
#: ../tuxpaint.c:2187 ../tuxpaint.c:2192
#: ../tuxpaint.c:2164 ../tuxpaint.c:2169 ../tuxpaint.c:2178 ../tuxpaint.c:2185
#: ../tuxpaint.c:2194 ../tuxpaint.c:2199
msgid "OK"
msgstr "OK"
#. Notification that 'Open' dialog has nothing to show
#: ../tuxpaint.c:2161
#: ../tuxpaint.c:2168
msgid "There are no saved files!"
msgstr "Det finst ingen lagra teikningar."
#. Verification of print action
#: ../tuxpaint.c:2165
#: ../tuxpaint.c:2172
msgid "Print your picture now?"
msgstr "Er du sikker på at du vil skriva ut teikninga?"
#: ../tuxpaint.c:2166
#: ../tuxpaint.c:2173
msgid "Yes, print it!"
msgstr "Ja, skriv ho ut!"
#. Confirmation of successful (we hope) printing
#: ../tuxpaint.c:2170
#: ../tuxpaint.c:2177
msgid "Your picture has been printed!"
msgstr "Teikninga er skriven ut."
msgstr "Teikninga er no skriven ut."
#. We got an error printing
#: ../tuxpaint.c:2174
#: ../tuxpaint.c:2181
msgid "Sorry! Your picture could not be printed!"
msgstr "Klarte ikkje skriva ut teikninga."
#. Notification that it's too soon to print again (--printdelay option is in effect)
#: ../tuxpaint.c:2177
#: ../tuxpaint.c:2184
msgid "You cant print yet!"
msgstr "Du kan ikkje skriva ut enno."
#. Prompt to confirm erasing a picture in the Open dialog
#: ../tuxpaint.c:2181
#: ../tuxpaint.c:2188
msgid "Erase this picture?"
msgstr "Vil du verkeleg sletta teikninga?"
#: ../tuxpaint.c:2182
#: ../tuxpaint.c:2189
msgid "Yes, erase it!"
msgstr "Ja, slett ho!"
#: ../tuxpaint.c:2183
#: ../tuxpaint.c:2190
msgid "No, dont erase it!"
msgstr "Nei, ikkje slett ho!"
#. Reminder that Mouse Button 1 is the button to use in Tux Paint
#: ../tuxpaint.c:2186
#: ../tuxpaint.c:2193
msgid "Remember to use the left mouse button!"
msgstr "Hugs å bruka venstre museknapp!"
#. Confirmation of successful (we hope) image export
#: ../tuxpaint.c:2190
#, fuzzy
#| msgid "Your picture has been printed!"
#: ../tuxpaint.c:2197
msgid "Your picture has been exported!"
msgstr "Teikninga er skriven ut."
msgstr "Teikninga er no eksportert."
#: ../tuxpaint.c:2191
#, fuzzy
#| msgid "Your picture has been printed!"
#: ../tuxpaint.c:2198
msgid "Your slideshow GIF has been exported!"
msgstr "Teikninga er skriven ut."
msgstr "GIF-animasjonen er no eksportert."
#. We got an error exporting
#: ../tuxpaint.c:2195
#, fuzzy
#| msgid "Sorry! Your picture could not be printed!"
#: ../tuxpaint.c:2202
msgid "Sorry! Your picture could not be exported!"
msgstr "Klarte ikkje skriva ut teikninga."
msgstr "Klarte ikkje eksportera teikninga."
#: ../tuxpaint.c:2196
#, fuzzy
#| msgid "Sorry! Your picture could not be printed!"
#: ../tuxpaint.c:2203
msgid "Sorry! Your slideshow GIF could not be exported!"
msgstr "Klarte ikkje skriva ut teikninga."
msgstr "Klarte ikkje eksportera GIF-animasjonen."
#. Slideshow instructions
#: ../tuxpaint.c:2200
#: ../tuxpaint.c:2207
msgid "Choose the pictures you want, then click “Play”."
msgstr "Vel teikningane du vil ha, og trykk så på «Køyr»."
#. Sound has been muted (silenced) via keyboard shortcut
#: ../tuxpaint.c:2407
#: ../tuxpaint.c:2416
msgid "Sound muted."
msgstr "Lyd slått av."
#. Sound has been unmuted (unsilenced) via keyboard shortcut
#: ../tuxpaint.c:2412
#: ../tuxpaint.c:2421
msgid "Sound unmuted."
msgstr "Lyd slått på."
#. Wait while Text tool finishes loading fonts
#: ../tuxpaint.c:3167
#: ../tuxpaint.c:3190
msgid "Please wait…"
msgstr "Vent litt …"
#. Open dialog: 'Erase' button, to erase/deleted the selected picture
#: ../tuxpaint.c:7923
#: ../tuxpaint.c:7952
msgid "Erase"
msgstr "Slett"
#. Open dialog: 'Slides' button, to switch to slide show mode
#: ../tuxpaint.c:7926
#: ../tuxpaint.c:7955
msgid "Slides"
msgstr "Lysbilete"
#. Open dialog: 'Export' button, to copy an image to an easily-accessible location
#: ../tuxpaint.c:7929
#: ../tuxpaint.c:7958
msgid "Export"
msgstr ""
msgstr "Eksporter"
#. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture
#: ../tuxpaint.c:7932
#: ../tuxpaint.c:7961
msgid "Back"
msgstr "Tilbake"
#. Slideshow: 'Play' button, to begin a slideshow sequence
#: ../tuxpaint.c:7935
#: ../tuxpaint.c:7964
msgid "Play"
msgstr "Køyr"
#. Slideshow: 'GIF Export' button, to create an animated GIF
#: ../tuxpaint.c:7938
#: ../tuxpaint.c:7967
msgid "GIF Export"
msgstr ""
msgstr "GIF-eksport"
#. Slideshow: 'Next' button, to load next slide (image)
#: ../tuxpaint.c:7941
#: ../tuxpaint.c:7970
msgid "Next"
msgstr "Neste"
#. Label for 'Letters' buttons (font selector, down the right when the Text tool is being used); used to show the difference between font faces
#: ../tuxpaint.c:8656
#: ../tuxpaint.c:8685
msgid "Aa"
msgstr "Aa"
#. Admittedly stupid way of determining which keys can be used for
#. positive and negative responses in dialogs (e.g., [Y] (for 'yes') in English)
#: ../tuxpaint.c:12069
#: ../tuxpaint.c:12179
msgid "Yes"
msgstr "Ja!"
#: ../tuxpaint.c:12073
#: ../tuxpaint.c:12183
msgid "No"
msgstr "Nei!"
#. Prompt to ask whether user wishes to save over old version of their file
#: ../tuxpaint.c:13190
#: ../tuxpaint.c:13309
msgid "Replace the picture with your changes?"
msgstr "Vil du byta ut den gamle teikninga med den nye?"
#. Positive response to saving over old version
#. (like a 'File:Save' action in other applications)
#: ../tuxpaint.c:13194
#: ../tuxpaint.c:13313
msgid "Yes, replace the old one!"
msgstr "Ja, byt ut den gamle!"
#. Negative response to saving over old version (saves a new image)
#. (like a 'File:Save As...' action in other applications)
#: ../tuxpaint.c:13198
#: ../tuxpaint.c:13317
msgid "No, save a new file!"
msgstr "Nei, lagra som ei ny teikning!"
#. Let user choose an image:
#. Instructions for 'Open' file dialog
#: ../tuxpaint.c:14454
#: ../tuxpaint.c:14573
msgid "Choose the picture you want, then click “Open”."
msgstr "Vel ei teikning, og trykk så «Opna»."
#. None selected? Too dangerous to automatically select all (like we do for slideshow playback).
#. Only 1 selected? No point in saving as GIF.
#.
#: ../tuxpaint.c:15880
#: ../tuxpaint.c:15999
msgid "Select 2 or more drawings to turn into an animated GIF."
msgstr ""
"Vel to eller fleire teikningar for å gjera dei om til ei animert GIF-"
"biletfil."
#: ../tuxpaint.c:23539
#: ../tuxpaint.c:23670
msgid "Select a color from your drawing."
msgstr "Vel ein farge frå teikninga."
#: ../tuxpaint.c:23551
#: ../tuxpaint.c:23682
msgid "Pick a color."
msgstr "Vel ein farge."